From 4feb9b1c72209628a8a8fcad22fd730ecddee126 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 11 May 2019 14:48:44 +0300
Subject: [PATCH 001/275] build: ignore `.devcontainer/` directory (#30417)

This makes it easier to experiment with VSCode's
[remote development using docker containers][1] feature.

In the future, we may check in the necessary files for users to use this
feature, but for now ignoring the directory makes it easier play around
and evaluate the feature.

[1]: https://code.visualstudio.com/docs/remote/containers

PR Close #30417
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fc7de6bcee..d7d46f27fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ tools/gulp-tasks/cldr/cldr-data/
 pubspec.lock
 .c9
 .idea/
+.devcontainer
 .settings/
 .vscode/launch.json
 .vscode/settings.json

From 0d4a0b6519aee94f384622e276be61cb7037b879 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 11 May 2019 09:53:41 +0000
Subject: [PATCH 002/275] build(docs-infra): upgrade cli command docs sources
 to 73d875a70 (#30414)

Updating [angular#master](https://github.com/angular/angular/tree/master) from [cli-builds#master](https://github.com/angular/cli-builds/tree/master).

##
Relevant changes in [commit range](https://github.com/angular/cli-builds/compare/8dd9b98ac...73d875a70):

**Modified**
- help/build.json
- help/e2e.json
- help/serve.json
- help/test.json
- help/xi18n.json

##

PR Close #30414
---
 aio/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/package.json b/aio/package.json
index 8f4a920b90..d09bd5c267 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -19,7 +19,7 @@
     "build-local": "yarn ~~build",
     "prebuild-with-ivy": "yarn setup-local && node scripts/switch-to-ivy",
     "build-with-ivy": "yarn ~~build",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 8dd9b98ac",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 73d875a70",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",

From 877b2285f982b6c7f133b722791357548821f7b1 Mon Sep 17 00:00:00 2001
From: D3T0N8R <tmalin@gmail.com>
Date: Fri, 10 May 2019 09:27:49 -0400
Subject: [PATCH 003/275] docs: change reference to jQuery programmers (#30386)

The section on Data Binding makes a reference to "any experienced jQuery programmer" which is a bit too narrow since there are also  programmers that write their front end in pure JavaScript.
PR Close #30386
---
 aio/content/guide/architecture-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/architecture-components.md b/aio/content/guide/architecture-components.md
index 75b1029fbd..c140abd4e9 100644
--- a/aio/content/guide/architecture-components.md
+++ b/aio/content/guide/architecture-components.md
@@ -75,7 +75,7 @@ Notice how custom components like this mix seamlessly with native HTML in the sa
 
 ### Data binding
 
-Without a framework, you would be responsible for pushing data values into the HTML controls and turning user responses into actions and value updates. Writing such push and pull logic by hand is tedious, error-prone, and a nightmare to read, as any experienced jQuery programmer can attest.
+Without a framework, you would be responsible for pushing data values into the HTML controls and turning user responses into actions and value updates. Writing such push and pull logic by hand is tedious, error-prone, and a nightmare to read, as any experienced front-end JavaScript programmer can attest.
 
 Angular supports *two-way data binding*, a mechanism for coordinating the parts of a template with the parts of a component. Add binding markup to the template HTML to tell Angular how to connect both sides.
 

From 0cf09fc981cf90b90a5b715db13f089f08123969 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 6 May 2019 15:33:34 +0200
Subject: [PATCH 004/275] test(ivy): use `TestBed` for render3 i18n tests
 (#30352) PR Close #30352

---
 packages/core/test/acceptance/i18n_spec.ts  |  964 ++++++++++++
 packages/core/test/i18n_integration_spec.ts |  640 --------
 packages/core/test/render3/i18n_spec.ts     | 1471 +------------------
 3 files changed, 969 insertions(+), 2106 deletions(-)
 create mode 100644 packages/core/test/acceptance/i18n_spec.ts
 delete mode 100644 packages/core/test/i18n_integration_spec.ts

diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
new file mode 100644
index 0000000000..f63ed86800
--- /dev/null
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -0,0 +1,964 @@
+/**
+ * @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 {Component, ContentChild, ContentChildren, Directive, HostBinding, QueryList, TemplateRef, Type, ViewChild, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
+import {onlyInIvy} from '@angular/private/testing';
+
+
+onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({declarations: [AppComp, DirectiveWithTplRef]});
+  });
+
+  it('should translate text', () => {
+    ɵi18nConfigureLocalize({translations: {'text': 'texte'}});
+    const fixture = initWithTemplate(AppComp, `<div i18n>text</div>`);
+    expect(fixture.nativeElement.innerHTML).toEqual(`<div>texte</div>`);
+  });
+
+  it('should support interpolations', () => {
+    ɵi18nConfigureLocalize(
+        {translations: {'Hello {$interpolation}!': 'Bonjour {$interpolation}!'}});
+    const fixture = initWithTemplate(AppComp, `<div i18n>Hello {{name}}!</div>`);
+    expect(fixture.nativeElement.innerHTML).toEqual(`<div>Bonjour Angular!</div>`);
+    fixture.componentRef.instance.name = `John`;
+    fixture.detectChanges();
+    expect(fixture.nativeElement.innerHTML).toEqual(`<div>Bonjour John!</div>`);
+  });
+
+  it('should support interpolations with custom interpolation config', () => {
+    ɵi18nConfigureLocalize({translations: {'Hello {$interpolation}': 'Bonjour {$interpolation}'}});
+    const interpolation = ['{%', '%}'] as[string, string];
+    TestBed.overrideComponent(AppComp, {set: {interpolation}});
+    const fixture = initWithTemplate(AppComp, `<div i18n>Hello {% name %}</div>`);
+
+    expect(fixture.nativeElement.innerHTML).toBe('<div>Bonjour Angular</div>');
+  });
+
+  it('should support interpolations with complex expressions', () => {
+    ɵi18nConfigureLocalize({
+      translations:
+          {'{$interpolation} - {$interpolation_1}': '{$interpolation} - {$interpolation_1} (fr)'}
+    });
+    const fixture =
+        initWithTemplate(AppComp, `<div i18n>{{ name | uppercase }} - {{ obj?.a?.b }}</div>`);
+    expect(fixture.nativeElement.innerHTML).toEqual(`<div>ANGULAR -  (fr)</div>`);
+    fixture.componentRef.instance.obj = {a: {b: 'value'}};
+    fixture.detectChanges();
+    expect(fixture.nativeElement.innerHTML).toEqual(`<div>ANGULAR - value (fr)</div>`);
+  });
+
+  it('should support elements', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        'Hello {$startTagSpan}world{$closeTagSpan} and {$startTagDiv}universe{$closeTagDiv}!':
+            'Bonjour {$startTagSpan}monde{$closeTagSpan} et {$startTagDiv}univers{$closeTagDiv}!'
+      }
+    });
+    const fixture = initWithTemplate(
+        AppComp, `<div i18n>Hello <span>world</span> and <div>universe</div>!</div>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(`<div>Bonjour <span>monde</span> et <div>univers</div>!</div>`);
+  });
+
+  it('should support removing elements', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        'Hello {$startBoldText}my{$closeBoldText}{$startTagSpan}world{$closeTagSpan}':
+            'Bonjour {$startTagSpan}monde{$closeTagSpan}'
+      }
+    });
+    const fixture =
+        initWithTemplate(AppComp, `<div i18n>Hello <b>my</b><span>world</span></div><div>!</div>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(`<div>Bonjour <span>monde</span></div><div>!</div>`);
+  });
+
+  it('should support moving elements', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        'Hello {$startTagSpan}world{$closeTagSpan} and {$startTagDiv}universe{$closeTagDiv}!':
+            'Bonjour {$startTagDiv}univers{$closeTagDiv} et {$startTagSpan}monde{$closeTagSpan}!'
+      }
+    });
+    const fixture = initWithTemplate(
+        AppComp, `<div i18n>Hello <span>world</span> and <div>universe</div>!</div>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(`<div>Bonjour <div>univers</div> et <span>monde</span>!</div>`);
+  });
+
+  it('should support template directives', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        'Content: {$startTagDiv}before{$startTagSpan}middle{$closeTagSpan}after{$closeTagDiv}!':
+            'Contenu: {$startTagDiv}avant{$startTagSpan}milieu{$closeTagSpan}après{$closeTagDiv}!'
+      }
+    });
+    const fixture = initWithTemplate(
+        AppComp,
+        `<div i18n>Content: <div *ngIf="visible">before<span>middle</span>after</div>!</div>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(`<div>Contenu: <div>avant<span>milieu</span>après</div><!--bindings={
+  "ng-reflect-ng-if": "true"
+}-->!</div>`);
+
+    fixture.componentRef.instance.visible = false;
+    fixture.detectChanges();
+    expect(fixture.nativeElement.innerHTML).toEqual(`<div>Contenu: <!--bindings={
+  "ng-reflect-ng-if": "false"
+}-->!</div>`);
+  });
+
+  it('should support multiple i18n blocks', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        'trad {$interpolation}': 'traduction {$interpolation}',
+        'start {$interpolation} middle {$interpolation_1} end':
+            'start {$interpolation_1} middle {$interpolation} end',
+        '{$startTagC}trad{$closeTagC}{$startTagD}{$closeTagD}{$startTagE}{$closeTagE}':
+            '{$startTagE}{$closeTagE}{$startTagC}traduction{$closeTagC}'
+      }
+    });
+    const fixture = initWithTemplate(AppComp, `
+      <div>
+        <a i18n>trad {{name}}</a>
+        hello
+        <b i18n i18n-title title="start {{count}} middle {{name}} end">
+          <c>trad</c>
+          <d></d>
+          <e></e>
+        </b>
+      </div>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(
+            `<div><a>traduction Angular</a> hello <b title="start Angular middle 0 end"><e></e><c>traduction</c></b></div>`);
+  });
+
+  it('should support multiple sibling i18n blocks', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        'Section 1': 'Section un',
+        'Section 2': 'Section deux',
+        'Section 3': 'Section trois',
+      }
+    });
+    const fixture = initWithTemplate(AppComp, `
+      <div>
+        <div i18n>Section 1</div>
+        <div i18n>Section 2</div>
+        <div i18n>Section 3</div>
+      </div>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(`<div><div>Section un</div><div>Section deux</div><div>Section trois</div></div>`);
+  });
+
+  it('should support multiple sibling i18n blocks inside of a template directive', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        'Section 1': 'Section un',
+        'Section 2': 'Section deux',
+        'Section 3': 'Section trois',
+      }
+    });
+    const fixture = initWithTemplate(AppComp, `
+      <ul *ngFor="let item of [1,2,3]">
+        <li i18n>Section 1</li>
+        <li i18n>Section 2</li>
+        <li i18n>Section 3</li>
+      </ul>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(
+            `<ul><li>Section un</li><li>Section deux</li><li>Section trois</li></ul><ul><li>Section un</li><li>Section deux</li><li>Section trois</li></ul><ul><li>Section un</li><li>Section deux</li><li>Section trois</li></ul><!--bindings={
+  "ng-reflect-ng-for-of": "1,2,3"
+}-->`);
+  });
+
+  it('should properly escape quotes in content', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        '\'Single quotes\' and "Double quotes"': '\'Guillemets simples\' et "Guillemets doubles"'
+      }
+    });
+    const fixture =
+        initWithTemplate(AppComp, `<div i18n>'Single quotes' and "Double quotes"</div>`);
+
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual('<div>\'Guillemets simples\' et "Guillemets doubles"</div>');
+  });
+
+  it('should correctly bind to context in nested template', () => {
+    ɵi18nConfigureLocalize({translations: {'Item {$interpolation}': 'Article {$interpolation}'}});
+    const fixture = initWithTemplate(AppComp, `
+          <div *ngFor='let id of items'>
+            <div i18n>Item {{ id }}</div>
+          </div>
+        `);
+
+    const element = fixture.nativeElement;
+    for (let i = 0; i < element.children.length; i++) {
+      const child = element.children[i];
+      expect(child).toHaveText(`Article ${i + 1}`);
+    }
+  });
+
+  it('should ignore i18n attributes on self-closing tags', () => {
+    const fixture = initWithTemplate(AppComp, '<img src="logo.png" i18n>');
+    expect(fixture.nativeElement.innerHTML).toBe(`<img src="logo.png">`);
+  });
+
+  it('should handle i18n attribute with directives', () => {
+    ɵi18nConfigureLocalize({translations: {'Hello {$interpolation}': 'Bonjour {$interpolation}'}});
+    const fixture = initWithTemplate(AppComp, `<div *ngIf="visible" i18n>Hello {{ name }}</div>`);
+    expect(fixture.nativeElement.firstChild).toHaveText('Bonjour Angular');
+  });
+
+  it('should work correctly with event listeners', () => {
+    ɵi18nConfigureLocalize({translations: {'Hello {$interpolation}': 'Bonjour {$interpolation}'}});
+
+    @Component(
+        {selector: 'app-comp', template: `<div i18n (click)="onClick()">Hello {{ name }}</div>`})
+    class ListenerComp {
+      name = `Angular`;
+      clicks = 0;
+
+      onClick() { this.clicks++; }
+    }
+
+    TestBed.configureTestingModule({declarations: [ListenerComp]});
+    const fixture = TestBed.createComponent(ListenerComp);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement.firstChild;
+    const instance = fixture.componentInstance;
+
+    expect(element).toHaveText('Bonjour Angular');
+    expect(instance.clicks).toBe(0);
+
+    element.click();
+    expect(instance.clicks).toBe(1);
+  });
+
+  describe('ng-container and ng-template support', () => {
+    it('should support ng-container', () => {
+      ɵi18nConfigureLocalize({translations: {'text': 'texte'}});
+      const fixture = initWithTemplate(AppComp, `<ng-container i18n>text</ng-container>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`texte<!--ng-container-->`);
+    });
+
+    it('should handle single translation message within ng-template', () => {
+      ɵi18nConfigureLocalize(
+          {translations: {'Hello {$interpolation}': 'Bonjour {$interpolation}'}});
+      const fixture =
+          initWithTemplate(AppComp, `<ng-template i18n tplRef>Hello {{ name }}</ng-template>`);
+
+      const element = fixture.nativeElement;
+      expect(element).toHaveText('Bonjour Angular');
+    });
+
+    it('should be able to act as child elements inside i18n block (plain text content)', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{$startTagNgTemplate} Hello {$closeTagNgTemplate}{$startTagNgContainer} Bye {$closeTagNgContainer}':
+              '{$startTagNgTemplate} Bonjour {$closeTagNgTemplate}{$startTagNgContainer} Au revoir {$closeTagNgContainer}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `
+        <div i18n>
+          <ng-template tplRef>
+            Hello
+          </ng-template>
+          <ng-container>
+            Bye
+          </ng-container>
+        </div>
+      `);
+
+      const element = fixture.nativeElement.firstChild;
+      expect(element.textContent.replace(/\s+/g, ' ').trim()).toBe('Bonjour Au revoir');
+    });
+
+    it('should be able to act as child elements inside i18n block (text + tags)', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{$startTagNgTemplate}{$startTagSpan}Hello{$closeTagSpan}{$closeTagNgTemplate}{$startTagNgContainer}{$startTagSpan}Hello{$closeTagSpan}{$closeTagNgContainer}':
+              '{$startTagNgTemplate}{$startTagSpan}Bonjour{$closeTagSpan}{$closeTagNgTemplate}{$startTagNgContainer}{$startTagSpan}Bonjour{$closeTagSpan}{$closeTagNgContainer}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `
+        <div i18n>
+          <ng-template tplRef>
+            <span>Hello</span>
+          </ng-template>
+          <ng-container>
+            <span>Hello</span>
+          </ng-container>
+        </div>
+      `);
+
+      const element = fixture.nativeElement;
+      const spans = element.getElementsByTagName('span');
+      for (let i = 0; i < spans.length; i++) {
+        expect(spans[i]).toHaveText('Bonjour');
+      }
+    });
+
+    it('should be able to handle deep nested levels with templates', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{$startTagSpan} Hello - 1 {$closeTagSpan}{$startTagSpan_1} Hello - 2 {$startTagSpan_1} Hello - 3 {$startTagSpan_1} Hello - 4 {$closeTagSpan}{$closeTagSpan}{$closeTagSpan}{$startTagSpan} Hello - 5 {$closeTagSpan}':
+              '{$startTagSpan} Bonjour - 1 {$closeTagSpan}{$startTagSpan_1} Bonjour - 2 {$startTagSpan_1} Bonjour - 3 {$startTagSpan_1} Bonjour - 4 {$closeTagSpan}{$closeTagSpan}{$closeTagSpan}{$startTagSpan} Bonjour - 5 {$closeTagSpan}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `
+        <div i18n>
+          <span>
+            Hello - 1
+          </span>
+          <span *ngIf="visible">
+            Hello - 2
+            <span *ngIf="visible">
+              Hello - 3
+              <span *ngIf="visible">
+                Hello - 4
+              </span>
+            </span>
+          </span>
+          <span>
+            Hello - 5
+          </span>
+        </div>
+      `);
+
+      const element = fixture.nativeElement;
+      const spans = element.getElementsByTagName('span');
+      for (let i = 0; i < spans.length; i++) {
+        expect(spans[i].innerHTML).toContain(`Bonjour - ${i + 1}`);
+      }
+    });
+
+    it('should handle self-closing tags as content', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{$startTagSpan}My logo{$tagImg}{$closeTagSpan}':
+              '{$startTagSpan}Mon logo{$tagImg}{$closeTagSpan}'
+        }
+      });
+      const content = `My logo<img src="logo.png" title="Logo">`;
+      const fixture = initWithTemplate(AppComp, `
+        <ng-container i18n>
+          <span>${content}</span>
+        </ng-container>
+        <ng-template i18n tplRef>
+          <span>${content}</span>
+        </ng-template>
+      `);
+
+      const element = fixture.nativeElement;
+      const spans = element.getElementsByTagName('span');
+      for (let i = 0; i < spans.length; i++) {
+        const child = spans[i];
+        expect(child).toHaveText('Mon logo');
+      }
+    });
+  });
+
+  describe('should support ICU expressions', () => {
+    it('with no root node', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}':
+              '{VAR_SELECT, select, 10 {dix} 20 {vingt} other {autre}}'
+        }
+      });
+      const fixture =
+          initWithTemplate(AppComp, `{count, select, 10 {ten} 20 {twenty} other {other}}`);
+
+      const element = fixture.nativeElement;
+      expect(element).toHaveText('autre');
+    });
+
+    it('with no i18n tag', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}':
+              '{VAR_SELECT, select, 10 {dix} 20 {vingt} other {autre}}'
+        }
+      });
+      const fixture = initWithTemplate(
+          AppComp, `<div>{count, select, 10 {ten} 20 {twenty} other {other}}</div>`);
+
+      const element = fixture.nativeElement;
+      expect(element).toHaveText('autre');
+    });
+
+    it('multiple', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_PLURAL, plural, =0 {no {$startBoldText}emails{$closeBoldText}!} =1 {one {$startItalicText}email{$closeItalicText}} other {{$interpolation} {$startTagSpan}emails{$closeTagSpan}}}':
+              '{VAR_PLURAL, plural, =0 {aucun {$startBoldText}email{$closeBoldText}!} =1 {un {$startItalicText}email{$closeItalicText}} other {{$interpolation} {$startTagSpan}emails{$closeTagSpan}}}',
+          '{VAR_SELECT, select, other {(name)}}': '{VAR_SELECT, select, other {({$interpolation})}}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `<div i18n>{count, plural,
+        =0 {no <b>emails</b>!}
+        =1 {one <i>email</i>}
+        other {{{count}} <span title="{{name}}">emails</span>}
+      } - {name, select,
+        other {({{name}})}
+      }</div>`);
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(`<div>aucun <b>email</b>!<!--ICU 7--> - (Angular)<!--ICU 13--></div>`);
+
+      fixture.componentRef.instance.count = 4;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(
+              `<div>4 <span title="Angular">emails</span><!--ICU 7--> - (Angular)<!--ICU 13--></div>`);
+
+      fixture.componentRef.instance.count = 0;
+      fixture.componentRef.instance.name = 'John';
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(`<div>aucun <b>email</b>!<!--ICU 7--> - (John)<!--ICU 13--></div>`);
+    });
+
+    it('with custom interpolation config', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_SELECT, select, 10 {ten} other {{$interpolation}}}':
+              '{VAR_SELECT, select, 10 {dix} other {{$interpolation}}}'
+        }
+      });
+      const interpolation = ['{%', '%}'] as[string, string];
+      TestBed.overrideComponent(AppComp, {set: {interpolation}});
+      const fixture =
+          initWithTemplate(AppComp, `<div i18n>{count, select, 10 {ten} other {{% name %}}}</div>`);
+
+      expect(fixture.nativeElement).toHaveText(`Angular`);
+    });
+
+    it('inside HTML elements', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_PLURAL, plural, =0 {no {$startBoldText}emails{$closeBoldText}!} =1 {one {$startItalicText}email{$closeItalicText}} other {{$interpolation} {$startTagSpan}emails{$closeTagSpan}}}':
+              '{VAR_PLURAL, plural, =0 {aucun {$startBoldText}email{$closeBoldText}!} =1 {un {$startItalicText}email{$closeItalicText}} other {{$interpolation} {$startTagSpan}emails{$closeTagSpan}}}',
+          '{VAR_SELECT, select, other {(name)}}': '{VAR_SELECT, select, other {({$interpolation})}}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `<div i18n><span>{count, plural,
+        =0 {no <b>emails</b>!}
+        =1 {one <i>email</i>}
+        other {{{count}} <span title="{{name}}">emails</span>}
+      }</span> - <span>{name, select,
+        other {({{name}})}
+      }</span></div>`);
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(
+              `<div><span>aucun <b>email</b>!<!--ICU 9--></span> - <span>(Angular)<!--ICU 15--></span></div>`);
+
+      fixture.componentRef.instance.count = 4;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(
+              `<div><span>4 <span title="Angular">emails</span><!--ICU 9--></span> - <span>(Angular)<!--ICU 15--></span></div>`);
+
+      fixture.componentRef.instance.count = 0;
+      fixture.componentRef.instance.name = 'John';
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(
+              `<div><span>aucun <b>email</b>!<!--ICU 9--></span> - <span>(John)<!--ICU 15--></span></div>`);
+    });
+
+    it('inside template directives', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_SELECT, select, other {(name)}}': '{VAR_SELECT, select, other {({$interpolation})}}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `<div i18n><span *ngIf="visible">{name, select,
+        other {({{name}})}
+      }</span></div>`);
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(`<div><span>(Angular)<!--ICU 4--></span><!--bindings={
+  "ng-reflect-ng-if": "true"
+}--></div>`);
+
+      fixture.componentRef.instance.visible = false;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div><!--bindings={
+  "ng-reflect-ng-if": "false"
+}--></div>`);
+    });
+
+    it('inside ng-container', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_SELECT, select, other {(name)}}': '{VAR_SELECT, select, other {({$interpolation})}}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `<ng-container i18n>{name, select,
+        other {({{name}})}
+      }</ng-container>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`(Angular)<!--ICU 4--><!--ng-container-->`);
+    });
+
+    it('inside <ng-template>', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}':
+              '{VAR_SELECT, select, 10 {dix} 20 {vingt} other {autre}}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `
+        <ng-template i18n tplRef>
+          {count, select, 10 {ten} 20 {twenty} other {other}}
+        </ng-template>
+      `);
+
+      const element = fixture.nativeElement;
+      expect(element).toHaveText('autre');
+    });
+
+    it('nested', () => {
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{VAR_PLURAL, plural, =0 {zero} other {{$interpolation} {VAR_SELECT, select, cat {cats} dog {dogs} other {animals}}!}}':
+              '{VAR_PLURAL, plural, =0 {zero} other {{$interpolation} {VAR_SELECT, select, cat {chats} dog {chients} other {animaux}}!}}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `<div i18n>{count, plural,
+        =0 {zero}
+        other {{{count}} {name, select,
+                       cat {cats}
+                       dog {dogs}
+                       other {animals}
+                     }!}
+      }</div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div>zero<!--ICU 5--></div>`);
+
+      fixture.componentRef.instance.count = 4;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(`<div>4 animaux<!--nested ICU 0-->!<!--ICU 5--></div>`);
+    });
+  });
+
+  describe('should support attributes', () => {
+    it('text', () => {
+      ɵi18nConfigureLocalize({translations: {'text': 'texte'}});
+      const fixture = initWithTemplate(AppComp, `<div i18n i18n-title title="text"></div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div title="texte"></div>`);
+    });
+
+    it('interpolations', () => {
+      ɵi18nConfigureLocalize(
+          {translations: {'hello {$interpolation}': 'bonjour {$interpolation}'}});
+      const fixture =
+          initWithTemplate(AppComp, `<div i18n i18n-title title="hello {{name}}"></div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div title="bonjour Angular"></div>`);
+
+      fixture.componentRef.instance.name = 'John';
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div title="bonjour John"></div>`);
+    });
+
+    it('multiple attributes', () => {
+      ɵi18nConfigureLocalize(
+          {translations: {'hello {$interpolation}': 'bonjour {$interpolation}'}});
+      const fixture = initWithTemplate(
+          AppComp,
+          `<div i18n i18n-title title="hello {{name}}" i18n-aria-label aria-label="hello {{name}}"></div>`);
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(`<div title="bonjour Angular" aria-label="bonjour Angular"></div>`);
+
+      fixture.componentRef.instance.name = 'John';
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(`<div title="bonjour John" aria-label="bonjour John"></div>`);
+    });
+
+    it('on removed elements', () => {
+      ɵi18nConfigureLocalize(
+          {translations: {'text': 'texte', '{$startTagSpan}content{$closeTagSpan}': 'contenu'}});
+      const fixture =
+          initWithTemplate(AppComp, `<div i18n><span i18n-title title="text">content</span></div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div>contenu</div>`);
+    });
+
+    it('with custom interpolation config', () => {
+      ɵi18nConfigureLocalize(
+          {translations: {'Hello {$interpolation}': 'Bonjour {$interpolation}'}});
+      const interpolation = ['{%', '%}'] as[string, string];
+      TestBed.overrideComponent(AppComp, {set: {interpolation}});
+      const fixture =
+          initWithTemplate(AppComp, `<div i18n-title="m|d" title="Hello {% name %}"></div>`);
+
+      const element = fixture.nativeElement.firstChild;
+      expect(element.title).toBe('Bonjour Angular');
+    });
+
+    it('in nested template', () => {
+      ɵi18nConfigureLocalize({translations: {'Item {$interpolation}': 'Article {$interpolation}'}});
+      const fixture = initWithTemplate(AppComp, `
+          <div *ngFor='let item of [1,2,3]'>
+            <div i18n-title='m|d' title='Item {{ item }}'></div>
+          </div>`);
+
+      const element = fixture.nativeElement;
+      for (let i = 0; i < element.children.length; i++) {
+        const child = element.children[i];
+        expect((child as any).innerHTML).toBe(`<div title="Article ${i + 1}"></div>`);
+      }
+    });
+
+    it('should add i18n attributes on self-closing tags', () => {
+      ɵi18nConfigureLocalize(
+          {translations: {'Hello {$interpolation}': 'Bonjour {$interpolation}'}});
+      const fixture =
+          initWithTemplate(AppComp, `<img src="logo.png" i18n-title title="Hello {{ name }}">`);
+
+      const element = fixture.nativeElement.firstChild;
+      expect(element.title).toBe('Bonjour Angular');
+    });
+  });
+
+  it('should work with directives and host bindings', () => {
+    let directiveInstances: ClsDir[] = [];
+
+    @Directive({selector: '[test]'})
+    class ClsDir {
+      @HostBinding('className')
+      klass = 'foo';
+
+      constructor() { directiveInstances.push(this); }
+    }
+
+    @Component({
+      selector: `my-app`,
+      template: `
+      <div i18n test i18n-title title="start {{exp1}} middle {{exp2}} end">
+         trad: {exp1, plural,
+              =0 {no <b title="none">emails</b>!}
+              =1 {one <i>email</i>}
+              other {{{exp1}} emails}
+         }
+      </div><div test></div>`
+    })
+    class MyApp {
+      exp1 = 1;
+      exp2 = 2;
+    }
+
+    TestBed.configureTestingModule({declarations: [ClsDir, MyApp]});
+    ɵi18nConfigureLocalize({
+      translations: {
+        'start {$interpolation} middle {$interpolation_1} end':
+            'début {$interpolation_1} milieu {$interpolation} fin',
+        '{VAR_PLURAL, plural, =0 {no {$startBoldText}emails{$closeBoldText}!} =1 {one {$startItalicText}email{$closeItalicText}} other {{$interpolation} emails}}':
+            '{VAR_PLURAL, plural, =0 {aucun {$startBoldText}email{$closeBoldText}!} =1 {un {$startItalicText}email{$closeItalicText}} other {{$interpolation} emails}}',
+        ' trad: {$icu}': ' traduction: {$icu}'
+      }
+    });
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(
+            `<div test="" title="début 2 milieu 1 fin" class="foo"> traduction: un <i>email</i><!--ICU 19--></div><div test="" class="foo"></div>`);
+
+    directiveInstances.forEach(instance => instance.klass = 'bar');
+    fixture.componentRef.instance.exp1 = 2;
+    fixture.componentRef.instance.exp2 = 3;
+    fixture.detectChanges();
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(
+            `<div test="" title="début 3 milieu 2 fin" class="bar"> traduction: 2 emails<!--ICU 19--></div><div test="" class="bar"></div>`);
+  });
+
+  it('should support adding/moving/removing nodes', () => {
+    ɵi18nConfigureLocalize({
+      translations: {
+        '{$startTagDiv2}{$closeTagDiv2}{$startTagDiv3}{$closeTagDiv3}{$startTagDiv4}{$closeTagDiv4}{$startTagDiv5}{$closeTagDiv5}{$startTagDiv6}{$closeTagDiv6}{$startTagDiv7}{$closeTagDiv7}{$startTagDiv8}{$closeTagDiv8}':
+            '{$startTagDiv2}{$closeTagDiv2}{$startTagDiv8}{$closeTagDiv8}{$startTagDiv4}{$closeTagDiv4}{$startTagDiv5}{$closeTagDiv5}Bonjour monde{$startTagDiv3}{$closeTagDiv3}{$startTagDiv7}{$closeTagDiv7}'
+      }
+    });
+    const fixture = initWithTemplate(AppComp, `
+      <div i18n>
+        <div2></div2>
+        <div3></div3>
+        <div4></div4>
+        <div5></div5>
+        <div6></div6>
+        <div7></div7>
+        <div8></div8>
+      </div>`);
+    expect(fixture.nativeElement.innerHTML)
+        .toEqual(
+            `<div><div2></div2><div8></div8><div4></div4><div5></div5>Bonjour monde<div3></div3><div7></div7></div>`);
+  });
+
+  describe('projection', () => {
+    it('should project the translations', () => {
+      @Component({selector: 'child', template: '<p><ng-content></ng-content></p>'})
+      class Child {
+      }
+
+      @Component({
+        selector: 'parent',
+        template: `
+            <div i18n>
+              <child>I am projected from
+                <b i18n-title title="Child of {{name}}">{{name}}<remove-me-1></remove-me-1></b>
+                <remove-me-2></remove-me-2>
+              </child>
+              <remove-me-3></remove-me-3>
+            </div>`
+      })
+      class Parent {
+        name: string = 'Parent';
+      }
+      TestBed.configureTestingModule({declarations: [Parent, Child]});
+      ɵi18nConfigureLocalize({
+        translations: {
+          'Child of {$interpolation}': 'Enfant de {$interpolation}',
+          '{$startTagChild}I am projected from {$startBoldText}{$interpolation}{$startTagRemoveMe_1}{$closeTagRemoveMe_1}{$closeBoldText}{$startTagRemoveMe_2}{$closeTagRemoveMe_2}{$closeTagChild}{$startTagRemoveMe_3}{$closeTagRemoveMe_3}':
+              '{$startTagChild}Je suis projeté depuis {$startBoldText}{$interpolation}{$closeBoldText}{$closeTagChild}'
+        }
+      });
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(
+              `<div><child><p>Je suis projeté depuis <b title="Enfant de Parent">Parent</b></p></child></div>`);
+    });
+
+    it('should project a translated i18n block', () => {
+      @Component({selector: 'child', template: '<p><ng-content></ng-content></p>'})
+      class Child {
+      }
+
+      @Component({
+        selector: 'parent',
+        template: `
+          <div>
+            <child>
+              <any></any>
+              <b i18n i18n-title title="Child of {{name}}">I am projected from {{name}}</b>
+              <any></any>
+            </child>
+          </div>`
+      })
+      class Parent {
+        name: string = 'Parent';
+      }
+      TestBed.configureTestingModule({declarations: [Parent, Child]});
+      ɵi18nConfigureLocalize({
+        translations: {
+          'Child of {$interpolation}': 'Enfant de {$interpolation}',
+          'I am projected from {$interpolation}': 'Je suis projeté depuis {$interpolation}'
+        }
+      });
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(
+              `<div><child><p><any></any><b title="Enfant de Parent">Je suis projeté depuis Parent</b><any></any></p></child></div>`);
+
+      // it should be able to render a new component with the same template code
+      const fixture2 = TestBed.createComponent(Parent);
+      fixture2.detectChanges();
+      expect(fixture.nativeElement.innerHTML).toEqual(fixture2.nativeElement.innerHTML);
+
+      fixture2.componentRef.instance.name = 'Parent 2';
+      fixture2.detectChanges();
+      expect(fixture2.nativeElement.innerHTML)
+          .toEqual(
+              `<div><child><p><any></any><b title="Enfant de Parent 2">Je suis projeté depuis Parent 2</b><any></any></p></child></div>`);
+
+      // The first fixture should not have changed
+      expect(fixture.nativeElement.innerHTML).not.toEqual(fixture2.nativeElement.innerHTML);
+    });
+
+    it('should re-project translations when multiple projections', () => {
+      @Component({selector: 'grand-child', template: '<div><ng-content></ng-content></div>'})
+      class GrandChild {
+      }
+
+      @Component(
+          {selector: 'child', template: '<grand-child><ng-content></ng-content></grand-child>'})
+      class Child {
+      }
+
+      @Component({selector: 'parent', template: `<child i18n><b>Hello</b> World!</child>`})
+      class Parent {
+        name: string = 'Parent';
+      }
+
+      TestBed.configureTestingModule({declarations: [Parent, Child, GrandChild]});
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{$startBoldText}Hello{$closeBoldText} World!':
+              '{$startBoldText}Bonjour{$closeBoldText} monde!'
+        }
+      });
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual('<child><grand-child><div><b>Bonjour</b> monde!</div></grand-child></child>');
+    });
+
+    // FW-1319 Runtime i18n should be able to remove projected placeholders
+    xit('should be able to remove projected placeholders', () => {
+      @Component({selector: 'grand-child', template: '<div><ng-content></ng-content></div>'})
+      class GrandChild {
+      }
+
+      @Component(
+          {selector: 'child', template: '<grand-child><ng-content></ng-content></grand-child>'})
+      class Child {
+      }
+
+      @Component({selector: 'parent', template: `<child i18n><b>Hello</b> World!</child>`})
+      class Parent {
+        name: string = 'Parent';
+      }
+
+      TestBed.configureTestingModule({declarations: [Parent, Child, GrandChild]});
+      ɵi18nConfigureLocalize(
+          {translations: {'{$startBoldText}Hello{$closeBoldText} World!': 'Bonjour monde!'}});
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual('<child><grand-child><div>Bonjour monde!</div></grand-child></child>');
+    });
+
+    // FW-1312: Wrong i18n code generated by the compiler when the template has 2 empty `span`
+    xit('should project translations with selectors', () => {
+      @Component({selector: 'child', template: `<ng-content select="span"></ng-content>`})
+      class Child {
+      }
+
+      @Component({
+        selector: 'parent',
+        template: `
+          <child i18n>
+            <span title="keepMe"></span>
+            <span title="deleteMe"></span>
+          </child>
+        `
+      })
+      class Parent {
+      }
+
+      TestBed.configureTestingModule({declarations: [Parent, Child]});
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{$startTagSpan}{$closeTagSpan}{$startTagSpan_1}{$closeTagSpan}':
+              '{$startTagSpan}Contenu{$closeTagSpan}'
+        }
+      });
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual('<child><span title="keepMe">Contenu</span></child>');
+    });
+  });
+
+  describe('queries', () => {
+    function toHtml(element: Element): string {
+      return element.innerHTML.replace(/\sng-reflect-\S*="[^"]*"/g, '')
+          .replace(/<!--bindings=\{(\W.*\W\s*)?\}-->/g, '');
+    }
+
+    it('detached nodes should still be part of query', () => {
+      @Directive({selector: '[text]', inputs: ['text'], exportAs: 'textDir'})
+      class TextDirective {
+        // TODO(issue/24571): remove '!'.
+        text !: string;
+        constructor() {}
+      }
+
+      @Component({selector: 'div-query', template: '<ng-container #vc></ng-container>'})
+      class DivQuery {
+        // TODO(issue/24571): remove '!'.
+        @ContentChild(TemplateRef) template !: TemplateRef<any>;
+
+        // TODO(issue/24571): remove '!'.
+        @ViewChild('vc', {read: ViewContainerRef})
+        vc !: ViewContainerRef;
+
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(TextDirective, {descendants: true})
+        query !: QueryList<TextDirective>;
+
+        create() { this.vc.createEmbeddedView(this.template); }
+
+        destroy() { this.vc.clear(); }
+      }
+
+      TestBed.configureTestingModule({declarations: [TextDirective, DivQuery]});
+      ɵi18nConfigureLocalize({
+        translations: {
+          '{$startTagNgTemplate}{$startTagDiv_1}{$startTagDiv}{$startTagSpan}Content{$closeTagSpan}{$closeTagDiv}{$closeTagDiv}{$closeTagNgTemplate}':
+              '{$startTagNgTemplate}Contenu{$closeTagNgTemplate}'
+        }
+      });
+      const fixture = initWithTemplate(AppComp, `
+          <div-query #q i18n>
+            <ng-template>
+              <div>
+                <div *ngIf="visible">
+                  <span text="1">Content</span>
+                </div>
+              </div>
+            </ng-template>
+          </div-query>
+        `);
+      const q = fixture.debugElement.children[0].references.q;
+      expect(q.query.length).toEqual(0);
+
+      // Create embedded view
+      q.create();
+      fixture.detectChanges();
+      expect(q.query.length).toEqual(1);
+      expect(toHtml(fixture.nativeElement))
+          .toEqual(`<div-query><!--ng-container-->Contenu<!--container--></div-query>`);
+
+      // Disable ng-if
+      fixture.componentInstance.visible = false;
+      fixture.detectChanges();
+      expect(q.query.length).toEqual(0);
+      expect(toHtml(fixture.nativeElement))
+          .toEqual(`<div-query><!--ng-container-->Contenu<!--container--></div-query>`);
+    });
+  });
+});
+
+function initWithTemplate(compType: Type<any>, template: string) {
+  TestBed.overrideComponent(compType, {set: {template}});
+  const fixture = TestBed.createComponent(compType);
+  fixture.detectChanges();
+  return fixture;
+}
+
+@Component({selector: 'app-comp', template: ``})
+class AppComp {
+  name = `Angular`;
+  visible = true;
+  count = 0;
+}
+
+@Directive({
+  selector: '[tplRef]',
+})
+class DirectiveWithTplRef {
+  constructor(public vcRef: ViewContainerRef, public tplRef: TemplateRef<{}>) {}
+  ngOnInit() { this.vcRef.createEmbeddedView(this.tplRef, {}); }
+}
diff --git a/packages/core/test/i18n_integration_spec.ts b/packages/core/test/i18n_integration_spec.ts
deleted file mode 100644
index af09a356a7..0000000000
--- a/packages/core/test/i18n_integration_spec.ts
+++ /dev/null
@@ -1,640 +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 {Component, ContentChild, ContentChildren, Directive, QueryList, TemplateRef, ViewChild, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
-import {TestBed} from '@angular/core/testing';
-import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {onlyInIvy} from '@angular/private/testing';
-
-@Directive({
-  selector: '[tplRef]',
-})
-class DirectiveWithTplRef {
-  constructor(public vcRef: ViewContainerRef, public tplRef: TemplateRef<{}>) {}
-  ngOnInit() { this.vcRef.createEmbeddedView(this.tplRef, {}); }
-}
-
-@Component({selector: 'my-comp', template: ''})
-class MyComp {
-  name = 'John';
-  items = ['1', '2', '3'];
-  obj = {a: {b: 'value'}};
-  visible = true;
-  age = 20;
-  count = 2;
-  otherLabel = 'other label';
-  clicks = 0;
-
-  onClick() { this.clicks++; }
-}
-
-const TRANSLATIONS: any = {
-  'one': 'un',
-  'two': 'deux',
-  'more than two': 'plus que deux',
-  'ten': 'dix',
-  'twenty': 'vingt',
-  'other': 'autres',
-  'Hello': 'Bonjour',
-  'Hello {$interpolation}': 'Bonjour {$interpolation}',
-  'Bye': 'Au revoir',
-  'Item {$interpolation}': 'Article {$interpolation}',
-  '\'Single quotes\' and "Double quotes"': '\'Guillemets simples\' et "Guillemets doubles"',
-  'My logo': 'Mon logo',
-  '{$interpolation} - {$interpolation_1}': '{$interpolation} - {$interpolation_1} (fr)',
-  '{$startTagSpan}My logo{$tagImg}{$closeTagSpan}':
-      '{$startTagSpan}Mon logo{$tagImg}{$closeTagSpan}',
-  '{$startTagNgTemplate} Hello {$closeTagNgTemplate}{$startTagNgContainer} Bye {$closeTagNgContainer}':
-      '{$startTagNgTemplate} Bonjour {$closeTagNgTemplate}{$startTagNgContainer} Au revoir {$closeTagNgContainer}',
-  '{$startTagNgTemplate}{$startTagSpan}Hello{$closeTagSpan}{$closeTagNgTemplate}{$startTagNgContainer}{$startTagSpan}Hello{$closeTagSpan}{$closeTagNgContainer}':
-      '{$startTagNgTemplate}{$startTagSpan}Bonjour{$closeTagSpan}{$closeTagNgTemplate}{$startTagNgContainer}{$startTagSpan}Bonjour{$closeTagSpan}{$closeTagNgContainer}',
-  '{$startTagNgTemplate}{$startTagSpan}Hello{$closeTagSpan}{$closeTagNgTemplate}{$startTagNgContainer}{$startTagSpan_1}Hello{$closeTagSpan}{$closeTagNgContainer}':
-      '{$startTagNgTemplate}{$startTagSpan}Bonjour{$closeTagSpan}{$closeTagNgTemplate}{$startTagNgContainer}{$startTagSpan_1}Bonjour{$closeTagSpan}{$closeTagNgContainer}',
-  '{$startTagSpan} Hello - 1 {$closeTagSpan}{$startTagSpan_1} Hello - 2 {$startTagSpan_1} Hello - 3 {$startTagSpan_1} Hello - 4 {$closeTagSpan}{$closeTagSpan}{$closeTagSpan}{$startTagSpan} Hello - 5 {$closeTagSpan}':
-      '{$startTagSpan} Bonjour - 1 {$closeTagSpan}{$startTagSpan_1} Bonjour - 2 {$startTagSpan_1} Bonjour - 3 {$startTagSpan_1} Bonjour - 4 {$closeTagSpan}{$closeTagSpan}{$closeTagSpan}{$startTagSpan} Bonjour - 5 {$closeTagSpan}',
-  '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}':
-      '{VAR_SELECT, select, 10 {dix} 20 {vingt} other {autres}}',
-  '{VAR_SELECT, select, 1 {one} 2 {two} other {more than two}}':
-      '{VAR_SELECT, select, 1 {un} 2 {deux} other {plus que deux}}',
-  '{VAR_SELECT, select, 10 {10 - {$startBoldText}ten{$closeBoldText}} 20 {20 - {$startItalicText}twenty{$closeItalicText}} other {{$startTagDiv}{$startUnderlinedText}other{$closeUnderlinedText}{$closeTagDiv}}}':
-      '{VAR_SELECT, select, 10 {10 - {$startBoldText}dix{$closeBoldText}} 20 {20 - {$startItalicText}vingt{$closeItalicText}} other {{$startTagDiv}{$startUnderlinedText}autres{$closeUnderlinedText}{$closeTagDiv}}}',
-  '{VAR_SELECT_2, select, 10 {ten - {VAR_SELECT, select, 1 {one} 2 {two} other {more than two}}} 20 {twenty - {VAR_SELECT_1, select, 1 {one} 2 {two} other {more than two}}} other {other}}':
-      '{VAR_SELECT_2, select, 10 {dix - {VAR_SELECT, select, 1 {un} 2 {deux} other {plus que deux}}} 20 {vingt - {VAR_SELECT_1, select, 1 {un} 2 {deux} other {plus que deux}}} other {autres}}',
-  '{$startTagNgTemplate}{$startTagDiv_1}{$startTagDiv}{$startTagSpan}Content{$closeTagSpan}{$closeTagDiv}{$closeTagDiv}{$closeTagNgTemplate}':
-      '{$startTagNgTemplate}Contenu{$closeTagNgTemplate}'
-};
-
-const getFixtureWithOverrides = (overrides = {}) => {
-  TestBed.overrideComponent(MyComp, {set: overrides});
-  const fixture = TestBed.createComponent(MyComp);
-  fixture.detectChanges();
-  return fixture;
-};
-
-onlyInIvy('Ivy i18n logic').describe('i18n', function() {
-
-  beforeEach(() => {
-    ɵi18nConfigureLocalize({translations: TRANSLATIONS});
-    TestBed.configureTestingModule({declarations: [MyComp, DirectiveWithTplRef]});
-  });
-
-  describe('attributes', () => {
-    it('should translate static attributes', () => {
-      const title = 'Hello';
-      const template = `<div i18n-title="m|d" title="${title}"></div>`;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element.title).toBe('Bonjour');
-    });
-
-    it('should support interpolation', () => {
-      const title = 'Hello {{ name }}';
-      const template = `<div i18n-title="m|d" title="${title}"></div>`;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element.title).toBe('Bonjour John');
-    });
-
-    it('should support interpolation with custom interpolation config', () => {
-      const title = 'Hello {% name %}';
-      const template = `<div i18n-title="m|d" title="${title}"></div>`;
-      const interpolation = ['{%', '%}'] as[string, string];
-      const fixture = getFixtureWithOverrides({template, interpolation});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element.title).toBe('Bonjour John');
-    });
-
-    it('should correctly bind to context in nested template', () => {
-      const title = 'Item {{ id }}';
-      const template = `
-        <div *ngFor='let id of items'>
-          <div i18n-title='m|d' title='${title}'></div>
-        </div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      for (let i = 0; i < element.children.length; i++) {
-        const child = element.children[i];
-        expect((child as any).innerHTML).toBe(`<div title="Article ${i + 1}"></div>`);
-      }
-    });
-
-    it('should work correctly when placed on i18n root node', () => {
-      const title = 'Hello {{ name }}';
-      const content = 'Hello';
-      const template = `
-            <div i18n i18n-title="m|d" title="${title}">${content}</div>
-          `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element.title).toBe('Bonjour John');
-      expect(element).toHaveText('Bonjour');
-    });
-
-    it('should add i18n attributes on self-closing tags', () => {
-      const title = 'Hello {{ name }}';
-      const template = `<img src="logo.png" i18n-title title="${title}">`;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element.title).toBe('Bonjour John');
-    });
-  });
-
-  describe('nested nodes', () => {
-    it('should handle static content', () => {
-      const content = 'Hello';
-      const template = `<div i18n>${content}</div>`;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('Bonjour');
-    });
-
-    it('should support interpolation', () => {
-      const content = 'Hello {{ name }}';
-      const template = `<div i18n>${content}</div>`;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('Bonjour John');
-    });
-
-    it('should support interpolation with custom interpolation config', () => {
-      const content = 'Hello {% name %}';
-      const template = `<div i18n>${content}</div>`;
-      const interpolation = ['{%', '%}'] as[string, string];
-      const fixture = getFixtureWithOverrides({template, interpolation});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('Bonjour John');
-    });
-
-    it('should support interpolations with complex expressions', () => {
-      const template = `<div i18n>{{ name | uppercase }} - {{ obj?.a?.b }}</div>`;
-      const fixture = getFixtureWithOverrides({template});
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('JOHN - value (fr)');
-    });
-
-    it('should properly escape quotes in content', () => {
-      const content = `'Single quotes' and "Double quotes"`;
-      const template = `<div i18n>${content}</div>`;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('\'Guillemets simples\' et "Guillemets doubles"');
-    });
-
-    it('should correctly bind to context in nested template', () => {
-      const content = 'Item {{ id }}';
-      const template = `
-          <div *ngFor='let id of items'>
-            <div i18n>${content}</div>
-          </div>
-        `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      for (let i = 0; i < element.children.length; i++) {
-        const child = element.children[i];
-        expect(child).toHaveText(`Article ${i + 1}`);
-      }
-    });
-
-    it('should handle i18n attributes inside i18n section', () => {
-      const title = 'Hello {{ name }}';
-      const template = `
-          <div i18n>
-            <div i18n-title="m|d" title="${title}"></div>
-          </div>
-        `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      const content = `<div title="Bonjour John"></div>`;
-      expect(element.innerHTML).toBe(content);
-    });
-
-    it('should handle i18n blocks in nested templates', () => {
-      const content = 'Hello {{ name }}';
-      const template = `
-        <div *ngIf="visible">
-          <div i18n>${content}</div>
-        </div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element.children[0]).toHaveText('Bonjour John');
-    });
-
-    it('should ignore i18n attributes on self-closing tags', () => {
-      const template = '<img src="logo.png" i18n>';
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element.innerHTML).toBe(template.replace(' i18n', ''));
-    });
-
-    it('should handle i18n attribute with directives', () => {
-      const content = 'Hello {{ name }}';
-      const template = `
-        <div *ngIf="visible" i18n>${content}</div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('Bonjour John');
-    });
-
-    it('should work correctly with event listeners', () => {
-      const content = 'Hello {{ name }}';
-      const template = `
-        <div i18n (click)="onClick()">${content}</div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      const instance = fixture.componentInstance;
-
-      expect(element).toHaveText('Bonjour John');
-      expect(instance.clicks).toBe(0);
-
-      element.click();
-      expect(instance.clicks).toBe(1);
-    });
-  });
-
-  describe('ng-container and ng-template support', () => {
-    it('should handle single translation message within ng-container', () => {
-      const content = 'Hello {{ name }}';
-      const template = `
-        <ng-container i18n>${content}</ng-container>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('Bonjour John');
-    });
-
-    it('should handle single translation message within ng-template', () => {
-      const content = 'Hello {{ name }}';
-      const template = `
-        <ng-template i18n tplRef>${content}</ng-template>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText('Bonjour John');
-    });
-
-    it('should be able to act as child elements inside i18n block (plain text content)', () => {
-      const hello = 'Hello';
-      const bye = 'Bye';
-      const template = `
-        <div i18n>
-          <ng-template tplRef>
-            ${hello}
-          </ng-template>
-          <ng-container>
-            ${bye}
-          </ng-container>
-        </div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element.textContent.replace(/\s+/g, ' ').trim()).toBe('Bonjour Au revoir');
-    });
-
-    it('should be able to act as child elements inside i18n block (text + tags)', () => {
-      const content = 'Hello';
-      const template = `
-        <div i18n>
-          <ng-template tplRef>
-            <span>${content}</span>
-          </ng-template>
-          <ng-container>
-            <span>${content}</span>
-          </ng-container>
-        </div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      const spans = element.getElementsByTagName('span');
-      for (let i = 0; i < spans.length; i++) {
-        expect(spans[i]).toHaveText('Bonjour');
-      }
-    });
-
-    it('should be able to handle deep nested levels with templates', () => {
-      const content = 'Hello';
-      const template = `
-        <div i18n>
-          <span>
-            ${content} - 1
-          </span>
-          <span *ngIf="visible">
-            ${content} - 2
-            <span *ngIf="visible">
-              ${content} - 3
-              <span *ngIf="visible">
-                ${content} - 4
-              </span>
-            </span>
-          </span>
-          <span>
-            ${content} - 5
-          </span>
-        </div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      const spans = element.getElementsByTagName('span');
-      for (let i = 0; i < spans.length; i++) {
-        expect(spans[i].innerHTML).toContain(`Bonjour - ${i + 1}`);
-      }
-    });
-
-    it('should handle self-closing tags as content', () => {
-      const label = 'My logo';
-      const content = `${label}<img src="logo.png" title="Logo">`;
-      const template = `
-        <ng-container i18n>
-          <span>${content}</span>
-        </ng-container>
-        <ng-template i18n tplRef>
-          <span>${content}</span>
-        </ng-template>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      const spans = element.getElementsByTagName('span');
-      for (let i = 0; i < spans.length; i++) {
-        const child = spans[i];
-        expect(child).toHaveText('Mon logo');
-      }
-    });
-  });
-
-  describe('ICU logic', () => {
-    it('should handle single ICUs', () => {
-      const template = `
-        <div i18n>{age, select, 10 {ten} 20 {twenty} other {other}}</div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText('vingt');
-    });
-
-    it('should support ICU-only templates', () => {
-      const template = `
-        {age, select, 10 {ten} 20 {twenty} other {other}}
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText('vingt');
-    });
-
-    it('should support ICUs generated outside of i18n blocks', () => {
-      const template = `
-        <div>{age, select, 10 {ten} 20 {twenty} other {other}}</div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText('vingt');
-    });
-
-    it('should support interpolation', () => {
-      const template = `
-        <div i18n>{age, select, 10 {ten} other {{{ otherLabel }}}}</div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText(fixture.componentInstance.otherLabel);
-    });
-
-    it('should support interpolation with custom interpolation config', () => {
-      const template = `
-        <div i18n>{age, select, 10 {ten} other {{% otherLabel %}}}</div>
-      `;
-      const interpolation = ['{%', '%}'] as[string, string];
-      const fixture = getFixtureWithOverrides({template, interpolation});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText(fixture.componentInstance.otherLabel);
-    });
-
-    it('should handle ICUs with HTML tags inside', () => {
-      const template = `
-        <div i18n>
-          {age, select, 10 {10 - <b>ten</b>} 20 {20 - <i>twenty</i>} other {<div class="other"><u>other</u></div>}}
-        </div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      const italicTags = element.getElementsByTagName('i');
-      expect(italicTags.length).toBe(1);
-      expect(italicTags[0].innerHTML).toBe('vingt');
-    });
-
-    it('should handle multiple ICUs in one block', () => {
-      const template = `
-            <div i18n>
-              {age, select, 10 {ten} 20 {twenty} other {other}} - 
-              {count, select, 1 {one} 2 {two} other {more than two}}
-            </div>
-          `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('vingt - deux');
-    });
-
-    it('should handle multiple ICUs in one i18n block wrapped in HTML elements', () => {
-      const template = `
-            <div i18n>
-              <span>
-                {age, select, 10 {ten} 20 {twenty} other {other}}
-              </span>
-              <span>
-                {count, select, 1 {one} 2 {two} other {more than two}}
-              </span>
-            </div>
-          `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      const spans = element.getElementsByTagName('span');
-      expect(spans.length).toBe(2);
-      expect(spans[0]).toHaveText('vingt');
-      expect(spans[1]).toHaveText('deux');
-    });
-
-    it('should handle ICUs inside a template in i18n block', () => {
-      const template = `
-            <div i18n>
-              <span *ngIf="visible">
-                {age, select, 10 {ten} 20 {twenty} other {other}}
-              </span>
-            </div>
-          `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      const spans = element.getElementsByTagName('span');
-      expect(spans.length).toBe(1);
-      expect(spans[0]).toHaveText('vingt');
-    });
-
-    it('should handle nested icus', () => {
-      const template = `
-        <div i18n>
-          {age, select,
-            10 {ten - {count, select, 1 {one} 2 {two} other {more than two}}}
-            20 {twenty - {count, select, 1 {one} 2 {two} other {more than two}}}
-            other {other}}
-        </div>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement.firstChild;
-      expect(element).toHaveText('vingt - deux');
-    });
-
-    it('should handle ICUs inside <ng-container>', () => {
-      const template = `
-        <ng-container i18n>
-          {age, select, 10 {ten} 20 {twenty} other {other}}
-        </ng-container>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText('vingt');
-    });
-
-    it('should handle ICUs inside <ng-template>', () => {
-      const template = `
-        <ng-template i18n tplRef>
-          {age, select, 10 {ten} 20 {twenty} other {other}}
-        </ng-template>
-      `;
-      const fixture = getFixtureWithOverrides({template});
-
-      const element = fixture.nativeElement;
-      expect(element).toHaveText('vingt');
-    });
-  });
-
-  describe('queries', () => {
-    function toHtml(element: Element): string {
-      return element.innerHTML.replace(/\sng-reflect-\S*="[^"]*"/g, '')
-          .replace(/<!--bindings=\{(\W.*\W\s*)?\}-->/g, '');
-    }
-
-    it('detached nodes should still be part of query', () => {
-      const template = `
-          <div-query #q i18n>
-            <ng-template>
-              <div>
-                <div *ngIf="visible">
-                  <span text="1">Content</span>
-                </div>
-              </div>
-            </ng-template>
-          </div-query>
-        `;
-
-      @Directive({selector: '[text]', inputs: ['text'], exportAs: 'textDir'})
-      class TextDirective {
-        // TODO(issue/24571): remove '!'.
-        text !: string;
-        constructor() {}
-      }
-
-      @Component({selector: 'div-query', template: '<ng-container #vc></ng-container>'})
-      class DivQuery {
-        // TODO(issue/24571): remove '!'.
-        @ContentChild(TemplateRef) template !: TemplateRef<any>;
-
-        // TODO(issue/24571): remove '!'.
-        @ViewChild('vc', {read: ViewContainerRef})
-        vc !: ViewContainerRef;
-
-        // TODO(issue/24571): remove '!'.
-        @ContentChildren(TextDirective, {descendants: true})
-        query !: QueryList<TextDirective>;
-
-        create() { this.vc.createEmbeddedView(this.template); }
-
-        destroy() { this.vc.clear(); }
-      }
-
-      TestBed.configureTestingModule({declarations: [TextDirective, DivQuery]});
-      const fixture = getFixtureWithOverrides({template});
-      const q = fixture.debugElement.children[0].references.q;
-      expect(q.query.length).toEqual(0);
-
-      // Create embedded view
-      q.create();
-      fixture.detectChanges();
-      expect(q.query.length).toEqual(1);
-      expect(toHtml(fixture.nativeElement))
-          .toEqual(`<div-query><!--ng-container-->Contenu<!--container--></div-query>`);
-
-      // Disable ng-if
-      fixture.componentInstance.visible = false;
-      fixture.detectChanges();
-      expect(q.query.length).toEqual(0);
-      expect(toHtml(fixture.nativeElement))
-          .toEqual(`<div-query><!--ng-container-->Contenu<!--container--></div-query>`);
-    });
-  });
-
-  it('should handle multiple i18n sections', () => {
-    const template = `
-    <div i18n>Section 1</div>
-    <div i18n>Section 2</div>
-    <div i18n>Section 3</div>
-  `;
-    const fixture = getFixtureWithOverrides({template});
-    expect(fixture.nativeElement.innerHTML)
-        .toBe('<div>Section 1</div><div>Section 2</div><div>Section 3</div>');
-  });
-
-  it('should handle multiple i18n sections inside of *ngFor', () => {
-    const template = `
-    <ul *ngFor="let item of [1,2,3]">
-      <li i18n>Section 1</li>
-      <li i18n>Section 2</li>
-      <li i18n>Section 3</li>
-    </ul>
-  `;
-    const fixture = getFixtureWithOverrides({template});
-    const element = fixture.nativeElement;
-    for (let i = 0; i < element.children.length; i++) {
-      const child = element.children[i];
-      expect(child.innerHTML).toBe(`<li>Section 1</li><li>Section 2</li><li>Section 3</li>`);
-    }
-  });
-});
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index 8f47b2509a..10df144f31 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -6,26 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgForOfContext} from '@angular/common';
-
 import {noop} from '../../../compiler/src/render3/view/util';
-import {Component as _Component} from '../../src/core';
-import {ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/definition';
-import {getTranslationForTemplate, ɵɵi18n, ɵɵi18nApply, ɵɵi18nAttributes, ɵɵi18nEnd, ɵɵi18nExp, ɵɵi18nPostprocess, ɵɵi18nStart} from '../../src/render3/i18n';
-import {ɵɵallocHostVars, ɵɵbind, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵnextContext, ɵɵprojection, ɵɵprojectionDef, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
-import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n} from '../../src/render3/interfaces/i18n';
-import {AttributeMarker} from '../../src/render3/interfaces/node';
+import {getTranslationForTemplate, ɵɵi18nAttributes, ɵɵi18nPostprocess, ɵɵi18nStart} from '../../src/render3/i18n';
+import {ɵɵelementEnd, ɵɵelementStart} from '../../src/render3/instructions/all';
+import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nUpdateOpCode, I18nUpdateOpCodes, TI18n} from '../../src/render3/interfaces/i18n';
 import {HEADER_OFFSET, LView, TVIEW} from '../../src/render3/interfaces/view';
-import {getNativeByIndex, getTNode} from '../../src/render3/util/view_utils';
-
-import {NgForOf, NgIf} from './common_with_def';
-import {ComponentFixture, TemplateFixture} from './render_util';
-
-const Component: typeof _Component = function(...args: any[]): any {
-  // In test we use @Component for documentation only so it's safe to mock out the implementation.
-  return () => undefined;
-} as any;
+import {getNativeByIndex} from '../../src/render3/util/view_utils';
+import {TemplateFixture} from './render_util';
 
 describe('Runtime i18n', () => {
   describe('getTranslationForTemplate', () => {
@@ -83,7 +70,6 @@ describe('Runtime i18n', () => {
       const index = 0;
       const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
-
       // Check debug
       const debugOps = (opCodes as any).create.debug !.operations;
       expect(debugOps[0].__raw_opCode).toBe('simple text');
@@ -586,319 +572,6 @@ describe('Runtime i18n', () => {
     });
   });
 
-  describe(`i18nEnd`, () => {
-    it('for text', () => {
-      const MSG_DIV = `simple text`;
-      const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18n(1, MSG_DIV);
-        ɵɵelementEnd();
-      }, null, 2);
-
-      expect(fixture.html).toEqual(`<div>${MSG_DIV}</div>`);
-    });
-
-    it('for bindings', () => {
-      const MSG_DIV = `Hello �0�!`;
-      const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18n(1, MSG_DIV);
-        ɵɵelementEnd();
-      }, null, 2);
-
-      // Template should be empty because there is no update template function
-      expect(fixture.html).toEqual('<div></div>');
-
-      // But it should have created an empty text node in `viewData`
-      const textTNode = fixture.hostView[HEADER_OFFSET + 2] as Node;
-      expect(textTNode.nodeType).toEqual(Node.TEXT_NODE);
-    });
-
-    it('for elements', () => {
-      const MSG_DIV = `Hello �#3�world�/#3� and �#2�universe�/#2�!`;
-      let fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18nStart(1, MSG_DIV);
-        ɵɵelement(2, 'div');
-        ɵɵelement(3, 'span');
-        ɵɵi18nEnd();
-        ɵɵelementEnd();
-      }, null, 4);
-
-      expect(fixture.html).toEqual('<div>Hello <span>world</span> and <div>universe</div>!</div>');
-    });
-
-    it('for translations without top level element', () => {
-      // When it's the first node
-      let MSG_DIV = `Hello world`;
-      let fixture = prepareFixture(() => { ɵɵi18n(0, MSG_DIV); }, null, 1);
-
-      expect(fixture.html).toEqual('Hello world');
-
-      // When the first node is a text node
-      MSG_DIV = ` world`;
-      fixture = prepareFixture(() => {
-        ɵɵtext(0, 'Hello');
-        ɵɵi18n(1, MSG_DIV);
-      }, null, 2);
-
-      expect(fixture.html).toEqual('Hello world');
-
-      // When the first node is an element
-      fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵtext(1, 'Hello');
-        ɵɵelementEnd();
-        ɵɵi18n(2, MSG_DIV);
-      }, null, 3);
-
-      expect(fixture.html).toEqual('<div>Hello</div> world');
-
-      // When there is a node after
-      MSG_DIV = `Hello `;
-      fixture = prepareFixture(() => {
-        ɵɵi18n(0, MSG_DIV);
-        ɵɵtext(1, 'world');
-      }, null, 2);
-
-      expect(fixture.html).toEqual('Hello world');
-    });
-
-    it('for deleted placeholders', () => {
-      const MSG_DIV = `Hello �#3�world�/#3�`;
-      let fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        {
-          ɵɵi18nStart(1, MSG_DIV);
-          {
-            ɵɵelement(2, 'div');  // Will be removed
-            ɵɵelement(3, 'span');
-          }
-          ɵɵi18nEnd();
-        }
-        ɵɵelementEnd();
-        ɵɵelementStart(4, 'div');
-        { ɵɵtext(5, '!'); }
-        ɵɵelementEnd();
-      }, null, 6);
-
-      expect(fixture.html).toEqual('<div>Hello <span>world</span></div><div>!</div>');
-    });
-
-    it('for sub-templates', () => {
-      // Template: `<div>Content: <div>before<span>middle</span>after</div>!</div>`;
-      const MSG_DIV =
-          `Content: �*2:1��#1:1�before�*2:2��#1:2�middle�/#1:2��/*2:2�after�/#1:1��/*2:1�!`;
-
-      function subTemplate_1(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵi18nStart(0, MSG_DIV, 1);
-          ɵɵelementStart(1, 'div');
-          ɵɵtemplate(2, subTemplate_2, 2, 0, 'span', [AttributeMarker.Template, 'ngIf']);
-          ɵɵelementEnd();
-          ɵɵi18nEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(2, 'ngIf', ɵɵbind(true));
-        }
-      }
-
-      function subTemplate_2(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵi18nStart(0, MSG_DIV, 2);
-          ɵɵelement(1, 'span');
-          ɵɵi18nEnd();
-        }
-      }
-
-      class MyApp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          directives: [NgIf],
-          factory: () => new MyApp(),
-          consts: 3,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              ɵɵi18nStart(1, MSG_DIV);
-              ɵɵtemplate(2, subTemplate_1, 3, 1, 'div', [AttributeMarker.Template, 'ngIf']);
-              ɵɵi18nEnd();
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(2, 'ngIf', true);
-            }
-          }
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html)
-          .toEqual('<div>Content: <div>before<span>middle</span>after</div>!</div>');
-    });
-
-    it('for ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      }`;
-      const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18n(1, MSG_DIV);
-        ɵɵelementEnd();
-      }, null, 2);
-
-      // Template should be empty because there is no update template function
-      expect(fixture.html).toEqual('<div><!--ICU 2--></div>');
-    });
-
-    it('for multiple ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      } - {�0�, select,
-        other {(�0�)}
-      }`;
-      const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18n(1, MSG_DIV);
-        ɵɵelementEnd();
-      }, null, 2);
-
-      // Template should be empty because there is no update template function
-      expect(fixture.html).toEqual('<div><!--ICU 2--> - <!--ICU 8--></div>');
-    });
-
-    it('for multiple ICU expressions inside html', () => {
-      const MSG_DIV = `�#2�{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      }�/#2��#3�{�0�, select,
-        other {(�0�)}
-      }�/#3�`;
-      const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18nStart(1, MSG_DIV);
-        ɵɵelement(2, 'span');
-        ɵɵelement(3, 'span');
-        ɵɵi18nEnd();
-        ɵɵelementEnd();
-      }, null, 4);
-
-      // Template should be empty because there is no update template function
-      expect(fixture.html).toEqual('<div><span><!--ICU 4--></span><span><!--ICU 9--></span></div>');
-    });
-
-    it('for ICU expressions inside templates', () => {
-      const MSG_DIV = `�*2:1��#1:1�{�0:1�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0:1� <span title="�1:1�">emails</span>}
-      }�/#1:1��/*2:1�`;
-
-      function subTemplate_1(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵi18nStart(0, MSG_DIV, 1);
-          ɵɵelement(1, 'span');
-          ɵɵi18nEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const ctx = ɵɵnextContext();
-          ɵɵi18nExp(ɵɵbind(ctx.value0));
-          ɵɵi18nExp(ɵɵbind(ctx.value1));
-          ɵɵi18nApply(0);
-        }
-      }
-
-      class MyApp {
-        value0 = 0;
-        value1 = 'emails label';
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          directives: [NgIf],
-          factory: () => new MyApp(),
-          consts: 3,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              ɵɵi18nStart(1, MSG_DIV);
-              ɵɵtemplate(2, subTemplate_1, 2, 2, 'span', [AttributeMarker.Template, 'ngIf']);
-              ɵɵi18nEnd();
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(2, 'ngIf', true);
-            }
-          }
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html)
-          .toEqual('<div><span>no <b title="none">emails</b>!<!--ICU 4--></span></div>');
-
-      // Update the value
-      fixture.component.value0 = 3;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div><span>3 <span title="emails label">emails</span><!--ICU 4--></span></div>');
-    });
-
-    it('for ICU expressions inside <ng-container>', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      }`;
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            {
-              ɵɵelementContainerStart(1);
-              { ɵɵi18n(2, MSG_DIV); }
-              ɵɵelementContainerEnd();
-            }
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(0));
-            ɵɵi18nExp(ɵɵbind('more than one'));
-            ɵɵi18nApply(2);
-          },
-          3, 2);
-
-      expect(fixture.html).toEqual('<div>no <b title="none">emails</b>!<!--ICU 5--></div>');
-    });
-
-    it('for nested ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {zero}
-        other {�0� {�1�, select,
-                       cat {cats}
-                       dog {dogs}
-                       other {animals}
-                     }!}
-      }`;
-      const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18n(1, MSG_DIV);
-        ɵɵelementEnd();
-      }, null, 2);
-
-      // Template should be empty because there is no update template function
-      expect(fixture.html).toEqual('<div><!--ICU 2--></div>');
-    });
-  });
-
   describe(`i18nAttribute`, () => {
     it('for text', () => {
       const MSG_title = `Hello world!`;
@@ -975,1140 +648,6 @@ describe('Runtime i18n', () => {
     });
   });
 
-  describe(`i18nExp & i18nApply`, () => {
-    it('for text bindings', () => {
-      const MSG_DIV = `Hello �0�!`;
-      const ctx = {value: 'world'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18n(1, MSG_DIV);
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value));
-            ɵɵi18nApply(1);
-          },
-          2, 1);
-
-      // Template should be empty because there is no update template function
-      expect(fixture.html).toEqual('<div>Hello world!</div>');
-    });
-
-    it('for attribute bindings', () => {
-      const MSG_title = `Hello �0�!`;
-      const MSG_div_attr = ['title', MSG_title];
-      const ctx = {value: 'world'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18nAttributes(1, MSG_div_attr);
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value));
-            ɵɵi18nApply(1);
-          },
-          2, 1);
-
-      expect(fixture.html).toEqual('<div title="Hello world!"></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html).toEqual('<div title="Hello world!"></div>');
-
-      ctx.value = 'universe';
-      fixture.update();
-      expect(fixture.html).toEqual('<div title="Hello universe!"></div>');
-    });
-
-    it('for attributes with no bindings', () => {
-      const MSG_title = `Hello world!`;
-      const MSG_div_attr = ['title', MSG_title];
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18nAttributes(1, MSG_div_attr);
-            ɵɵelementEnd();
-          },
-          () => { ɵɵi18nApply(1); }, 2, 1);
-
-      expect(fixture.html).toEqual('<div title="Hello world!"></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html).toEqual('<div title="Hello world!"></div>');
-    });
-
-    it('for multiple attribute bindings', () => {
-      const MSG_title = `Hello �0� and �1�, again �0�!`;
-      const MSG_div_attr = ['title', MSG_title];
-      const ctx = {value0: 'world', value1: 'universe'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18nAttributes(1, MSG_div_attr);
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value0));
-            ɵɵi18nExp(ɵɵbind(ctx.value1));
-            ɵɵi18nApply(1);
-          },
-          2, 2);
-
-      expect(fixture.html).toEqual('<div title="Hello world and universe, again world!"></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html).toEqual('<div title="Hello world and universe, again world!"></div>');
-
-      ctx.value0 = 'earth';
-      fixture.update();
-      expect(fixture.html).toEqual('<div title="Hello earth and universe, again earth!"></div>');
-
-      ctx.value0 = 'earthlings';
-      ctx.value1 = 'martians';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<div title="Hello earthlings and martians, again earthlings!"></div>');
-    });
-
-    it('for bindings of multiple attributes', () => {
-      const MSG_title = `Hello �0�!`;
-      const MSG_div_attr = ['title', MSG_title, 'aria-label', MSG_title];
-      const ctx = {value: 'world'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18nAttributes(1, MSG_div_attr);
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value));
-            ɵɵi18nApply(1);
-          },
-          2, 1);
-
-      expect(fixture.html).toEqual('<div aria-label="Hello world!" title="Hello world!"></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html).toEqual('<div aria-label="Hello world!" title="Hello world!"></div>');
-
-      ctx.value = 'universe';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<div aria-label="Hello universe!" title="Hello universe!"></div>');
-    });
-
-    it('for ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      }`;
-      const ctx = {value0: 0, value1: 'emails label'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18n(1, MSG_DIV);
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value0));
-            ɵɵi18nExp(ɵɵbind(ctx.value1));
-            ɵɵi18nApply(1);
-          },
-          2, 2);
-      expect(fixture.html).toEqual('<div>no <b title="none">emails</b>!<!--ICU 4--></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html).toEqual('<div>no <b title="none">emails</b>!<!--ICU 4--></div>');
-
-      ctx.value0 = 1;
-      fixture.update();
-      expect(fixture.html).toEqual('<div>one <i>email</i><!--ICU 4--></div>');
-
-      ctx.value0 = 10;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<div>10 <span title="emails label">emails</span><!--ICU 4--></div>');
-
-      ctx.value1 = '10 emails';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<div>10 <span title="10 emails">emails</span><!--ICU 4--></div>');
-
-      ctx.value0 = 0;
-      fixture.update();
-      expect(fixture.html).toEqual('<div>no <b title="none">emails</b>!<!--ICU 4--></div>');
-    });
-
-    it('for multiple ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      } - {�0�, select,
-        other {(�0�)}
-      }`;
-      const ctx = {value0: 0, value1: 'emails label'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18n(1, MSG_DIV);
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value0));
-            ɵɵi18nExp(ɵɵbind(ctx.value1));
-            ɵɵi18nApply(1);
-          },
-          2, 2);
-      expect(fixture.html)
-          .toEqual('<div>no <b title="none">emails</b>!<!--ICU 4--> - (0)<!--ICU 10--></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<div>no <b title="none">emails</b>!<!--ICU 4--> - (0)<!--ICU 10--></div>');
-
-      ctx.value0 = 1;
-      fixture.update();
-      expect(fixture.html).toEqual('<div>one <i>email</i><!--ICU 4--> - (1)<!--ICU 10--></div>');
-
-      ctx.value0 = 10;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div>10 <span title="emails label">emails</span><!--ICU 4--> - (10)<!--ICU 10--></div>');
-
-      ctx.value1 = '10 emails';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div>10 <span title="10 emails">emails</span><!--ICU 4--> - (10)<!--ICU 10--></div>');
-
-      ctx.value0 = 0;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<div>no <b title="none">emails</b>!<!--ICU 4--> - (0)<!--ICU 10--></div>');
-    });
-
-    it('for multiple ICU expressions', () => {
-      const MSG_DIV = `�#2�{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      }�/#2��#3�{�0�, select,
-        other {(�0�)}
-      }�/#3�`;
-      const ctx = {value0: 0, value1: 'emails label'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18nStart(1, MSG_DIV);
-            ɵɵelement(2, 'span');
-            ɵɵelement(3, 'span');
-            ɵɵi18nEnd();
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value0));
-            ɵɵi18nExp(ɵɵbind(ctx.value1));
-            ɵɵi18nApply(1);
-          },
-          4, 2);
-      expect(fixture.html)
-          .toEqual(
-              '<div><span>no <b title="none">emails</b>!<!--ICU 6--></span><span>(0)<!--ICU 11--></span></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div><span>no <b title="none">emails</b>!<!--ICU 6--></span><span>(0)<!--ICU 11--></span></div>');
-
-      ctx.value0 = 1;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div><span>one <i>email</i><!--ICU 6--></span><span>(1)<!--ICU 11--></span></div>');
-
-      ctx.value0 = 10;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div><span>10 <span title="emails label">emails</span><!--ICU 6--></span><span>(10)<!--ICU 11--></span></div>');
-
-      ctx.value1 = '10 emails';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div><span>10 <span title="10 emails">emails</span><!--ICU 6--></span><span>(10)<!--ICU 11--></span></div>');
-
-      ctx.value0 = 0;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<div><span>no <b title="none">emails</b>!<!--ICU 6--></span><span>(0)<!--ICU 11--></span></div>');
-    });
-
-    it('for nested ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {zero}
-        other {�0� {�1�, select,
-                       cat {cats}
-                       dog {dogs}
-                       other {animals}
-                     }!}
-      }`;
-      const ctx = {value0: 0, value1: 'cat'};
-
-      const fixture = prepareFixture(
-          () => {
-            ɵɵelementStart(0, 'div');
-            ɵɵi18n(1, MSG_DIV);
-            ɵɵelementEnd();
-          },
-          () => {
-            ɵɵi18nExp(ɵɵbind(ctx.value0));
-            ɵɵi18nExp(ɵɵbind(ctx.value1));
-            ɵɵi18nApply(1);
-          },
-          2, 2);
-
-      expect(fixture.html).toEqual('<div>zero<!--ICU 4--></div>');
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html).toEqual('<div>zero<!--ICU 4--></div>');
-
-      ctx.value0 = 10;
-      fixture.update();
-      expect(fixture.html).toEqual('<div>10 cats<!--nested ICU 0-->!<!--ICU 4--></div>');
-
-      ctx.value1 = 'squirrel';
-      fixture.update();
-      expect(fixture.html).toEqual('<div>10 animals<!--nested ICU 0-->!<!--ICU 4--></div>');
-
-      ctx.value0 = 0;
-      fixture.update();
-      expect(fixture.html).toEqual('<div>zero<!--ICU 4--></div>');
-    });
-  });
-
-  describe('integration', () => {
-    it('should support multiple i18n blocks', () => {
-      // Translated template:
-      // <div>
-      //  <a i18n>
-      //    trad {{exp1}}
-      //  </a>
-      //  hello
-      //  <b i18n i18n-title title="start {{exp2}} middle {{exp1}} end">
-      //    <e></e>
-      //    <c>trad</c>
-      //  </b>
-      // </div>
-
-      const MSG_DIV_1 = `trad �0�`;
-      const MSG_DIV_2_ATTR = ['title', `start �1� middle �0� end`];
-      const MSG_DIV_2 = `�#9��/#9��#7�trad�/#7�`;
-
-      class MyApp {
-        exp1 = '1';
-        exp2 = '2';
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          factory: () => new MyApp(),
-          consts: 10,
-          vars: 2,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              {
-                ɵɵelementStart(1, 'a');
-                { ɵɵi18n(2, MSG_DIV_1); }
-                ɵɵelementEnd();
-                ɵɵtext(3, 'hello');
-                ɵɵelementStart(4, 'b');
-                {
-                  ɵɵi18nAttributes(5, MSG_DIV_2_ATTR);
-                  ɵɵi18nStart(6, MSG_DIV_2);
-                  {
-                    ɵɵelement(7, 'c');
-                    ɵɵelement(8, 'd');  // will be removed
-                    ɵɵelement(9, 'e');  // will be moved before `c`
-                  }
-                  ɵɵi18nEnd();
-                }
-                ɵɵelementEnd();
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nApply(2);
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nExp(ɵɵbind(ctx.exp2));
-              ɵɵi18nApply(5);
-            }
-          }
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html)
-          .toEqual(
-              `<div><a>trad 1</a>hello<b title="start 2 middle 1 end"><e></e><c>trad</c></b></div>`);
-    });
-
-    it('should support multiple sibling i18n blocks', () => {
-      // Translated template:
-      // <div>
-      //  <div i18n>Section 1</div>
-      //  <div i18n>Section 2</div>
-      //  <div i18n>Section 3</div>
-      // </div>
-
-      const MSG_DIV_1 = `Section 1`;
-      const MSG_DIV_2 = `Section 2`;
-      const MSG_DIV_3 = `Section 3`;
-
-      class MyApp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          factory: () => new MyApp(),
-          consts: 7,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              {
-                ɵɵelementStart(1, 'div');
-                { ɵɵi18n(2, MSG_DIV_1); }
-                ɵɵelementEnd();
-                ɵɵelementStart(3, 'div');
-                { ɵɵi18n(4, MSG_DIV_2); }
-                ɵɵelementEnd();
-                ɵɵelementStart(5, 'div');
-                { ɵɵi18n(6, MSG_DIV_3); }
-                ɵɵelementEnd();
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵi18nApply(2);
-              ɵɵi18nApply(4);
-              ɵɵi18nApply(6);
-            }
-          }
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html)
-          .toEqual(`<div><div>Section 1</div><div>Section 2</div><div>Section 3</div></div>`);
-    });
-
-    it('should support multiple sibling i18n blocks inside of *ngFor', () => {
-      // Translated template:
-      // <ul *ngFor="let item of [1,2,3]">
-      //  <li i18n>Section 1</li>
-      //  <li i18n>Section 2</li>
-      //  <li i18n>Section 3</li>
-      // </ul>
-
-      const MSG_DIV_1 = `Section 1`;
-      const MSG_DIV_2 = `Section 2`;
-      const MSG_DIV_3 = `Section 3`;
-
-      function liTemplate(rf: RenderFlags, ctx: NgForOfContext<string>) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'ul');
-          ɵɵelementStart(1, 'li');
-          { ɵɵi18n(2, MSG_DIV_1); }
-          ɵɵelementEnd();
-          ɵɵelementStart(3, 'li');
-          { ɵɵi18n(4, MSG_DIV_2); }
-          ɵɵelementEnd();
-          ɵɵelementStart(5, 'li');
-          { ɵɵi18n(6, MSG_DIV_3); }
-          ɵɵelementEnd();
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵi18nApply(2);
-          ɵɵi18nApply(4);
-          ɵɵi18nApply(6);
-        }
-      }
-
-      class MyApp {
-        items: string[] = ['1', '2', '3'];
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          factory: () => new MyApp(),
-          consts: 2,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              {
-                ɵɵtemplate(
-                    1, liTemplate, 7, 0, 'ul', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(1, 'ngForOf', ɵɵbind(ctx.items));
-            }
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html)
-          .toEqual(
-              `<div><ul><li>Section 1</li><li>Section 2</li><li>Section 3</li></ul><ul><li>Section 1</li><li>Section 2</li><li>Section 3</li></ul><ul><li>Section 1</li><li>Section 2</li><li>Section 3</li></ul></div>`);
-    });
-
-    it('should support attribute translations on removed elements', () => {
-      // Translated template:
-      // <div i18n i18n-title title="start {{exp2}} middle {{exp1}} end">
-      //    trad {{exp1}}
-      // </div>
-
-      const MSG_DIV_1 = `trad �0�`;
-      const MSG_DIV_1_ATTR_1 = ['title', `start �1� middle �0� end`];
-
-      class MyApp {
-        exp1 = '1';
-        exp2 = '2';
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          factory: () => new MyApp(),
-          consts: 5,
-          vars: 5,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              {
-                ɵɵi18nAttributes(1, MSG_DIV_1_ATTR_1);
-                ɵɵi18nStart(2, MSG_DIV_1);
-                {
-                  ɵɵelementStart(3, 'b');  // Will be removed
-                  { ɵɵi18nAttributes(4, MSG_DIV_1_ATTR_1); }
-                  ɵɵelementEnd();
-                }
-                ɵɵi18nEnd();
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nExp(ɵɵbind(ctx.exp2));
-              ɵɵi18nApply(1);
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nApply(2);
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nExp(ɵɵbind(ctx.exp2));
-              ɵɵi18nApply(4);
-            }
-          }
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html).toEqual(`<div title="start 2 middle 1 end">trad 1</div>`);
-    });
-
-    it('should work with directives and host bindings', () => {
-      let directiveInstances: Directive[] = [];
-
-      class Directive {
-        // @HostBinding('className')
-        klass = 'foo';
-
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: Directive,
-          selectors: [['', 'dir', '']],
-          factory: () => {
-            const instance = new Directive();
-            directiveInstances.push(instance);
-            return instance;
-          },
-          hostBindings: (rf: RenderFlags, ctx: any, elementIndex: number) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵallocHostVars(1);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(elementIndex, 'className', ɵɵbind(ctx.klass), null, true);
-            }
-          }
-        });
-      }
-
-      // Translated template:
-      // <div i18n [test]="false" i18n-title title="start {{exp2}} middle {{exp1}} end">
-      //    trad {�0�, plural,
-      //         =0 {no <b title="none">emails</b>!}
-      //         =1 {one <i>email</i>}
-      //         other {�0� emails}
-      //       }
-      // </div>
-
-      const MSG_DIV_1 = `trad {�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� emails}
-      }`;
-      const MSG_DIV_1_ATTR_1 = ['title', `start �1� middle �0� end`];
-
-      class MyApp {
-        exp1 = 1;
-        exp2 = 2;
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          factory: () => new MyApp(),
-          consts: 6,
-          vars: 5,
-          directives: [Directive],
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'dir']);
-              {
-                ɵɵi18nAttributes(1, MSG_DIV_1_ATTR_1);
-                ɵɵi18nStart(2, MSG_DIV_1);
-                {
-                  ɵɵelementStart(3, 'b', [AttributeMarker.Bindings, 'dir']);  // Will be removed
-                  { ɵɵi18nAttributes(4, MSG_DIV_1_ATTR_1); }
-                  ɵɵelementEnd();
-                }
-                ɵɵi18nEnd();
-              }
-              ɵɵelementEnd();
-              ɵɵelement(5, 'div', [AttributeMarker.Bindings, 'dir']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nExp(ɵɵbind(ctx.exp2));
-              ɵɵi18nApply(1);
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nApply(2);
-              ɵɵi18nExp(ɵɵbind(ctx.exp1));
-              ɵɵi18nExp(ɵɵbind(ctx.exp2));
-              ɵɵi18nApply(4);
-            }
-          }
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      // the "test" attribute should not be reflected in the DOM as it is here only for directive
-      // matching purposes
-      expect(fixture.html)
-          .toEqual(
-              `<div class="foo" title="start 2 middle 1 end">trad one <i>email</i><!--ICU 23--></div><div class="foo"></div>`);
-
-      directiveInstances.forEach(instance => instance.klass = 'bar');
-      fixture.component.exp1 = 2;
-      fixture.component.exp2 = 3;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              `<div class="bar" title="start 3 middle 2 end">trad 2 emails<!--ICU 23--></div><div class="bar"></div>`);
-    });
-
-    it('should fix the links when adding/moving/removing nodes', () => {
-      const MSG_DIV = `�#2��/#2��#8��/#8��#4��/#4��#5��/#5�Hello World�#3��/#3��#7��/#7�`;
-      let fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        {
-          ɵɵi18nStart(1, MSG_DIV);
-          {
-            ɵɵelement(2, 'div2');
-            ɵɵelement(3, 'div3');
-            ɵɵelement(4, 'div4');
-            ɵɵelement(5, 'div5');
-            ɵɵelement(6, 'div6');
-            ɵɵelement(7, 'div7');
-            ɵɵelement(8, 'div8');
-          }
-          ɵɵi18nEnd();
-        }
-        ɵɵelementEnd();
-      }, null, 9);
-
-      expect(fixture.html)
-          .toEqual(
-              '<div><div2></div2><div8></div8><div4></div4><div5></div5>Hello World<div3></div3><div7></div7></div>');
-
-      const div0 = getTNode(0, fixture.hostView);
-      const div2 = getTNode(2, fixture.hostView);
-      const div3 = getTNode(3, fixture.hostView);
-      const div4 = getTNode(4, fixture.hostView);
-      const div5 = getTNode(5, fixture.hostView);
-      const div7 = getTNode(7, fixture.hostView);
-      const div8 = getTNode(8, fixture.hostView);
-      const text = getTNode(9, fixture.hostView);
-      expect(div0.child).toEqual(div2);
-      expect(div0.next).toBeNull();
-      expect(div2.next).toEqual(div8);
-      expect(div8.next).toEqual(div4);
-      expect(div4.next).toEqual(div5);
-      expect(div5.next).toEqual(text);
-      expect(text.next).toEqual(div3);
-      expect(div3.next).toEqual(div7);
-      expect(div7.next).toBeNull();
-    });
-
-    describe('projection', () => {
-      it('should project the translations', () => {
-        @Component({selector: 'child', template: '<p><ng-content></ng-content></p>'})
-        class Child {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Child,
-            selectors: [['child']],
-            factory: () => new Child(),
-            consts: 2,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef();
-                ɵɵelementStart(0, 'p');
-                { ɵɵprojection(1); }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        const MSG_DIV_SECTION_1 = `�#2�Je suis projeté depuis �#3��0��/#3��/#2�`;
-        const MSG_ATTR_1 = ['title', `Enfant de �0�`];
-
-        @Component({
-          selector: 'parent',
-          template: `
-            <div i18n>
-              <child>
-                I am projected from
-                <b i18n-title title="Child of {{name}}">{{name}}
-                  <remove-me-1></remove-me-1>
-                </b>
-                <remove-me-2></remove-me-2>
-              </child>
-              <remove-me-3></remove-me-3>
-            </div>`
-          // Translated to:
-          // <div i18n>
-          //   <child>
-          //     <p>
-          //       Je suis projeté depuis <b i18n-title title="Enfant de {{name}}">{{name}}</b>
-          //     </p>
-          //   </child>
-          // </div>
-        })
-        class Parent {
-          name: string = 'Parent';
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Parent,
-            selectors: [['parent']],
-            directives: [Child],
-            factory: () => new Parent(),
-            consts: 8,
-            vars: 2,
-            template: (rf: RenderFlags, cmp: Parent) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'div');
-                {
-                  ɵɵi18nStart(1, MSG_DIV_SECTION_1);
-                  {
-                    ɵɵelementStart(2, 'child');
-                    {
-                      ɵɵelementStart(3, 'b');
-                      {
-                        ɵɵi18nAttributes(4, MSG_ATTR_1);
-                        ɵɵelement(5, 'remove-me-1');
-                      }
-                      ɵɵelementEnd();
-                      ɵɵelement(6, 'remove-me-2');
-                    }
-                    ɵɵelementEnd();
-                    ɵɵelement(7, 'remove-me-3');
-                  }
-                  ɵɵi18nEnd();
-                }
-                ɵɵelementEnd();
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵi18nExp(ɵɵbind(cmp.name));
-                ɵɵi18nApply(1);
-                ɵɵi18nExp(ɵɵbind(cmp.name));
-                ɵɵi18nApply(4);
-              }
-            }
-          });
-        }
-
-        const fixture = new ComponentFixture(Parent);
-        expect(fixture.html)
-            .toEqual(
-                '<div><child><p>Je suis projeté depuis <b title="Enfant de Parent">Parent</b></p></child></div>');
-        // <div><child><p><b title="Enfant de Parent">Parent</b></p></child></div>
-        // <div><child><p>Je suis projeté depuis <b title="Enfant de
-        // Parent">Parent</b></p></child></div>
-      });
-
-      it('should project a translated i18n block', () => {
-        @Component({selector: 'child', template: '<p><ng-content></ng-content></p>'})
-        class Child {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Child,
-            selectors: [['child']],
-            factory: () => new Child(),
-            consts: 2,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef();
-                ɵɵelementStart(0, 'p');
-                { ɵɵprojection(1); }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        const MSG_DIV_SECTION_1 = `Je suis projeté depuis �0�`;
-        const MSG_ATTR_1 = ['title', `Enfant de �0�`];
-
-        @Component({
-          selector: 'parent',
-          template: `
-        <div>
-          <child>
-            <any></any>
-            <b i18n i18n-title title="Child of {{name}}">I am projected from {{name}}</b>
-            <any></any>
-          </child>
-        </div>`
-          // Translated to:
-          // <div>
-          //   <child>
-          //     <any></any>
-          //     <b i18n i18n-title title="Enfant de {{name}}">Je suis projeté depuis {{name}}</b>
-          //     <any></any>
-          //   </child>
-          // </div>
-        })
-        class Parent {
-          name: string = 'Parent';
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Parent,
-            selectors: [['parent']],
-            directives: [Child],
-            factory: () => new Parent(),
-            consts: 7,
-            vars: 2,
-            template: (rf: RenderFlags, cmp: Parent) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'div');
-                {
-                  ɵɵelementStart(1, 'child');
-                  {
-                    ɵɵelement(2, 'any');
-                    ɵɵelementStart(3, 'b');
-                    {
-                      ɵɵi18nAttributes(4, MSG_ATTR_1);
-                      ɵɵi18n(5, MSG_DIV_SECTION_1);
-                    }
-                    ɵɵelementEnd();
-                    ɵɵelement(6, 'any');
-                  }
-                  ɵɵelementEnd();
-                }
-                ɵɵelementEnd();
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵi18nExp(ɵɵbind(cmp.name));
-                ɵɵi18nApply(4);
-                ɵɵi18nExp(ɵɵbind(cmp.name));
-                ɵɵi18nApply(5);
-              }
-            }
-          });
-        }
-
-        const fixture = new ComponentFixture(Parent);
-        expect(fixture.html)
-            .toEqual(
-                '<div><child><p><any></any><b title="Enfant de Parent">Je suis projeté depuis Parent</b><any></any></p></child></div>');
-
-        // it should be able to render a new component with the same template code
-        const fixture2 = new ComponentFixture(Parent);
-        expect(fixture2.html).toEqual(fixture.html);
-
-        // Updating the fixture should work
-        fixture2.component.name = 'Parent 2';
-        fixture.update();
-        fixture2.update();
-        expect(fixture2.html)
-            .toEqual(
-                '<div><child><p><any></any><b title="Enfant de Parent 2">Je suis projeté depuis Parent 2</b><any></any></p></child></div>');
-
-        // The first fixture should not have changed
-        expect(fixture.html)
-            .toEqual(
-                '<div><child><p><any></any><b title="Enfant de Parent">Je suis projeté depuis Parent</b><any></any></p></child></div>');
-      });
-
-      it('should re-project translations when multiple projections', () => {
-        @Component({selector: 'grand-child', template: '<div><ng-content></ng-content></div>'})
-        class GrandChild {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: GrandChild,
-            selectors: [['grand-child']],
-            factory: () => new GrandChild(),
-            consts: 2,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef();
-                ɵɵelementStart(0, 'div');
-                { ɵɵprojection(1); }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        @Component(
-            {selector: 'child', template: '<grand-child><ng-content></ng-content></grand-child>'})
-        class Child {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Child,
-            selectors: [['child']],
-            directives: [GrandChild],
-            factory: () => new Child(),
-            consts: 2,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef();
-                ɵɵelementStart(0, 'grand-child');
-                { ɵɵprojection(1); }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        const MSG_DIV_SECTION_1 = `�#2�Bonjour�/#2� Monde!`;
-
-        @Component({
-          selector: 'parent',
-          template: `<child i18n><b>Hello</b> World!</child>`
-          // Translated to:
-          // <child i18n><grand-child><div><b>Bonjour</b> Monde!</div></grand-child></child>
-        })
-        class Parent {
-          name: string = 'Parent';
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Parent,
-            selectors: [['parent']],
-            directives: [Child],
-            factory: () => new Parent(),
-            consts: 3,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Parent) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'child');
-                {
-                  ɵɵi18nStart(1, MSG_DIV_SECTION_1);
-                  { ɵɵelement(2, 'b'); }
-                  ɵɵi18nEnd();
-                }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        const fixture = new ComponentFixture(Parent);
-        expect(fixture.html)
-            .toEqual('<child><grand-child><div><b>Bonjour</b> Monde!</div></grand-child></child>');
-        // <child><grand-child><div><b>Bonjour</b></div></grand-child></child>
-        // <child><grand-child><div><b>Bonjour</b> Monde!</div></grand-child></child>
-      });
-
-      xit('should re-project translations when removed placeholders', () => {
-        @Component({selector: 'grand-child', template: '<div><ng-content></ng-content></div>'})
-        class GrandChild {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: GrandChild,
-            selectors: [['grand-child']],
-            factory: () => new GrandChild(),
-            consts: 3,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef();
-                ɵɵelementStart(0, 'div');
-                { ɵɵprojection(1); }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        @Component(
-            {selector: 'child', template: '<grand-child><ng-content></ng-content></grand-child>'})
-        class Child {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Child,
-            selectors: [['child']],
-            directives: [GrandChild],
-            factory: () => new Child(),
-            consts: 2,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef();
-                ɵɵelementStart(0, 'grand-child');
-                { ɵɵprojection(1); }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        const MSG_DIV_SECTION_1 = `Bonjour Monde!`;
-
-        @Component({
-          selector: 'parent',
-          template: `<child i18n><b>Hello</b> World!</child>`
-          // Translated to:
-          // <child i18n><grand-child><div>Bonjour Monde!</div></grand-child></child>
-        })
-        class Parent {
-          name: string = 'Parent';
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Parent,
-            selectors: [['parent']],
-            directives: [Child],
-            factory: () => new Parent(),
-            consts: 3,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Parent) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'child');
-                {
-                  ɵɵi18nStart(1, MSG_DIV_SECTION_1);
-                  {
-                    ɵɵelement(2, 'b');  // will be removed
-                  }
-                  ɵɵi18nEnd();
-                }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        const fixture = new ComponentFixture(Parent);
-        expect(fixture.html)
-            .toEqual('<child><grand-child><div>Bonjour Monde!</div></grand-child></child>');
-      });
-
-      it('should project translations with selectors', () => {
-        @Component({
-          selector: 'child',
-          template: `
-          <ng-content select="span"></ng-content>
-        `
-        })
-        class Child {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Child,
-            selectors: [['child']],
-            factory: () => new Child(),
-            consts: 1,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef([[['span']]]);
-                ɵɵprojection(0, 1);
-              }
-            }
-          });
-        }
-
-        const MSG_DIV_SECTION_1 = `�#2�Contenu�/#2�`;
-
-        @Component({
-          selector: 'parent',
-          template: `
-          <child i18n>
-            <span title="keepMe"></span>
-            <span title="deleteMe"></span>
-          </child>
-        `
-          // Translated to:
-          // <child i18n><span title="keepMe">Contenu</span></child>
-        })
-        class Parent {
-          static ngComponentDef = ɵɵdefineComponent({
-            type: Parent,
-            selectors: [['parent']],
-            directives: [Child],
-            factory: () => new Parent(),
-            consts: 4,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Parent) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'child');
-                {
-                  ɵɵi18nStart(1, MSG_DIV_SECTION_1);
-                  {
-                    ɵɵelement(2, 'span', ['title', 'keepMe']);
-                    ɵɵelement(3, 'span', ['title', 'deleteMe']);
-                  }
-                  ɵɵi18nEnd();
-                }
-                ɵɵelementEnd();
-              }
-            }
-          });
-        }
-
-        const fixture = new ComponentFixture(Parent);
-        expect(fixture.html).toEqual('<child><span title="keepMe">Contenu</span></child>');
-      });
-    });
-  });
-
   describe('i18nPostprocess', () => {
     it('should handle valid cases', () => {
       const arr = ['�*1:1��#2:1�', '�#4:1�', '�6:1�', '�/#2:1��/*1:1�'];

From 7dad3284e35764cafa720e36e5878f748f8e7d9c Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 25 Apr 2019 10:31:21 -0700
Subject: [PATCH 005/275] release: ts_api_guardian (#30120)

PR Close #30120
---
 tools/ts-api-guardian/README.md    | 2 +-
 tools/ts-api-guardian/package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ts-api-guardian/README.md b/tools/ts-api-guardian/README.md
index 19f343b4e7..296d4e1e6f 100644
--- a/tools/ts-api-guardian/README.md
+++ b/tools/ts-api-guardian/README.md
@@ -30,7 +30,7 @@ $ yarn bazel test //tools/ts-api-guardian:all
 Publish to NPM:
 
 ```sh
-$ npm whoami # should be logged in as angular
+$ yarn bazel run @nodejs//:npm whoami # should be logged in as angular
 $ grep version tools/ts-api-guardian/package.json # advance as needed
 $ yarn bazel run //tools/ts-api-guardian:ts-api-guardian.publish
 ```
diff --git a/tools/ts-api-guardian/package.json b/tools/ts-api-guardian/package.json
index 79006d7179..9ea00518b4 100644
--- a/tools/ts-api-guardian/package.json
+++ b/tools/ts-api-guardian/package.json
@@ -1,12 +1,12 @@
 {
   "name": "ts-api-guardian",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "Guards the API of TypeScript libraries!",
   "main": "lib/main.js",
   "typings": "lib/main.d.ts",
   "bazelWorkspaces": {
     "npm_ts_api_guardian": {
-      "version": "0.4.1",
+      "version": "0.4.4",
       "rootPath": "."
     }
   },

From 7569a2e0d9452e4ed7fa1fc504b1fd3d6dfcd8a7 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 10 May 2019 13:50:22 -0700
Subject: [PATCH 006/275] test(ivy): pure function acceptance tests (#30406)

- Moves tests related to the pureFunction instructions from render3 to acceptance tests
- Leaves behind one test for in-template javascript that is not supported syntax yet

PR Close #30406
---
 .../test/acceptance/pure_function_spec.ts     | 482 ++++++++++++++++++
 .../core/test/render3/pure_function_spec.ts   | 481 +----------------
 2 files changed, 489 insertions(+), 474 deletions(-)
 create mode 100644 packages/core/test/acceptance/pure_function_spec.ts

diff --git a/packages/core/test/acceptance/pure_function_spec.ts b/packages/core/test/acceptance/pure_function_spec.ts
new file mode 100644
index 0000000000..01abb54b2e
--- /dev/null
+++ b/packages/core/test/acceptance/pure_function_spec.ts
@@ -0,0 +1,482 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {Component, Input} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+
+describe('components using pure function instructions internally', () => {
+  describe('with array literals', () => {
+    @Component({
+      selector: 'my-comp',
+      template: ``,
+    })
+    class MyComp {
+      @Input()
+      names: string[] = [];
+    }
+
+
+    it('should support an array literal with a binding', () => {
+      @Component({
+        template: `
+                <my-comp [names]="['Nancy', customName, 'Bess']"></my-comp>
+              `,
+      })
+      class App {
+        showing = true;
+        customName = 'Carson';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComp],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const myComp = fixture.debugElement.query(By.directive(MyComp)).componentInstance;
+
+      const firstArray = myComp.names;
+      expect(firstArray).toEqual(['Nancy', 'Carson', 'Bess']);
+
+      fixture.detectChanges();
+      expect(myComp.names).toEqual(['Nancy', 'Carson', 'Bess']);
+      expect(firstArray).toBe(myComp.names);
+
+      fixture.componentInstance.customName = 'Hannah';
+      fixture.detectChanges();
+      expect(myComp.names).toEqual(['Nancy', 'Hannah', 'Bess']);
+
+      // Identity must change if binding changes
+      expect(firstArray).not.toBe(myComp.names);
+
+      // The property should not be set if the exp value is the same, so artificially
+      // setting the property to ensure it's not overwritten.
+      myComp.names = ['should not be overwritten'];
+      fixture.detectChanges();
+
+      expect(myComp !.names).toEqual(['should not be overwritten']);
+    });
+
+
+    it('should support array literals in dynamic views', () => {
+      @Component({
+        template: `
+                <my-comp *ngIf="showing" [names]="['Nancy', customName, 'Bess']"></my-comp>
+              `,
+      })
+      class App {
+        showing = true;
+        customName = 'Carson';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComp],
+        imports: [CommonModule],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const myComp = fixture.debugElement.query(By.directive(MyComp)).componentInstance;
+      expect(myComp.names).toEqual(['Nancy', 'Carson', 'Bess']);
+    });
+
+    it('should support multiple array literals passed through to one node', () => {
+      @Component({
+        selector: 'many-prop-comp',
+        template: ``,
+      })
+      class ManyPropComp {
+        @Input()
+        names1: string[] = [];
+
+        @Input()
+        names2: string[] = [];
+      }
+
+      @Component({
+        template: `
+                <many-prop-comp [names1]="['Nancy', customName]" [names2]="[customName2]">
+                </many-prop-comp>
+              `,
+      })
+      class App {
+        showing = true;
+        customName = 'Carson';
+        customName2 = 'George';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, ManyPropComp],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const manyPropComp = fixture.debugElement.query(By.directive(ManyPropComp)).componentInstance;
+
+      expect(manyPropComp !.names1).toEqual(['Nancy', 'Carson']);
+      expect(manyPropComp !.names2).toEqual(['George']);
+
+      fixture.componentInstance.customName = 'George';
+      fixture.componentInstance.customName2 = 'Carson';
+      fixture.detectChanges();
+      expect(manyPropComp !.names1).toEqual(['Nancy', 'George']);
+      expect(manyPropComp !.names2).toEqual(['Carson']);
+    });
+
+
+    it('should support an array literals inside fn calls', () => {
+      @Component({
+        selector: 'parent-comp',
+        template: `
+                <my-comp [names]="someFn(['Nancy', customName])"></my-comp>
+              `
+      })
+      class ParentComp {
+        customName = 'Bess';
+
+        someFn(arr: string[]): string[] {
+          arr[0] = arr[0].toUpperCase();
+          return arr;
+        }
+      }
+
+      @Component({
+        template: `
+                <parent-comp></parent-comp>
+                <parent-comp></parent-comp>
+              `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComp, ParentComp],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const myComps =
+          fixture.debugElement.queryAll(By.directive(MyComp)).map(f => f.componentInstance);
+
+
+      const firstArray = myComps[0].names;
+      const secondArray = myComps[1].names;
+      expect(firstArray).toEqual(['NANCY', 'Bess']);
+      expect(secondArray).toEqual(['NANCY', 'Bess']);
+      expect(firstArray).not.toBe(secondArray);
+
+      fixture.detectChanges();
+      expect(firstArray).toEqual(['NANCY', 'Bess']);
+      expect(secondArray).toEqual(['NANCY', 'Bess']);
+      expect(firstArray).toBe(myComps[0].names);
+      expect(secondArray).toBe(myComps[1].names);
+    });
+
+
+    it('should support an array literal with more than 1 binding', () => {
+      @Component({
+        template: `
+                <my-comp *ngIf="showing" [names]="['Nancy', customName, 'Bess', customName2]"></my-comp>
+              `,
+      })
+      class App {
+        showing = true;
+        customName = 'Carson';
+        customName2 = 'Hannah';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComp],
+        imports: [CommonModule],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const myComp = fixture.debugElement.query(By.directive(MyComp)).componentInstance;
+
+      const firstArray = myComp.names;
+      expect(firstArray).toEqual(['Nancy', 'Carson', 'Bess', 'Hannah']);
+
+      fixture.detectChanges();
+      expect(myComp.names).toEqual(['Nancy', 'Carson', 'Bess', 'Hannah']);
+      expect(firstArray).toBe(myComp.names);
+
+      fixture.componentInstance.customName = 'George';
+      fixture.detectChanges();
+      expect(myComp.names).toEqual(['Nancy', 'George', 'Bess', 'Hannah']);
+      expect(firstArray).not.toBe(myComp.names);
+
+      fixture.componentInstance.customName = 'Frank';
+      fixture.componentInstance.customName2 = 'Ned';
+      fixture.detectChanges();
+      expect(myComp.names).toEqual(['Nancy', 'Frank', 'Bess', 'Ned']);
+
+      // The property should not be set if the exp value is the same, so artificially
+      // setting the property to ensure it's not overwritten.
+      myComp.names = ['should not be overwritten'];
+      fixture.detectChanges();
+      expect(myComp.names).toEqual(['should not be overwritten']);
+    });
+
+
+    it('should work up to 8 bindings', () => {
+
+      @Component({
+        template: `
+                <my-comp [names]="['a', 'b', 'c', 'd', 'e', 'f', 'g', v8]"></my-comp>
+                <my-comp [names]="['a', 'b', 'c', 'd', 'e', 'f', v7, v8]"></my-comp>
+                <my-comp [names]="['a', 'b', 'c', 'd', 'e', v6, v7, v8]"></my-comp>
+                <my-comp [names]="['a', 'b', 'c', 'd', v5, v6, v7, v8]"></my-comp>
+                <my-comp [names]="['a', 'b', 'c', v4, v5, v6, v7, v8]"></my-comp>
+                <my-comp [names]="['a', 'b', v3, v4, v5, v6, v7, v8]"></my-comp>
+                <my-comp [names]="['a', v2, v3, v4, v5, v6, v7, v8]"></my-comp>
+                <my-comp [names]="[v1, v2, v3, v4, v5, v6, v7, v8]"></my-comp>
+              `
+      })
+      class App {
+        v1 = 'a';
+        v2 = 'b';
+        v3 = 'c';
+        v4 = 'd';
+        v5 = 'e';
+        v6 = 'f';
+        v7 = 'g';
+        v8 = 'h';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComp],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const myComps =
+          fixture.debugElement.queryAll(By.directive(MyComp)).map(f => f.componentInstance);
+
+      myComps.forEach(myComp => {
+        expect(myComp.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
+      });
+
+      const app = fixture.componentInstance;
+
+      app.v1 = 'a1';
+      app.v2 = 'b1';
+      app.v3 = 'c1';
+      app.v4 = 'd1';
+      app.v5 = 'e1';
+      app.v6 = 'f1';
+      app.v7 = 'g1';
+      app.v8 = 'h1';
+
+      fixture.detectChanges();
+
+      expect(myComps[0].names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h1']);
+      expect(myComps[1].names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g1', 'h1']);
+      expect(myComps[2].names).toEqual(['a', 'b', 'c', 'd', 'e', 'f1', 'g1', 'h1']);
+      expect(myComps[3].names).toEqual(['a', 'b', 'c', 'd', 'e1', 'f1', 'g1', 'h1']);
+      expect(myComps[4].names).toEqual(['a', 'b', 'c', 'd1', 'e1', 'f1', 'g1', 'h1']);
+      expect(myComps[5].names).toEqual(['a', 'b', 'c1', 'd1', 'e1', 'f1', 'g1', 'h1']);
+      expect(myComps[6].names).toEqual(['a', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h1']);
+      expect(myComps[7].names).toEqual(['a1', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h1']);
+
+      app.v8 = 'h2';
+      fixture.detectChanges();
+
+      expect(myComps[0].names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h2']);
+      expect(myComps[1].names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g1', 'h2']);
+      expect(myComps[2].names).toEqual(['a', 'b', 'c', 'd', 'e', 'f1', 'g1', 'h2']);
+      expect(myComps[3].names).toEqual(['a', 'b', 'c', 'd', 'e1', 'f1', 'g1', 'h2']);
+      expect(myComps[4].names).toEqual(['a', 'b', 'c', 'd1', 'e1', 'f1', 'g1', 'h2']);
+      expect(myComps[5].names).toEqual(['a', 'b', 'c1', 'd1', 'e1', 'f1', 'g1', 'h2']);
+      expect(myComps[6].names).toEqual(['a', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h2']);
+      expect(myComps[7].names).toEqual(['a1', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h2']);
+    });
+
+    it('should work with pureFunctionV for 9+ bindings', () => {
+      @Component({
+        template: `
+                <my-comp [names]="['start', v0, v1, v2, v3, 'modified_' + v4, v5, v6, v7, v8, 'end']">
+                </my-comp>
+              `
+      })
+      class App {
+        v0 = 'a';
+        v1 = 'b';
+        v2 = 'c';
+        v3 = 'd';
+        v4 = 'e';
+        v5 = 'f';
+        v6 = 'g';
+        v7 = 'h';
+        v8 = 'i';
+      }
+      TestBed.configureTestingModule({
+        declarations: [App, MyComp],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const myComp = fixture.debugElement.query(By.directive(MyComp)).componentInstance;
+      const app = fixture.componentInstance;
+
+      expect(myComp.names).toEqual([
+        'start', 'a', 'b', 'c', 'd', 'modified_e', 'f', 'g', 'h', 'i', 'end'
+      ]);
+
+      app.v0 = 'a1';
+      fixture.detectChanges();
+
+      expect(myComp.names).toEqual([
+        'start', 'a1', 'b', 'c', 'd', 'modified_e', 'f', 'g', 'h', 'i', 'end'
+      ]);
+
+      app.v4 = 'e5';
+      fixture.detectChanges();
+
+      expect(myComp.names).toEqual([
+        'start', 'a1', 'b', 'c', 'd', 'modified_e5', 'f', 'g', 'h', 'i', 'end'
+      ]);
+    });
+  });
+
+  describe('with object literals', () => {
+    @Component({
+      selector: 'object-comp',
+      template: ``,
+    })
+    class ObjectComp {
+      @Input()
+      config: any = [];
+    }
+
+    it('should support an object literal', () => {
+      @Component({
+        template: '<object-comp [config]="{duration: 500, animation: name}"></object-comp>',
+      })
+      class App {
+        name = 'slide';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, ObjectComp],
+      });
+
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const objectComp = fixture.debugElement.query(By.directive(ObjectComp)).componentInstance;
+
+      const firstObj = objectComp.config;
+      expect(objectComp.config).toEqual({duration: 500, animation: 'slide'});
+
+      fixture.detectChanges();
+      expect(objectComp.config).toEqual({duration: 500, animation: 'slide'});
+      expect(firstObj).toBe(objectComp.config);
+
+      fixture.componentInstance.name = 'tap';
+      fixture.detectChanges();
+      expect(objectComp.config).toEqual({duration: 500, animation: 'tap'});
+
+      // Identity must change if binding changes
+      expect(firstObj).not.toBe(objectComp.config);
+    });
+
+
+    it('should support expressions nested deeply in object/array literals', () => {
+      @Component({
+        template: `
+        <object-comp [config]="{animation: name, actions: [{ opacity: 0, duration: 0}, {opacity: 1,
+        duration: duration }]}">
+        </object-comp>
+      `,
+      })
+      class App {
+        name = 'slide';
+        duration = 100;
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, ObjectComp],
+      });
+
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const objectComp = fixture.debugElement.query(By.directive(ObjectComp)).componentInstance;
+
+      expect(objectComp.config).toEqual({
+        animation: 'slide',
+        actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 100}]
+      });
+      const firstConfig = objectComp.config;
+
+      fixture.detectChanges();
+      expect(objectComp.config).toEqual({
+        animation: 'slide',
+        actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 100}]
+      });
+      expect(objectComp.config).toBe(firstConfig);
+
+      fixture.componentInstance.duration = 50;
+      fixture.detectChanges();
+      expect(objectComp.config).toEqual({
+        animation: 'slide',
+        actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 50}]
+      });
+      expect(objectComp.config).not.toBe(firstConfig);
+
+      fixture.componentInstance.name = 'tap';
+      fixture.detectChanges();
+      expect(objectComp.config).toEqual({
+        animation: 'tap',
+        actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 50}]
+      });
+
+      fixture.componentInstance.name = 'drag';
+      fixture.componentInstance.duration = 500;
+      fixture.detectChanges();
+      expect(objectComp.config).toEqual({
+        animation: 'drag',
+        actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 500}]
+      });
+
+      // The property should not be set if the exp value is the same, so artificially
+      // setting the property to ensure it's not overwritten.
+      objectComp.config = ['should not be overwritten'];
+      fixture.detectChanges();
+      expect(objectComp.config).toEqual(['should not be overwritten']);
+    });
+
+    it('should support multiple view instances with multiple bindings', () => {
+      @Component({
+        template: `
+        <object-comp *ngFor="let config of configs" [config]="config">
+        </object-comp>
+      `,
+      })
+      class App {
+        configs = [
+          {opacity: 0, duration: 500},
+          {opacity: 1, duration: 600},
+        ];
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, ObjectComp],
+        imports: [CommonModule],
+      });
+
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+      const objectComps =
+          fixture.debugElement.queryAll(By.directive(ObjectComp)).map(f => f.componentInstance);
+
+      expect(objectComps[0].config).toEqual({opacity: 0, duration: 500});
+      expect(objectComps[1].config).toEqual({opacity: 1, duration: 600});
+
+      app.configs[0].duration = 1000;
+      fixture.detectChanges();
+      expect(objectComps[0].config).toEqual({opacity: 0, duration: 1000});
+      expect(objectComps[1].config).toEqual({opacity: 1, duration: 600});
+    });
+  });
+});
diff --git a/packages/core/test/render3/pure_function_spec.ts b/packages/core/test/render3/pure_function_spec.ts
index 2824d8ee2a..42f7a17476 100644
--- a/packages/core/test/render3/pure_function_spec.ts
+++ b/packages/core/test/render3/pure_function_spec.ts
@@ -5,381 +5,13 @@
  * 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 {AttributeMarker, ɵɵdefineComponent, ɵɵtemplate} from '../../src/render3/index';
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵnextContext} from '../../src/render3/instructions/all';
+import {ɵɵdefineComponent} from '../../src/render3/index';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {ɵɵpureFunction1, ɵɵpureFunction2, ɵɵpureFunction3, ɵɵpureFunction4, ɵɵpureFunction5, ɵɵpureFunction6, ɵɵpureFunction7, ɵɵpureFunction8, ɵɵpureFunctionV} from '../../src/render3/pure_function';
-import {ComponentFixture, createComponent, getDirectiveOnNode, renderToHtml} from '../../test/render3/render_util';
-
-import {NgIf} from './common_with_def';
-
-describe('array literals', () => {
-  let myComp: MyComp;
-
-  class MyComp {
-    // TODO(issue/24571): remove '!'.
-    names !: string[];
-
-    static ngComponentDef = ɵɵdefineComponent({
-      type: MyComp,
-      selectors: [['my-comp']],
-      factory: function MyComp_Factory() { return myComp = new MyComp(); },
-      consts: 0,
-      vars: 0,
-      template: function MyComp_Template(rf: RenderFlags, ctx: MyComp) {},
-      inputs: {names: 'names'}
-    });
-  }
-
-  const directives = [MyComp];
-
-  it('should support an array literal with a binding', () => {
-    const e0_ff = (v: any) => ['Nancy', v, 'Bess'];
-
-    /** <my-comp [names]="['Nancy', customName, 'Bess']"></my-comp> */
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'my-comp');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'names', ɵɵbind(ɵɵpureFunction1(1, e0_ff, ctx.customName)));
-      }
-    }, 1, 3, directives);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.customName = 'Carson';
-    fixture.update();
-    const firstArray = myComp !.names;
-    expect(firstArray).toEqual(['Nancy', 'Carson', 'Bess']);
-
-    fixture.update();
-    expect(myComp !.names).toEqual(['Nancy', 'Carson', 'Bess']);
-    expect(firstArray).toBe(myComp !.names);
-
-    fixture.component.customName = 'Hannah';
-    fixture.update();
-    expect(myComp !.names).toEqual(['Nancy', 'Hannah', 'Bess']);
-
-    // Identity must change if binding changes
-    expect(firstArray).not.toBe(myComp !.names);
-
-    // The property should not be set if the exp value is the same, so artificially
-    // setting the property to ensure it's not overwritten.
-    myComp !.names = ['should not be overwritten'];
-    fixture.update();
-    expect(myComp !.names).toEqual(['should not be overwritten']);
-  });
-
-  it('should support array literals in dynamic views', () => {
-    const e0_ff = (v: any) => ['Nancy', v, 'Bess'];
-
-    function IfTemplate(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'my-comp');
-      }
-      if (rf & RenderFlags.Update) {
-        const comp = ɵɵnextContext();
-        ɵɵelementProperty(0, 'names', ɵɵbind(ɵɵpureFunction1(1, e0_ff, comp.customName)));
-      }
-    }
-
-    /**
-     *  <my-comp *ngIf="showing" [names]="['Nancy', customName, 'Bess']"></my-comp>
-     */
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵtemplate(
-            0, IfTemplate, 1, 3, 'my-comp',
-            [AttributeMarker.Bindings, 'names', AttributeMarker.Template, 'ngIf']);
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.showing));
-      }
-    }, 1, 1, [MyComp, NgIf]);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.showing = true;
-    fixture.component.customName = 'Carson';
-    fixture.update();
-
-    expect(myComp !.names).toEqual(['Nancy', 'Carson', 'Bess']);
-  });
-
-  it('should support multiple array literals passed through to one node', () => {
-    let manyPropComp: ManyPropComp;
-
-    class ManyPropComp {
-      // TODO(issue/24571): remove '!'.
-      names1 !: string[];
-      // TODO(issue/24571): remove '!'.
-      names2 !: string[];
-
-      static ngComponentDef = ɵɵdefineComponent({
-        type: ManyPropComp,
-        selectors: [['many-prop-comp']],
-        factory: function ManyPropComp_Factory() { return manyPropComp = new ManyPropComp(); },
-        consts: 0,
-        vars: 0,
-        template: function ManyPropComp_Template(rf: RenderFlags, ctx: ManyPropComp) {},
-        inputs: {names1: 'names1', names2: 'names2'}
-      });
-    }
-
-    const e0_ff = (v: any) => ['Nancy', v];
-    const e0_ff_1 = (v: any) => [v];
-
-    /**
-     * <many-prop-comp [names1]="['Nancy', customName]" [names2]="[customName2]">
-     * </many-prop-comp>
-     */
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'many-prop-comp');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'names1', ɵɵbind(ɵɵpureFunction1(2, e0_ff, ctx.customName)));
-        ɵɵelementProperty(0, 'names2', ɵɵbind(ɵɵpureFunction1(4, e0_ff_1, ctx.customName2)));
-      }
-    }, 1, 6, [ManyPropComp]);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.customName = 'Carson';
-    fixture.component.customName2 = 'George';
-    fixture.update();
-    expect(manyPropComp !.names1).toEqual(['Nancy', 'Carson']);
-    expect(manyPropComp !.names2).toEqual(['George']);
-
-    fixture.component.customName = 'George';
-    fixture.component.customName2 = 'Carson';
-    fixture.update();
-    expect(manyPropComp !.names1).toEqual(['Nancy', 'George']);
-    expect(manyPropComp !.names2).toEqual(['Carson']);
-  });
-
-  it('should support an array literals inside fn calls', () => {
-    let myComps: MyComp[] = [];
-
-    const e0_ff = (v: any) => ['Nancy', v];
-
-    /** <my-comp [names]="someFn(['Nancy', customName])"></my-comp> */
-    class ParentComp {
-      customName = 'Bess';
-
-      someFn(arr: string[]): string[] {
-        arr[0] = arr[0].toUpperCase();
-        return arr;
-      }
-
-      static ngComponentDef = ɵɵdefineComponent({
-        type: ParentComp,
-        selectors: [['parent-comp']],
-        factory: () => new ParentComp(),
-        consts: 1,
-        vars: 3,
-        template: function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'my-comp');
-            myComps.push(getDirectiveOnNode(0));
-            ɵɵelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(
-                0, 'names', ɵɵbind(ctx.someFn(ɵɵpureFunction1(1, e0_ff, ctx.customName))));
-          }
-        },
-        directives: directives
-      });
-    }
-
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'parent-comp');
-        ɵɵelement(1, 'parent-comp');
-      }
-    }, 2, 0, [ParentComp]);
-
-    const fixture = new ComponentFixture(App);
-    const firstArray = myComps[0].names;
-    const secondArray = myComps[1].names;
-    expect(firstArray).toEqual(['NANCY', 'Bess']);
-    expect(secondArray).toEqual(['NANCY', 'Bess']);
-    expect(firstArray).not.toBe(secondArray);
-
-    fixture.update();
-    expect(firstArray).toEqual(['NANCY', 'Bess']);
-    expect(secondArray).toEqual(['NANCY', 'Bess']);
-    expect(firstArray).toBe(myComps[0].names);
-    expect(secondArray).toBe(myComps[1].names);
-  });
-
-  it('should support an array literal with more than 1 binding', () => {
-    const e0_ff = (v1: any, v2: any) => ['Nancy', v1, 'Bess', v2];
-
-    /** <my-comp [names]="['Nancy', customName, 'Bess', customName2]"></my-comp> */
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'my-comp');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(
-            0, 'names', ɵɵbind(ɵɵpureFunction2(1, e0_ff, ctx.customName, ctx.customName2)));
-      }
-    }, 1, 4, directives);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.customName = 'Carson';
-    fixture.component.customName2 = 'Hannah';
-    fixture.update();
-    const firstArray = myComp !.names;
-    expect(firstArray).toEqual(['Nancy', 'Carson', 'Bess', 'Hannah']);
-
-    fixture.update();
-    expect(myComp !.names).toEqual(['Nancy', 'Carson', 'Bess', 'Hannah']);
-    expect(firstArray).toBe(myComp !.names);
-
-    fixture.component.customName = 'George';
-    fixture.update();
-    expect(myComp !.names).toEqual(['Nancy', 'George', 'Bess', 'Hannah']);
-    expect(firstArray).not.toBe(myComp !.names);
-
-    fixture.component.customName = 'Frank';
-    fixture.component.customName2 = 'Ned';
-    fixture.update();
-    expect(myComp !.names).toEqual(['Nancy', 'Frank', 'Bess', 'Ned']);
-
-    // The property should not be set if the exp value is the same, so artificially
-    // setting the property to ensure it's not overwritten.
-    myComp !.names = ['should not be overwritten'];
-    fixture.update();
-    expect(myComp !.names).toEqual(['should not be overwritten']);
-  });
-
-  it('should work up to 8 bindings', () => {
-    let f3Comp: MyComp;
-    let f4Comp: MyComp;
-    let f5Comp: MyComp;
-    let f6Comp: MyComp;
-    let f7Comp: MyComp;
-    let f8Comp: MyComp;
+import {ɵɵpureFunction2} from '../../src/render3/pure_function';
+import {getDirectiveOnNode, renderToHtml} from '../../test/render3/render_util';
 
 
-    const e0_ff = (v1: any, v2: any, v3: any) => ['a', 'b', 'c', 'd', 'e', v1, v2, v3];
-    const e2_ff = (v1: any, v2: any, v3: any, v4: any) => ['a', 'b', 'c', 'd', v1, v2, v3, v4];
-    const e4_ff =
-        (v1: any, v2: any, v3: any, v4: any, v5: any) => ['a', 'b', 'c', v1, v2, v3, v4, v5];
-    const e6_ff =
-        (v1: any, v2: any, v3: any, v4: any, v5: any,
-         v6: any) => ['a', 'b', v1, v2, v3, v4, v5, v6];
-    const e8_ff =
-        (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any,
-         v7: any) => ['a', v1, v2, v3, v4, v5, v6, v7];
-    const e10_ff =
-        (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any,
-         v8: any) => [v1, v2, v3, v4, v5, v6, v7, v8];
-
-    function Template(rf: RenderFlags, c: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'my-comp');
-        f3Comp = getDirectiveOnNode(0);
-        ɵɵelementEnd();
-        ɵɵelementStart(1, 'my-comp');
-        f4Comp = getDirectiveOnNode(1);
-        ɵɵelementEnd();
-        ɵɵelementStart(2, 'my-comp');
-        f5Comp = getDirectiveOnNode(2);
-        ɵɵelementEnd();
-        ɵɵelementStart(3, 'my-comp');
-        f6Comp = getDirectiveOnNode(3);
-        ɵɵelementEnd();
-        ɵɵelementStart(4, 'my-comp');
-        f7Comp = getDirectiveOnNode(4);
-        ɵɵelementEnd();
-        ɵɵelementStart(5, 'my-comp');
-        f8Comp = getDirectiveOnNode(5);
-        ɵɵelementEnd();
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'names', ɵɵbind(ɵɵpureFunction3(6, e0_ff, c[5], c[6], c[7])));
-        ɵɵelementProperty(1, 'names', ɵɵbind(ɵɵpureFunction4(10, e2_ff, c[4], c[5], c[6], c[7])));
-        ɵɵelementProperty(
-            2, 'names', ɵɵbind(ɵɵpureFunction5(15, e4_ff, c[3], c[4], c[5], c[6], c[7])));
-        ɵɵelementProperty(
-            3, 'names', ɵɵbind(ɵɵpureFunction6(21, e6_ff, c[2], c[3], c[4], c[5], c[6], c[7])));
-        ɵɵelementProperty(
-            4, 'names',
-            ɵɵbind(ɵɵpureFunction7(28, e8_ff, c[1], c[2], c[3], c[4], c[5], c[6], c[7])));
-        ɵɵelementProperty(
-            5, 'names',
-            ɵɵbind(ɵɵpureFunction8(36, e10_ff, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7])));
-      }
-    }
-
-    renderToHtml(Template, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'], 6, 45, directives);
-    expect(f3Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
-    expect(f4Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
-    expect(f5Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
-    expect(f6Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
-    expect(f7Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
-    expect(f8Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
-
-    renderToHtml(
-        Template, ['a1', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h1', 'i1'], 6, 45, directives);
-    expect(f3Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f1', 'g1', 'h1']);
-    expect(f4Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e1', 'f1', 'g1', 'h1']);
-    expect(f5Comp !.names).toEqual(['a', 'b', 'c', 'd1', 'e1', 'f1', 'g1', 'h1']);
-    expect(f6Comp !.names).toEqual(['a', 'b', 'c1', 'd1', 'e1', 'f1', 'g1', 'h1']);
-    expect(f7Comp !.names).toEqual(['a', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h1']);
-    expect(f8Comp !.names).toEqual(['a1', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h1']);
-
-    renderToHtml(
-        Template, ['a1', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h2', 'i1'], 6, 45, directives);
-    expect(f3Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e', 'f1', 'g1', 'h2']);
-    expect(f4Comp !.names).toEqual(['a', 'b', 'c', 'd', 'e1', 'f1', 'g1', 'h2']);
-    expect(f5Comp !.names).toEqual(['a', 'b', 'c', 'd1', 'e1', 'f1', 'g1', 'h2']);
-    expect(f6Comp !.names).toEqual(['a', 'b', 'c1', 'd1', 'e1', 'f1', 'g1', 'h2']);
-    expect(f7Comp !.names).toEqual(['a', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h2']);
-    expect(f8Comp !.names).toEqual(['a1', 'b1', 'c1', 'd1', 'e1', 'f1', 'g1', 'h2']);
-  });
-
-  it('should work with pureFunctionV for 9+ bindings', () => {
-    const e0_ff =
-        (v0: any, v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any,
-         v8: any) => ['start', v0, v1, v2, v3, v4, v5, v6, v7, v8, 'end'];
-    const e0_ff_1 = (v: any) => `modified_${v}`;
-
-    /**
-     * <my-comp [names]="['start', v0, v1, v2, v3, `modified_${v4}`, v5, v6, v7, v8, 'end']">
-     * </my-comp>
-     */
-    function Template(rf: RenderFlags, c: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'my-comp');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(
-            0, 'names', ɵɵbind(ɵɵpureFunctionV(3, e0_ff, [
-              c[0], c[1], c[2], c[3], ɵɵpureFunction1(1, e0_ff_1, c[4]), c[5], c[6], c[7], c[8]
-            ])));
-      }
-    }
-
-    renderToHtml(Template, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'], 1, 13, directives);
-    expect(myComp !.names).toEqual([
-      'start', 'a', 'b', 'c', 'd', 'modified_e', 'f', 'g', 'h', 'i', 'end'
-    ]);
-
-    renderToHtml(Template, ['a1', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'], 1, 13, directives);
-    expect(myComp !.names).toEqual([
-      'start', 'a1', 'b', 'c', 'd', 'modified_e', 'f', 'g', 'h', 'i', 'end'
-    ]);
-
-    renderToHtml(Template, ['a1', 'b', 'c', 'd', 'e5', 'f', 'g', 'h', 'i'], 1, 13, directives);
-    expect(myComp !.names).toEqual([
-      'start', 'a1', 'b', 'c', 'd', 'modified_e5', 'f', 'g', 'h', 'i', 'end'
-    ]);
-  });
-
-});
 describe('object literals', () => {
   let objectComp: ObjectComp;
 
@@ -393,114 +25,15 @@ describe('object literals', () => {
       factory: function ObjectComp_Factory() { return objectComp = new ObjectComp(); },
       consts: 0,
       vars: 1,
-      template: function ObjectComp_Template(rf: RenderFlags, ctx: ObjectComp) {},
+      template: function ObjectComp_Template() {},
       inputs: {config: 'config'}
     });
   }
 
   const defs = [ObjectComp];
 
-  it('should support an object literal', () => {
-    const e0_ff = (v: any) => { return {duration: 500, animation: v}; };
-
-    /** <object-comp [config]="{duration: 500, animation: name}"></object-comp> */
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'object-comp');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'config', ɵɵbind(ɵɵpureFunction1(1, e0_ff, ctx.name)));
-      }
-    }, 1, 3, defs);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.name = 'slide';
-    fixture.update();
-    const firstObj = objectComp !.config;
-    expect(objectComp !.config).toEqual({duration: 500, animation: 'slide'});
-
-    fixture.update();
-    expect(objectComp !.config).toEqual({duration: 500, animation: 'slide'});
-    expect(firstObj).toBe(objectComp !.config);
-
-    fixture.component.name = 'tap';
-    fixture.update();
-    expect(objectComp !.config).toEqual({duration: 500, animation: 'tap'});
-
-    // Identity must change if binding changes
-    expect(firstObj).not.toBe(objectComp !.config);
-  });
-
-  it('should support expressions nested deeply in object/array literals', () => {
-    const e0_ff = (v1: any, v2: any) => { return {animation: v1, actions: v2}; };
-    const e0_ff_1 = (v: any) => [{opacity: 0, duration: 0}, v];
-    const e0_ff_2 = (v: any) => { return {opacity: 1, duration: v}; };
-
-    /**
-     * <object-comp [config]="{animation: name, actions: [{ opacity: 0, duration: 0}, {opacity: 1,
-     * duration: duration }]}">
-     * </object-comp>
-     */
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'object-comp');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(
-            0, 'config',
-            ɵɵbind(ɵɵpureFunction2(
-                5, e0_ff, ctx.name,
-                ɵɵpureFunction1(3, e0_ff_1, ɵɵpureFunction1(1, e0_ff_2, ctx.duration)))));
-      }
-    }, 1, 8, defs);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.name = 'slide';
-    fixture.component.duration = 100;
-    fixture.update();
-    expect(objectComp !.config).toEqual({
-      animation: 'slide',
-      actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 100}]
-    });
-    const firstConfig = objectComp !.config;
-
-    fixture.update();
-    expect(objectComp !.config).toEqual({
-      animation: 'slide',
-      actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 100}]
-    });
-    expect(objectComp !.config).toBe(firstConfig);
-
-    fixture.component.duration = 50;
-    fixture.update();
-    expect(objectComp !.config).toEqual({
-      animation: 'slide',
-      actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 50}]
-    });
-    expect(objectComp !.config).not.toBe(firstConfig);
-
-    fixture.component.name = 'tap';
-    fixture.update();
-    expect(objectComp !.config).toEqual({
-      animation: 'tap',
-      actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 50}]
-    });
-
-    fixture.component.name = 'drag';
-    fixture.component.duration = 500;
-    fixture.update();
-    expect(objectComp !.config).toEqual({
-      animation: 'drag',
-      actions: [{opacity: 0, duration: 0}, {opacity: 1, duration: 500}]
-    });
-
-    // The property should not be set if the exp value is the same, so artificially
-    // setting the property to ensure it's not overwritten.
-    objectComp !.config = ['should not be overwritten'];
-    fixture.update();
-    expect(objectComp !.config).toEqual(['should not be overwritten']);
-  });
-
+  // NOTE: This test cannot be ported to acceptance tests with TestBed because
+  // the syntax is still unsupported.
   it('should support multiple view instances with multiple bindings', () => {
     let objectComps: ObjectComp[] = [];
 

From 31df5139c5e4b75234690c84ddeb7cac1bcfa75b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 26 Apr 2019 15:29:27 +0200
Subject: [PATCH 007/275] test: fix several Bazel compiler tests in windows
 (#30146)

```
//packages/compiler-cli/test:ngc
//packages/compiler/test:test
```

This also address `node_modules` to the ignored paths for ngc compiler as otherwise the `ready` is never fired

Partially addresses #29785

PR Close #30146
---
 .codefresh/codefresh.yml                   | 2 +-
 packages/compiler-cli/src/perform_watch.ts | 2 +-
 packages/compiler-cli/test/ngc_spec.ts     | 8 +++++---
 packages/compiler-cli/test/test_support.ts | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.codefresh/codefresh.yml b/.codefresh/codefresh.yml
index 7316835c66..38cef7a59a 100644
--- a/.codefresh/codefresh.yml
+++ b/.codefresh/codefresh.yml
@@ -20,7 +20,7 @@ steps:
     # Add Bazel CI config
     - copy .codefresh\bazel.rc %ProgramData%\bazel.bazelrc
     # Run tests
-    - yarn bazel test //tools/ts-api-guardian:all //packages/language-service/test
+    - yarn bazel test //tools/ts-api-guardian:all //packages/language-service/test //packages/compiler/test //packages/compiler-cli/test:ngc
     - yarn test-ivy-aot //packages/animations/test //packages/common/test //packages/forms/test //packages/http/test //packages/platform-browser/test //packages/platform-browser-dynamic/test //packages/router/test
     - yarn bazel test //tools/public_api_guard/...
     - yarn bazel test //packages/compiler-cli/integrationtest:integrationtest //packages/compiler-cli/test/compliance:compliance
diff --git a/packages/compiler-cli/src/perform_watch.ts b/packages/compiler-cli/src/perform_watch.ts
index d070e729b2..0997dfd720 100644
--- a/packages/compiler-cli/src/perform_watch.ts
+++ b/packages/compiler-cli/src/perform_watch.ts
@@ -70,7 +70,7 @@ export function createPerformWatchHost(
       const watcher = chokidar.watch(options.basePath, {
         // ignore .dotfiles, .js and .map files.
         // can't ignore other files as we e.g. want to recompile if an `.html` file changes as well.
-        ignored: /((^[\/\\])\..)|(\.js$)|(\.map$)|(\.metadata\.json)/,
+        ignored: /((^[\/\\])\..)|(\.js$)|(\.map$)|(\.metadata\.json|node_modules)/,
         ignoreInitial: true,
         persistent: true,
       });
diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts
index cc2258882a..665bd37c98 100644
--- a/packages/compiler-cli/test/ngc_spec.ts
+++ b/packages/compiler-cli/test/ngc_spec.ts
@@ -2028,11 +2028,13 @@ describe('ngc transformer command-line', () => {
       const exitCode =
           main(['-p', path.join(basePath, 'src/tsconfig.json')], message => messages.push(message));
       expect(exitCode).toBe(1, 'Compile was expected to fail');
+      const srcPathWithSep = `lib${path.sep}`;
       expect(messages[0])
-          .toEqual(`lib/test.component.ts(6,21): Error during template compile of 'TestComponent'
+          .toEqual(
+              `${srcPathWithSep}test.component.ts(6,21): Error during template compile of 'TestComponent'
   Tagged template expressions are not supported in metadata in 't1'
-    't1' references 't2' at lib/indirect1.ts(3,27)
-      't2' contains the error at lib/indirect2.ts(4,27).
+    't1' references 't2' at ${srcPathWithSep}indirect1.ts(3,27)
+      't2' contains the error at ${srcPathWithSep}indirect2.ts(4,27).
 `);
     });
   });
diff --git a/packages/compiler-cli/test/test_support.ts b/packages/compiler-cli/test/test_support.ts
index 13a883eaf3..4e77479630 100644
--- a/packages/compiler-cli/test/test_support.ts
+++ b/packages/compiler-cli/test/test_support.ts
@@ -19,7 +19,7 @@ export function makeTempDir(): string {
   let dir: string;
   while (true) {
     const id = (Math.random() * 1000000).toFixed(0);
-    dir = path.join(tmpdir, `tmp.${id}`);
+    dir = path.posix.join(tmpdir, `tmp.${id}`);
     if (!fs.existsSync(dir)) break;
   }
   fs.mkdirSync(dir);

From 2f35dbfd3b9f6d633ed272b67f177278a0541f6f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 26 Apr 2019 16:14:05 +0200
Subject: [PATCH 008/275] test: fix ngtsc tests in windows (#30146)

This commit fixes the following test target in windows

```
//packages/compiler-cli/test/ngtsc:ngtsc
```

PR Close #30146
---
 .codefresh/codefresh.yml                | 2 +-
 packages/compiler-cli/test/ngtsc/env.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.codefresh/codefresh.yml b/.codefresh/codefresh.yml
index 38cef7a59a..2032ec4c5d 100644
--- a/.codefresh/codefresh.yml
+++ b/.codefresh/codefresh.yml
@@ -20,7 +20,7 @@ steps:
     # Add Bazel CI config
     - copy .codefresh\bazel.rc %ProgramData%\bazel.bazelrc
     # Run tests
-    - yarn bazel test //tools/ts-api-guardian:all //packages/language-service/test //packages/compiler/test //packages/compiler-cli/test:ngc
+    - yarn bazel test //tools/ts-api-guardian:all //packages/language-service/test //packages/compiler/test //packages/compiler-cli/test:ngc //packages/compiler-cli/test/ngtsc:ngtsc
     - yarn test-ivy-aot //packages/animations/test //packages/common/test //packages/forms/test //packages/http/test //packages/platform-browser/test //packages/platform-browser-dynamic/test //packages/router/test
     - yarn bazel test //tools/public_api_guard/...
     - yarn bazel test //packages/compiler-cli/integrationtest:integrationtest //packages/compiler-cli/test/compliance:compliance
diff --git a/packages/compiler-cli/test/ngtsc/env.ts b/packages/compiler-cli/test/ngtsc/env.ts
index 52281fb454..98e5f4bd0e 100644
--- a/packages/compiler-cli/test/ngtsc/env.ts
+++ b/packages/compiler-cli/test/ngtsc/env.ts
@@ -29,7 +29,7 @@ function setupFakeCore(support: TestSupport): void {
   const nodeModulesPath = path.join(support.basePath, 'node_modules');
   const angularCoreDirectory = path.join(nodeModulesPath, '@angular/core');
 
-  fs.symlinkSync(fakeNpmPackageDir, angularCoreDirectory, 'dir');
+  fs.symlinkSync(fakeNpmPackageDir, angularCoreDirectory, 'junction');
 }
 
 /**
@@ -121,7 +121,7 @@ export class NgtscTestEnvironment {
     if (this.multiCompileHostExt === null) {
       throw new Error(`Not tracking written files - call enableMultipleCompilations()`);
     }
-    const outDir = path.join(this.support.basePath, 'built');
+    const outDir = path.posix.join(this.support.basePath, 'built');
     const writtenFiles = new Set<string>();
     this.multiCompileHostExt.getFilesWrittenSinceLastFlush().forEach(rawFile => {
       if (rawFile.startsWith(outDir)) {

From f74373f2dd829249e77537a90883eda833a8ce85 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@abv.bg>
Date: Tue, 7 May 2019 22:57:55 -0400
Subject: [PATCH 009/275] fix(ivy): align NgModule registration timing with
 ViewEngine (#30244)

Currently in Ivy `NgModule` registration happens when the class is declared, however this is inconsistent with ViewEngine and requires extra generated code. These changes remove the generated code for `registerModuleFactory`, pass the id through to the `ngModuleDef` and do the module registration inside `NgModuleFactory.create`.

This PR resolves FW-1285.

PR Close #30244
---
 .../src/ngtsc/annotations/src/ng_module.ts    |  6 +--
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 22 ++++----
 .../compiler/src/compiler_facade_interface.ts |  1 +
 packages/compiler/src/jit_compiler_facade.ts  |  1 +
 .../compiler/src/render3/r3_identifiers.ts    |  3 --
 .../src/render3/r3_module_compiler.ts         | 13 ++++-
 packages/core/src/codegen_private_exports.ts  |  2 +-
 .../src/compiler/compiler_facade_interface.ts |  1 +
 .../core/src/core_render3_private_export.ts   |  7 ++-
 .../src/linker/ng_module_factory_loader.ts    | 41 ++-------------
 .../linker/ng_module_factory_registration.ts  | 52 +++++++++++++++++++
 packages/core/src/metadata/ng_module.ts       |  3 ++
 packages/core/src/render3/definition.ts       |  4 ++
 packages/core/src/render3/jit/environment.ts  |  3 --
 packages/core/src/render3/jit/module.ts       |  5 +-
 packages/core/src/render3/ng_module_ref.ts    |  9 +++-
 .../test/linker/ng_module_integration_spec.ts | 14 ++++-
 tools/public_api_guard/core/core.d.ts         |  1 +
 18 files changed, 115 insertions(+), 73 deletions(-)
 create mode 100644 packages/core/src/linker/ng_module_factory_registration.ts

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index f65b93db86..52040dfd1e 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -162,6 +162,7 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
       exports,
       imports,
       containsForwardDecls,
+      id,
       emitInline: false,
       // TODO: to be implemented as a part of FW-1004.
       schemas: [],
@@ -257,11 +258,6 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
         ngModuleStatements.push(callExpr.toStmt());
       }
     }
-    if (analysis.id !== null) {
-      const registerNgModuleType = new ExternalExpr(R3Identifiers.registerNgModuleType);
-      const callExpr = registerNgModuleType.callFn([analysis.id, new WrappedNodeExpr(node.name)]);
-      ngModuleStatements.push(callExpr.toStmt());
-    }
     return [
       {
         name: 'ngModuleDef',
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 8dc8f76496..f9fd964068 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -484,7 +484,7 @@ describe('ngtsc behavioral tests', () => {
        expect(jsContents).not.toContain('\u0275\u0275setNgModuleScope(TestModule,');
      });
 
-  it('should emit a \u0275registerNgModuleType call when the module has an id', () => {
+  it('should emit the id when the module\'s id is a string', () => {
     env.tsconfig();
     env.write('test.ts', `
         import {NgModule} from '@angular/core';
@@ -496,27 +496,27 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.\u0275registerNgModuleType(\'test\', TestModule);');
+    expect(jsContents).toContain(`i0.\u0275\u0275defineNgModule({ type: TestModule, id: 'test' })`);
   });
 
-  it('should emit a \u0275registerNgModuleType call when the module id is defined as `module.id`',
-     () => {
-       env.tsconfig();
-       env.write('index.d.ts', `
+  it('should emit the id when the module\'s id is defined as `module.id`', () => {
+    env.tsconfig();
+    env.write('index.d.ts', `
          declare const module = {id: string};
        `);
-       env.write('test.ts', `
+    env.write('test.ts', `
          import {NgModule} from '@angular/core';
 
          @NgModule({id: module.id})
          export class TestModule {}
        `);
 
-       env.driveMain();
+    env.driveMain();
 
-       const jsContents = env.getContents('test.js');
-       expect(jsContents).toContain('i0.\u0275registerNgModuleType(module.id, TestModule);');
-     });
+    const jsContents = env.getContents('test.js');
+    expect(jsContents)
+        .toContain('i0.\u0275\u0275defineNgModule({ type: TestModule, id: module.id })');
+  });
 
   it('should filter out directives and pipes from module exports in the injector def', () => {
     env.tsconfig();
diff --git a/packages/compiler/src/compiler_facade_interface.ts b/packages/compiler/src/compiler_facade_interface.ts
index 7214522ddd..8fb8a44d07 100644
--- a/packages/compiler/src/compiler_facade_interface.ts
+++ b/packages/compiler/src/compiler_facade_interface.ts
@@ -106,6 +106,7 @@ export interface R3NgModuleMetadataFacade {
   exports: Function[];
   emitInline: boolean;
   schemas: {name: string}[]|null;
+  id: string|null;
 }
 
 export interface R3InjectorMetadataFacade {
diff --git a/packages/compiler/src/jit_compiler_facade.ts b/packages/compiler/src/jit_compiler_facade.ts
index 4e135ad90a..c14a4680bf 100644
--- a/packages/compiler/src/jit_compiler_facade.ts
+++ b/packages/compiler/src/jit_compiler_facade.ts
@@ -91,6 +91,7 @@ export class CompilerFacadeImpl implements CompilerFacade {
       emitInline: true,
       containsForwardDecls: false,
       schemas: facade.schemas ? facade.schemas.map(wrapReference) : null,
+      id: facade.id ? new WrappedNodeExpr(facade.id) : null,
     };
     const res = compileNgModule(meta);
     return this.jitExpression(res.expression, angularCoreEnv, sourceMapUrl, []);
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 7e872d9a3e..af400aa98c 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -239,9 +239,6 @@ export class Identifiers {
     moduleName: CORE,
   };
 
-  static registerNgModuleType:
-      o.ExternalReference = {name: 'ɵregisterNgModuleType', moduleName: CORE};
-
   // sanitization-related functions
   static sanitizeHtml: o.ExternalReference = {name: 'ɵɵsanitizeHtml', moduleName: CORE};
   static sanitizeStyle: o.ExternalReference = {name: 'ɵɵsanitizeStyle', moduleName: CORE};
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index 213e762c5f..df83a468d6 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -67,6 +67,9 @@ export interface R3NgModuleMetadata {
    * The set of schemas that declare elements to be allowed in the NgModule.
    */
   schemas: R3Reference[]|null;
+
+  /** Unique ID or expression representing the unique ID of an NgModule. */
+  id: o.Expression|null;
 }
 
 /**
@@ -81,7 +84,8 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
     exports,
     schemas,
     containsForwardDecls,
-    emitInline
+    emitInline,
+    id
   } = meta;
 
   const additionalStatements: o.Statement[] = [];
@@ -93,7 +97,8 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
     declarations: o.Expression,
     imports: o.Expression,
     exports: o.Expression,
-    schemas: o.LiteralArrayExpr
+    schemas: o.LiteralArrayExpr,
+    id: o.Expression
   };
 
   // Only generate the keys in the metadata if the arrays have values.
@@ -130,6 +135,10 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
     definitionMap.schemas = o.literalArr(schemas.map(ref => ref.value));
   }
 
+  if (id) {
+    definitionMap.id = id;
+  }
+
   const expression = o.importExpr(R3.defineNgModule).callFn([mapToMapExpression(definitionMap)]);
   const type = new o.ExpressionType(o.importExpr(R3.NgModuleDefWithMeta, [
     new o.ExpressionType(moduleType), tupleTypeOf(declarations), tupleTypeOf(imports),
diff --git a/packages/core/src/codegen_private_exports.ts b/packages/core/src/codegen_private_exports.ts
index fffbd4f4fa..177d4560ab 100644
--- a/packages/core/src/codegen_private_exports.ts
+++ b/packages/core/src/codegen_private_exports.ts
@@ -7,5 +7,5 @@
  */
 
 export {CodegenComponentFactoryResolver as ɵCodegenComponentFactoryResolver} from './linker/component_factory_resolver';
-export {registerModuleFactory as ɵregisterModuleFactory} from './linker/ng_module_factory_loader';
+export {registerModuleFactory as ɵregisterModuleFactory} from './linker/ng_module_factory_registration';
 export {ArgumentType as ɵArgumentType, BindingFlags as ɵBindingFlags, DepFlags as ɵDepFlags, EMPTY_ARRAY as ɵEMPTY_ARRAY, EMPTY_MAP as ɵEMPTY_MAP, NodeFlags as ɵNodeFlags, QueryBindingType as ɵQueryBindingType, QueryValueType as ɵQueryValueType, ViewDefinition as ɵViewDefinition, ViewFlags as ɵViewFlags, anchorDef as ɵand, createComponentFactory as ɵccf, createNgModuleFactory as ɵcmf, createRendererType2 as ɵcrt, directiveDef as ɵdid, elementDef as ɵeld, getComponentViewDefinitionFactory as ɵgetComponentViewDefinitionFactory, inlineInterpolate as ɵinlineInterpolate, interpolate as ɵinterpolate, moduleDef as ɵmod, moduleProvideDef as ɵmpd, ngContentDef as ɵncd, nodeValue as ɵnov, pipeDef as ɵpid, providerDef as ɵprd, pureArrayDef as ɵpad, pureObjectDef as ɵpod, purePipeDef as ɵppd, queryDef as ɵqud, textDef as ɵted, unwrapValue as ɵunv, viewDef as ɵvid} from './view/index';
diff --git a/packages/core/src/compiler/compiler_facade_interface.ts b/packages/core/src/compiler/compiler_facade_interface.ts
index 7214522ddd..8fb8a44d07 100644
--- a/packages/core/src/compiler/compiler_facade_interface.ts
+++ b/packages/core/src/compiler/compiler_facade_interface.ts
@@ -106,6 +106,7 @@ export interface R3NgModuleMetadataFacade {
   exports: Function[];
   emitInline: boolean;
   schemas: {name: string}[]|null;
+  id: string|null;
 }
 
 export interface R3InjectorMetadataFacade {
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index c7374775ac..f2b48983e4 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -274,10 +274,9 @@ export {
   SWITCH_RENDERER2_FACTORY__POST_R3__ as ɵSWITCH_RENDERER2_FACTORY__POST_R3__,
 } from './render/api';
 
-export {
-  getModuleFactory__POST_R3__ as ɵgetModuleFactory__POST_R3__,
-  registerNgModuleType as ɵregisterNgModuleType,
-} from './linker/ng_module_factory_loader';
+export { getModuleFactory__POST_R3__ as ɵgetModuleFactory__POST_R3__ } from './linker/ng_module_factory_loader';
+
+export { registerNgModuleType as ɵregisterNgModuleType } from './linker/ng_module_factory_registration';
 
 export {
   publishGlobalUtil as ɵpublishGlobalUtil,
diff --git a/packages/core/src/linker/ng_module_factory_loader.ts b/packages/core/src/linker/ng_module_factory_loader.ts
index f5a8b9aec6..2f6f710c6e 100644
--- a/packages/core/src/linker/ng_module_factory_loader.ts
+++ b/packages/core/src/linker/ng_module_factory_loader.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Type} from '../interface/type';
 import {NgModuleFactory as R3NgModuleFactory, NgModuleType} from '../render3/ng_module_ref';
-import {stringify} from '../util/stringify';
 
 import {NgModuleFactory} from './ng_module_factory';
+import {getRegisteredNgModuleType} from './ng_module_factory_registration';
 
 
 /**
@@ -24,48 +23,14 @@ export abstract class NgModuleFactoryLoader {
   abstract load(path: string): Promise<NgModuleFactory<any>>;
 }
 
-/**
- * Map of module-id to the corresponding NgModule.
- * - In pre Ivy we track NgModuleFactory,
- * - In post Ivy we track the NgModuleType
- */
-const modules = new Map<string, NgModuleFactory<any>|NgModuleType>();
-
-/**
- * Registers a loaded module. Should only be called from generated NgModuleFactory code.
- * @publicApi
- */
-export function registerModuleFactory(id: string, factory: NgModuleFactory<any>) {
-  const existing = modules.get(id) as NgModuleFactory<any>;
-  assertSameOrNotExisting(id, existing && existing.moduleType, factory.moduleType);
-  modules.set(id, factory);
-}
-
-function assertSameOrNotExisting(id: string, type: Type<any>| null, incoming: Type<any>): void {
-  if (type && type !== incoming) {
-    throw new Error(
-        `Duplicate module registered for ${id} - ${stringify(type)} vs ${stringify(type.name)}`);
-  }
-}
-
-export function registerNgModuleType(id: string, ngModuleType: NgModuleType) {
-  const existing = modules.get(id) as NgModuleType | null;
-  assertSameOrNotExisting(id, existing, ngModuleType);
-  modules.set(id, ngModuleType);
-}
-
-export function clearModulesForTest(): void {
-  modules.clear();
-}
-
 export function getModuleFactory__PRE_R3__(id: string): NgModuleFactory<any> {
-  const factory = modules.get(id) as NgModuleFactory<any>| null;
+  const factory = getRegisteredNgModuleType(id) as NgModuleFactory<any>| null;
   if (!factory) throw noModuleError(id);
   return factory;
 }
 
 export function getModuleFactory__POST_R3__(id: string): NgModuleFactory<any> {
-  const type = modules.get(id) as NgModuleType | null;
+  const type = getRegisteredNgModuleType(id) as NgModuleType | null;
   if (!type) throw noModuleError(id);
   return new R3NgModuleFactory(type);
 }
diff --git a/packages/core/src/linker/ng_module_factory_registration.ts b/packages/core/src/linker/ng_module_factory_registration.ts
new file mode 100644
index 0000000000..e63314323f
--- /dev/null
+++ b/packages/core/src/linker/ng_module_factory_registration.ts
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Type} from '../interface/type';
+import {NgModuleType} from '../render3/ng_module_ref';
+import {stringify} from '../util/stringify';
+
+import {NgModuleFactory} from './ng_module_factory';
+
+
+/**
+ * Map of module-id to the corresponding NgModule.
+ * - In pre Ivy we track NgModuleFactory,
+ * - In post Ivy we track the NgModuleType
+ */
+const modules = new Map<string, NgModuleFactory<any>|NgModuleType>();
+
+/**
+ * Registers a loaded module. Should only be called from generated NgModuleFactory code.
+ * @publicApi
+ */
+export function registerModuleFactory(id: string, factory: NgModuleFactory<any>) {
+  const existing = modules.get(id) as NgModuleFactory<any>;
+  assertSameOrNotExisting(id, existing && existing.moduleType, factory.moduleType);
+  modules.set(id, factory);
+}
+
+function assertSameOrNotExisting(id: string, type: Type<any>| null, incoming: Type<any>): void {
+  if (type && type !== incoming) {
+    throw new Error(
+        `Duplicate module registered for ${id} - ${stringify(type)} vs ${stringify(type.name)}`);
+  }
+}
+
+export function registerNgModuleType(id: string, ngModuleType: NgModuleType) {
+  const existing = modules.get(id) as NgModuleType | null;
+  assertSameOrNotExisting(id, existing, ngModuleType);
+  modules.set(id, ngModuleType);
+}
+
+export function clearModulesForTest(): void {
+  modules.clear();
+}
+
+export function getRegisteredNgModuleType(id: string) {
+  return modules.get(id);
+}
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 36201f1726..0b7638f0ad 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -75,6 +75,9 @@ export interface NgModuleDef<T> {
 
   /** The set of schemas that declare elements to be allowed in the NgModule. */
   schemas: SchemaMetadata[]|null;
+
+  /** Unique ID for the module with which it should be registered.  */
+  id: string|null;
 }
 
 /**
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index ecefde30c9..a5eb841056 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -366,6 +366,9 @@ export function ɵɵdefineNgModule<T>(def: {
 
   /** The set of schemas that declare elements to be allowed in the NgModule. */
   schemas?: SchemaMetadata[] | null;
+
+  /** Unique ID for the module that is used with `getModuleFactory`. */
+  id?: string | null;
 }): never {
   const res: NgModuleDef<T> = {
     type: def.type,
@@ -375,6 +378,7 @@ export function ɵɵdefineNgModule<T>(def: {
     exports: def.exports || EMPTY_ARRAY,
     transitiveCompileScopes: null,
     schemas: def.schemas || null,
+    id: def.id || null,
   };
   return res as never;
 }
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 3dc719945e..781ed99f83 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -9,7 +9,6 @@
 import {ɵɵdefineInjectable, ɵɵdefineInjector,} from '../../di/interface/defs';
 import {ɵɵinject} from '../../di/injector_compatibility';
 import * as r3 from '../index';
-import {registerNgModuleType} from '../../linker/ng_module_factory_loader';
 import * as sanitization from '../../sanitization/sanitization';
 
 
@@ -139,6 +138,4 @@ export const angularCoreEnv: {[name: string]: Function} = {
   'ɵɵsanitizeScript': sanitization.ɵɵsanitizeScript,
   'ɵɵsanitizeUrl': sanitization.ɵɵsanitizeUrl,
   'ɵɵsanitizeUrlOrResourceUrl': sanitization.ɵɵsanitizeUrlOrResourceUrl,
-
-  'ɵregisterNgModuleType': registerNgModuleType,
 };
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 3777b0cf1c..324eef50e8 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -11,7 +11,6 @@ import {resolveForwardRef} from '../../di/forward_ref';
 import {NG_INJECTOR_DEF} from '../../di/interface/defs';
 import {reflectDependencies} from '../../di/jit/util';
 import {Type} from '../../interface/type';
-import {registerNgModuleType} from '../../linker/ng_module_factory_loader';
 import {Component} from '../../metadata';
 import {ModuleWithProviders, NgModule, NgModuleDef, NgModuleTransitiveScopes} from '../../metadata/ng_module';
 import {flatten} from '../../util/array_utils';
@@ -117,14 +116,12 @@ export function compileNgModuleDefs(moduleType: NgModuleType, ngModule: NgModule
                            .map(expandModuleWithProviders),
               emitInline: true,
               schemas: ngModule.schemas ? flatten(ngModule.schemas) : null,
+              id: ngModule.id || null,
             });
       }
       return ngModuleDef;
     }
   });
-  if (ngModule.id) {
-    registerNgModuleType(ngModule.id, moduleType);
-  }
 
   let ngInjectorDef: any = null;
   Object.defineProperty(moduleType, NG_INJECTOR_DEF, {
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
index 889548a86b..07518d77f2 100644
--- a/packages/core/src/render3/ng_module_ref.ts
+++ b/packages/core/src/render3/ng_module_ref.ts
@@ -14,9 +14,11 @@ import {R3Injector, createInjector} from '../di/r3_injector';
 import {Type} from '../interface/type';
 import {ComponentFactoryResolver as viewEngine_ComponentFactoryResolver} from '../linker/component_factory_resolver';
 import {InternalNgModuleRef, NgModuleFactory as viewEngine_NgModuleFactory, NgModuleRef as viewEngine_NgModuleRef} from '../linker/ng_module_factory';
+import {registerNgModuleType} from '../linker/ng_module_factory_registration';
 import {NgModuleDef} from '../metadata/ng_module';
 import {assertDefined} from '../util/assert';
 import {stringify} from '../util/stringify';
+
 import {ComponentFactoryResolver} from './component_ref';
 import {getNgModuleDef} from './definition';
 import {maybeUnwrapFn} from './util/misc_utils';
@@ -87,6 +89,11 @@ export class NgModuleFactory<T> extends viewEngine_NgModuleFactory<T> {
   constructor(public moduleType: Type<T>) { super(); }
 
   create(parentInjector: Injector|null): viewEngine_NgModuleRef<T> {
-    return new NgModuleRef(this.moduleType, parentInjector);
+    const moduleType = this.moduleType;
+    const moduleRef = new NgModuleRef(moduleType, parentInjector);
+    const ngModuleDef = getNgModuleDef(moduleType);
+    ngModuleDef && ngModuleDef.id &&
+        registerNgModuleType(ngModuleDef.id, moduleType as NgModuleType);
+    return moduleRef;
   }
 }
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index 4500bd26df..50061efc78 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -17,7 +17,7 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {modifiedInIvy, obsoleteInIvy, onlyInIvy} from '@angular/private/testing';
 
 import {InternalNgModuleRef, NgModuleFactory} from '../../src/linker/ng_module_factory';
-import {clearModulesForTest} from '../../src/linker/ng_module_factory_loader';
+import {clearModulesForTest} from '../../src/linker/ng_module_factory_registration';
 import {stringify} from '../../src/util/stringify';
 
 class Engine {}
@@ -327,6 +327,18 @@ function declareTests(config?: {useJit: boolean}) {
           createModule(SomeOtherModule);
         }).toThrowError(/Duplicate module registered/);
       });
+
+      it('should not throw immediately if two modules have the same id', () => {
+        expect(() => {
+          @NgModule({id: 'some-module'})
+          class ModuleA {
+          }
+
+          @NgModule({id: 'some-module'})
+          class ModuleB {
+          }
+        }).not.toThrow();
+      });
     });
 
     describe('entryComponents', () => {
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index ba7e436cf3..1a3c687730 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -777,6 +777,7 @@ export declare function ɵɵdefineNgModule<T>(def: {
     imports?: Type<any>[] | (() => Type<any>[]);
     exports?: Type<any>[] | (() => Type<any>[]);
     schemas?: SchemaMetadata[] | null;
+    id?: string | null;
 }): never;
 
 export declare function ɵɵdefinePipe<T>(pipeDef: {

From 3a7bfc721efd61809ec16b950549f14ad4f9e75d Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 30 Apr 2019 13:44:17 +0200
Subject: [PATCH 010/275] fix(ivy): handle windows drives correctly (#30297)

At the moment the module resolver will end up in an infinite loop in Windows because we are assuming that the root directory is always `/` however in windows this can be any drive letter example `c:/` or `d:/` etc...

With this change we also resolve the drive letter in windows, when using `AbsoluteFsPath.from` for consistence so under `/foo` will be converted to `c:/foo` this is also needed because of relative paths with different drive letters.

PR Close #30297
---
 .../ngcc/src/dependencies/module_resolver.ts             | 4 ++--
 .../compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts | 2 +-
 .../compiler-cli/ngcc/test/helpers/mock_file_system.ts   | 9 +++++----
 packages/compiler-cli/src/ngtsc/path/src/types.ts        | 9 +++++++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/dependencies/module_resolver.ts b/packages/compiler-cli/ngcc/src/dependencies/module_resolver.ts
index e8c12e361d..c558a2bb97 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/module_resolver.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/module_resolver.ts
@@ -118,7 +118,7 @@ export class ModuleResolver {
    */
   private resolveAsEntryPoint(moduleName: string, fromPath: AbsoluteFsPath): ResolvedModule|null {
     let folder = fromPath;
-    while (folder !== '/') {
+    while (!AbsoluteFsPath.isRoot(folder)) {
       folder = AbsoluteFsPath.dirname(folder);
       if (folder.endsWith('node_modules')) {
         // Skip up if the folder already ends in node_modules
@@ -225,7 +225,7 @@ export class ModuleResolver {
    */
   private findPackagePath(path: AbsoluteFsPath): AbsoluteFsPath|null {
     let folder = path;
-    while (folder !== '/') {
+    while (!AbsoluteFsPath.isRoot(folder)) {
       folder = AbsoluteFsPath.dirname(folder);
       if (this.fs.exists(AbsoluteFsPath.join(folder, 'package.json'))) {
         return folder;
diff --git a/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts b/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts
index 19ddb626dd..d437a51945 100644
--- a/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts
+++ b/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts
@@ -27,7 +27,7 @@ export class NgccCompilerHost implements ts.CompilerHost {
   }
 
   getDefaultLibLocation(): string {
-    const nodeLibPath = AbsoluteFsPath.fromUnchecked(require.resolve('typescript'));
+    const nodeLibPath = AbsoluteFsPath.from(require.resolve('typescript'));
     return AbsoluteFsPath.join(nodeLibPath, '..');
   }
 
diff --git a/packages/compiler-cli/ngcc/test/helpers/mock_file_system.ts b/packages/compiler-cli/ngcc/test/helpers/mock_file_system.ts
index c47e2f359e..3e8fd219b4 100644
--- a/packages/compiler-cli/ngcc/test/helpers/mock_file_system.ts
+++ b/packages/compiler-cli/ngcc/test/helpers/mock_file_system.ts
@@ -14,7 +14,7 @@ import {FileStats, FileSystem} from '../../src/file_system/file_system';
 export class MockFileSystem implements FileSystem {
   files: Folder = {};
   constructor(...folders: Folder[]) {
-    folders.forEach(files => this.processFiles(this.files, files));
+    folders.forEach(files => this.processFiles(this.files, files, true));
   }
 
   exists(path: AbsoluteFsPath): boolean { return this.findFromPath(path) !== null; }
@@ -67,7 +67,7 @@ export class MockFileSystem implements FileSystem {
     return new MockFileStats(fileOrFolder);
   }
 
-  pwd(): AbsoluteFsPath { return AbsoluteFsPath.fromUnchecked('/'); }
+  pwd(): AbsoluteFsPath { return AbsoluteFsPath.from('/'); }
 
   copyFile(from: AbsoluteFsPath, to: AbsoluteFsPath): void {
     this.writeFile(to, this.readFile(from));
@@ -82,9 +82,10 @@ export class MockFileSystem implements FileSystem {
 
   ensureDir(path: AbsoluteFsPath): void { this.ensureFolders(this.files, path.split('/')); }
 
-  private processFiles(current: Folder, files: Folder): void {
+  private processFiles(current: Folder, files: Folder, isRootPath = false): void {
     Object.keys(files).forEach(path => {
-      const segments = path.split('/');
+      const pathResolved = isRootPath ? AbsoluteFsPath.from(path) : path;
+      const segments = pathResolved.split('/');
       const lastSegment = segments.pop() !;
       const containingFolder = this.ensureFolders(current, segments);
       const entity = files[path];
diff --git a/packages/compiler-cli/src/ngtsc/path/src/types.ts b/packages/compiler-cli/src/ngtsc/path/src/types.ts
index 6561d7e2fe..7286aeaaa7 100644
--- a/packages/compiler-cli/src/ngtsc/path/src/types.ts
+++ b/packages/compiler-cli/src/ngtsc/path/src/types.ts
@@ -40,6 +40,12 @@ export const AbsoluteFsPath = {
    * Convert the path `str` to an `AbsoluteFsPath`, throwing an error if it's not an absolute path.
    */
   from: function(str: string): AbsoluteFsPath {
+    if (str.startsWith('/') && process.platform === 'win32') {
+      // in Windows if it's absolute path and starts with `/` we shall
+      // resolve it and return it including the drive.
+      str = path.resolve(str);
+    }
+
     const normalized = normalizeSeparators(str);
     if (!isAbsolutePath(normalized)) {
       throw new Error(`Internal Error: AbsoluteFsPath.from(${str}): path is not absolute`);
@@ -80,6 +86,9 @@ export const AbsoluteFsPath = {
    */
   resolve: function(basePath: string, ...paths: string[]):
       AbsoluteFsPath { return AbsoluteFsPath.from(path.resolve(basePath, ...paths));},
+
+  /** Returns true when the path provided is the root path. */
+  isRoot: function(path: AbsoluteFsPath): boolean { return AbsoluteFsPath.dirname(path) === path;},
 };
 
 /**

From 1bd4891c9a9562f467c8d4679739f1a77c65ebb9 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 30 Apr 2019 14:06:02 +0200
Subject: [PATCH 011/275] test: fix ngcc unit tests in windows (#30297)

```
//packages/compiler-cli/ngcc/test:test
```

Partially addresses #29785

PR Close #30297
---
 .codefresh/codefresh.yml                               |  4 +---
 packages/compiler-cli/ngcc/src/rendering/renderer.ts   | 10 +++++++---
 .../ngcc/test/dependencies/esm_dependency_host_spec.ts |  2 +-
 .../ngcc/test/packages/entry_point_spec.ts             |  2 +-
 .../ngcc/test/writing/in_place_file_writer_spec.ts     |  7 ++++---
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.codefresh/codefresh.yml b/.codefresh/codefresh.yml
index 2032ec4c5d..fd74b0f32f 100644
--- a/.codefresh/codefresh.yml
+++ b/.codefresh/codefresh.yml
@@ -20,7 +20,5 @@ steps:
     # Add Bazel CI config
     - copy .codefresh\bazel.rc %ProgramData%\bazel.bazelrc
     # Run tests
-    - yarn bazel test //tools/ts-api-guardian:all //packages/language-service/test //packages/compiler/test //packages/compiler-cli/test:ngc //packages/compiler-cli/test/ngtsc:ngtsc
     - yarn test-ivy-aot //packages/animations/test //packages/common/test //packages/forms/test //packages/http/test //packages/platform-browser/test //packages/platform-browser-dynamic/test //packages/router/test
-    - yarn bazel test //tools/public_api_guard/...
-    - yarn bazel test //packages/compiler-cli/integrationtest:integrationtest //packages/compiler-cli/test/compliance:compliance
+    - yarn bazel test //tools/ts-api-guardian:all //tools/public_api_guard/... //packages/language-service/test //packages/compiler-cli/ngcc/test:test //packages/compiler-cli/integrationtest:integrationtest //packages/compiler-cli/test/compliance:compliance //packages/compiler/test //packages/compiler-cli/test:ngc //packages/compiler-cli/test/ngtsc:ngtsc
diff --git a/packages/compiler-cli/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
index 911a8aac75..b1410eed1a 100644
--- a/packages/compiler-cli/ngcc/src/rendering/renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
@@ -173,7 +173,7 @@ export abstract class Renderer {
   renderDtsFile(dtsFile: ts.SourceFile, renderInfo: DtsRenderInfo): FileInfo[] {
     const input = this.extractSourceMap(dtsFile);
     const outputText = new MagicString(input.source);
-    const printer = ts.createPrinter();
+    const printer = createPrinter();
     const importManager = new ImportManager(
         this.getImportRewriter(this.bundle.dts !.r3SymbolsFile, false), IMPORT_PREFIX);
 
@@ -476,7 +476,7 @@ export function mergeSourceMaps(
  */
 export function renderConstantPool(
     sourceFile: ts.SourceFile, constantPool: ConstantPool, imports: ImportManager): string {
-  const printer = ts.createPrinter();
+  const printer = createPrinter();
   return constantPool.statements
       .map(stmt => translateStatement(stmt, imports, NOOP_DEFAULT_IMPORT_RECORDER))
       .map(stmt => printer.printNode(ts.EmitHint.Unspecified, stmt, sourceFile))
@@ -493,7 +493,7 @@ export function renderConstantPool(
  */
 export function renderDefinitions(
     sourceFile: ts.SourceFile, compiledClass: CompiledClass, imports: ImportManager): string {
-  const printer = ts.createPrinter();
+  const printer = createPrinter();
   const name = compiledClass.declaration.name;
   const translate = (stmt: Statement) =>
       translateStatement(stmt, imports, NOOP_DEFAULT_IMPORT_RECORDER);
@@ -529,3 +529,7 @@ function getImportString(
   const importAs = importPath ? importManager.generateNamedImport(importPath, importName) : null;
   return importAs ? `${importAs.moduleImport}.${importAs.symbol}` : `${importName}`;
 }
+
+function createPrinter(): ts.Printer {
+  return ts.createPrinter({newLine: ts.NewLineKind.LineFeed});
+}
\ No newline at end of file
diff --git a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
index bea7dc250f..0d10e82da0 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
@@ -70,7 +70,7 @@ describe('DependencyHost', () => {
       expect(dependencies.size).toBe(0);
       expect(missing.size).toBe(0);
       expect(deepImports.size).toBe(1);
-      expect(deepImports.has('/node_modules/lib-1/deep/import')).toBe(true);
+      expect(deepImports.has(_('/node_modules/lib-1/deep/import'))).toBe(true);
     });
 
     it('should recurse into internal dependencies', () => {
diff --git a/packages/compiler-cli/ngcc/test/packages/entry_point_spec.ts b/packages/compiler-cli/ngcc/test/packages/entry_point_spec.ts
index 375fa013ac..c921fb38c2 100644
--- a/packages/compiler-cli/ngcc/test/packages/entry_point_spec.ts
+++ b/packages/compiler-cli/ngcc/test/packages/entry_point_spec.ts
@@ -12,7 +12,7 @@ import {getEntryPointInfo} from '../../src/packages/entry_point';
 import {MockFileSystem} from '../helpers/mock_file_system';
 import {MockLogger} from '../helpers/mock_logger';
 
-const _ = AbsoluteFsPath.fromUnchecked;
+const _ = AbsoluteFsPath.from;
 
 describe('getEntryPointInfo()', () => {
   const SOME_PACKAGE = _('/some_package');
diff --git a/packages/compiler-cli/ngcc/test/writing/in_place_file_writer_spec.ts b/packages/compiler-cli/ngcc/test/writing/in_place_file_writer_spec.ts
index f3c13a01db..7e4ba0619a 100644
--- a/packages/compiler-cli/ngcc/test/writing/in_place_file_writer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/writing/in_place_file_writer_spec.ts
@@ -11,7 +11,7 @@ import {EntryPointBundle} from '../../src/packages/entry_point_bundle';
 import {InPlaceFileWriter} from '../../src/writing/in_place_file_writer';
 import {MockFileSystem} from '../helpers/mock_file_system';
 
-const _ = AbsoluteFsPath.fromUnchecked;
+const _ = AbsoluteFsPath.from;
 
 function createMockFileSystem() {
   return new MockFileSystem({
@@ -71,13 +71,14 @@ describe('InPlaceFileWriter', () => {
   it('should error if the backup file already exists', () => {
     const fs = createMockFileSystem();
     const fileWriter = new InPlaceFileWriter(fs);
+    const absoluteBackupPath = _('/package/path/already-backed-up.js');
     expect(
         () => fileWriter.writeBundle(
             {} as EntryPoint, {} as EntryPointBundle,
             [
-              {path: _('/package/path/already-backed-up.js'), contents: 'MODIFIED BACKED UP'},
+              {path: absoluteBackupPath, contents: 'MODIFIED BACKED UP'},
             ]))
         .toThrowError(
-            'Tried to overwrite /package/path/already-backed-up.js.__ivy_ngcc_bak with an ngcc back up file, which is disallowed.');
+            `Tried to overwrite ${absoluteBackupPath}.__ivy_ngcc_bak with an ngcc back up file, which is disallowed.`);
   });
 });

From 18c0ba5272d9800da77c2c418b49f702a6799815 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 7 May 2019 10:08:21 +0200
Subject: [PATCH 012/275] test: fix ngcc integration tests in windows (#30297)

```
//packages/compiler-cli/ngcc/test:integration
```

Partially addresses #29785

PR Close #30297
---
 .../ngcc/src/file_system/node_js_file_system.ts      |  2 +-
 .../ngcc/src/packages/entry_point_finder.ts          |  2 +-
 .../compiler-cli/ngcc/test/integration/ngcc_spec.ts  | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/file_system/node_js_file_system.ts b/packages/compiler-cli/ngcc/src/file_system/node_js_file_system.ts
index 7f821c3986..8f4e7c797c 100644
--- a/packages/compiler-cli/ngcc/src/file_system/node_js_file_system.ts
+++ b/packages/compiler-cli/ngcc/src/file_system/node_js_file_system.ts
@@ -23,7 +23,7 @@ export class NodeJSFileSystem implements FileSystem {
   readdir(path: AbsoluteFsPath): PathSegment[] { return fs.readdirSync(path) as PathSegment[]; }
   lstat(path: AbsoluteFsPath): fs.Stats { return fs.lstatSync(path); }
   stat(path: AbsoluteFsPath): fs.Stats { return fs.statSync(path); }
-  pwd() { return AbsoluteFsPath.fromUnchecked(process.cwd()); }
+  pwd() { return AbsoluteFsPath.from(process.cwd()); }
   copyFile(from: AbsoluteFsPath, to: AbsoluteFsPath): void { cp(from, to); }
   moveFile(from: AbsoluteFsPath, to: AbsoluteFsPath): void { mv(from, to); }
   ensureDir(path: AbsoluteFsPath): void { mkdir('-p', path); }
diff --git a/packages/compiler-cli/ngcc/src/packages/entry_point_finder.ts b/packages/compiler-cli/ngcc/src/packages/entry_point_finder.ts
index f739669480..d1546a7466 100644
--- a/packages/compiler-cli/ngcc/src/packages/entry_point_finder.ts
+++ b/packages/compiler-cli/ngcc/src/packages/entry_point_finder.ts
@@ -92,7 +92,7 @@ export class EntryPointFinder {
             entryPoints.push(...this.getEntryPointsForPackage(packagePath));
 
             // Also check for any nested node_modules in this package
-            const nestedNodeModulesPath = AbsoluteFsPath.resolve(packagePath, 'node_modules');
+            const nestedNodeModulesPath = AbsoluteFsPath.join(packagePath, 'node_modules');
             if (this.fs.exists(nestedNodeModulesPath)) {
               entryPoints.push(...this.walkDirectoryForEntryPoints(nestedNodeModulesPath));
             }
diff --git a/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts b/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
index f8c9023005..95e33310f3 100644
--- a/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
+++ b/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
@@ -7,8 +7,9 @@
  */
 
 import {AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/path';
-import {existsSync, readFileSync, readdirSync, statSync, writeFileSync} from 'fs';
+import {existsSync, readFileSync, readdirSync, statSync, symlinkSync} from 'fs';
 import * as mockFs from 'mock-fs';
+import * as path from 'path';
 
 import {getAngularPackagesFromRunfiles, resolveNpmTreeArtifact} from '../../../test/runfile_helpers';
 import {NodeJSFileSystem} from '../../src/file_system/node_js_file_system';
@@ -333,10 +334,15 @@ describe('ngcc main()', () => {
 
 
 function createMockFileSystem() {
+  const typeScriptPath = path.join(process.env.RUNFILES !, 'typescript');
+  if (!existsSync(typeScriptPath)) {
+    symlinkSync(resolveNpmTreeArtifact('typescript'), typeScriptPath, 'junction');
+  }
+
   mockFs({
     '/node_modules/@angular': loadAngularPackages(),
-    '/node_modules/rxjs': loadDirectory(resolveNpmTreeArtifact('rxjs', 'index.js')),
-    '/node_modules/tslib': loadDirectory(resolveNpmTreeArtifact('tslib', 'tslib.js')),
+    '/node_modules/rxjs': loadDirectory(resolveNpmTreeArtifact('rxjs')),
+    '/node_modules/tslib': loadDirectory(resolveNpmTreeArtifact('tslib')),
     '/node_modules/test-package': {
       'package.json': '{"name": "test-package", "es2015": "./index.js", "typings": "./index.d.ts"}',
       // no metadata.json file so not compiled by Angular.

From 197584d1af1daeebe57a6b947851197553884e82 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Fri, 10 May 2019 08:49:17 -0700
Subject: [PATCH 013/275] fix(router): IE 11 bug can break URL unification when
 comparing objects (#30393)

This PR fixes an issue where IE 11 can return `undefined` in with an `Object.keys` call. Solution is to add a runtime check on the value. Based on the types being passed, this shouldn't be necessary, but is needed only for IE 11. Unit test doesn't work for this PR because it can't be replicated easily.

PR Close #30393
---
 packages/router/src/utils/collection.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/router/src/utils/collection.ts b/packages/router/src/utils/collection.ts
index 6834cec4cf..149182dde2 100644
--- a/packages/router/src/utils/collection.ts
+++ b/packages/router/src/utils/collection.ts
@@ -23,7 +23,8 @@ export function shallowEqualArrays(a: any[], b: any[]): boolean {
 export function shallowEqual(a: {[x: string]: any}, b: {[x: string]: any}): boolean {
   const k1 = Object.keys(a);
   const k2 = Object.keys(b);
-  if (k1.length != k2.length) {
+  // IE 11 sometimes returns an `undefined` value here. This guard is for IE 11 only.
+  if (!(k1 || k2) || k1.length != k2.length) {
     return false;
   }
   let key: string;

From a57f3e7bbf18f8a8a32de0916dd74051786e3169 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 13 May 2019 19:01:55 +0200
Subject: [PATCH 014/275] test(ivy): move render3 renderer_factory tests to
 acceptance (#30435)

Moves all manual render3 tests which are located within the
`renderer_factory_spec.ts` file to acceptance tests. A few tests
that use Ivy-specific logic which is not replicable with `TestBed`
remain in the render3 folder (e.g. using `renderTemplate`)

Additionally migrated tests that assert the lifecycles of the
renderer_factory are set to *ivy only* as the lifecycle seems
to be different in Ivy. Tracked with: FW-1320

PR Close #30435
---
 packages/core/test/acceptance/BUILD.bazel     |  14 +-
 .../test/acceptance/renderer_factory_spec.ts  | 200 ++++++++++++++++++
 .../test/render3/renderer_factory_spec.ts     | 126 +----------
 3 files changed, 216 insertions(+), 124 deletions(-)
 create mode 100644 packages/core/test/acceptance/renderer_factory_spec.ts

diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel
index 8f74f3f99a..c037d23381 100644
--- a/packages/core/test/acceptance/BUILD.bazel
+++ b/packages/core/test/acceptance/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:private"])
 
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
 
 ts_library(
     name = "acceptance_lib",
@@ -9,6 +9,9 @@ ts_library(
         ["**/*.ts"],
     ),
     deps = [
+        "//packages/animations",
+        "//packages/animations/browser",
+        "//packages/animations/browser/testing",
         "//packages/common",
         "//packages/compiler",
         "//packages/compiler/testing",
@@ -17,7 +20,9 @@ ts_library(
         "//packages/core/testing",
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
+        "//packages/platform-browser/animations",
         "//packages/platform-browser/testing",
+        "//packages/platform-server",
         "//packages/private/testing",
         "@npm//zone.js",
     ],
@@ -34,3 +39,10 @@ jasmine_node_test(
         "@npm//zone.js",
     ],
 )
+
+ts_web_test_suite(
+    name = "acceptance_web",
+    deps = [
+        ":acceptance_lib",
+    ],
+)
diff --git a/packages/core/test/acceptance/renderer_factory_spec.ts b/packages/core/test/acceptance/renderer_factory_spec.ts
new file mode 100644
index 0000000000..be26ca3543
--- /dev/null
+++ b/packages/core/test/acceptance/renderer_factory_spec.ts
@@ -0,0 +1,200 @@
+/**
+ * @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 {AnimationEvent} from '@angular/animations';
+import {ɵAnimationEngine, ɵNoopAnimationStyleNormalizer} from '@angular/animations/browser';
+import {MockAnimationDriver, MockAnimationPlayer} from '@angular/animations/browser/testing';
+import {DOCUMENT} from '@angular/common';
+import {Component, DoCheck, NgZone, RendererFactory2, RendererType2} from '@angular/core';
+import {NoopNgZone} from '@angular/core/src/zone/ng_zone';
+import {TestBed} from '@angular/core/testing';
+import {EventManager, ɵDomSharedStylesHost} from '@angular/platform-browser';
+import {ɵAnimationRendererFactory} from '@angular/platform-browser/animations';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
+import {ServerRendererFactory2} from '@angular/platform-server/src/server_renderer';
+import {onlyInIvy} from '@angular/private/testing';
+
+describe('renderer factory lifecycle', () => {
+  let logs: string[] = [];
+
+  @Component({selector: 'some-component', template: `foo`})
+  class SomeComponent implements DoCheck {
+    ngOnInit() { logs.push('some_component create'); }
+    ngDoCheck() { logs.push('some_component update'); }
+  }
+
+  @Component({selector: 'some-component-with-error', template: `With error`})
+  class SomeComponentWhichThrows {
+    ngOnInit() { throw new Error('SomeComponentWhichThrows threw'); }
+  }
+
+  @Component({selector: 'lol', template: `<some-component></some-component>`})
+  class TestComponent implements DoCheck {
+    ngOnInit() { logs.push('test_component create'); }
+    ngDoCheck() { logs.push('test_component update'); }
+  }
+
+  /** Creates a patched renderer factory that pushes entries to the test log */
+  function createPatchedRendererFactory(document: any) {
+    let rendererFactory = getRendererFactory2(document);
+    const createRender = rendererFactory.createRenderer;
+
+    rendererFactory.createRenderer = (hostElement: any, type: RendererType2 | null) => {
+      logs.push('create');
+      return createRender.apply(rendererFactory, [hostElement, type]);
+    };
+
+    rendererFactory.begin = () => logs.push('begin');
+    rendererFactory.end = () => logs.push('end');
+
+    return rendererFactory;
+  }
+
+  beforeEach(() => {
+    logs = [];
+
+    TestBed.configureTestingModule({
+      declarations: [SomeComponent, SomeComponentWhichThrows, TestComponent],
+      providers: [{
+        provide: RendererFactory2,
+        useFactory: (document: any) => createPatchedRendererFactory(document),
+        deps: [DOCUMENT]
+      }]
+    });
+  });
+
+  onlyInIvy('FW-1320: Ivy creates renderer twice.').it('should work with a component', () => {
+    const fixture = TestBed.createComponent(SomeComponent);
+    fixture.detectChanges();
+    expect(logs).toEqual(
+        ['create', 'create', 'begin', 'some_component create', 'some_component update', 'end']);
+
+    logs = [];
+    fixture.detectChanges();
+    expect(logs).toEqual(['begin', 'some_component update', 'end']);
+  });
+
+  onlyInIvy('FW-1320: Ivy creates renderer twice.')
+      .it('should work with a component which throws', () => {
+        expect(() => {
+          const fixture = TestBed.createComponent(SomeComponentWhichThrows);
+          fixture.detectChanges();
+        }).toThrow();
+        expect(logs).toEqual(['create', 'create', 'begin', 'end']);
+      });
+});
+
+describe('animation renderer factory', () => {
+  let eventLogs: string[] = [];
+  let rendererFactory: RendererFactory2|null = null;
+
+  function getAnimationLog(): MockAnimationPlayer[] {
+    return MockAnimationDriver.log as MockAnimationPlayer[];
+  }
+
+  beforeEach(() => {
+    eventLogs = [];
+    rendererFactory = null;
+    MockAnimationDriver.log = [];
+
+    TestBed.configureTestingModule({
+      declarations: [SomeComponentWithAnimation, SomeComponent],
+      providers: [{
+        provide: RendererFactory2,
+        useFactory: (d: any) => rendererFactory = getAnimationRendererFactory2(d),
+        deps: [DOCUMENT]
+      }]
+    });
+  });
+
+  @Component({
+    selector: 'some-component',
+    template: `
+      <div [@myAnimation]="exp"
+           (@myAnimation.start)="callback($event)"
+           (@myAnimation.done)="callback($event)">
+        foo
+      </div>
+    `,
+    animations: [{
+      type: 7,
+      name: 'myAnimation',
+      definitions: [{
+        type: 1,
+        expr: '* => on',
+        animation: [{type: 4, styles: {type: 6, styles: {opacity: 1}, offset: null}, timings: 10}],
+        options: null
+      }],
+      options: {}
+    }]
+  })
+  class SomeComponentWithAnimation {
+    exp: string|undefined;
+
+    callback(event: AnimationEvent) {
+      eventLogs.push(`${event.fromState ? event.fromState : event.toState} - ${event.phaseName}`);
+    }
+  }
+
+  @Component({selector: 'some-component', template: 'foo'})
+  class SomeComponent {
+  }
+
+  it('should work with components without animations', () => {
+    const fixture = TestBed.createComponent(SomeComponent);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.innerHTML).toEqual('foo');
+  });
+
+  isBrowser && it('should work with animated components', (done) => {
+    const fixture = TestBed.createComponent(SomeComponentWithAnimation);
+    fixture.detectChanges();
+
+    expect(rendererFactory).toBeTruthy();
+    expect(fixture.nativeElement.innerHTML)
+        .toMatch(/<div class="ng-tns-c\d+-0 ng-trigger ng-trigger-myAnimation">\s+foo\s+<\/div>/);
+
+    fixture.componentInstance.exp = 'on';
+    fixture.detectChanges();
+
+    const [player] = getAnimationLog();
+    expect(player.keyframes).toEqual([
+      {opacity: '*', offset: 0},
+      {opacity: 1, offset: 1},
+    ]);
+    player.finish();
+
+    rendererFactory !.whenRenderingDone !().then(() => {
+      expect(eventLogs).toEqual(['void - start', 'void - done', 'on - start', 'on - done']);
+      done();
+    });
+  });
+});
+
+function getRendererFactory2(document: any): RendererFactory2 {
+  const fakeNgZone: NgZone = new NoopNgZone();
+  const eventManager = new EventManager([], fakeNgZone);
+  const rendererFactory = new ServerRendererFactory2(
+      eventManager, fakeNgZone, document, new ɵDomSharedStylesHost(document));
+  const origCreateRenderer = rendererFactory.createRenderer;
+  rendererFactory.createRenderer = function() {
+    const renderer = origCreateRenderer.apply(this, arguments);
+    renderer.destroyNode = () => {};
+    return renderer;
+  };
+  return rendererFactory;
+}
+
+function getAnimationRendererFactory2(document: any): RendererFactory2 {
+  const fakeNgZone: NgZone = new NoopNgZone();
+  return new ɵAnimationRendererFactory(
+      getRendererFactory2(document),
+      new ɵAnimationEngine(
+          document.body, new MockAnimationDriver(), new ɵNoopAnimationStyleNormalizer()),
+      fakeNgZone);
+}
diff --git a/packages/core/test/render3/renderer_factory_spec.ts b/packages/core/test/render3/renderer_factory_spec.ts
index 4d3952b83c..1e7473bdbd 100644
--- a/packages/core/test/render3/renderer_factory_spec.ts
+++ b/packages/core/test/render3/renderer_factory_spec.ts
@@ -6,16 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationEvent} from '@angular/animations';
-import {MockAnimationDriver, MockAnimationPlayer} from '@angular/animations/browser/testing';
-
 import {RendererType2, ViewEncapsulation} from '../../src/core';
 import {ɵɵdefineComponent} from '../../src/render3/index';
-import {tick, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵlistener, ɵɵtext} from '../../src/render3/instructions/all';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
-import {getAnimationRendererFactory2, getRendererFactory2} from './imported_renderer2';
-import {TemplateFixture, containerEl, document, renderComponent, renderToHtml, toHtml} from './render_util';
+import {getRendererFactory2} from './imported_renderer2';
+import {TemplateFixture, document, renderToHtml} from './render_util';
 
 describe('renderer factory lifecycle', () => {
   let logs: string[] = [];
@@ -87,21 +84,6 @@ describe('renderer factory lifecycle', () => {
 
   beforeEach(() => { logs = []; });
 
-  it('should work with a component', () => {
-    const component = renderComponent(SomeComponent, {rendererFactory});
-    expect(logs).toEqual(
-        ['create', 'create', 'begin', 'component create', 'component update', 'end']);
-
-    logs = [];
-    tick(component);
-    expect(logs).toEqual(['begin', 'component update', 'end']);
-  });
-
-  it('should work with a component which throws', () => {
-    expect(() => renderComponent(SomeComponentWhichThrows, {rendererFactory})).toThrow();
-    expect(logs).toEqual(['create', 'create', 'begin', 'end']);
-  });
-
   it('should work with a template', () => {
     renderToHtml(Template, {}, 1, 0, null, null, rendererFactory);
     expect(logs).toEqual(['create', 'function create', 'function update']);
@@ -125,108 +107,6 @@ describe('renderer factory lifecycle', () => {
 
 });
 
-describe('animation renderer factory', () => {
-  let eventLogs: string[] = [];
-  function getLog(): MockAnimationPlayer[] {
-    return MockAnimationDriver.log as MockAnimationPlayer[];
-  }
-
-  function resetLog() { MockAnimationDriver.log = []; }
-
-  beforeEach(() => {
-    eventLogs = [];
-    resetLog();
-  });
-
-  class SomeComponent {
-    static ngComponentDef = ɵɵdefineComponent({
-      type: SomeComponent,
-      encapsulation: ViewEncapsulation.None,
-      selectors: [['some-component']],
-      consts: 1,
-      vars: 0,
-      template: function(rf: RenderFlags, ctx: SomeComponent) {
-        if (rf & RenderFlags.Create) {
-          ɵɵtext(0, 'foo');
-        }
-      },
-      factory: () => new SomeComponent
-    });
-  }
-
-  class SomeComponentWithAnimation {
-    // TODO(issue/24571): remove '!'.
-    exp !: string;
-    callback(event: AnimationEvent) {
-      eventLogs.push(`${event.fromState ? event.fromState : event.toState} - ${event.phaseName}`);
-    }
-    static ngComponentDef = ɵɵdefineComponent({
-      type: SomeComponentWithAnimation,
-      selectors: [['some-component']],
-      consts: 2,
-      vars: 1,
-      template: function(rf: RenderFlags, ctx: SomeComponentWithAnimation) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          {
-            ɵɵlistener('@myAnimation.start', ctx.callback.bind(ctx));
-            ɵɵlistener('@myAnimation.done', ctx.callback.bind(ctx));
-            ɵɵtext(1, 'foo');
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, '@myAnimation', ɵɵbind(ctx.exp));
-        }
-      },
-      factory: () => new SomeComponentWithAnimation,
-      encapsulation: ViewEncapsulation.None,
-      styles: [],
-      data: {
-        animation: [{
-          type: 7,
-          name: 'myAnimation',
-          definitions: [{
-            type: 1,
-            expr: '* => on',
-            animation:
-                [{type: 4, styles: {type: 6, styles: {opacity: 1}, offset: null}, timings: 10}],
-            options: null
-          }],
-          options: {}
-        }]
-      },
-    });
-  }
-
-  it('should work with components without animations', () => {
-    renderComponent(SomeComponent, {rendererFactory: getAnimationRendererFactory2(document)});
-    expect(toHtml(containerEl)).toEqual('foo');
-  });
-
-  isBrowser && it('should work with animated components', (done) => {
-    const rendererFactory = getAnimationRendererFactory2(document);
-    const component = renderComponent(SomeComponentWithAnimation, {rendererFactory});
-    expect(toHtml(containerEl))
-        .toMatch(/<div class="ng-tns-c\d+-0 ng-trigger ng-trigger-myAnimation">foo<\/div>/);
-
-    component.exp = 'on';
-    tick(component);
-
-    const [player] = getLog();
-    expect(player.keyframes).toEqual([
-      {opacity: '*', offset: 0},
-      {opacity: 1, offset: 1},
-    ]);
-    player.finish();
-
-    rendererFactory.whenRenderingDone !().then(() => {
-      expect(eventLogs).toEqual(['void - start', 'void - done', 'on - start', 'on - done']);
-      done();
-    });
-  });
-});
-
 describe('Renderer2 destruction hooks', () => {
   const rendererFactory = getRendererFactory2(document);
 

From d09d8e0adfb26e09ae82561e0f7769a407661a5a Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 13 May 2019 12:01:15 +0200
Subject: [PATCH 015/275] test(ivy): move render3 directive tests to acceptance
 (#30432)

Moves all manual render3 directive tests to TestBed acceptance
tests.

PR Close #30432
---
 .../core/test/acceptance/directive_spec.ts    | 171 +++++++++-
 packages/core/test/render3/directive_spec.ts  | 316 ------------------
 2 files changed, 170 insertions(+), 317 deletions(-)
 delete mode 100644 packages/core/test/render3/directive_spec.ts

diff --git a/packages/core/test/acceptance/directive_spec.ts b/packages/core/test/acceptance/directive_spec.ts
index 6764573e7b..0fc8027586 100644
--- a/packages/core/test/acceptance/directive_spec.ts
+++ b/packages/core/test/acceptance/directive_spec.ts
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {Component, Directive, EventEmitter, Output, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
+import {Input} from '@angular/core/src/metadata';
 import {TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 
@@ -16,6 +18,7 @@ describe('directives', () => {
 
     @Directive({selector: 'ng-template[test]'})
     class TestDirective {
+      constructor(public templateRef: TemplateRef<any>) {}
     }
 
     @Directive({selector: '[title]'})
@@ -26,6 +29,77 @@ describe('directives', () => {
     class TestComponent {
     }
 
+    it('should match directives with attribute selectors on bindings', () => {
+      @Directive({selector: '[test]'})
+      class TestDir {
+        testValue: boolean|undefined;
+
+        /** Setter to assert that a binding is not invoked with stringified attribute value */
+        @Input()
+        set test(value: any) {
+          // Assert that the binding is processed correctly. The property should be set
+          // to a "false" boolean and never to the "false" string literal.
+          this.testValue = value;
+          if (value !== false) {
+            fail('Should only be called with a false Boolean value, got a non-falsy value');
+          }
+        }
+      }
+
+      TestBed.configureTestingModule({declarations: [TestComponent, TestDir]});
+      TestBed.overrideTemplate(TestComponent, `<span class="fade" [test]="false"></span>`);
+
+      const fixture = TestBed.createComponent(TestComponent);
+      const testDir = fixture.debugElement.query(By.directive(TestDir)).injector.get(TestDir);
+      const spanEl = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      // the "test" attribute should not be reflected in the DOM as it is here only
+      // for directive matching purposes
+      expect(spanEl.hasAttribute('test')).toBe(false);
+      expect(spanEl.getAttribute('class')).toBe('fade');
+      expect(testDir.testValue).toBe(false);
+    });
+
+    it('should not accidentally set inputs from attributes extracted from bindings / outputs',
+       () => {
+         @Directive({selector: '[test]'})
+         class TestDir {
+           @Input() prop1: boolean|undefined;
+           @Input() prop2: boolean|undefined;
+           testValue: boolean|undefined;
+
+           /** Setter to assert that a binding is not invoked with stringified attribute value */
+           @Input()
+           set test(value: any) {
+             // Assert that the binding is processed correctly. The property should be set
+             // to a "false" boolean and never to the "false" string literal.
+             this.testValue = value;
+             if (value !== false) {
+               fail('Should only be called with a false Boolean value, got a non-falsy value');
+             }
+           }
+         }
+
+         TestBed.configureTestingModule({declarations: [TestComponent, TestDir]});
+         TestBed.overrideTemplate(
+             TestComponent,
+             `<span class="fade" [prop1]="true" [test]="false" [prop2]="true"></span>`);
+
+         const fixture = TestBed.createComponent(TestComponent);
+         const testDir = fixture.debugElement.query(By.directive(TestDir)).injector.get(TestDir);
+         const spanEl = fixture.nativeElement.children[0];
+         fixture.detectChanges();
+
+         // the "test" attribute should not be reflected in the DOM as it is here only
+         // for directive matching purposes
+         expect(spanEl.hasAttribute('test')).toBe(false);
+         expect(spanEl.hasAttribute('prop1')).toBe(false);
+         expect(spanEl.hasAttribute('prop2')).toBe(false);
+         expect(spanEl.getAttribute('class')).toBe('fade');
+         expect(testDir.testValue).toBe(false);
+       });
+
     it('should match directives on ng-template', () => {
       TestBed.configureTestingModule({declarations: [TestComponent, TestDirective]});
       TestBed.overrideTemplate(TestComponent, `<ng-template test></ng-template>`);
@@ -34,6 +108,8 @@ describe('directives', () => {
       const nodesWithDirective = fixture.debugElement.queryAllNodes(By.directive(TestDirective));
 
       expect(nodesWithDirective.length).toBe(1);
+      expect(nodesWithDirective[0].injector.get(TestDirective).templateRef instanceof TemplateRef)
+          .toBe(true);
     });
 
     it('should match directives on ng-template created by * syntax', () => {
@@ -46,6 +122,32 @@ describe('directives', () => {
       expect(nodesWithDirective.length).toBe(1);
     });
 
+    it('should match directives on <ng-container>', () => {
+      @Directive({selector: 'ng-container[directiveA]'})
+      class DirectiveA {
+        constructor(public viewContainerRef: ViewContainerRef) {}
+      }
+
+      @Component({
+        selector: 'my-component',
+        template: `
+          <ng-container *ngIf="visible" directiveA>
+            <span>Some content</span>
+          </ng-container>`
+      })
+      class MyComponent {
+        visible = true;
+      }
+
+      TestBed.configureTestingModule(
+          {declarations: [MyComponent, DirectiveA], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(MyComponent);
+      fixture.detectChanges();
+      const directiveA = fixture.debugElement.query(By.css('span')).injector.get(DirectiveA);
+
+      expect(directiveA.viewContainerRef).toBeTruthy();
+    });
+
     it('should match directives on i18n-annotated attributes', () => {
       TestBed.configureTestingModule({declarations: [TestComponent, TitleDirective]});
       TestBed.overrideTemplate(TestComponent, `
@@ -82,6 +184,73 @@ describe('directives', () => {
       expect(nodesWithDirective.length).toBe(0);
     });
 
+    it('should match directives with attribute selectors on outputs', () => {
+      @Directive({selector: '[out]'})
+      class TestDir {
+        @Output() out = new EventEmitter();
+      }
+
+      TestBed.configureTestingModule({declarations: [TestComponent, TestDir]});
+      TestBed.overrideTemplate(TestComponent, `<span class="span" (out)="someVar = true"></span>`);
+
+      const fixture = TestBed.createComponent(TestComponent);
+      const spanEl = fixture.nativeElement.children[0];
+
+      // "out" should not be part of reflected attributes
+      expect(spanEl.hasAttribute('out')).toBe(false);
+      expect(spanEl.getAttribute('class')).toBe('span');
+      expect(fixture.debugElement.query(By.directive(TestDir))).toBeTruthy();
+    });
+
+  });
+
+  describe('outputs', () => {
+    @Directive({selector: '[out]'})
+    class TestDir {
+      @Output() out = new EventEmitter();
+    }
+
+    it('should allow outputs of directive on ng-template', () => {
+      @Component({template: `<ng-template (out)="value = true"></ng-template>`})
+      class TestComp {
+        @ViewChild(TestDir) testDir: TestDir|undefined;
+        value = false;
+      }
+
+      TestBed.configureTestingModule({declarations: [TestComp, TestDir]});
+      const fixture = TestBed.createComponent(TestComp);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.testDir).toBeTruthy();
+      expect(fixture.componentInstance.value).toBe(false);
+
+      fixture.componentInstance.testDir !.out.emit();
+      fixture.detectChanges();
+      expect(fixture.componentInstance.value).toBe(true);
+    });
+
+    it('should allow outputs of directive on ng-container', () => {
+      @Component({
+        template: `
+          <ng-container (out)="value = true">
+            <span>Hello</span>
+          </ng-container>`
+      })
+      class TestComp {
+        value = false;
+      }
+
+      TestBed.configureTestingModule({declarations: [TestComp, TestDir]});
+      const fixture = TestBed.createComponent(TestComp);
+      const testDir = fixture.debugElement.query(By.css('span')).injector.get(TestDir);
+
+      expect(fixture.componentInstance.value).toBe(false);
+
+      testDir.out.emit();
+      fixture.detectChanges();
+      expect(fixture.componentInstance.value).toBeTruthy();
+    });
+
   });
 
 });
diff --git a/packages/core/test/render3/directive_spec.ts b/packages/core/test/render3/directive_spec.ts
deleted file mode 100644
index b5bd88b269..0000000000
--- a/packages/core/test/render3/directive_spec.ts
+++ /dev/null
@@ -1,316 +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 {EventEmitter, TemplateRef, ViewContainerRef} from '@angular/core';
-
-import {AttributeMarker, RenderFlags, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdirectiveInject} from '../../src/render3/index';
-import {ɵɵbind, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵlistener, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
-
-import {NgIf} from './common_with_def';
-import {ComponentFixture, TemplateFixture, createComponent} from './render_util';
-
-describe('directive', () => {
-
-  describe('selectors', () => {
-
-    it('should match directives with attribute selectors on bindings', () => {
-      let directiveInstance: Directive;
-
-      class Directive {
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: Directive,
-          selectors: [['', 'test', '']],
-          factory: () => directiveInstance = new Directive,
-          inputs: {test: 'test', other: 'other'}
-        });
-
-        // TODO(issue/24571): remove '!'.
-        testValue !: boolean;
-        // TODO(issue/24571): remove '!'.
-        other !: boolean;
-
-        /**
-         * A setter to assert that a binding is not invoked with stringified attribute value
-         */
-        set test(value: any) {
-          // if a binding is processed correctly we should only be invoked with a false Boolean
-          // and never with the "false" string literal
-          this.testValue = value;
-          if (value !== false) {
-            fail('Should only be called with a false Boolean value, got a non-falsy value');
-          }
-        }
-      }
-
-      /**
-       * <span [test]="false" [other]="true"></span>
-       */
-      function createTemplate() {
-        // using 2 bindings to show example shape of attributes array
-        ɵɵelement(0, 'span', ['class', 'fade', AttributeMarker.Bindings, 'test', 'other']);
-      }
-
-      function updateTemplate() { ɵɵelementProperty(0, 'test', ɵɵbind(false)); }
-
-      const fixture = new TemplateFixture(createTemplate, updateTemplate, 1, 1, [Directive]);
-
-      // the "test" attribute should not be reflected in the DOM as it is here only for directive
-      // matching purposes
-      expect(fixture.html).toEqual('<span class="fade"></span>');
-      expect(directiveInstance !.testValue).toBe(false);
-    });
-
-    it('should not accidentally set inputs from attributes extracted from bindings / outputs',
-       () => {
-         let directiveInstance: Directive;
-
-         class Directive {
-           static ngDirectiveDef = ɵɵdefineDirective({
-             type: Directive,
-             selectors: [['', 'test', '']],
-             factory: () => directiveInstance = new Directive,
-             inputs: {test: 'test', prop1: 'prop1', prop2: 'prop2'}
-           });
-
-           // TODO(issue/24571): remove '!'.
-           prop1 !: boolean;
-           // TODO(issue/24571): remove '!'.
-           prop2 !: boolean;
-           // TODO(issue/24571): remove '!'.
-           testValue !: boolean;
-
-
-           /**
-            * A setter to assert that a binding is not invoked with stringified attribute value
-            */
-           set test(value: any) {
-             // if a binding is processed correctly we should only be invoked with a false Boolean
-             // and never with the "false" string literal
-             this.testValue = value;
-             if (value !== false) {
-               fail('Should only be called with a false Boolean value, got a non-falsy value');
-             }
-           }
-         }
-
-         /**
-          * <span class="fade" [prop1]="true" [test]="false" [prop2]="true"></span>
-          */
-         function createTemplate() {
-           // putting name (test) in the "usual" value position
-           ɵɵelement(
-               0, 'span', ['class', 'fade', AttributeMarker.Bindings, 'prop1', 'test', 'prop2']);
-         }
-
-         function updateTemplate() {
-           ɵɵelementProperty(0, 'prop1', ɵɵbind(true));
-           ɵɵelementProperty(0, 'test', ɵɵbind(false));
-           ɵɵelementProperty(0, 'prop2', ɵɵbind(true));
-         }
-
-         const fixture = new TemplateFixture(createTemplate, updateTemplate, 1, 3, [Directive]);
-
-         // the "test" attribute should not be reflected in the DOM as it is here only for directive
-         // matching purposes
-         expect(fixture.html).toEqual('<span class="fade"></span>');
-         expect(directiveInstance !.testValue).toBe(false);
-       });
-
-    it('should match directives on <ng-template>', () => {
-      /**
-       *   @Directive({
-       *     selector: 'ng-template[directiveA]'
-       *   })
-       *   export class DirectiveA {
-       *     constructor(public templateRef: TemplateRef<any>) {}
-       *   }
-       */
-      let tmplRef: any;
-      class DirectiveA {
-        constructor(public templateRef: any) { tmplRef = templateRef; }
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: DirectiveA,
-          selectors: [['ng-template', 'directiveA', '']],
-          factory: () => new DirectiveA(ɵɵdirectiveInject(TemplateRef as any))
-        });
-      }
-
-      function MyComponent_ng_template_Template_0(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵtext(0, 'Some content');
-        }
-      }
-      class MyComponent {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyComponent,
-          selectors: [['my-component']],
-          factory: () => new MyComponent(),
-          consts: 1,
-          vars: 0,
-          // <ng-template directiveA>Some content</ng-template>
-          template: function MyComponent_Template(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, MyComponent_ng_template_Template_0, 1, 0, 'ng-template', ['directiveA', '']);
-            }
-          },
-          directives: [DirectiveA]
-        });
-      }
-
-      new ComponentFixture(MyComponent);
-      expect(tmplRef instanceof TemplateRef).toBeTruthy();
-    });
-
-    it('should match directives on <ng-container>', () => {
-      /**
-       *   @Directive({
-       *     selector: 'ng-container[directiveA]'
-       *   })
-       *   export class DirectiveA {
-       *     constructor(public vcRef: ViewContainerRef<any>) {}
-       *   }
-       */
-      let vcRef: any;
-      class DirectiveA {
-        constructor(public viewContainerRef: any) { vcRef = viewContainerRef; }
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: DirectiveA,
-          selectors: [['ng-container', 'directiveA', '']],
-          factory: () => new DirectiveA(ɵɵdirectiveInject(ViewContainerRef as any))
-        });
-      }
-
-      function MyComponent_ng_container_Template_0(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0, ['directiveA', '']);
-          ɵɵtext(1, 'Some content');
-          ɵɵelementContainerEnd();
-        }
-      }
-      class MyComponent {
-        visible = true;
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyComponent,
-          selectors: [['my-component']],
-          factory: () => new MyComponent(),
-          consts: 1,
-          vars: 1,
-          // <ng-container *ngIf="visible" directiveA>Some content</ng-container>
-          template: function MyComponent_Template(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, MyComponent_ng_container_Template_0, 2, 0, 'ng-container',
-                  ['directiveA', '', AttributeMarker.Template, 'ngIf']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.visible));
-            }
-          },
-          directives: [DirectiveA, NgIf]
-        });
-      }
-
-      new ComponentFixture(MyComponent);
-      expect(vcRef instanceof ViewContainerRef).toBeTruthy();
-    });
-
-    it('should match directives with attribute selectors on outputs', () => {
-      let directiveInstance: Directive;
-
-      class Directive {
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: Directive,
-          selectors: [['', 'out', '']],
-          factory: () => directiveInstance = new Directive,
-          outputs: {out: 'out'}
-        });
-
-        out = new EventEmitter();
-      }
-
-      /**
-       * <span (out)="someVar = true"></span>
-       */
-      function createTemplate() {
-        ɵɵelementStart(0, 'span', [AttributeMarker.Bindings, 'out']);
-        { ɵɵlistener('out', () => {}); }
-        ɵɵelementEnd();
-      }
-
-      const fixture = new TemplateFixture(createTemplate, () => {}, 1, 0, [Directive]);
-
-      // "out" should not be part of reflected attributes
-      expect(fixture.html).toEqual('<span></span>');
-      expect(directiveInstance !).not.toBeUndefined();
-    });
-  });
-
-  describe('outputs', () => {
-
-    let directiveInstance: Directive;
-
-    class Directive {
-      static ngDirectiveDef = ɵɵdefineDirective({
-        type: Directive,
-        selectors: [['', 'out', '']],
-        factory: () => directiveInstance = new Directive,
-        outputs: {out: 'out'}
-      });
-
-      out = new EventEmitter();
-    }
-
-    it('should allow outputs of directive on ng-template', () => {
-      /**
-       * <ng-template (out)="value = true"></ng-template>
-       */
-      const Cmpt = createComponent('Cmpt', function(rf: RenderFlags, ctx: {value: any}) {
-        if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'out']);
-          ɵɵlistener('out', () => { ctx.value = true; });
-        }
-      }, 1, 0, [Directive]);
-
-      const fixture = new ComponentFixture(Cmpt);
-
-      expect(directiveInstance !).not.toBeUndefined();
-      expect(fixture.component.value).toBeFalsy();
-
-      directiveInstance !.out.emit();
-      fixture.update();
-      expect(fixture.component.value).toBeTruthy();
-    });
-
-    it('should allow outputs of directive on ng-container', () => {
-      /**
-       * <ng-container (out)="value = true"></ng-container>
-       */
-      const Cmpt = createComponent('Cmpt', function(rf: RenderFlags, ctx: {value: any}) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0, [AttributeMarker.Bindings, 'out']);
-          {
-            ɵɵlistener('out', () => { ctx.value = true; });
-          }
-          ɵɵelementContainerEnd();
-        }
-      }, 1, 0, [Directive]);
-
-      const fixture = new ComponentFixture(Cmpt);
-
-      expect(directiveInstance !).not.toBeUndefined();
-      expect(fixture.component.value).toBeFalsy();
-
-      directiveInstance !.out.emit();
-      fixture.update();
-      expect(fixture.component.value).toBeTruthy();
-    });
-
-  });
-});

From 090eac068a4cb17ab71eec7ce6c7e57f2643c2ab Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Sun, 12 May 2019 21:29:53 +0200
Subject: [PATCH 016/275] test(ivy): move property render3 tests to acceptance
 (#30426)

Moves all manual render3 property binding tests to
TestBed acceptance tests. Unfortunately three property
binding tests could not be migrated as these rely on
manual Ivy template code that is not supported within
TestBed. These can be revisited as discussed in the
framework team meeting.

PR Close #30426
---
 .../test/acceptance/property_binding_spec.ts  | 465 ++++++++++++-
 packages/core/test/render3/properties_spec.ts | 621 ------------------
 2 files changed, 464 insertions(+), 622 deletions(-)
 delete mode 100644 packages/core/test/render3/properties_spec.ts

diff --git a/packages/core/test/acceptance/property_binding_spec.ts b/packages/core/test/acceptance/property_binding_spec.ts
index 1bfe65e1b7..8c96cfed80 100644
--- a/packages/core/test/acceptance/property_binding_spec.ts
+++ b/packages/core/test/acceptance/property_binding_spec.ts
@@ -5,11 +5,30 @@
  * 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 {Component, Input} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {Component, Directive, EventEmitter, Input, Output} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {By, DomSanitizer, SafeUrl} from '@angular/platform-browser';
 
 describe('property bindings', () => {
+  it('should support bindings to properties', () => {
+    @Component({template: `<span [id]="id"></span>`})
+    class Comp {
+      id: string|undefined;
+    }
+
+    TestBed.configureTestingModule({declarations: [Comp]});
+    const fixture = TestBed.createComponent(Comp);
+    const spanEl = fixture.nativeElement.querySelector('span');
+
+    expect(spanEl.id).toBeFalsy();
+
+    fixture.componentInstance.id = 'testId';
+    fixture.detectChanges();
+
+    expect(spanEl.id).toBe('testId');
+  });
+
   it('should update bindings when value changes', () => {
     @Component({
       template: `<a [title]="title"></a>`,
@@ -135,4 +154,448 @@ describe('property bindings', () => {
 
     expect(fixture.debugElement.query(By.css('input')).nativeElement.required).toBe(false);
   });
+
+  it('should support interpolation for properties', () => {
+    @Component({template: `<span id="{{'_' + id + '_'}}"></span>`})
+    class Comp {
+      id: string|undefined;
+    }
+
+    TestBed.configureTestingModule({declarations: [Comp]});
+    const fixture = TestBed.createComponent(Comp);
+    const spanEl = fixture.nativeElement.querySelector('span');
+
+    fixture.componentInstance.id = 'testId';
+    fixture.detectChanges();
+    expect(spanEl.id).toBe('_testId_');
+
+    fixture.componentInstance.id = 'otherId';
+    fixture.detectChanges();
+    expect(spanEl.id).toBe('_otherId_');
+  });
+
+  describe('input properties', () => {
+    @Directive({
+      selector: '[myButton]',
+    })
+    class MyButton {
+      @Input() disabled: boolean|undefined;
+    }
+
+    @Directive({
+      selector: '[otherDir]',
+    })
+    class OtherDir {
+      @Input() id: number|undefined;
+      @Output('click') clickStream = new EventEmitter();
+    }
+
+    @Directive({
+      selector: '[otherDisabledDir]',
+    })
+    class OtherDisabledDir {
+      @Input() disabled: boolean|undefined;
+    }
+
+    @Directive({
+      selector: '[idDir]',
+    })
+    class IdDir {
+      @Input('id') idNumber: string|undefined;
+    }
+
+    it('should check input properties before setting (directives)', () => {
+      @Component({
+        template: `<button myButton otherDir [id]="id" [disabled]="isDisabled">Click me</button>`
+      })
+      class App {
+        id = 0;
+        isDisabled = true;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyButton, OtherDir]});
+      const fixture = TestBed.createComponent(App);
+      const button = fixture.debugElement.query(By.directive(MyButton)).injector.get(MyButton);
+      const otherDir = fixture.debugElement.query(By.directive(OtherDir)).injector.get(OtherDir);
+      const buttonEl = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(buttonEl.getAttribute('mybutton')).toBe('');
+      expect(buttonEl.getAttribute('otherdir')).toBe('');
+      expect(buttonEl.hasAttribute('id')).toBe(false);
+      expect(buttonEl.hasAttribute('disabled')).toBe(false);
+      expect(button.disabled).toEqual(true);
+      expect(otherDir.id).toEqual(0);
+
+      fixture.componentInstance.isDisabled = false;
+      fixture.componentInstance.id = 1;
+      fixture.detectChanges();
+
+      expect(buttonEl.getAttribute('mybutton')).toBe('');
+      expect(buttonEl.getAttribute('otherdir')).toBe('');
+      expect(buttonEl.hasAttribute('id')).toBe(false);
+      expect(buttonEl.hasAttribute('disabled')).toBe(false);
+      expect(button.disabled).toEqual(false);
+      expect(otherDir.id).toEqual(1);
+    });
+
+    it('should support mixed element properties and input properties', () => {
+      @Component({template: `<button myButton [id]="id" [disabled]="isDisabled">Click me</button>`})
+      class App {
+        isDisabled = true;
+        id = 0;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyButton]});
+      const fixture = TestBed.createComponent(App);
+      const button = fixture.debugElement.query(By.directive(MyButton)).injector.get(MyButton);
+      const buttonEl = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(buttonEl.getAttribute('id')).toBe('0');
+      expect(buttonEl.hasAttribute('disabled')).toBe(false);
+      expect(button.disabled).toEqual(true);
+
+      fixture.componentInstance.isDisabled = false;
+      fixture.componentInstance.id = 1;
+      fixture.detectChanges();
+
+      expect(buttonEl.getAttribute('id')).toBe('1');
+      expect(buttonEl.hasAttribute('disabled')).toBe(false);
+      expect(button.disabled).toEqual(false);
+    });
+
+    it('should check that property is not an input property before setting (component)', () => {
+      @Component({
+        selector: 'comp',
+        template: '',
+      })
+      class Comp {
+        @Input() id: number|undefined;
+      }
+
+      @Component({template: `<comp [id]="id"></comp>`})
+      class App {
+        id = 1;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, Comp]});
+      const fixture = TestBed.createComponent(App);
+      const compDebugEl = fixture.debugElement.query(By.directive(Comp));
+      fixture.detectChanges();
+
+      expect(compDebugEl.nativeElement.hasAttribute('id')).toBe(false);
+      expect(compDebugEl.componentInstance.id).toEqual(1);
+
+      fixture.componentInstance.id = 2;
+      fixture.detectChanges();
+
+      expect(compDebugEl.nativeElement.hasAttribute('id')).toBe(false);
+      expect(compDebugEl.componentInstance.id).toEqual(2);
+    });
+
+    it('should support two input properties with the same name', () => {
+      @Component(
+          {template: `<button myButton otherDisabledDir [disabled]="isDisabled">Click me</button>`})
+      class App {
+        isDisabled = true;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyButton, OtherDisabledDir]});
+      const fixture = TestBed.createComponent(App);
+      const button = fixture.debugElement.query(By.directive(MyButton)).injector.get(MyButton);
+      const otherDisabledDir =
+          fixture.debugElement.query(By.directive(OtherDisabledDir)).injector.get(OtherDisabledDir);
+      const buttonEl = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(buttonEl.hasAttribute('disabled')).toBe(false);
+      expect(button.disabled).toEqual(true);
+      expect(otherDisabledDir.disabled).toEqual(true);
+
+      fixture.componentInstance.isDisabled = false;
+      fixture.detectChanges();
+
+      expect(buttonEl.hasAttribute('disabled')).toBe(false);
+      expect(button.disabled).toEqual(false);
+      expect(otherDisabledDir.disabled).toEqual(false);
+    });
+
+    it('should set input property if there is an output first', () => {
+      @Component({
+        template: `<button otherDir [id]="id" (click)="onClick()">Click me</button>`,
+      })
+      class App {
+        id = 1;
+        counter = 0;
+        onClick = () => this.counter++;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, OtherDir]});
+      const fixture = TestBed.createComponent(App);
+      const otherDir = fixture.debugElement.query(By.directive(OtherDir)).injector.get(OtherDir);
+      const buttonEl = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(buttonEl.hasAttribute('id')).toBe(false);
+      expect(otherDir.id).toEqual(1);
+
+      otherDir.clickStream.next();
+      expect(fixture.componentInstance.counter).toEqual(1);
+
+      fixture.componentInstance.id = 2;
+      fixture.detectChanges();
+      expect(otherDir.id).toEqual(2);
+    });
+
+    it('should support unrelated element properties at same index in if-else block', () => {
+      @Component({
+        template: `
+          <button idDir [id]="id1">Click me</button>
+          <button *ngIf="condition" [id]="id2">Click me too (2)</button>
+          <button *ngIf="!condition" otherDir [id]="id3">Click me too (3)</button> 
+        `
+      })
+      class App {
+        condition = true;
+        id1 = 'one';
+        id2 = 'two';
+        id3 = 3;
+      }
+
+      TestBed.configureTestingModule(
+          {declarations: [App, IdDir, OtherDir], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      let buttonElements = fixture.nativeElement.querySelectorAll('button');
+      const idDir = fixture.debugElement.query(By.directive(IdDir)).injector.get(IdDir);
+
+      expect(buttonElements.length).toBe(2);
+      expect(buttonElements[0].hasAttribute('id')).toBe(false);
+      expect(buttonElements[1].getAttribute('id')).toBe('two');
+      expect(buttonElements[1].textContent).toBe('Click me too (2)');
+      expect(idDir.idNumber).toBe('one');
+
+      fixture.componentInstance.condition = false;
+      fixture.componentInstance.id1 = 'four';
+      fixture.detectChanges();
+
+      const otherDir = fixture.debugElement.query(By.directive(OtherDir)).injector.get(OtherDir);
+      buttonElements = fixture.nativeElement.querySelectorAll('button');
+      expect(buttonElements.length).toBe(2);
+      expect(buttonElements[0].hasAttribute('id')).toBe(false);
+      expect(buttonElements[1].hasAttribute('id')).toBe(false);
+      expect(buttonElements[1].textContent).toBe('Click me too (3)');
+      expect(idDir.idNumber).toBe('four');
+      expect(otherDir.id).toBe(3);
+    });
+  });
+
+  describe('attributes and input properties', () => {
+
+    @Directive({selector: '[myDir]', exportAs: 'myDir'})
+    class MyDir {
+      @Input() role: string|undefined;
+      @Input('dir') direction: string|undefined;
+      @Output('change') changeStream = new EventEmitter();
+    }
+
+    @Directive({selector: '[myDirB]'})
+    class MyDirB {
+      @Input('role') roleB: string|undefined;
+    }
+
+    it('should set input property based on attribute if existing', () => {
+      @Component({template: `<div role="button" myDir></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir]});
+      const fixture = TestBed.createComponent(App);
+      const myDir = fixture.debugElement.query(By.directive(MyDir)).injector.get(MyDir);
+      const divElement = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(divElement.getAttribute('role')).toBe('button');
+      expect(divElement.getAttribute('mydir')).toBe('');
+      expect(myDir.role).toEqual('button');
+    });
+
+    it('should set input property and attribute if both defined', () => {
+      @Component({template: `<div role="button" [role]="role" myDir></div>`})
+      class App {
+        role = 'listbox';
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir]});
+      const fixture = TestBed.createComponent(App);
+      const myDir = fixture.debugElement.query(By.directive(MyDir)).injector.get(MyDir);
+      const divElement = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(divElement.getAttribute('role')).toBe('button');
+      expect(myDir.role).toEqual('listbox');
+
+      fixture.componentInstance.role = 'button';
+      fixture.detectChanges();
+      expect(myDir.role).toEqual('button');
+    });
+
+    it('should set two directive input properties based on same attribute', () => {
+      @Component({template: `<div role="button" myDir myDirB></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir, MyDirB]});
+      const fixture = TestBed.createComponent(App);
+      const myDir = fixture.debugElement.query(By.directive(MyDir)).injector.get(MyDir);
+      const myDirB = fixture.debugElement.query(By.directive(MyDirB)).injector.get(MyDirB);
+      const divElement = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(divElement.getAttribute('role')).toBe('button');
+      expect(myDir.role).toEqual('button');
+      expect(myDirB.roleB).toEqual('button');
+    });
+
+    it('should process two attributes on same directive', () => {
+      @Component({
+        template: `<div role="button" dir="rtl" myDir></div>`,
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir]});
+      const fixture = TestBed.createComponent(App);
+      const myDir = fixture.debugElement.query(By.directive(MyDir)).injector.get(MyDir);
+      const divElement = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(divElement.getAttribute('role')).toBe('button');
+      expect(divElement.getAttribute('dir')).toBe('rtl');
+      expect(myDir.role).toEqual('button');
+      expect(myDir.direction).toEqual('rtl');
+    });
+
+    it('should process attributes and outputs properly together', () => {
+      @Component({template: `<div role="button" (change)="onChange()" myDir></div>`})
+      class App {
+        counter = 0;
+        onChange = () => this.counter++;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir]});
+      const fixture = TestBed.createComponent(App);
+      const myDir = fixture.debugElement.query(By.directive(MyDir)).injector.get(MyDir);
+      const divElement = fixture.nativeElement.children[0];
+      fixture.detectChanges();
+
+      expect(divElement.getAttribute('role')).toBe('button');
+      expect(myDir.role).toEqual('button');
+
+      myDir.changeStream.next();
+      expect(fixture.componentInstance.counter).toEqual(1);
+    });
+
+    it('should process attributes properly for directives with later indices', () => {
+      @Component({
+        template: `
+          <div role="button" dir="rtl" myDir></div>
+          <div role="listbox" myDirB></div>
+        `,
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir, MyDirB]});
+      const fixture = TestBed.createComponent(App);
+      const myDir = fixture.debugElement.query(By.directive(MyDir)).injector.get(MyDir);
+      const myDirB = fixture.debugElement.query(By.directive(MyDirB)).injector.get(MyDirB);
+      const [buttonEl, listboxEl] = fixture.nativeElement.children;
+      fixture.detectChanges();
+
+      expect(buttonEl.getAttribute('role')).toBe('button');
+      expect(buttonEl.getAttribute('dir')).toBe('rtl');
+      expect(listboxEl.getAttribute('role')).toBe('listbox');
+
+      expect(myDir.role).toEqual('button');
+      expect(myDir.direction).toEqual('rtl');
+      expect(myDirB.roleB).toEqual('listbox');
+    });
+
+    it('should support attributes at same index inside an if-else block', () => {
+      @Component({
+        template: `
+          <div role="listbox" myDir></div>
+          <div role="button" myDirB *ngIf="condition"></div>
+          <div role="menu" *ngIf="!condition"></div>
+        `,
+      })
+      class App {
+        condition = true;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir, MyDirB], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const myDir = fixture.debugElement.query(By.directive(MyDir)).injector.get(MyDir);
+      const myDirB = fixture.debugElement.query(By.directive(MyDirB)).injector.get(MyDirB);
+      let divElements = fixture.nativeElement.querySelectorAll('div');
+
+      expect(divElements.length).toBe(2);
+      expect(divElements[0].getAttribute('role')).toBe('listbox');
+      expect(divElements[1].getAttribute('role')).toBe('button');
+      expect(myDir.role).toEqual('listbox');
+      expect(myDirB.roleB).toEqual('button');
+      expect((myDirB as any).role).toBeUndefined();
+
+      fixture.componentInstance.condition = false;
+      fixture.detectChanges();
+
+      divElements = fixture.nativeElement.querySelectorAll('div');
+      expect(divElements.length).toBe(2);
+      expect(divElements[0].getAttribute('role')).toBe('listbox');
+      expect(divElements[1].getAttribute('role')).toBe('menu');
+      expect(myDir.role).toEqual('listbox');
+      expect(myDirB.roleB).toEqual('button');
+    });
+
+    it('should process attributes properly inside a for loop', () => {
+      @Component({
+        selector: 'comp',
+        template: `<div role="button" myDir #dir="myDir"></div>role: {{dir.role}}`
+      })
+      class Comp {
+      }
+
+      @Component({
+        template: `
+          <comp *ngFor="let i of [0, 1]"></comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyDir, Comp], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.children.length).toBe(2);
+
+      const [comp1, comp2] = fixture.nativeElement.children;
+
+      expect(comp1.tagName).toBe('COMP');
+      expect(comp2.tagName).toBe('COMP');
+
+      expect(comp1.children[0].tagName).toBe('DIV');
+      expect(comp1.children[0].getAttribute('role')).toBe('button');
+      expect(comp1.textContent).toBe('role: button');
+
+      expect(comp2.children[0].tagName).toBe('DIV');
+      expect(comp2.children[0].getAttribute('role')).toBe('button');
+      expect(comp2.textContent).toBe('role: button');
+    });
+
+  });
+
 });
diff --git a/packages/core/test/render3/properties_spec.ts b/packages/core/test/render3/properties_spec.ts
deleted file mode 100644
index d7efadec1a..0000000000
--- a/packages/core/test/render3/properties_spec.ts
+++ /dev/null
@@ -1,621 +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 {EventEmitter} from '@angular/core';
-
-import {ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵlistener, ɵɵload, ɵɵreference, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
-import {RenderFlags} from '../../src/render3/interfaces/definition';
-
-import {ComponentFixture, createComponent, renderToHtml} from './render_util';
-
-describe('elementProperty', () => {
-
-  it('should support bindings to properties', () => {
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'span');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id));
-      }
-    }, 1, 1);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.id = 'testId';
-    fixture.update();
-    expect(fixture.html).toEqual('<span id="testId"></span>');
-
-    fixture.component.id = 'otherId';
-    fixture.update();
-    expect(fixture.html).toEqual('<span id="otherId"></span>');
-  });
-
-  it('should support creation time bindings to properties', () => {
-    function expensive(ctx: string): any {
-      if (ctx === 'cheapId') {
-        return ctx;
-      } else {
-        throw 'Too expensive!';
-      }
-    }
-
-    function Template(rf: RenderFlags, ctx: string) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'span');
-        ɵɵelementProperty(0, 'id', expensive(ctx));
-      }
-    }
-
-    expect(renderToHtml(Template, 'cheapId', 1)).toEqual('<span id="cheapId"></span>');
-    expect(renderToHtml(Template, 'expensiveId', 1)).toEqual('<span id="cheapId"></span>');
-  });
-
-  it('should support interpolation for properties', () => {
-    const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'span');
-      }
-      if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'id', ɵɵinterpolation1('_', ctx.id, '_'));
-      }
-    }, 1, 1);
-
-    const fixture = new ComponentFixture(App);
-    fixture.component.id = 'testId';
-    fixture.update();
-    expect(fixture.html).toEqual('<span id="_testId_"></span>');
-
-    fixture.component.id = 'otherId';
-    fixture.update();
-    expect(fixture.html).toEqual('<span id="_otherId_"></span>');
-  });
-
-  describe('input properties', () => {
-    let button: MyButton;
-    let otherDir: OtherDir;
-    let otherDisabledDir: OtherDisabledDir;
-    let idDir: IdDir;
-
-    class MyButton {
-      // TODO(issue/24571): remove '!'.
-      disabled !: boolean;
-
-      static ngDirectiveDef = ɵɵdefineDirective({
-        type: MyButton,
-        selectors: [['', 'myButton', '']],
-        factory: () => button = new MyButton(),
-        inputs: {disabled: 'disabled'}
-      });
-    }
-
-    class OtherDir {
-      // TODO(issue/24571): remove '!'.
-      id !: number;
-      clickStream = new EventEmitter();
-
-      static ngDirectiveDef = ɵɵdefineDirective({
-        type: OtherDir,
-        selectors: [['', 'otherDir', '']],
-        factory: () => otherDir = new OtherDir(),
-        inputs: {id: 'id'},
-        outputs: {clickStream: 'click'}
-      });
-    }
-
-    class OtherDisabledDir {
-      // TODO(issue/24571): remove '!'.
-      disabled !: boolean;
-
-      static ngDirectiveDef = ɵɵdefineDirective({
-        type: OtherDisabledDir,
-        selectors: [['', 'otherDisabledDir', '']],
-        factory: () => otherDisabledDir = new OtherDisabledDir(),
-        inputs: {disabled: 'disabled'}
-      });
-    }
-
-    class IdDir {
-      // TODO(issue/24571): remove '!'.
-      idNumber !: string;
-
-      static ngDirectiveDef = ɵɵdefineDirective({
-        type: IdDir,
-        selectors: [['', 'idDir', '']],
-        factory: () => idDir = new IdDir(),
-        inputs: {idNumber: 'id'}
-      });
-    }
-
-
-    const deps = [MyButton, OtherDir, OtherDisabledDir, IdDir];
-
-    it('should check input properties before setting (directives)', () => {
-
-      /** <button myButton otherDir [id]="id" [disabled]="isDisabled">Click me</button> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'button', ['otherDir', '', 'myButton', '']);
-          { ɵɵtext(1, 'Click me'); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'disabled', ɵɵbind(ctx.isDisabled));
-          ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id));
-        }
-      }, 2, 2, deps);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.isDisabled = true;
-      fixture.component.id = 0;
-      fixture.update();
-      expect(fixture.html).toEqual(`<button mybutton="" otherdir="">Click me</button>`);
-      expect(button !.disabled).toEqual(true);
-      expect(otherDir !.id).toEqual(0);
-
-      fixture.component.isDisabled = false;
-      fixture.component.id = 1;
-      fixture.update();
-      expect(fixture.html).toEqual(`<button mybutton="" otherdir="">Click me</button>`);
-      expect(button !.disabled).toEqual(false);
-      expect(otherDir !.id).toEqual(1);
-    });
-
-    it('should support mixed element properties and input properties', () => {
-
-      /** <button myButton [id]="id" [disabled]="isDisabled">Click me</button> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'button', ['myButton', '']);
-          { ɵɵtext(1, 'Click me'); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'disabled', ɵɵbind(ctx.isDisabled));
-          ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id));
-        }
-      }, 2, 2, deps);
-
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.isDisabled = true;
-      fixture.component.id = 0;
-      fixture.update();
-      expect(fixture.html).toEqual(`<button id="0" mybutton="">Click me</button>`);
-      expect(button !.disabled).toEqual(true);
-
-      fixture.component.isDisabled = false;
-      fixture.component.id = 1;
-      fixture.update();
-      expect(fixture.html).toEqual(`<button id="1" mybutton="">Click me</button>`);
-      expect(button !.disabled).toEqual(false);
-    });
-
-    it('should check that property is not an input property before setting (component)', () => {
-      let comp: Comp;
-
-      class Comp {
-        // TODO(issue/24571): remove '!'.
-        id !: number;
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          consts: 0,
-          vars: 0,
-          template: function(rf: RenderFlags, ctx: any) {},
-          factory: () => comp = new Comp(),
-          inputs: {id: 'id'}
-        });
-      }
-
-      /** <comp [id]="id"></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id));
-        }
-      }, 1, 1, [Comp]);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.id = 1;
-      fixture.update();
-      expect(fixture.html).toEqual(`<comp></comp>`);
-      expect(comp !.id).toEqual(1);
-
-      fixture.component.id = 2;
-      fixture.update();
-      expect(fixture.html).toEqual(`<comp></comp>`);
-      expect(comp !.id).toEqual(2);
-    });
-
-    it('should support two input properties with the same name', () => {
-
-      /** <button myButton otherDisabledDir [disabled]="isDisabled">Click me</button> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'button', ['myButton', '', 'otherDisabledDir', '']);
-          { ɵɵtext(1, 'Click me'); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'disabled', ɵɵbind(ctx.isDisabled));
-        }
-      }, 2, 1, deps);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.isDisabled = true;
-      fixture.update();
-      expect(fixture.html).toEqual(`<button mybutton="" otherdisableddir="">Click me</button>`);
-      expect(button !.disabled).toEqual(true);
-      expect(otherDisabledDir !.disabled).toEqual(true);
-
-      fixture.component.isDisabled = false;
-      fixture.update();
-      expect(fixture.html).toEqual(`<button mybutton="" otherdisableddir="">Click me</button>`);
-      expect(button !.disabled).toEqual(false);
-      expect(otherDisabledDir !.disabled).toEqual(false);
-    });
-
-    it('should set input property if there is an output first', () => {
-      /** <button otherDir [id]="id" (click)="onClick()">Click me</button> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'button', ['otherDir', '']);
-          {
-            ɵɵlistener('click', () => ctx.onClick());
-            ɵɵtext(1, 'Click me');
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id));
-        }
-      }, 2, 1, deps);
-
-      const fixture = new ComponentFixture(App);
-      let counter = 0;
-      fixture.component.id = 1;
-      fixture.component.onClick = () => counter++;
-      fixture.update();
-      expect(fixture.html).toEqual(`<button otherdir="">Click me</button>`);
-      expect(otherDir !.id).toEqual(1);
-
-      otherDir !.clickStream.next();
-      expect(counter).toEqual(1);
-
-      fixture.component.id = 2;
-      fixture.update();
-      fixture.html;
-      expect(otherDir !.id).toEqual(2);
-    });
-
-    it('should support unrelated element properties at same index in if-else block', () => {
-      /**
-       * <button idDir [id]="id1">Click me</button>             // inputs: {'id': [0, 'idNumber']}
-       * % if (condition) {
-       *   <button [id]="id2">Click me too</button>             // inputs: null
-       * % } else {
-       *   <button otherDir [id]="id3">Click me too</button>   // inputs: {'id': [0, 'id']}
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'button', ['idDir', '']);
-          { ɵɵtext(1, 'Click me'); }
-          ɵɵelementEnd();
-          ɵɵcontainer(2);
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id1));
-          ɵɵcontainerRefreshStart(2);
-          {
-            if (ctx.condition) {
-              let rf0 = ɵɵembeddedViewStart(0, 2, 1);
-              if (rf0 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'button');
-                { ɵɵtext(1, 'Click me too'); }
-                ɵɵelementEnd();
-              }
-              if (rf0 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id2));
-              }
-              ɵɵembeddedViewEnd();
-            } else {
-              let rf1 = ɵɵembeddedViewStart(1, 2, 1);
-              if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'button', ['otherDir', '']);
-                { ɵɵtext(1, 'Click me too'); }
-                ɵɵelementEnd();
-              }
-              if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'id', ɵɵbind(ctx.id3));
-              }
-              ɵɵembeddedViewEnd();
-            }
-          }
-          ɵɵcontainerRefreshEnd();
-        }
-      }, 3, 1, deps);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.condition = true;
-      fixture.component.id1 = 'one';
-      fixture.component.id2 = 'two';
-      fixture.component.id3 = 3;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(`<button iddir="">Click me</button><button id="two">Click me too</button>`);
-      expect(idDir !.idNumber).toEqual('one');
-
-      fixture.component.condition = false;
-      fixture.component.id1 = 'four';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(`<button iddir="">Click me</button><button otherdir="">Click me too</button>`);
-      expect(idDir !.idNumber).toEqual('four');
-      expect(otherDir !.id).toEqual(3);
-    });
-
-  });
-
-  describe('attributes and input properties', () => {
-    let myDir: MyDir;
-    class MyDir {
-      // TODO(issue/24571): remove '!'.
-      role !: string;
-      // TODO(issue/24571): remove '!'.
-      direction !: string;
-      changeStream = new EventEmitter();
-
-      static ngDirectiveDef = ɵɵdefineDirective({
-        type: MyDir,
-        selectors: [['', 'myDir', '']],
-        factory: () => myDir = new MyDir(),
-        inputs: {role: 'role', direction: 'dir'},
-        outputs: {changeStream: 'change'},
-        exportAs: ['myDir']
-      });
-    }
-
-    let dirB: MyDirB;
-    class MyDirB {
-      // TODO(issue/24571): remove '!'.
-      roleB !: string;
-
-      static ngDirectiveDef = ɵɵdefineDirective({
-        type: MyDirB,
-        selectors: [['', 'myDirB', '']],
-        factory: () => dirB = new MyDirB(),
-        inputs: {roleB: 'role'}
-      });
-    }
-
-    const deps = [MyDir, MyDirB];
-
-    it('should set input property based on attribute if existing', () => {
-
-      /** <div role="button" myDir></div> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['role', 'button', 'myDir', '']);
-        }
-      }, 1, 0, deps);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual(`<div mydir="" role="button"></div>`);
-      expect(myDir !.role).toEqual('button');
-    });
-
-    it('should set input property and attribute if both defined', () => {
-
-      /** <div role="button" [role]="role" myDir></div> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['role', 'button', 'myDir', '']);
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'role', ɵɵbind(ctx.role));
-        }
-      }, 1, 1, deps);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.role = 'listbox';
-      fixture.update();
-      expect(fixture.html).toEqual(`<div mydir="" role="button"></div>`);
-      expect(myDir !.role).toEqual('listbox');
-
-      fixture.component.role = 'button';
-      fixture.update();
-      expect(myDir !.role).toEqual('button');
-    });
-
-    it('should set two directive input properties based on same attribute', () => {
-
-      /** <div role="button" myDir myDirB></div> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['role', 'button', 'myDir', '', 'myDirB', '']);
-        }
-      }, 1, 0, deps);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual(`<div mydir="" mydirb="" role="button"></div>`);
-      expect(myDir !.role).toEqual('button');
-      expect(dirB !.roleB).toEqual('button');
-    });
-
-    it('should process two attributes on same directive', () => {
-
-      /** <div role="button" dir="rtl" myDir></div> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['role', 'button', 'dir', 'rtl', 'myDir', '']);
-        }
-      }, 1, 0, deps);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual(`<div dir="rtl" mydir="" role="button"></div>`);
-      expect(myDir !.role).toEqual('button');
-      expect(myDir !.direction).toEqual('rtl');
-    });
-
-    it('should process attributes and outputs properly together', () => {
-
-      /** <div role="button" (change)="onChange()" myDir></div> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div', ['role', 'button', 'myDir', '']);
-          { ɵɵlistener('change', () => ctx.onChange()); }
-          ɵɵelementEnd();
-        }
-      }, 1, 0, deps);
-
-      const fixture = new ComponentFixture(App);
-      let counter = 0;
-      fixture.component.onChange = () => counter++;
-      fixture.update();
-      expect(fixture.html).toEqual(`<div mydir="" role="button"></div>`);
-      expect(myDir !.role).toEqual('button');
-
-      myDir !.changeStream.next();
-      expect(counter).toEqual(1);
-    });
-
-    it('should process attributes properly for directives with later indices', () => {
-
-      /**
-       * <div role="button" dir="rtl" myDir></div>
-       * <div role="listbox" myDirB></div>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['role', 'button', 'dir', 'rtl', 'myDir', '']);
-          ɵɵelement(1, 'div', ['role', 'listbox', 'myDirB', '']);
-        }
-      }, 2, 0, deps);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html)
-          .toEqual(
-              `<div dir="rtl" mydir="" role="button"></div><div mydirb="" role="listbox"></div>`);
-      expect(myDir !.role).toEqual('button');
-      expect(myDir !.direction).toEqual('rtl');
-      expect(dirB !.roleB).toEqual('listbox');
-    });
-
-    it('should support attributes at same index inside an if-else block', () => {
-      /**
-       * <div role="listbox" myDir></div>          // initialInputs: [['role', 'listbox']]
-       *
-       * % if (condition) {
-       *   <div role="button" myDirB></div>       // initialInputs: [['role', 'button']]
-       * % } else {
-       *   <div role="menu"></div>               // initialInputs: [null]
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['role', 'listbox', 'myDir', '']);
-          ɵɵcontainer(1);
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(1);
-          {
-            if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['role', 'button', 'myDirB', '']);
-              }
-              ɵɵembeddedViewEnd();
-            } else {
-              let rf2 = ɵɵembeddedViewStart(1, 1, 0);
-              if (rf2 & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['role', 'menu']);
-              }
-              ɵɵembeddedViewEnd();
-            }
-          }
-          ɵɵcontainerRefreshEnd();
-        }
-      }, 2, 0, deps);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.condition = true;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(`<div mydir="" role="listbox"></div><div mydirb="" role="button"></div>`);
-      expect(myDir !.role).toEqual('listbox');
-      expect(dirB !.roleB).toEqual('button');
-      expect((dirB !as any).role).toBeUndefined();
-
-      fixture.component.condition = false;
-      fixture.update();
-      expect(fixture.html).toEqual(`<div mydir="" role="listbox"></div><div role="menu"></div>`);
-      expect(myDir !.role).toEqual('listbox');
-    });
-
-    it('should process attributes properly inside a for loop', () => {
-
-      class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          consts: 3,
-          vars: 1,
-          /** <div role="button" dir #dir="myDir"></div> {{ dir.role }} */
-          template: function(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'div', ['role', 'button', 'myDir', ''], ['dir', 'myDir']);
-              ɵɵtext(2);
-            }
-            if (rf & RenderFlags.Update) {
-              const tmp = ɵɵreference(1) as any;
-              ɵɵtextBinding(2, ɵɵbind(tmp.role));
-            }
-          },
-          factory: () => new Comp(),
-          directives: () => [MyDir]
-        });
-      }
-
-      /**
-       * % for (let i = 0; i < 3; i++) {
-       *     <comp></comp>
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
-          {
-            for (let i = 0; i < 2; i++) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
-              }
-              ɵɵembeddedViewEnd();
-            }
-          }
-          ɵɵcontainerRefreshEnd();
-        }
-      }, 1, 0, [Comp]);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html)
-          .toEqual(
-              `<comp><div mydir="" role="button"></div>button</comp><comp><div mydir="" role="button"></div>button</comp>`);
-    });
-
-  });
-
-});

From 96baff3a856538f5b026b6b6ae703c08fb21b93a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@abv.bg>
Date: Sun, 12 May 2019 18:52:41 +0200
Subject: [PATCH 017/275] test(ivy): move change detection tests into
 acceptance (#30425)

Moves most of the r3 change detection tests into `acceptance`. Notes:
* A handful of tests weren't migrated, because they were testing an API that isn't exposed publicly yet.
* The `should throw if bindings in children of current view have changed` and `should NOT throw if bindings in ancestors of current view have changed` tests were removed, because there's not nice way of hitting the same code path with `TestBed` and doing the same assertion as with the raw instructions. I'm open to ideas on how we could do them.
* There were a few tests that assert that the `innerHTML` looks in a particular way. I've switched them to use `textContent`, because Ivy and ViewEngine produce slightly different DOM. The tests were only checking whether the text has changed anyway.

PR Close #30425
---
 .../test/acceptance/change_detection_spec.ts  |  854 +++++++++++-
 .../test/render3/change_detection_spec.ts     | 1179 +----------------
 2 files changed, 863 insertions(+), 1170 deletions(-)

diff --git a/packages/core/test/acceptance/change_detection_spec.ts b/packages/core/test/acceptance/change_detection_spec.ts
index 340a224321..596e67e2b7 100644
--- a/packages/core/test/acceptance/change_detection_spec.ts
+++ b/packages/core/test/acceptance/change_detection_spec.ts
@@ -7,7 +7,8 @@
  */
 
 
-import {ApplicationRef, ChangeDetectionStrategy, Component, ComponentFactoryResolver, ComponentRef, Directive, EmbeddedViewRef, NgModule, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {ApplicationRef, ChangeDetectionStrategy, ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, Directive, DoCheck, EmbeddedViewRef, ErrorHandler, Input, NgModule, OnInit, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
@@ -127,4 +128,853 @@ describe('change detection', () => {
     });
   });
 
-});
\ No newline at end of file
+  describe('OnPush', () => {
+    @Component({
+      selector: 'my-comp',
+      changeDetection: ChangeDetectionStrategy.OnPush,
+      template: `{{ doCheckCount }} - {{ name }} <button (click)="onClick()"></button>`
+    })
+    class MyComponent implements DoCheck {
+      @Input()
+      name = 'Nancy';
+      doCheckCount = 0;
+
+      ngDoCheck(): void { this.doCheckCount++; }
+
+      onClick() {}
+    }
+
+    @Component({selector: 'my-app', template: '<my-comp [name]="name"></my-comp>'})
+    class MyApp {
+      @ViewChild(MyComponent) comp !: MyComponent;
+      name: string = 'Nancy';
+    }
+
+    it('should check OnPush components on initialization', () => {
+      TestBed.configureTestingModule({declarations: [MyComponent, MyApp]});
+      const fixture = TestBed.createComponent(MyApp);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - Nancy');
+    });
+
+    it('should call doCheck even when OnPush components are not dirty', () => {
+      TestBed.configureTestingModule({declarations: [MyComponent, MyApp]});
+      const fixture = TestBed.createComponent(MyApp);
+      fixture.detectChanges();
+
+      fixture.detectChanges();
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(2);
+
+      fixture.detectChanges();
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(3);
+    });
+
+    it('should skip OnPush components in update mode when they are not dirty', () => {
+      TestBed.configureTestingModule({declarations: [MyComponent, MyApp]});
+      const fixture = TestBed.createComponent(MyApp);
+      fixture.detectChanges();
+
+      // doCheckCount is 2, but 1 should be rendered since it has not been marked dirty.
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - Nancy');
+
+      fixture.detectChanges();
+
+      // doCheckCount is 3, but 1 should be rendered since it has not been marked dirty.
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - Nancy');
+    });
+
+    it('should check OnPush components in update mode when inputs change', () => {
+      TestBed.configureTestingModule({declarations: [MyComponent, MyApp]});
+      const fixture = TestBed.createComponent(MyApp);
+      fixture.detectChanges();
+
+      fixture.componentInstance.name = 'Bess';
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(2);
+      // View should update, as changed input marks view dirty
+      expect(fixture.nativeElement.textContent.trim()).toEqual('2 - Bess');
+
+      fixture.componentInstance.name = 'George';
+      fixture.detectChanges();
+
+      // View should update, as changed input marks view dirty
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(3);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('3 - George');
+
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(4);
+      // View should not be updated to "4", as inputs have not changed.
+      expect(fixture.nativeElement.textContent.trim()).toEqual('3 - George');
+    });
+
+    it('should check OnPush components in update mode when component events occur', () => {
+      TestBed.configureTestingModule({declarations: [MyComponent, MyApp]});
+      const fixture = TestBed.createComponent(MyApp);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(1);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - Nancy');
+
+      const button = fixture.nativeElement.querySelector('button') !;
+      button.click();
+
+      // No ticks should have been scheduled.
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(1);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - Nancy');
+
+      fixture.detectChanges();
+
+      // Because the onPush comp should be dirty, it should update once CD runs
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(2);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('2 - Nancy');
+    });
+
+    it('should not check OnPush components in update mode when parent events occur', () => {
+      @Component({
+        selector: 'button-parent',
+        template: '<my-comp></my-comp><button id="parent" (click)="noop()"></button>'
+      })
+      class ButtonParent {
+        @ViewChild(MyComponent) comp !: MyComponent;
+        noop() {}
+      }
+
+      TestBed.configureTestingModule({declarations: [MyComponent, ButtonParent]});
+      const fixture = TestBed.createComponent(ButtonParent);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - Nancy');
+
+      const button: HTMLButtonElement = fixture.nativeElement.querySelector('button#parent');
+      button.click();
+      fixture.detectChanges();
+
+      // The comp should still be clean. So doCheck will run, but the view should display 1.
+      expect(fixture.componentInstance.comp.doCheckCount).toEqual(2);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - Nancy');
+    });
+
+    it('should check parent OnPush components in update mode when child events occur', () => {
+      @Component({
+        selector: 'button-parent',
+        template: '{{ doCheckCount }} - <my-comp></my-comp>',
+        changeDetection: ChangeDetectionStrategy.OnPush
+      })
+      class ButtonParent implements DoCheck {
+        @ViewChild(MyComponent) comp !: MyComponent;
+        noop() {}
+
+        doCheckCount = 0;
+        ngDoCheck(): void { this.doCheckCount++; }
+      }
+
+      @Component({selector: 'my-button-app', template: '<button-parent></button-parent>'})
+      class MyButtonApp {
+        @ViewChild(ButtonParent) parent !: ButtonParent;
+      }
+
+      TestBed.configureTestingModule({declarations: [MyButtonApp, MyComponent, ButtonParent]});
+      const fixture = TestBed.createComponent(MyButtonApp);
+      fixture.detectChanges();
+
+      const parent = fixture.componentInstance.parent;
+      const comp = parent.comp;
+
+      expect(parent.doCheckCount).toEqual(1);
+      expect(comp.doCheckCount).toEqual(1);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - 1 - Nancy');
+
+      fixture.detectChanges();
+      expect(parent.doCheckCount).toEqual(2);
+      // parent isn't checked, so child doCheck won't run
+      expect(comp.doCheckCount).toEqual(1);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('1 - 1 - Nancy');
+
+      const button = fixture.nativeElement.querySelector('button');
+      button.click();
+
+      // No ticks should have been scheduled.
+      expect(parent.doCheckCount).toEqual(2);
+      expect(comp.doCheckCount).toEqual(1);
+
+      fixture.detectChanges();
+      expect(parent.doCheckCount).toEqual(3);
+      expect(comp.doCheckCount).toEqual(2);
+      expect(fixture.nativeElement.textContent.trim()).toEqual('3 - 2 - Nancy');
+    });
+
+  });
+
+  describe('ChangeDetectorRef', () => {
+    describe('detectChanges()', () => {
+      @Component({
+        selector: 'my-comp',
+        template: '{{ name }}',
+        changeDetection: ChangeDetectionStrategy.OnPush
+      })
+      class MyComp implements DoCheck {
+        doCheckCount = 0;
+        name = 'Nancy';
+
+        constructor(public cdr: ChangeDetectorRef) {}
+
+        ngDoCheck() { this.doCheckCount++; }
+      }
+
+      @Component({selector: 'parent-comp', template: `{{ doCheckCount}} - <my-comp></my-comp>`})
+      class ParentComp implements DoCheck {
+        @ViewChild(MyComp) myComp !: MyComp;
+
+        doCheckCount = 0;
+
+        constructor(public cdr: ChangeDetectorRef) {}
+
+        ngDoCheck() { this.doCheckCount++; }
+      }
+
+      @Directive({selector: '[dir]'})
+      class Dir {
+        constructor(public cdr: ChangeDetectorRef) {}
+      }
+
+      it('should check the component view when called by component (even when OnPush && clean)',
+         () => {
+           TestBed.configureTestingModule({declarations: [MyComp]});
+           const fixture = TestBed.createComponent(MyComp);
+           fixture.detectChanges();
+
+           expect(fixture.nativeElement.textContent).toEqual('Nancy');
+
+           fixture.componentInstance.name =
+               'Bess';  // as this is not an Input, the component stays clean
+           fixture.componentInstance.cdr.detectChanges();
+           expect(fixture.nativeElement.textContent).toEqual('Bess');
+         });
+
+      it('should NOT call component doCheck when called by a component', () => {
+        TestBed.configureTestingModule({declarations: [MyComp]});
+        const fixture = TestBed.createComponent(MyComp);
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.doCheckCount).toEqual(1);
+
+        // NOTE: in current Angular, detectChanges does not itself trigger doCheck, but you
+        // may see doCheck called in some cases bc of the extra CD run triggered by zone.js.
+        // It's important not to call doCheck to allow calls to detectChanges in that hook.
+        fixture.componentInstance.cdr.detectChanges();
+        expect(fixture.componentInstance.doCheckCount).toEqual(1);
+      });
+
+      it('should NOT check the component parent when called by a child component', () => {
+        TestBed.configureTestingModule({declarations: [MyComp, ParentComp]});
+        const fixture = TestBed.createComponent(ParentComp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('1 - Nancy');
+
+        fixture.componentInstance.doCheckCount = 100;
+        fixture.componentInstance.myComp.cdr.detectChanges();
+        expect(fixture.componentInstance.doCheckCount).toEqual(100);
+        expect(fixture.nativeElement.textContent).toEqual('1 - Nancy');
+      });
+
+      it('should check component children when called by component if dirty or check-always',
+         () => {
+           TestBed.configureTestingModule({declarations: [MyComp, ParentComp]});
+           const fixture = TestBed.createComponent(ParentComp);
+           fixture.detectChanges();
+           expect(fixture.componentInstance.doCheckCount).toEqual(1);
+
+           fixture.componentInstance.myComp.name = 'Bess';
+           fixture.componentInstance.cdr.detectChanges();
+           expect(fixture.componentInstance.doCheckCount).toEqual(1);
+           expect(fixture.componentInstance.myComp.doCheckCount).toEqual(2);
+           // OnPush child is not dirty, so its change isn't rendered.
+           expect(fixture.nativeElement.textContent).toEqual('1 - Nancy');
+         });
+
+      it('should not group detectChanges calls (call every time)', () => {
+        TestBed.configureTestingModule({declarations: [MyComp, ParentComp]});
+        const fixture = TestBed.createComponent(ParentComp);
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.doCheckCount).toEqual(1);
+
+        fixture.componentInstance.cdr.detectChanges();
+        fixture.componentInstance.cdr.detectChanges();
+        expect(fixture.componentInstance.myComp.doCheckCount).toEqual(3);
+      });
+
+      it('should check component view when called by directive on component node', () => {
+        @Component({template: '<my-comp dir></my-comp>'})
+        class MyApp {
+          @ViewChild(MyComp) myComp !: MyComp;
+          @ViewChild(Dir) dir !: Dir;
+        }
+
+        TestBed.configureTestingModule({declarations: [MyComp, Dir, MyApp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('Nancy');
+
+        fixture.componentInstance.myComp.name = 'George';
+        fixture.componentInstance.dir.cdr.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('George');
+      });
+
+      it('should check host component when called by directive on element node', () => {
+        @Component({template: '{{ value }}<div dir></div>'})
+        class MyApp {
+          @ViewChild(MyComp) myComp !: MyComp;
+          @ViewChild(Dir) dir !: Dir;
+          value = '';
+        }
+
+        TestBed.configureTestingModule({declarations: [Dir, MyApp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        fixture.componentInstance.value = 'Frank';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('Frank');
+
+        fixture.componentInstance.value = 'Joe';
+        fixture.componentInstance.dir.cdr.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('Joe');
+      });
+
+      it('should check the host component when called from EmbeddedViewRef', () => {
+        @Component({template: '{{ name }}<div *ngIf="showing" dir></div>'})
+        class MyApp {
+          @ViewChild(Dir) dir !: Dir;
+          showing = true;
+          name = 'Amelia';
+        }
+
+        TestBed.configureTestingModule({declarations: [Dir, MyApp], imports: [CommonModule]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('Amelia');
+
+        fixture.componentInstance.name = 'Emerson';
+        fixture.componentInstance.dir.cdr.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('Emerson');
+      });
+
+      it('should support call in ngOnInit', () => {
+        @Component({template: '{{ value }}'})
+        class DetectChangesComp implements OnInit {
+          value = 0;
+
+          constructor(public cdr: ChangeDetectorRef) {}
+
+          ngOnInit() {
+            this.value++;
+            this.cdr.detectChanges();
+          }
+        }
+
+        TestBed.configureTestingModule({declarations: [DetectChangesComp]});
+        const fixture = TestBed.createComponent(DetectChangesComp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('1');
+      });
+
+      ['OnInit', 'AfterContentInit', 'AfterViewInit', 'OnChanges'].forEach(hook => {
+        it(`should not go infinite loop when recursively called from children's ng${hook}`, () => {
+          @Component({template: '<child-comp [inp]="true"></child-comp>'})
+          class ParentComp {
+            constructor(public cdr: ChangeDetectorRef) {}
+            triggerChangeDetection() { this.cdr.detectChanges(); }
+          }
+
+          @Component({template: '{{inp}}', selector: 'child-comp'})
+          class ChildComp {
+            @Input()
+            inp: any = '';
+
+            count = 0;
+            constructor(public parentComp: ParentComp) {}
+
+            ngOnInit() { this.check('OnInit'); }
+            ngAfterContentInit() { this.check('AfterContentInit'); }
+            ngAfterViewInit() { this.check('AfterViewInit'); }
+            ngOnChanges() { this.check('OnChanges'); }
+
+            check(h: string) {
+              if (h === hook) {
+                this.count++;
+                if (this.count > 1) throw new Error(`ng${hook} should be called only once!`);
+                this.parentComp.triggerChangeDetection();
+              }
+            }
+          }
+
+          TestBed.configureTestingModule({declarations: [ParentComp, ChildComp]});
+
+          expect(() => {
+            const fixture = TestBed.createComponent(ParentComp);
+            fixture.detectChanges();
+          }).not.toThrow();
+        });
+      });
+
+      it('should support call in ngDoCheck', () => {
+        @Component({template: '{{doCheckCount}}'})
+        class DetectChangesComp {
+          doCheckCount = 0;
+
+          constructor(public cdr: ChangeDetectorRef) {}
+
+          ngDoCheck() {
+            this.doCheckCount++;
+            this.cdr.detectChanges();
+          }
+        }
+
+        TestBed.configureTestingModule({declarations: [DetectChangesComp]});
+        const fixture = TestBed.createComponent(DetectChangesComp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('1');
+      });
+
+      describe('dynamic views', () => {
+        @Component({selector: 'structural-comp', template: '{{ value }}'})
+        class StructuralComp {
+          @Input()
+          tmp !: TemplateRef<any>;
+          value = 'one';
+
+          constructor(public vcr: ViewContainerRef) {}
+
+          create() { return this.vcr.createEmbeddedView(this.tmp, {ctx: this}); }
+        }
+
+        it('should support ViewRef.detectChanges()', () => {
+          @Component({
+            template:
+                '<ng-template #foo let-ctx="ctx">{{ ctx.value }}</ng-template><structural-comp [tmp]="foo"></structural-comp>'
+          })
+          class App {
+            @ViewChild(StructuralComp) structuralComp !: StructuralComp;
+          }
+
+          TestBed.configureTestingModule({declarations: [App, StructuralComp]});
+          const fixture = TestBed.createComponent(App);
+          fixture.detectChanges();
+
+          expect(fixture.nativeElement.textContent).toEqual('one');
+
+          const viewRef: EmbeddedViewRef<any> = fixture.componentInstance.structuralComp.create();
+          fixture.detectChanges();
+          expect(fixture.nativeElement.textContent).toEqual('oneone');
+
+          // check embedded view update
+          fixture.componentInstance.structuralComp.value = 'two';
+          viewRef.detectChanges();
+          expect(fixture.nativeElement.textContent).toEqual('onetwo');
+
+          // check root view update
+          fixture.componentInstance.structuralComp.value = 'three';
+          fixture.detectChanges();
+          expect(fixture.nativeElement.textContent).toEqual('threethree');
+        });
+
+        it('should support ViewRef.detectChanges() directly after creation', () => {
+          @Component({
+            template: '<ng-template #foo>Template text</ng-template><structural-comp [tmp]="foo">'
+          })
+          class App {
+            @ViewChild(StructuralComp) structuralComp !: StructuralComp;
+          }
+
+          TestBed.configureTestingModule({declarations: [App, StructuralComp]});
+          const fixture = TestBed.createComponent(App);
+          fixture.detectChanges();
+
+          expect(fixture.nativeElement.textContent).toEqual('one');
+
+          const viewRef: EmbeddedViewRef<any> = fixture.componentInstance.structuralComp.create();
+          viewRef.detectChanges();
+          expect(fixture.nativeElement.textContent).toEqual('oneTemplate text');
+        });
+
+      });
+
+    });
+
+    describe('attach/detach', () => {
+      @Component({selector: 'detached-comp', template: '{{ value }}'})
+      class DetachedComp implements DoCheck {
+        value = 'one';
+        doCheckCount = 0;
+
+        constructor(public cdr: ChangeDetectorRef) {}
+
+        ngDoCheck() { this.doCheckCount++; }
+      }
+
+      @Component({template: '<detached-comp></detached-comp>'})
+      class MyApp {
+        @ViewChild(DetachedComp) comp !: DetachedComp;
+
+        constructor(public cdr: ChangeDetectorRef) {}
+      }
+
+      it('should not check detached components', () => {
+        TestBed.configureTestingModule({declarations: [MyApp, DetachedComp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one');
+
+        fixture.componentInstance.comp.cdr.detach();
+
+        fixture.componentInstance.comp.value = 'two';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one');
+      });
+
+      it('should check re-attached components', () => {
+        TestBed.configureTestingModule({declarations: [MyApp, DetachedComp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one');
+
+        fixture.componentInstance.comp.cdr.detach();
+        fixture.componentInstance.comp.value = 'two';
+
+        fixture.componentInstance.comp.cdr.reattach();
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('two');
+      });
+
+      it('should call lifecycle hooks on detached components', () => {
+        TestBed.configureTestingModule({declarations: [MyApp, DetachedComp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.comp.doCheckCount).toEqual(1);
+
+        fixture.componentInstance.comp.cdr.detach();
+
+        fixture.detectChanges();
+        expect(fixture.componentInstance.comp.doCheckCount).toEqual(2);
+      });
+
+      it('should check detached component when detectChanges is called', () => {
+        TestBed.configureTestingModule({declarations: [MyApp, DetachedComp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one');
+
+        fixture.componentInstance.comp.cdr.detach();
+
+        fixture.componentInstance.comp.value = 'two';
+        fixture.componentInstance.comp.cdr.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('two');
+      });
+
+      it('should not check detached component when markDirty is called', () => {
+        TestBed.configureTestingModule({declarations: [MyApp, DetachedComp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+        const comp = fixture.componentInstance.comp;
+
+        comp.cdr.detach();
+        comp.value = 'two';
+        comp.cdr.markForCheck();
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one');
+      });
+
+      it('should detach any child components when parent is detached', () => {
+        TestBed.configureTestingModule({declarations: [MyApp, DetachedComp]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one');
+
+        fixture.componentInstance.cdr.detach();
+
+        fixture.componentInstance.comp.value = 'two';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one');
+
+        fixture.componentInstance.cdr.reattach();
+
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('two');
+      });
+
+      it('should detach OnPush components properly', () => {
+
+        @Component({
+          selector: 'on-push-comp',
+          template: '{{ value }}',
+          changeDetection: ChangeDetectionStrategy.OnPush
+        })
+        class OnPushComp {
+          @Input()
+          value !: string;
+
+          constructor(public cdr: ChangeDetectorRef) {}
+        }
+
+        @Component({template: '<on-push-comp [value]="value"></on-push-comp>'})
+        class OnPushApp {
+          @ViewChild(OnPushComp) onPushComp !: OnPushComp;
+          value = '';
+        }
+
+        TestBed.configureTestingModule({declarations: [OnPushApp, OnPushComp]});
+        const fixture = TestBed.createComponent(OnPushApp);
+        fixture.detectChanges();
+
+        fixture.componentInstance.value = 'one';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one');
+
+        fixture.componentInstance.onPushComp.cdr.detach();
+
+        fixture.componentInstance.value = 'two';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one');
+
+        fixture.componentInstance.onPushComp.cdr.reattach();
+
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('two');
+      });
+
+    });
+
+    describe('markForCheck()', () => {
+      @Component({
+        selector: 'on-push-comp',
+        template: '{{ value }}',
+        changeDetection: ChangeDetectionStrategy.OnPush
+      })
+      class OnPushComp implements DoCheck {
+        value = 'one';
+
+        doCheckCount = 0;
+
+        constructor(public cdr: ChangeDetectorRef) {}
+
+        ngDoCheck() { this.doCheckCount++; }
+      }
+
+      @Component({
+        template: '{{ value }} - <on-push-comp></on-push-comp>',
+        changeDetection: ChangeDetectionStrategy.OnPush
+      })
+      class OnPushParent {
+        @ViewChild(OnPushComp) comp !: OnPushComp;
+        value = 'one';
+      }
+
+      it('should ensure OnPush components are checked', () => {
+        TestBed.configureTestingModule({declarations: [OnPushParent, OnPushComp]});
+        const fixture = TestBed.createComponent(OnPushParent);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.componentInstance.comp.value = 'two';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.componentInstance.comp.cdr.markForCheck();
+
+        // Change detection should not have run yet, since markForCheck
+        // does not itself schedule change detection.
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one - two');
+      });
+
+      it('should never schedule change detection on its own', () => {
+        TestBed.configureTestingModule({declarations: [OnPushParent, OnPushComp]});
+        const fixture = TestBed.createComponent(OnPushParent);
+        fixture.detectChanges();
+        const comp = fixture.componentInstance.comp;
+
+        expect(comp.doCheckCount).toEqual(1);
+
+        comp.cdr.markForCheck();
+        comp.cdr.markForCheck();
+
+        expect(comp.doCheckCount).toEqual(1);
+      });
+
+      it('should ensure ancestor OnPush components are checked', () => {
+        TestBed.configureTestingModule({declarations: [OnPushParent, OnPushComp]});
+        const fixture = TestBed.createComponent(OnPushParent);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.componentInstance.value = 'two';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.componentInstance.comp.cdr.markForCheck();
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('two - one');
+
+      });
+
+      it('should ensure OnPush components in embedded views are checked', () => {
+        @Component({
+          template: '{{ value }} - <on-push-comp *ngIf="showing"></on-push-comp>',
+          changeDetection: ChangeDetectionStrategy.OnPush
+        })
+        class EmbeddedViewParent {
+          @ViewChild(OnPushComp) comp !: OnPushComp;
+          value = 'one';
+          showing = true;
+        }
+
+        TestBed.configureTestingModule(
+            {declarations: [EmbeddedViewParent, OnPushComp], imports: [CommonModule]});
+        const fixture = TestBed.createComponent(EmbeddedViewParent);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.componentInstance.comp.value = 'two';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.componentInstance.comp.cdr.markForCheck();
+        // markForCheck should not trigger change detection on its own.
+        expect(fixture.nativeElement.textContent).toEqual('one - one');
+
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one - two');
+
+        fixture.componentInstance.value = 'two';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('one - two');
+
+        fixture.componentInstance.comp.cdr.markForCheck();
+        fixture.detectChanges();
+        expect(fixture.nativeElement.textContent).toEqual('two - two');
+      });
+
+      // TODO(kara): add test for dynamic views once bug fix is in
+    });
+
+    describe('checkNoChanges', () => {
+      let comp: NoChangesComp;
+
+      @Component({selector: 'no-changes-comp', template: '{{ value }}'})
+      class NoChangesComp {
+        value = 1;
+        doCheckCount = 0;
+        contentCheckCount = 0;
+        viewCheckCount = 0;
+
+        ngDoCheck() { this.doCheckCount++; }
+
+        ngAfterContentChecked() { this.contentCheckCount++; }
+
+        ngAfterViewChecked() { this.viewCheckCount++; }
+
+        constructor(public cdr: ChangeDetectorRef) { comp = this; }
+      }
+
+      @Component({template: '{{ value }} - <no-changes-comp></no-changes-comp>'})
+      class AppComp {
+        value = 1;
+
+        constructor(public cdr: ChangeDetectorRef) {}
+      }
+
+      // Custom error handler that just rethrows all the errors from the
+      // view, rather than logging them out. Used to keep our logs clean.
+      class RethrowErrorHandler extends ErrorHandler {
+        handleError(error: any) { throw error; }
+      }
+
+      it('should throw if bindings in current view have changed', () => {
+        TestBed.configureTestingModule({
+          declarations: [NoChangesComp],
+          providers: [{provide: ErrorHandler, useClass: RethrowErrorHandler}]
+        });
+        const fixture = TestBed.createComponent(NoChangesComp);
+
+        expect(() => { fixture.componentInstance.cdr.checkNoChanges(); })
+            .toThrowError(
+                /ExpressionChangedAfterItHasBeenCheckedError: .+ Previous value: '.*undefined'. Current value: '.*1'/gi);
+      });
+
+      it('should throw if interpolations in current view have changed', () => {
+        TestBed.configureTestingModule({
+          declarations: [AppComp, NoChangesComp],
+          providers: [{provide: ErrorHandler, useClass: RethrowErrorHandler}]
+        });
+        const fixture = TestBed.createComponent(AppComp);
+
+        expect(() => fixture.componentInstance.cdr.checkNoChanges())
+            .toThrowError(
+                /ExpressionChangedAfterItHasBeenCheckedError: .+ Previous value: '.*undefined'. Current value: '.*1'/gi);
+      });
+
+      it('should throw if bindings in embedded view have changed', () => {
+        @Component({template: '<span *ngIf="showing">{{ showing }}</span>'})
+        class EmbeddedViewApp {
+          showing = true;
+          constructor(public cdr: ChangeDetectorRef) {}
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [EmbeddedViewApp],
+          imports: [CommonModule],
+          providers: [{provide: ErrorHandler, useClass: RethrowErrorHandler}]
+        });
+        const fixture = TestBed.createComponent(EmbeddedViewApp);
+
+        expect(() => fixture.componentInstance.cdr.checkNoChanges())
+            .toThrowError(
+                /ExpressionChangedAfterItHasBeenCheckedError: .+ Previous value: '.*undefined'. Current value: '.*true'/gi);
+      });
+
+      it('should NOT call lifecycle hooks', () => {
+        TestBed.configureTestingModule({
+          declarations: [AppComp, NoChangesComp],
+          providers: [{provide: ErrorHandler, useClass: RethrowErrorHandler}]
+        });
+
+        const fixture = TestBed.createComponent(AppComp);
+        fixture.detectChanges();
+
+        expect(comp.doCheckCount).toEqual(1);
+        expect(comp.contentCheckCount).toEqual(1);
+        expect(comp.viewCheckCount).toEqual(1);
+
+        comp.value = 2;
+        expect(() => fixture.componentInstance.cdr.checkNoChanges()).toThrow();
+        expect(comp.doCheckCount).toEqual(1);
+        expect(comp.contentCheckCount).toEqual(1);
+        expect(comp.viewCheckCount).toEqual(1);
+      });
+
+    });
+
+  });
+
+});
diff --git a/packages/core/test/render3/change_detection_spec.ts b/packages/core/test/render3/change_detection_spec.ts
index c5e38d76d5..52629da45b 100644
--- a/packages/core/test/render3/change_detection_spec.ts
+++ b/packages/core/test/render3/change_detection_spec.ts
@@ -6,18 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {EmbeddedViewRef, TemplateRef, ViewContainerRef} from '@angular/core';
 import {withBody} from '@angular/private/testing';
 
-import {ChangeDetectionStrategy, ChangeDetectorRef, DoCheck, RendererType2} from '../../src/core';
+import {ChangeDetectionStrategy, DoCheck} from '../../src/core';
 import {whenRendered} from '../../src/render3/component';
-import {LifecycleHooksFeature, getRenderedText, ɵɵNgOnChangesFeature, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵgetCurrentView, ɵɵtemplateRefExtractor} from '../../src/render3/index';
-import {detectChanges, markDirty, tick, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵinterpolation2, ɵɵlistener, ɵɵreference, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {LifecycleHooksFeature, getRenderedText, ɵɵdefineComponent, ɵɵgetCurrentView} from '../../src/render3/index';
+import {detectChanges, markDirty, tick, ɵɵbind, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵinterpolation1, ɵɵinterpolation2, ɵɵlistener, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {RElement, Renderer3, RendererFactory3} from '../../src/render3/interfaces/renderer';
+import {Renderer3, RendererFactory3} from '../../src/render3/interfaces/renderer';
 import {FLAGS, LViewFlags} from '../../src/render3/interfaces/view';
 
-import {ComponentFixture, containerEl, createComponent, renderComponent, requestAnimationFrame} from './render_util';
+import {containerEl, createComponent, renderComponent, requestAnimationFrame} from './render_util';
 
 describe('change detection', () => {
   describe('markDirty, detectChanges, whenRendered, getRenderedText', () => {
@@ -129,175 +128,6 @@ describe('change detection', () => {
       });
     }
 
-    class MyApp {
-      name: string = 'Nancy';
-
-      static ngComponentDef = ɵɵdefineComponent({
-        type: MyApp,
-        selectors: [['my-app']],
-        factory: () => new MyApp(),
-        consts: 1,
-        vars: 1,
-        /** <my-comp [name]="name"></my-comp> */
-        template: (rf: RenderFlags, ctx: MyApp) => {
-          if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'my-comp');
-          }
-          if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(0, 'name', ɵɵbind(ctx.name));
-          }
-        },
-        directives: () => [MyComponent]
-      });
-    }
-
-    it('should check OnPush components on initialization', () => {
-      const myApp = renderComponent(MyApp);
-      expect(getRenderedText(myApp)).toEqual('1 - Nancy');
-    });
-
-    it('should call doCheck even when OnPush components are not dirty', () => {
-      const myApp = renderComponent(MyApp);
-
-      tick(myApp);
-      expect(comp.doCheckCount).toEqual(2);
-
-      tick(myApp);
-      expect(comp.doCheckCount).toEqual(3);
-    });
-
-    it('should skip OnPush components in update mode when they are not dirty', () => {
-      const myApp = renderComponent(MyApp);
-
-      tick(myApp);
-      // doCheckCount is 2, but 1 should be rendered since it has not been marked dirty.
-      expect(getRenderedText(myApp)).toEqual('1 - Nancy');
-
-      tick(myApp);
-      // doCheckCount is 3, but 1 should be rendered since it has not been marked dirty.
-      expect(getRenderedText(myApp)).toEqual('1 - Nancy');
-    });
-
-    it('should check OnPush components in update mode when inputs change', () => {
-      const myApp = renderComponent(MyApp);
-
-      myApp.name = 'Bess';
-      tick(myApp);
-      expect(comp.doCheckCount).toEqual(2);
-      // View should update, as changed input marks view dirty
-      expect(getRenderedText(myApp)).toEqual('2 - Bess');
-
-      myApp.name = 'George';
-      tick(myApp);
-      // View should update, as changed input marks view dirty
-      expect(comp.doCheckCount).toEqual(3);
-      expect(getRenderedText(myApp)).toEqual('3 - George');
-
-      tick(myApp);
-      expect(comp.doCheckCount).toEqual(4);
-      // View should not be updated to "4", as inputs have not changed.
-      expect(getRenderedText(myApp)).toEqual('3 - George');
-    });
-
-    it('should check OnPush components in update mode when component events occur', () => {
-      const myApp = renderComponent(MyApp);
-      expect(comp.doCheckCount).toEqual(1);
-      expect(getRenderedText(myApp)).toEqual('1 - Nancy');
-
-      const button = containerEl.querySelector('button') !;
-      button.click();
-      requestAnimationFrame.flush();
-      // No ticks should have been scheduled.
-      expect(comp.doCheckCount).toEqual(1);
-      expect(getRenderedText(myApp)).toEqual('1 - Nancy');
-
-      tick(myApp);
-      // Because the onPush comp should be dirty, it should update once CD runs
-      expect(comp.doCheckCount).toEqual(2);
-      expect(getRenderedText(myApp)).toEqual('2 - Nancy');
-    });
-
-    it('should not check OnPush components in update mode when parent events occur', () => {
-      function noop() {}
-
-      const ButtonParent = createComponent('button-parent', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'my-comp');
-          ɵɵelementStart(1, 'button', ['id', 'parent']);
-          { ɵɵlistener('click', () => noop()); }
-          ɵɵelementEnd();
-        }
-      }, 2, 0, [MyComponent]);
-
-      const buttonParent = renderComponent(ButtonParent);
-      expect(getRenderedText(buttonParent)).toEqual('1 - Nancy');
-
-      const button = containerEl.querySelector('button#parent') !;
-      (button as HTMLButtonElement).click();
-      tick(buttonParent);
-      // The comp should still be clean. So doCheck will run, but the view should display 1.
-      expect(comp.doCheckCount).toEqual(2);
-      expect(getRenderedText(buttonParent)).toEqual('1 - Nancy');
-    });
-
-    it('should check parent OnPush components in update mode when child events occur', () => {
-      let parent: ButtonParent;
-
-      class ButtonParent implements DoCheck {
-        doCheckCount = 0;
-        ngDoCheck(): void { this.doCheckCount++; }
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: ButtonParent,
-          selectors: [['button-parent']],
-          factory: () => parent = new ButtonParent(),
-          consts: 2,
-          vars: 1,
-          /** {{ doCheckCount }} - <my-comp></my-comp> */
-          template: (rf: RenderFlags, ctx: ButtonParent) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-              ɵɵelement(1, 'my-comp');
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵinterpolation1('', ctx.doCheckCount, ' - '));
-            }
-          },
-          directives: () => [MyComponent],
-          changeDetection: ChangeDetectionStrategy.OnPush
-        });
-      }
-
-      const MyButtonApp = createComponent('my-button-app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'button-parent');
-        }
-      }, 1, 0, [ButtonParent]);
-
-      const myButtonApp = renderComponent(MyButtonApp);
-      expect(parent !.doCheckCount).toEqual(1);
-      expect(comp !.doCheckCount).toEqual(1);
-      expect(getRenderedText(myButtonApp)).toEqual('1 - 1 - Nancy');
-
-      tick(myButtonApp);
-      expect(parent !.doCheckCount).toEqual(2);
-      // parent isn't checked, so child doCheck won't run
-      expect(comp !.doCheckCount).toEqual(1);
-      expect(getRenderedText(myButtonApp)).toEqual('1 - 1 - Nancy');
-
-      const button = containerEl.querySelector('button');
-      button !.click();
-      requestAnimationFrame.flush();
-      // No ticks should have been scheduled.
-      expect(parent !.doCheckCount).toEqual(2);
-      expect(comp !.doCheckCount).toEqual(1);
-
-      tick(myButtonApp);
-      expect(parent !.doCheckCount).toEqual(3);
-      expect(comp !.doCheckCount).toEqual(2);
-      expect(getRenderedText(myButtonApp)).toEqual('3 - 2 - Nancy');
-    });
-
     describe('Manual mode', () => {
       class ManualComponent implements DoCheck {
         /* @Input() */
@@ -420,12 +250,11 @@ describe('change detection', () => {
              });
            }
 
-           const MyButtonApp =
-               createComponent('my-button-app', function(rf: RenderFlags, ctx: any) {
-                 if (rf & RenderFlags.Create) {
-                   ɵɵelement(0, 'button-parent');
-                 }
-               }, 1, 0, [ButtonParent]);
+           const MyButtonApp = createComponent('my-button-app', function(rf: RenderFlags) {
+             if (rf & RenderFlags.Create) {
+               ɵɵelement(0, 'button-parent');
+             }
+           }, 1, 0, [ButtonParent]);
 
            const myButtonApp = renderComponent(MyButtonApp);
            expect(parent !.doCheckCount).toEqual(1);
@@ -462,997 +291,11 @@ describe('change detection', () => {
     });
   });
 
-  describe('ChangeDetectorRef', () => {
-
-    describe('detectChanges()', () => {
-      let myComp: MyComp;
-      let dir: Dir;
-
-      class MyComp {
-        doCheckCount = 0;
-        name = 'Nancy';
-
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        ngDoCheck() { this.doCheckCount++; }
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyComp,
-          selectors: [['my-comp']],
-          factory: () => myComp = new MyComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-          consts: 1,
-          vars: 1,
-          /** {{ name }} */
-          template: (rf: RenderFlags, ctx: MyComp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.name));
-            }
-          },
-          changeDetection: ChangeDetectionStrategy.OnPush
-        });
-      }
-
-      class ParentComp {
-        doCheckCount = 0;
-
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        ngDoCheck() { this.doCheckCount++; }
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: ParentComp,
-          selectors: [['parent-comp']],
-          factory: () => new ParentComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-          consts: 2,
-          vars: 1,
-          /**
-           * {{ doCheckCount}} -
-           * <my-comp></my-comp>
-           */
-          template: (rf: RenderFlags, ctx: ParentComp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-              ɵɵelement(1, 'my-comp');
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵinterpolation1('', ctx.doCheckCount, ' - '));
-            }
-          },
-          directives: () => [MyComp]
-        });
-      }
-
-      class Dir {
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: Dir,
-          selectors: [['', 'dir', '']],
-          factory: () => dir = new Dir(ɵɵdirectiveInject(ChangeDetectorRef as any))
-        });
-      }
-
-
-      it('should check the component view when called by component (even when OnPush && clean)',
-         () => {
-           const comp = renderComponent(MyComp, {hostFeatures: [LifecycleHooksFeature]});
-           expect(getRenderedText(comp)).toEqual('Nancy');
-
-           comp.name = 'Bess';  // as this is not an Input, the component stays clean
-           comp.cdr.detectChanges();
-           expect(getRenderedText(comp)).toEqual('Bess');
-         });
-
-      it('should NOT call component doCheck when called by a component', () => {
-        const comp = renderComponent(MyComp, {hostFeatures: [LifecycleHooksFeature]});
-        expect(comp.doCheckCount).toEqual(1);
-
-        // NOTE: in current Angular, detectChanges does not itself trigger doCheck, but you
-        // may see doCheck called in some cases bc of the extra CD run triggered by zone.js.
-        // It's important not to call doCheck to allow calls to detectChanges in that hook.
-        comp.cdr.detectChanges();
-        expect(comp.doCheckCount).toEqual(1);
-      });
-
-      it('should NOT check the component parent when called by a child component', () => {
-        const parentComp = renderComponent(ParentComp, {hostFeatures: [LifecycleHooksFeature]});
-        expect(getRenderedText(parentComp)).toEqual('1 - Nancy');
-
-        parentComp.doCheckCount = 100;
-        myComp.cdr.detectChanges();
-        expect(parentComp.doCheckCount).toEqual(100);
-        expect(getRenderedText(parentComp)).toEqual('1 - Nancy');
-      });
-
-      it('should check component children when called by component if dirty or check-always',
-         () => {
-           const parentComp = renderComponent(ParentComp, {hostFeatures: [LifecycleHooksFeature]});
-           expect(parentComp.doCheckCount).toEqual(1);
-
-           myComp.name = 'Bess';
-           parentComp.cdr.detectChanges();
-           expect(parentComp.doCheckCount).toEqual(1);
-           expect(myComp.doCheckCount).toEqual(2);
-           // OnPush child is not dirty, so its change isn't rendered.
-           expect(getRenderedText(parentComp)).toEqual('1 - Nancy');
-         });
-
-      it('should not group detectChanges calls (call every time)', () => {
-        const parentComp = renderComponent(ParentComp, {hostFeatures: [LifecycleHooksFeature]});
-        expect(myComp.doCheckCount).toEqual(1);
-
-        parentComp.cdr.detectChanges();
-        parentComp.cdr.detectChanges();
-        expect(myComp.doCheckCount).toEqual(3);
-      });
-
-      it('should check component view when called by directive on component node', () => {
-        /** <my-comp dir></my-comp> */
-        const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'my-comp', ['dir', '']);
-          }
-        }, 1, 0, [MyComp, Dir]);
-
-        const app = renderComponent(MyApp);
-        expect(getRenderedText(app)).toEqual('Nancy');
-
-        myComp.name = 'George';
-        dir !.cdr.detectChanges();
-        expect(getRenderedText(app)).toEqual('George');
-      });
-
-      it('should check host component when called by directive on element node', () => {
-        /**
-         * {{ name }}
-         * <div dir></div>
-         */
-        const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ɵɵtext(0);
-            ɵɵelement(1, 'div', ['dir', '']);
-          }
-          if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(1, ɵɵbind(ctx.value));
-          }
-        }, 2, 1, [Dir]);
-
-        const app = renderComponent(MyApp);
-        app.value = 'Frank';
-        tick(app);
-        expect(getRenderedText(app)).toEqual('Frank');
-
-        app.value = 'Joe';
-        dir !.cdr.detectChanges();
-        expect(getRenderedText(app)).toEqual('Joe');
-      });
-
-      it('should check the host component when called from EmbeddedViewRef', () => {
-        class MyApp {
-          showing = true;
-          name = 'Amelia';
-
-          constructor(public cdr: ChangeDetectorRef) {}
-
-          static ngComponentDef = ɵɵdefineComponent({
-            type: MyApp,
-            selectors: [['my-app']],
-            factory: () => new MyApp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-            consts: 2,
-            vars: 1,
-            /**
-             * {{ name}}
-             * % if (showing) {
-           *   <div dir></div>
-           * % }
-             */
-            template: function(rf: RenderFlags, ctx: MyApp) {
-              if (rf & RenderFlags.Create) {
-                ɵɵtext(0);
-                ɵɵcontainer(1);
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵtextBinding(0, ɵɵbind(ctx.name));
-                ɵɵcontainerRefreshStart(1);
-                {
-                  if (ctx.showing) {
-                    let rf0 = ɵɵembeddedViewStart(0, 1, 0);
-                    if (rf0 & RenderFlags.Create) {
-                      ɵɵelement(0, 'div', ['dir', '']);
-                    }
-                  }
-                  ɵɵembeddedViewEnd();
-                }
-                ɵɵcontainerRefreshEnd();
-              }
-            },
-            directives: [Dir]
-          });
-        }
-
-        const app = renderComponent(MyApp);
-        expect(getRenderedText(app)).toEqual('Amelia');
-
-        app.name = 'Emerson';
-        dir !.cdr.detectChanges();
-        expect(getRenderedText(app)).toEqual('Emerson');
-      });
-
-      it('should support call in ngOnInit', () => {
-        class DetectChangesComp {
-          value = 0;
-
-          constructor(public cdr: ChangeDetectorRef) {}
-
-          ngOnInit() {
-            this.value++;
-            this.cdr.detectChanges();
-          }
-
-          static ngComponentDef = ɵɵdefineComponent({
-            type: DetectChangesComp,
-            selectors: [['detect-changes-comp']],
-            factory: () => new DetectChangesComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-            consts: 1,
-            vars: 1,
-            /** {{ value }} */
-            template: (rf: RenderFlags, ctx: DetectChangesComp) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵtext(0);
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵtextBinding(0, ɵɵbind(ctx.value));
-              }
-            }
-          });
-        }
-
-        const comp = renderComponent(DetectChangesComp, {hostFeatures: [LifecycleHooksFeature]});
-        expect(getRenderedText(comp)).toEqual('1');
-      });
-
-
-      ['OnInit', 'AfterContentInit', 'AfterViewInit', 'OnChanges'].forEach(hook => {
-        it(`should not go infinite loop when recursively called from children's ng${hook}`, () => {
-          class ChildComp {
-            // @Input
-            inp = '';
-
-            count = 0;
-            constructor(public parentComp: ParentComp) {}
-
-            ngOnInit() { this.check('OnInit'); }
-            ngAfterContentInit() { this.check('AfterContentInit'); }
-            ngAfterViewInit() { this.check('AfterViewInit'); }
-            ngOnChanges() { this.check('OnChanges'); }
-
-            check(h: string) {
-              if (h === hook) {
-                this.count++;
-                if (this.count > 1) throw new Error(`ng${hook} should be called only once!`);
-                this.parentComp.triggerChangeDetection();
-              }
-            }
-
-            static ngComponentDef = ɵɵdefineComponent({
-              type: ChildComp,
-              selectors: [['child-comp']],
-              factory: () => new ChildComp(ɵɵdirectiveInject(ParentComp as any)),
-              consts: 1,
-              vars: 0,
-              template: (rf: RenderFlags, ctx: ChildComp) => {
-                if (rf & RenderFlags.Create) {
-                  ɵɵtext(0, 'foo');
-                }
-              },
-              inputs: {inp: 'inp'},
-              features: [ɵɵNgOnChangesFeature]
-            });
-          }
-
-          class ParentComp {
-            constructor(public cdr: ChangeDetectorRef) {}
-
-            triggerChangeDetection() { this.cdr.detectChanges(); }
-
-            static ngComponentDef = ɵɵdefineComponent({
-              type: ParentComp,
-              selectors: [['parent-comp']],
-              factory: () => new ParentComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-              consts: 1,
-              vars: 1,
-              /** {{ value }} */
-              template: (rf: RenderFlags, ctx: ParentComp) => {
-                if (rf & RenderFlags.Create) {
-                  ɵɵelement(0, 'child-comp');
-                }
-                if (rf & RenderFlags.Update) {
-                  ɵɵelementProperty(0, 'inp', ɵɵbind(true));
-                }
-              },
-              directives: [ChildComp]
-            });
-          }
-
-          expect(() => renderComponent(ParentComp)).not.toThrow();
-        });
-      });
-
-      it('should support call in ngDoCheck', () => {
-        class DetectChangesComp {
-          doCheckCount = 0;
-
-          constructor(public cdr: ChangeDetectorRef) {}
-
-          ngDoCheck() {
-            this.doCheckCount++;
-            this.cdr.detectChanges();
-          }
-
-          static ngComponentDef = ɵɵdefineComponent({
-            type: DetectChangesComp,
-            selectors: [['detect-changes-comp']],
-            factory: () => new DetectChangesComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-            consts: 1,
-            vars: 1,
-            /** {{ doCheckCount }} */
-            template: (rf: RenderFlags, ctx: DetectChangesComp) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵtext(0);
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵtextBinding(0, ɵɵbind(ctx.doCheckCount));
-              }
-            }
-          });
-        }
-
-        const comp = renderComponent(DetectChangesComp, {hostFeatures: [LifecycleHooksFeature]});
-        expect(getRenderedText(comp)).toEqual('1');
-      });
-
-      describe('dynamic views', () => {
-        let structuralComp: StructuralComp|null = null;
-
-        beforeEach(() => structuralComp = null);
-
-        class StructuralComp {
-          tmp !: TemplateRef<any>;
-          value = 'one';
-
-          constructor(public vcr: ViewContainerRef) {}
-
-          create() { return this.vcr.createEmbeddedView(this.tmp, this); }
-
-          static ngComponentDef = ɵɵdefineComponent({
-            type: StructuralComp,
-            selectors: [['structural-comp']],
-            factory: () => structuralComp =
-                         new StructuralComp(ɵɵdirectiveInject(ViewContainerRef as any)),
-            inputs: {tmp: 'tmp'},
-            consts: 1,
-            vars: 1,
-            template: function(rf: RenderFlags, ctx: any) {
-              if (rf & RenderFlags.Create) {
-                ɵɵtext(0);
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵtextBinding(0, ɵɵbind(ctx.value));
-              }
-            }
-          });
-        }
-
-        it('should support ViewRef.detectChanges()', () => {
-          function FooTemplate(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.value));
-            }
-          }
-
-          /**
-           * <ng-template #foo>{{ value }}</ng-template>
-           * <structural-comp [tmp]="foo"></structural-comp>
-           */
-          const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, FooTemplate, 1, 1, 'ng-template', null, ['foo', ''], ɵɵtemplateRefExtractor);
-              ɵɵelement(2, 'structural-comp');
-            }
-            if (rf & RenderFlags.Update) {
-              const foo = ɵɵreference(1) as any;
-              ɵɵelementProperty(2, 'tmp', ɵɵbind(foo));
-            }
-          }, 3, 1, [StructuralComp]);
-
-          const fixture = new ComponentFixture(App);
-          fixture.update();
-          expect(fixture.html).toEqual('<structural-comp>one</structural-comp>');
-
-          const viewRef: EmbeddedViewRef<any> = structuralComp !.create();
-          fixture.update();
-          expect(fixture.html).toEqual('<structural-comp>one</structural-comp>one');
-
-          // check embedded view update
-          structuralComp !.value = 'two';
-          viewRef.detectChanges();
-          expect(fixture.html).toEqual('<structural-comp>one</structural-comp>two');
-
-          // check root view update
-          structuralComp !.value = 'three';
-          fixture.update();
-          expect(fixture.html).toEqual('<structural-comp>three</structural-comp>three');
-        });
-
-        it('should support ViewRef.detectChanges() directly after creation', () => {
-          function FooTemplate(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0, 'Template text');
-            }
-          }
-
-          /**
-           * <ng-template #foo>Template text</ng-template>
-           * <structural-comp [tmp]="foo"></structural-comp>
-           */
-          const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, FooTemplate, 1, 0, 'ng-template', null, ['foo', ''], ɵɵtemplateRefExtractor);
-              ɵɵelement(2, 'structural-comp');
-            }
-            if (rf & RenderFlags.Update) {
-              const foo = ɵɵreference(1) as any;
-              ɵɵelementProperty(2, 'tmp', ɵɵbind(foo));
-            }
-          }, 3, 1, [StructuralComp]);
-
-          const fixture = new ComponentFixture(App);
-          fixture.update();
-          expect(fixture.html).toEqual('<structural-comp>one</structural-comp>');
-
-          const viewRef: EmbeddedViewRef<any> = structuralComp !.create();
-          viewRef.detectChanges();
-          expect(fixture.html).toEqual('<structural-comp>one</structural-comp>Template text');
-        });
-
-      });
-
-    });
-
-    describe('attach/detach', () => {
-      let comp: DetachedComp;
-
-      class MyApp {
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          selectors: [['my-app']],
-          factory: () => new MyApp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-          consts: 1,
-          vars: 0,
-          /** <detached-comp></detached-comp> */
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'detached-comp');
-            }
-          },
-          directives: () => [DetachedComp]
-        });
-      }
-
-      class DetachedComp {
-        value = 'one';
-        doCheckCount = 0;
-
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        ngDoCheck() { this.doCheckCount++; }
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: DetachedComp,
-          selectors: [['detached-comp']],
-          factory: () => comp = new DetachedComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-          consts: 1,
-          vars: 1,
-          /** {{ value }} */
-          template: (rf: RenderFlags, ctx: DetachedComp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.value));
-            }
-          }
-        });
-      }
-
-      it('should not check detached components', () => {
-        const app = renderComponent(MyApp);
-        expect(getRenderedText(app)).toEqual('one');
-
-        comp.cdr.detach();
-
-        comp.value = 'two';
-        tick(app);
-        expect(getRenderedText(app)).toEqual('one');
-      });
-
-      it('should check re-attached components', () => {
-        const app = renderComponent(MyApp);
-        expect(getRenderedText(app)).toEqual('one');
-
-        comp.cdr.detach();
-        comp.value = 'two';
-
-        comp.cdr.reattach();
-        tick(app);
-        expect(getRenderedText(app)).toEqual('two');
-      });
-
-      it('should call lifecycle hooks on detached components', () => {
-        const app = renderComponent(MyApp);
-        expect(comp.doCheckCount).toEqual(1);
-
-        comp.cdr.detach();
-
-        tick(app);
-        expect(comp.doCheckCount).toEqual(2);
-      });
-
-      it('should check detached component when detectChanges is called', () => {
-        const app = renderComponent(MyApp);
-        expect(getRenderedText(app)).toEqual('one');
-
-        comp.cdr.detach();
-
-        comp.value = 'two';
-        detectChanges(comp);
-        expect(getRenderedText(app)).toEqual('two');
-      });
-
-      it('should not check detached component when markDirty is called', () => {
-        const app = renderComponent(MyApp);
-        expect(getRenderedText(app)).toEqual('one');
-
-        comp.cdr.detach();
-
-        comp.value = 'two';
-        markDirty(comp);
-        requestAnimationFrame.flush();
-
-        expect(getRenderedText(app)).toEqual('one');
-      });
-
-      it('should detach any child components when parent is detached', () => {
-        const app = renderComponent(MyApp);
-        expect(getRenderedText(app)).toEqual('one');
-
-        app.cdr.detach();
-
-        comp.value = 'two';
-        tick(app);
-        expect(getRenderedText(app)).toEqual('one');
-
-        app.cdr.reattach();
-
-        tick(app);
-        expect(getRenderedText(app)).toEqual('two');
-      });
-
-      it('should detach OnPush components properly', () => {
-        let onPushComp: OnPushComp;
-
-        class OnPushComp {
-          /** @Input() */
-          // TODO(issue/24571): remove '!'.
-          value !: string;
-
-          constructor(public cdr: ChangeDetectorRef) {}
-
-          static ngComponentDef = ɵɵdefineComponent({
-            type: OnPushComp,
-            selectors: [['on-push-comp']],
-            factory: () => onPushComp = new OnPushComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-            consts: 1,
-            vars: 1,
-            /** {{ value }} */
-            template: (rf: RenderFlags, ctx: any) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵtext(0);
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵtextBinding(0, ɵɵbind(ctx.value));
-              }
-            },
-            changeDetection: ChangeDetectionStrategy.OnPush,
-            inputs: {value: 'value'}
-          });
-        }
-
-        /** <on-push-comp [value]="value"></on-push-comp> */
-        const OnPushApp = createComponent('on-push-app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'on-push-comp');
-          }
-          if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(0, 'value', ɵɵbind(ctx.value));
-          }
-        }, 1, 1, [OnPushComp]);
-
-        const app = renderComponent(OnPushApp);
-        app.value = 'one';
-        tick(app);
-        expect(getRenderedText(app)).toEqual('one');
-
-        onPushComp !.cdr.detach();
-
-        app.value = 'two';
-        tick(app);
-        expect(getRenderedText(app)).toEqual('one');
-
-        onPushComp !.cdr.reattach();
-
-        tick(app);
-        expect(getRenderedText(app)).toEqual('two');
-      });
-
-    });
-
-    describe('markForCheck()', () => {
-      let comp: OnPushComp;
-
-      class OnPushComp {
-        value = 'one';
-
-        doCheckCount = 0;
-
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        ngDoCheck() { this.doCheckCount++; }
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: OnPushComp,
-          selectors: [['on-push-comp']],
-          factory: () => comp = new OnPushComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-          consts: 1,
-          vars: 1,
-          /** {{ value }} */
-          template: (rf: RenderFlags, ctx: OnPushComp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.value));
-            }
-          },
-          changeDetection: ChangeDetectionStrategy.OnPush
-        });
-      }
-
-      class OnPushParent {
-        value = 'one';
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: OnPushParent,
-          selectors: [['on-push-parent']],
-          factory: () => new OnPushParent(),
-          consts: 2,
-          vars: 1,
-          /**
-           * {{ value }} -
-           * <on-push-comp></on-push-comp>
-           */
-          template: (rf: RenderFlags, ctx: OnPushParent) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-              ɵɵelement(1, 'on-push-comp');
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵinterpolation1('', ctx.value, ' - '));
-            }
-          },
-          directives: () => [OnPushComp],
-          changeDetection: ChangeDetectionStrategy.OnPush
-        });
-      }
-
-      it('should ensure OnPush components are checked', () => {
-        const fixture = new ComponentFixture(OnPushParent);
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        comp.value = 'two';
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        comp.cdr.markForCheck();
-
-        // Change detection should not have run yet, since markForCheck
-        // does not itself schedule change detection.
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('one - two');
-      });
-
-      it('should never schedule change detection on its own', () => {
-        const fixture = new ComponentFixture(OnPushParent);
-        expect(comp.doCheckCount).toEqual(1);
-
-        comp.cdr.markForCheck();
-        comp.cdr.markForCheck();
-        requestAnimationFrame.flush();
-
-        expect(comp.doCheckCount).toEqual(1);
-      });
-
-      it('should ensure ancestor OnPush components are checked', () => {
-        const fixture = new ComponentFixture(OnPushParent);
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        fixture.component.value = 'two';
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        comp.cdr.markForCheck();
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('two - one');
-
-      });
-
-      it('should ensure OnPush components in embedded views are checked', () => {
-        class EmbeddedViewParent {
-          value = 'one';
-          showing = true;
-
-          static ngComponentDef = ɵɵdefineComponent({
-            type: EmbeddedViewParent,
-            selectors: [['embedded-view-parent']],
-            factory: () => new EmbeddedViewParent(),
-            consts: 2,
-            vars: 1,
-            /**
-             * {{ value }} -
-             * % if (ctx.showing) {
-             *   <on-push-comp></on-push-comp>
-             * % }
-             */
-            template: (rf: RenderFlags, ctx: any) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵtext(0);
-                ɵɵcontainer(1);
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵtextBinding(0, ɵɵinterpolation1('', ctx.value, ' - '));
-                ɵɵcontainerRefreshStart(1);
-                {
-                  if (ctx.showing) {
-                    let rf0 = ɵɵembeddedViewStart(0, 1, 0);
-                    if (rf0 & RenderFlags.Create) {
-                      ɵɵelement(0, 'on-push-comp');
-                    }
-                    ɵɵembeddedViewEnd();
-                  }
-                }
-                ɵɵcontainerRefreshEnd();
-              }
-            },
-            directives: () => [OnPushComp],
-            changeDetection: ChangeDetectionStrategy.OnPush
-          });
-        }
-
-        const fixture = new ComponentFixture(EmbeddedViewParent);
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        comp.value = 'two';
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        comp.cdr.markForCheck();
-        // markForCheck should not trigger change detection on its own.
-        expect(fixture.hostElement.textContent).toEqual('one - one');
-
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('one - two');
-
-        fixture.component.value = 'two';
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('one - two');
-
-        comp.cdr.markForCheck();
-        tick(fixture.component);
-        expect(fixture.hostElement.textContent).toEqual('two - two');
-      });
-
-      // TODO(kara): add test for dynamic views once bug fix is in
-    });
-
-    describe('checkNoChanges', () => {
-      let comp: NoChangesComp;
-
-      class NoChangesComp {
-        value = 1;
-        doCheckCount = 0;
-        contentCheckCount = 0;
-        viewCheckCount = 0;
-
-        ngDoCheck() { this.doCheckCount++; }
-
-        ngAfterContentChecked() { this.contentCheckCount++; }
-
-        ngAfterViewChecked() { this.viewCheckCount++; }
-
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: NoChangesComp,
-          selectors: [['no-changes-comp']],
-          factory: () => comp = new NoChangesComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-          consts: 1,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: NoChangesComp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.value));
-            }
-          }
-        });
-      }
-
-      class AppComp {
-        value = 1;
-
-        constructor(public cdr: ChangeDetectorRef) {}
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: AppComp,
-          selectors: [['app-comp']],
-          factory: () => new AppComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-          consts: 2,
-          vars: 1,
-          /**
-           * {{ value }} -
-           * <no-changes-comp></no-changes-comp>
-           */
-          template: (rf: RenderFlags, ctx: AppComp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
-              ɵɵelement(1, 'no-changes-comp');
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵinterpolation1('', ctx.value, ' - '));
-            }
-          },
-          directives: () => [NoChangesComp]
-        });
-      }
-
-      it('should throw if bindings in current view have changed', () => {
-        const comp = renderComponent(NoChangesComp, {hostFeatures: [LifecycleHooksFeature]});
-
-        expect(() => comp.cdr.checkNoChanges()).not.toThrow();
-
-        comp.value = 2;
-        expect(() => comp.cdr.checkNoChanges())
-            .toThrowError(
-                /ExpressionChangedAfterItHasBeenCheckedError: .+ Previous value: '1'. Current value: '2'/gi);
-      });
-
-      it('should throw if interpolations in current view have changed', () => {
-        const app = renderComponent(AppComp);
-
-        expect(() => app.cdr.checkNoChanges()).not.toThrow();
-
-        app.value = 2;
-        expect(() => app.cdr.checkNoChanges())
-            .toThrowError(
-                /ExpressionChangedAfterItHasBeenCheckedError: .+ Previous value: '1'. Current value: '2'/gi);
-      });
-
-      it('should throw if bindings in children of current view have changed', () => {
-        const app = renderComponent(AppComp);
-
-        expect(() => app.cdr.checkNoChanges()).not.toThrow();
-
-        comp.value = 2;
-        expect(() => app.cdr.checkNoChanges())
-            .toThrowError(
-                /ExpressionChangedAfterItHasBeenCheckedError: .+ Previous value: '1'. Current value: '2'/gi);
-      });
-
-      it('should throw if bindings in embedded view have changed', () => {
-        class EmbeddedViewApp {
-          value = 1;
-          showing = true;
-
-          constructor(public cdr: ChangeDetectorRef) {}
-
-          static ngComponentDef = ɵɵdefineComponent({
-            type: EmbeddedViewApp,
-            selectors: [['embedded-view-app']],
-            factory: () => new EmbeddedViewApp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
-            consts: 1,
-            vars: 0,
-            /**
-             * % if (showing) {
-             *  {{ value }}
-             * %}
-             */
-            template: (rf: RenderFlags, ctx: EmbeddedViewApp) => {
-              if (rf & RenderFlags.Create) {
-                ɵɵcontainer(0);
-              }
-              if (rf & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
-                {
-                  if (ctx.showing) {
-                    let rf0 = ɵɵembeddedViewStart(0, 1, 1);
-                    if (rf0 & RenderFlags.Create) {
-                      ɵɵtext(0);
-                    }
-                    if (rf0 & RenderFlags.Update) {
-                      ɵɵtextBinding(0, ɵɵbind(ctx.value));
-                    }
-                    ɵɵembeddedViewEnd();
-                  }
-                }
-                ɵɵcontainerRefreshEnd();
-              }
-            }
-          });
-        }
-
-        const app = renderComponent(EmbeddedViewApp);
-
-        expect(() => app.cdr.checkNoChanges()).not.toThrow();
-
-        app.value = 2;
-        expect(() => app.cdr.checkNoChanges())
-            .toThrowError(
-                /ExpressionChangedAfterItHasBeenCheckedError: .+ Previous value: '1'. Current value: '2'/gi);
-      });
-
-      it('should NOT call lifecycle hooks', () => {
-        const app = renderComponent(AppComp);
-        expect(comp.doCheckCount).toEqual(1);
-        expect(comp.contentCheckCount).toEqual(1);
-        expect(comp.viewCheckCount).toEqual(1);
-
-        comp.value = 2;
-        expect(() => app.cdr.checkNoChanges()).toThrow();
-        expect(comp.doCheckCount).toEqual(1);
-        expect(comp.contentCheckCount).toEqual(1);
-        expect(comp.viewCheckCount).toEqual(1);
-      });
-
-      it('should NOT throw if bindings in ancestors of current view have changed', () => {
-        const app = renderComponent(AppComp);
-
-        app.value = 2;
-        expect(() => comp.cdr.checkNoChanges()).not.toThrow();
-      });
-
-    });
-
-  });
-
   it('should call begin and end when the renderer factory implements them', () => {
     const log: string[] = [];
 
     const testRendererFactory: RendererFactory3 = {
-      createRenderer: (hostElement: RElement | null, rendererType: RendererType2 | null):
-                          Renderer3 => { return document; },
+      createRenderer: (): Renderer3 => { return document; },
       begin: () => log.push('begin'),
       end: () => log.push('end'),
     };

From cc2f175617dae7a7cb95a61ae00033ba67a2fbbd Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@abv.bg>
Date: Sat, 11 May 2019 08:50:12 -0400
Subject: [PATCH 018/275] test(ivy): move discovery_utils tests to acceptance
 (#30416)

Rewrites the discovery util tests to use `TestBed`.

PR Close #30416
---
 .../discover_utils_spec.ts}                   | 359 +++++-------------
 1 file changed, 95 insertions(+), 264 deletions(-)
 rename packages/core/test/{render3/discovery_utils_spec.ts => acceptance/discover_utils_spec.ts} (51%)

diff --git a/packages/core/test/render3/discovery_utils_spec.ts b/packages/core/test/acceptance/discover_utils_spec.ts
similarity index 51%
rename from packages/core/test/render3/discovery_utils_spec.ts
rename to packages/core/test/acceptance/discover_utils_spec.ts
index ac6acb306d..d55eb3d91d 100644
--- a/packages/core/test/render3/discovery_utils_spec.ts
+++ b/packages/core/test/acceptance/discover_utils_spec.ts
@@ -5,16 +5,15 @@
  * 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 {StaticInjector} from '../../src/di/injector';
-import {createInjector} from '../../src/di/r3_injector';
-import {AttributeMarker, RenderFlags, getHostElement, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵi18n, ɵɵi18nApply, ɵɵi18nExp, ɵɵselect} from '../../src/render3/index';
-import {markDirty, ɵɵbind, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵlistener, ɵɵstyling, ɵɵstylingApply, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {CommonModule} from '@angular/common';
+import {Component, Directive, InjectionToken, ViewChild} from '@angular/core';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {onlyInIvy} from '@angular/private/testing';
+
+import {getHostElement, markDirty} from '../../src/render3/index';
 import {getComponent, getContext, getDirectives, getInjectionTokens, getInjector, getListeners, getLocalRefs, getRootComponents, getViewComponent, loadLContext} from '../../src/render3/util/discovery_utils';
 
-import {NgIf} from './common_with_def';
-import {ComponentFixture} from './render_util';
-
-describe('discovery utils', () => {
+onlyInIvy('Ivy-specific utilities').describe('discovery utils', () => {
   let fixture: ComponentFixture<MyApp>;
   let myApp: MyApp;
   let dirA: DirectiveA[];
@@ -29,115 +28,46 @@ describe('discovery utils', () => {
     log = [];
     dirA = [];
     childComponent = [];
-    fixture = new ComponentFixture(
-        MyApp, {injector: createInjector(null, null, [{provide: String, useValue: 'Module'}])});
-    child = fixture.hostElement.querySelectorAll('child');
-    span = fixture.hostElement.querySelectorAll('span');
-    div = fixture.hostElement.querySelectorAll('div');
-    p = fixture.hostElement.querySelectorAll('p');
+    TestBed.configureTestingModule({
+      imports: [CommonModule],
+      declarations: [MyApp, DirectiveA, Child],
+      providers: [{provide: String, useValue: 'Module'}]
+    });
+    fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    child = fixture.nativeElement.querySelectorAll('child');
+    span = fixture.nativeElement.querySelectorAll('span');
+    div = fixture.nativeElement.querySelectorAll('div');
+    p = fixture.nativeElement.querySelectorAll('p');
   });
 
-  /**
-   * For all tests assume this set up
-   *
-   * ```
-   * <my-app>
-   *   <#VIEW>
-   *     <span (click)=" log.push($event) ">{{text}}</span>
-   *     <div dirA #div #foo="dirA"></div>
-   *     <child>
-   *       <#VIEW>
-   *         <p></p>
-   *       <VIEW>
-   *     </child>
-   *     <child dirA #child>
-   *       <#VIEW>
-   *         <p></p>
-   *       <VIEW>
-   *     </child>
-   *     <child dirA *ngIf="true">
-   *       <#VIEW>
-   *         <p></p>
-   *       <VIEW>
-   *     </child>
-   *     <i18n>ICU expression</i18n>
-   *   </#VIEW>
-   * </my-app>
-   * ```
-   */
+  @Component(
+      {selector: 'child', template: '<p></p>', providers: [{provide: String, useValue: 'Child'}]})
   class Child {
     constructor() { childComponent.push(this); }
-
-    static ngComponentDef = ɵɵdefineComponent({
-      type: Child,
-      selectors: [['child']],
-      factory: () => new Child(),
-      consts: 1,
-      vars: 0,
-      template: (rf: RenderFlags, ctx: Child) => {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'p');
-        }
-      },
-      features: [ɵɵProvidersFeature([{provide: String, useValue: 'Child'}])]
-    });
   }
 
+  @Directive({selector: '[dirA]', exportAs: 'dirA'})
   class DirectiveA {
     constructor() { dirA.push(this); }
-
-    static ngDirectiveDef = ɵɵdefineDirective({
-      type: DirectiveA,
-      selectors: [['', 'dirA', '']],
-      exportAs: ['dirA'],
-      factory: () => new DirectiveA(),
-    });
   }
 
-  const MSG_DIV = `{�0�, select,
-        other {ICU expression}
-      }`;
-
+  @Component({
+    selector: 'my-app',
+    template: `
+      <span (click)="log($event)">{{text}}</span>
+      <div dirA #div #foo="dirA"></div>
+      <child></child>
+      <child dirA #child></child>
+      <child dirA *ngIf="true"></child>
+      <ng-container><p></p></ng-container>
+    `
+  })
   class MyApp {
     text: string = 'INIT';
     constructor() { myApp = this; }
 
-    static ngComponentDef = ɵɵdefineComponent({
-      type: MyApp,
-      selectors: [['my-app']],
-      factory: () => new MyApp(),
-      consts: 13,
-      vars: 1,
-      directives: [Child, DirectiveA, NgIf],
-      template: (rf: RenderFlags, ctx: MyApp) => {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          ɵɵlistener('click', $event => log.push($event));
-          ɵɵtext(1);
-          ɵɵelementEnd();
-          ɵɵelement(2, 'div', ['dirA', ''], ['div', '', 'foo', 'dirA']);
-          ɵɵelement(5, 'child');
-          ɵɵelement(6, 'child', ['dirA', ''], ['child', '']);
-          ɵɵtemplate(8, function(rf: RenderFlags, ctx: never) {
-            if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'child');
-            }
-          }, 1, 0, 'child', ['dirA', AttributeMarker.Template, 'ngIf']);
-          ɵɵelementStart(9, 'i18n');
-          ɵɵi18n(10, MSG_DIV);
-          ɵɵelementEnd();
-          ɵɵelementContainerStart(11);
-          { ɵɵtext(12, 'content'); }
-          ɵɵelementContainerEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(1, ɵɵbind(ctx.text));
-          ɵɵelementProperty(8, 'ngIf', ɵɵbind(true));
-          ɵɵi18nExp(ɵɵbind(ctx.text));
-          ɵɵi18nApply(10);
-        }
-      }
-    });
+    log(event: any) { log.push(event); }
   }
 
   describe('getComponent', () => {
@@ -151,7 +81,7 @@ describe('discovery utils', () => {
       expect(() => getComponent(dirA[1] as any)).toThrowError(/Expecting instance of DOM Node/);
     });
     it('should return component from element', () => {
-      expect(getComponent<MyApp>(fixture.hostElement)).toEqual(myApp);
+      expect(getComponent<MyApp>(fixture.nativeElement)).toEqual(myApp);
       expect(getComponent<Child>(child[0])).toEqual(childComponent[0]);
       expect(getComponent<Child>(child[1])).toEqual(childComponent[1]);
     });
@@ -171,7 +101,7 @@ describe('discovery utils', () => {
 
   describe('getHostElement', () => {
     it('should return element on component', () => {
-      expect(getHostElement(myApp)).toEqual(fixture.hostElement);
+      expect(getHostElement(myApp)).toEqual(fixture.nativeElement);
       expect(getHostElement(childComponent[0])).toEqual(child[0]);
       expect(getHostElement(childComponent[1])).toEqual(child[1]);
     });
@@ -186,7 +116,7 @@ describe('discovery utils', () => {
 
   describe('getInjector', () => {
     it('should return node-injector from element', () => {
-      expect(getInjector(fixture.hostElement).get(String)).toEqual('Module');
+      expect(getInjector(fixture.nativeElement).get(String)).toEqual('Module');
       expect(getInjector(child[0]).get(String)).toEqual('Child');
       expect(getInjector(p[0]).get(String)).toEqual('Child');
     });
@@ -203,7 +133,7 @@ describe('discovery utils', () => {
 
   describe('getDirectives', () => {
     it('should return empty array if no directives', () => {
-      expect(getDirectives(fixture.hostElement)).toEqual([]);
+      expect(getDirectives(fixture.nativeElement)).toEqual([]);
       expect(getDirectives(span[0])).toEqual([]);
       expect(getDirectives(child[0])).toEqual([]);
     });
@@ -215,7 +145,7 @@ describe('discovery utils', () => {
 
   describe('getViewComponent', () => {
     it('should return null when called on root component', () => {
-      expect(getViewComponent(fixture.hostElement)).toEqual(null);
+      expect(getViewComponent(fixture.nativeElement)).toEqual(null);
       expect(getViewComponent(myApp)).toEqual(null);
     });
     it('should return containing component of child component', () => {
@@ -242,7 +172,7 @@ describe('discovery utils', () => {
 
   describe('getLocalRefs', () => {
     it('should retrieve empty map', () => {
-      expect(getLocalRefs(fixture.hostElement)).toEqual({});
+      expect(getLocalRefs(fixture.nativeElement)).toEqual({});
       expect(getLocalRefs(myApp)).toEqual({});
       expect(getLocalRefs(span[0])).toEqual({});
       expect(getLocalRefs(child[0])).toEqual({});
@@ -274,7 +204,7 @@ describe('discovery utils', () => {
 
   describe('getListeners', () => {
     it('should return no listeners', () => {
-      expect(getListeners(fixture.hostElement)).toEqual([]);
+      expect(getListeners(fixture.nativeElement)).toEqual([]);
       expect(getListeners(child[0])).toEqual([]);
     });
     it('should return the listeners', () => {
@@ -290,7 +220,7 @@ describe('discovery utils', () => {
 
   describe('getInjectionTokens', () => {
     it('should retrieve tokens', () => {
-      expect(getInjectionTokens(fixture.hostElement)).toEqual([MyApp]);
+      expect(getInjectionTokens(fixture.nativeElement)).toEqual([MyApp]);
       expect(getInjectionTokens(child[0])).toEqual([String, Child]);
       expect(getInjectionTokens(child[1])).toEqual([String, Child, DirectiveA]);
     });
@@ -301,7 +231,7 @@ describe('discovery utils', () => {
       expect(span[0].textContent).toEqual('INIT');
       myApp.text = 'WORKS';
       markDirty(myApp);
-      fixture.requestAnimationFrame.flush();
+      fixture.detectChanges();
       expect(span[0].textContent).toEqual('WORKS');
     });
   });
@@ -314,23 +244,15 @@ describe('discovery utils', () => {
     });
 
     it('should work on templates', () => {
-      const templateComment = Array.from(fixture.hostElement.childNodes)
+      const templateComment = Array.from(fixture.nativeElement.childNodes)
                                   .find((node: ChildNode) => node.nodeType === Node.COMMENT_NODE) !;
       const lContext = loadLContext(templateComment);
       expect(lContext).toBeDefined();
       expect(lContext.native as any).toBe(templateComment);
     });
 
-    it('should work on ICU expressions', () => {
-      const icuComment = Array.from(fixture.hostElement.querySelector('i18n') !.childNodes)
-                             .find((node: ChildNode) => node.nodeType === Node.COMMENT_NODE) !;
-      const lContext = loadLContext(icuComment);
-      expect(lContext).toBeDefined();
-      expect(lContext.native as any).toBe(icuComment);
-    });
-
     it('should work on ng-container', () => {
-      const ngContainerComment = Array.from(fixture.hostElement.childNodes)
+      const ngContainerComment = Array.from(fixture.nativeElement.childNodes)
                                      .find(
                                          (node: ChildNode) => node.nodeType === Node.COMMENT_NODE &&
                                              node.textContent === `ng-container`) !;
@@ -341,50 +263,26 @@ describe('discovery utils', () => {
   });
 });
 
-describe('discovery utils deprecated', () => {
-
+onlyInIvy('Ivy-specific utilities').describe('discovery utils deprecated', () => {
   describe('getRootComponents()', () => {
     it('should return a list of the root components of the application from an element', () => {
-      let innerComp: InnerComp;
 
+      @Component({selector: 'inner-comp', template: '<div></div>'})
       class InnerComp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: InnerComp,
-          selectors: [['inner-comp']],
-          factory: () => innerComp = new InnerComp(),
-          consts: 1,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: InnerComp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'div');
-            }
-          }
-        });
       }
 
+      @Component({selector: 'comp', template: '<inner-comp></inner-comp>'})
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          factory: () => new Comp(),
-          consts: 1,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: Comp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'inner-comp');
-            }
-          },
-          directives: [InnerComp]
-        });
       }
 
-      const fixture = new ComponentFixture(Comp);
-      fixture.update();
+      TestBed.configureTestingModule({declarations: [Comp, InnerComp]});
+      const fixture = TestBed.createComponent(Comp);
+      fixture.detectChanges();
 
-      const hostElm = fixture.hostElement;
+      const hostElm = fixture.nativeElement;
       const innerElm = hostElm.querySelector('inner-comp') !;
       const divElm = hostElm.querySelector('div') !;
-      const component = fixture.component;
+      const component = fixture.componentInstance;
 
       expect(getRootComponents(hostElm) !).toEqual([component]);
       expect(getRootComponents(innerElm) !).toEqual([component]);
@@ -394,65 +292,46 @@ describe('discovery utils deprecated', () => {
 
   describe('getDirectives()', () => {
     it('should return a list of the directives that are on the given element', () => {
-      let myDir1Instance: MyDir1|null = null;
-      let myDir2Instance: MyDir2|null = null;
-      let myDir3Instance: MyDir2|null = null;
-
+      @Directive({selector: '[my-dir-1]'})
       class MyDir1 {
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: MyDir1,
-          selectors: [['', 'my-dir-1', '']],
-          factory: () => myDir1Instance = new MyDir1()
-        });
       }
 
+      @Directive({selector: '[my-dir-2]'})
       class MyDir2 {
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: MyDir2,
-          selectors: [['', 'my-dir-2', '']],
-          factory: () => myDir2Instance = new MyDir2()
-        });
       }
 
+      @Directive({selector: '[my-dir-3]'})
       class MyDir3 {
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: MyDir3,
-          selectors: [['', 'my-dir-3', '']],
-          factory: () => myDir3Instance = new MyDir2()
-        });
       }
 
+      @Component({
+        selector: 'comp',
+        template: `
+          <div my-dir-1 my-dir-2></div>
+          <div my-dir-3></div>
+        `
+      })
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          factory: () => new Comp(),
-          consts: 2,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: Comp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'div', ['my-dir-1', '', 'my-dir-2', '']);
-              ɵɵelement(1, 'div', ['my-dir-3']);
-            }
-          },
-          directives: [MyDir1, MyDir2, MyDir3]
-        });
+        @ViewChild(MyDir1) myDir1Instance !: MyDir1;
+        @ViewChild(MyDir2) myDir2Instance !: MyDir2;
+        @ViewChild(MyDir3) myDir3Instance !: MyDir3;
       }
 
-      const fixture = new ComponentFixture(Comp);
-      fixture.update();
+      TestBed.configureTestingModule({declarations: [Comp, MyDir1, MyDir2, MyDir3]});
+      const fixture = TestBed.createComponent(Comp);
+      fixture.detectChanges();
 
-      const hostElm = fixture.hostElement;
+      const hostElm = fixture.nativeElement;
       const elements = hostElm.querySelectorAll('div');
 
       const elm1 = elements[0];
       const elm1Dirs = getDirectives(elm1);
-      expect(elm1Dirs).toContain(myDir1Instance !);
-      expect(elm1Dirs).toContain(myDir2Instance !);
+      expect(elm1Dirs).toContain(fixture.componentInstance.myDir1Instance !);
+      expect(elm1Dirs).toContain(fixture.componentInstance.myDir2Instance !);
 
       const elm2 = elements[1];
       const elm2Dirs = getDirectives(elm2);
-      expect(elm2Dirs).toContain(myDir3Instance !);
+      expect(elm2Dirs).toContain(fixture.componentInstance.myDir3Instance !);
     });
   });
 
@@ -460,81 +339,48 @@ describe('discovery utils deprecated', () => {
 
     it('should return an injector that can return directive instances', () => {
 
+      @Component({template: ''})
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          factory: () => new Comp(),
-          consts: 0,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: Comp) => {}
-        });
       }
 
-      const fixture = new ComponentFixture(Comp);
-      fixture.update();
-
-      const nodeInjector = getInjector(fixture.hostElement);
+      TestBed.configureTestingModule({declarations: [Comp]});
+      const fixture = TestBed.createComponent(Comp);
+      const nodeInjector = getInjector(fixture.nativeElement);
       expect(nodeInjector.get(Comp)).toEqual(jasmine.any(Comp));
     });
 
     it('should return an injector that falls-back to a module injector', () => {
-
+      @Component({template: ''})
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          factory: () => new Comp(),
-          consts: 0,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: Comp) => {}
-        });
       }
 
       class TestToken {}
+      const token = new InjectionToken<TestToken>('test token');
 
-      const staticInjector = new StaticInjector([{provide: TestToken, useValue: new TestToken()}]);
-      const fixture = new ComponentFixture(Comp, {injector: staticInjector});
-      fixture.update();
-
-      const nodeInjector = getInjector(fixture.hostElement);
-      expect(nodeInjector.get(TestToken)).toEqual(jasmine.any(TestToken));
+      TestBed.configureTestingModule(
+          {declarations: [Comp], providers: [{provide: token, useValue: new TestToken()}]});
+      const fixture = TestBed.createComponent(Comp);
+      const nodeInjector = getInjector(fixture.nativeElement);
+      expect(nodeInjector.get(token)).toEqual(jasmine.any(TestToken));
     });
   });
 
   describe('getLocalRefs', () => {
     it('should return a map of local refs for an element', () => {
 
+      @Directive({selector: '[myDir]', exportAs: 'myDir'})
       class MyDir {
-        static ngDirectiveDef = ɵɵdefineDirective({
-          type: MyDir,
-          selectors: [['', 'myDir', '']],
-          exportAs: ['myDir'],
-          factory: () => new MyDir()
-        });
       }
 
+      @Component({template: '<div myDir #elRef #dirRef="myDir"></div>'})
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          factory: () => new Comp(),
-          consts: 3,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: Comp) => {
-            if (rf & RenderFlags.Create) {
-              // <div myDir #elRef #dirRef="myDir">
-              ɵɵelement(0, 'div', ['myDir'], ['elRef', '', 'dirRef', 'myDir']);
-            }
-          },
-          directives: [MyDir]
-        });
       }
 
-      const fixture = new ComponentFixture(Comp);
-      fixture.update();
+      TestBed.configureTestingModule({declarations: [Comp, MyDir]});
+      const fixture = TestBed.createComponent(Comp);
+      fixture.detectChanges();
 
-      const divEl = fixture.hostElement.querySelector('div') !;
+      const divEl = fixture.nativeElement.querySelector('div') !;
       const localRefs = getLocalRefs(divEl);
 
       expect(localRefs.elRef.tagName.toLowerCase()).toBe('div');
@@ -542,31 +388,16 @@ describe('discovery utils deprecated', () => {
     });
 
     it('should return a map of local refs for an element with styling context', () => {
+      @Component({template: '<div #elRef class="fooClass" [style.color]="color"></div>'})
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          factory: () => new Comp(),
-          consts: 2,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: Comp) => {
-            if (rf & RenderFlags.Create) {
-              // <div #elRef class="fooClass">
-              ɵɵelementStart(0, 'div', null, ['elRef', '']);
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵselect(0);
-              ɵɵstylingApply();
-            }
-          }
-        });
+        color = 'red';
       }
 
-      const fixture = new ComponentFixture(Comp);
-      fixture.update();
+      TestBed.configureTestingModule({declarations: [Comp]});
+      const fixture = TestBed.createComponent(Comp);
+      fixture.detectChanges();
 
-      const divEl = fixture.hostElement.querySelector('div') !;
+      const divEl = fixture.nativeElement.querySelector('div') !;
       const localRefs = getLocalRefs(divEl);
 
       expect(localRefs.elRef.tagName.toLowerCase()).toBe('div');

From 34e0d621fd438f835d6a0046a3ec0d3982c2c1aa Mon Sep 17 00:00:00 2001
From: Santosh Yadav <santosh.yadav198613@gmail.com>
Date: Tue, 14 May 2019 03:10:12 +0530
Subject: [PATCH 019/275] build(docs-infra): update http-server to 0.11.1
 (#30401)

Fixes #30363

PR Close #30401
---
 aio/package.json                       |  2 +-
 aio/tools/examples/shared/package.json |  2 +-
 aio/tools/examples/shared/yarn.lock    | 65 ++++++++++++++------------
 aio/yarn.lock                          | 53 +++++++++------------
 4 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/aio/package.json b/aio/package.json
index d09bd5c267..0428297960 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -123,7 +123,7 @@
     "hast-util-is-element": "^1.0.0",
     "hast-util-to-string": "^1.0.0",
     "html": "^1.0.0",
-    "http-server": "^0.9.0",
+    "http-server": "^0.11.1",
     "ignore": "^3.3.3",
     "image-size": "^0.5.1",
     "jasmine": "^2.6.0",
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index 198677f158..c439800643 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -59,7 +59,7 @@
     "@types/node": "~8.9.4",
     "canonical-path": "1.0.0",
     "concurrently": "^3.0.0",
-    "http-server": "^0.9.0",
+    "http-server": "^0.11.1",
     "jasmine-core": "~2.99.1",
     "jasmine-marbles": "^0.4.0",
     "jasmine-spec-reporter": "~4.2.1",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index 3540e04352..d74a31dac5 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -1006,10 +1006,6 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.0.tgz#ac3613b1da9bed1b47510bb4651b8931e47146c7"
-
 async@1.5.2, async@1.x, async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -2480,14 +2476,15 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-ecstatic@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-1.4.1.tgz#32cb7b6fa2e290d58668674d115e8f0c3d567d6a"
+ecstatic@^3.0.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.1.tgz#b15b5b036c2233defc78d7bacbd8765226c95577"
+  integrity sha512-/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ==
   dependencies:
-    he "^0.5.0"
-    mime "^1.2.11"
+    he "^1.1.1"
+    mime "^1.6.0"
     minimist "^1.1.0"
-    url-join "^1.0.0"
+    url-join "^2.0.5"
 
 ee-first@1.1.1:
   version "1.1.1"
@@ -3624,9 +3621,10 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-he@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-0.5.0.tgz#2c05ffaef90b68e860f3fd2b54ef580989277ee2"
+he@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -3726,17 +3724,18 @@ http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.8.1:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
-http-server@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.9.0.tgz#8f1b06bdc733618d4dc42831c7ba1aff4e06001a"
+http-server@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
+  integrity sha512-6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==
   dependencies:
     colors "1.0.3"
     corser "~2.0.0"
-    ecstatic "^1.4.0"
+    ecstatic "^3.0.0"
     http-proxy "^1.8.1"
     opener "~1.4.0"
     optimist "0.6.x"
-    portfinder "0.4.x"
+    portfinder "^1.0.13"
     union "~0.4.3"
 
 http-signature@~1.1.0:
@@ -4991,7 +4990,7 @@ mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.4.1, mime@^1.2.11, mime@^1.4.1:
+mime@1.4.1, mime@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
@@ -4999,6 +4998,11 @@ mime@1.4.1, mime@^1.2.11, mime@^1.4.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b"
 
+mime@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -5965,13 +5969,6 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-portfinder@0.4.x:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-0.4.0.tgz#a3ffadffafe4fb98e0601a85eda27c27ce84ca1e"
-  dependencies:
-    async "0.9.0"
-    mkdirp "0.5.x"
-
 portfinder@1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
@@ -5980,6 +5977,15 @@ portfinder@1.0.17:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
+portfinder@^1.0.13:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
 portfinder@^1.0.9:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
@@ -8071,9 +8077,10 @@ urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
-url-join@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
+url-join@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
+  integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
 url-parse@^1.4.3:
   version "1.4.4"
diff --git a/aio/yarn.lock b/aio/yarn.lock
index c98c1b7021..a69b3ff956 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -1078,10 +1078,6 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.0.tgz#ac3613b1da9bed1b47510bb4651b8931e47146c7"
-
 async@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
@@ -3094,14 +3090,15 @@ ecdsa-sig-formatter@1.0.9:
     base64url "^2.0.0"
     safe-buffer "^5.0.1"
 
-ecstatic@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-1.4.1.tgz#32cb7b6fa2e290d58668674d115e8f0c3d567d6a"
+ecstatic@^3.0.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.1.tgz#b15b5b036c2233defc78d7bacbd8765226c95577"
+  integrity sha512-/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ==
   dependencies:
-    he "^0.5.0"
-    mime "^1.2.11"
+    he "^1.1.1"
+    mime "^1.6.0"
     minimist "^1.1.0"
-    url-join "^1.0.0"
+    url-join "^2.0.5"
 
 editions@^1.1.1, editions@^1.1.2, editions@^1.3.1, editions@^1.3.3:
   version "1.3.3"
@@ -4656,9 +4653,10 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-he@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-0.5.0.tgz#2c05ffaef90b68e860f3fd2b54ef580989277ee2"
+he@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 header-case@^1.0.0:
   version "1.0.1"
@@ -4815,17 +4813,18 @@ http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-server@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.9.0.tgz#8f1b06bdc733618d4dc42831c7ba1aff4e06001a"
+http-server@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
+  integrity sha512-6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==
   dependencies:
     colors "1.0.3"
     corser "~2.0.0"
-    ecstatic "^1.4.0"
+    ecstatic "^3.0.0"
     http-proxy "^1.8.1"
     opener "~1.4.0"
     optimist "0.6.x"
-    portfinder "0.4.x"
+    portfinder "^1.0.13"
     union "~0.4.3"
 
 http-signature@~1.2.0:
@@ -6704,12 +6703,12 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.38.0"
 
-mime@1.4.1, mime@^1.2.11, mime@^1.3.4:
+mime@1.4.1, mime@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@^1.4.1, mime@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -7860,13 +7859,6 @@ pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
 
-portfinder@0.4.x:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-0.4.0.tgz#a3ffadffafe4fb98e0601a85eda27c27ce84ca1e"
-  dependencies:
-    async "0.9.0"
-    mkdirp "0.5.x"
-
 portfinder@^1.0.13:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
@@ -10540,9 +10532,10 @@ url-join@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8"
 
-url-join@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
+url-join@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
+  integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"

From 3fecab64b1505ace2ae3a7ef5946f2506b51be17 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 9 May 2019 09:21:07 -0700
Subject: [PATCH 020/275] build: update to Bazel 0.26 (#30370)

PR Close #30370
---
 package.json                                  |  2 +-
 packages/bazel/src/schematics/ng-add/index.ts |  2 +-
 yarn.lock                                     | 38 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 5bee6f8745..2989f92c66 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,7 @@
   "// 3": "when updating @bazel/bazel version you also need to update the RBE settings in .bazelrc (see https://github.com/angular/angular/pull/27935)",
   "devDependencies": {
     "@angular/cli": "^8.0.0-beta.15",
-    "@bazel/bazel": "0.24.0",
+    "@bazel/bazel": "0.26.0-rc5",
     "@bazel/buildifier": "^0.19.2",
     "@bazel/ibazel": "~0.9.0",
     "@types/minimist": "^1.2.0",
diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts
index 9a77610a55..4ebbb266c0 100755
--- a/packages/bazel/src/schematics/ng-add/index.ts
+++ b/packages/bazel/src/schematics/ng-add/index.ts
@@ -48,7 +48,7 @@ function addDevDependenciesToPackageJson(options: Schema) {
 
     const devDependencies: {[k: string]: string} = {
       '@angular/bazel': angularCoreVersion,
-      '@bazel/bazel': '^0.25.1',
+      '@bazel/bazel': '^0.26.0-rc.5',
       '@bazel/ibazel': '^0.10.2',
       '@bazel/karma': '0.27.12',
       '@bazel/typescript': '0.27.12',
diff --git a/yarn.lock b/yarn.lock
index c645cee73c..f2691cefed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -64,29 +64,29 @@
     universal-analytics "^0.4.20"
     uuid "^3.3.2"
 
-"@bazel/bazel-darwin_x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.24.0.tgz#828ef298d8d542961df388f17b0244f4f4302a74"
-  integrity sha512-xly44vkcD/fauUb7Lm5Lme4qhEZdkuuyBKSVQUHPbYAGDdbj/W8dupI3bZREkJAgG/WrRU+WXUemMj4U8ZcLcw==
+"@bazel/bazel-darwin_x64@0.26.0-rc5":
+  version "0.26.0-rc5"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.0-rc5.tgz#237a564ee03abe16ced3622624e40fb5564a9d54"
+  integrity sha512-1zGZUtC2jzK0bwknMaXStMmfKul15sZ089EoaWPI596VyF3uNkcOMQWDDc5daDz3ZdxpvWYbpByInmXzWQIDzw==
 
-"@bazel/bazel-linux_x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.24.0.tgz#9ef2e7266833ad2221fe4af4ceb6763d2897e3ff"
-  integrity sha512-p5ylPLWnJZDGbaIFBrtD/tp3Su5rMdzeeNJKU24XyiWQTHVZ3OD3I2Fb0ILCgfBjY8AlA7EtCtOI4hYnAuIOtg==
+"@bazel/bazel-linux_x64@0.26.0-rc5":
+  version "0.26.0-rc5"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.0-rc5.tgz#fc10602c13ca6ecb1afe76fb2f6c2773ba1204f2"
+  integrity sha512-HBNn4SL6zHBjA95dY/cpjnZEVB30+L2Uq4PWw48QhuQJGY/CYDwqWk2oFMUK47EEFMFh4OQfoN3q4oHKbvixdw==
 
-"@bazel/bazel-win32_x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.24.0.tgz#02d83113a6c6ed99795a3e41bff5631aa141638d"
-  integrity sha512-/bcSEx+GoV/q7H4WM0jazfxTcurSiIIePhRv+d05mxRDcaWwhCO8KzmmZRWH1abW6npvq5tLkbSQi7G7nUBhgg==
+"@bazel/bazel-win32_x64@0.26.0-rc5":
+  version "0.26.0-rc5"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.0-rc5.tgz#05fecc69fdf36bc883e66452e01acff89356980e"
+  integrity sha512-DviEGJHXKlhpvnuqfT3hjyJmGhpsKykNxnZ60dDexlh0GkhIn9rN8OF3vj0EL+pRpYhiBQvcoiwQdvV2gBYbRw==
 
-"@bazel/bazel@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.24.0.tgz#f4e68e3680ac299858c24c26be3d08d1151e78fc"
-  integrity sha512-/5E55tqH9ogAGF9Dd7RSCJmk7/xdlsPTAhsX3yEsEMs7GLdHlgD3jbeePsKUiHKKr8LXAufjTs2pXQfjrkZRMg==
+"@bazel/bazel@0.26.0-rc5":
+  version "0.26.0-rc5"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.26.0-rc5.tgz#42b4ed498f02a426adee30583b98166611eb49e8"
+  integrity sha512-pZGUFXzvFUqm/hd7UmMPcCUc5CZd8dknae2pptQTpBhCFUHdsQeTr1alFKTNZPArVqAtqIUL2DS2MadKb3v31A==
   optionalDependencies:
-    "@bazel/bazel-darwin_x64" "0.24.0"
-    "@bazel/bazel-linux_x64" "0.24.0"
-    "@bazel/bazel-win32_x64" "0.24.0"
+    "@bazel/bazel-darwin_x64" "0.26.0-rc5"
+    "@bazel/bazel-linux_x64" "0.26.0-rc5"
+    "@bazel/bazel-win32_x64" "0.26.0-rc5"
 
 "@bazel/buildifier-darwin_x64@0.19.2":
   version "0.19.2"

From 06efc340b6ad12b27d0ca1033c23aafc6bceced2 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 9 May 2019 14:51:51 -0700
Subject: [PATCH 021/275] build: update rules_nodejs and clean up bazel
 warnings (#30370)

Preserve compatibility with rollup_bundle rule.
Add missing npm dependencies, which are now enforced by the strict_deps plugin in tsc_wrapped

PR Close #30370
---
 WORKSPACE                                     |  4 +-
 integration/bazel/WORKSPACE                   |  4 +-
 integration/bazel/src/package.json            |  4 +-
 package.json                                  |  7 +-
 packages/bazel/package.bzl                    |  2 +
 packages/bazel/src/BUILD.bazel                |  1 +
 .../src/builders/files/WORKSPACE.template     |  4 +-
 packages/bazel/src/esm5.bzl                   |  2 +-
 packages/bazel/src/ng_module.bzl              |  4 +-
 packages/bazel/src/ng_package/ng_package.bzl  |  7 +-
 packages/bazel/src/ng_rollup_bundle.bzl       | 13 ++-
 packages/bazel/src/schematics/ng-add/index.ts |  4 +-
 packages/compiler-cli/BUILD.bazel             |  1 +
 .../ngcc/test/helpers/BUILD.bazel             |  1 +
 .../src/ngtsc/shims/test/BUILD.bazel          |  1 +
 .../injectable-pipe/google3/BUILD.bazel       |  1 +
 .../migrations/static-queries/BUILD.bazel     |  1 +
 .../static-queries/google3/BUILD.bazel        |  1 +
 .../template-var-assignment/BUILD.bazel       |  1 +
 .../google3/BUILD.bazel                       |  1 +
 packages/core/schematics/test/BUILD.bazel     |  1 +
 packages/core/schematics/utils/BUILD.bazel    |  3 +
 .../core/schematics/utils/tslint/BUILD.bazel  |  1 +
 packages/core/test/acceptance/BUILD.bazel     |  1 +
 packages/core/test/linker/integration_spec.ts |  4 +-
 packages/core/test/render3/ivy/BUILD.bazel    |  1 +
 packages/language-service/test/BUILD.bazel    |  1 +
 tools/size-tracking/BUILD.bazel               |  4 +-
 tools/ts-api-guardian/BUILD.bazel             |  7 +-
 yarn.lock                                     | 98 ++++++++++++-------
 30 files changed, 123 insertions(+), 62 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 4a1fe3b291..0e652c0c25 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,8 +15,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "3a3efbf223f6de733475602844ad3a8faa02abda25ab8cfe1d1ed0db134887cf",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.12/rules_nodejs-0.27.12.tar.gz"],
+    sha256 = "1db950bbd27fb2581866e307c0130983471d4c3cd49c46063a2503ca7b6770a4",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.29.0/rules_nodejs-0.29.0.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 53f174a705..d031ac5ed3 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "3a3efbf223f6de733475602844ad3a8faa02abda25ab8cfe1d1ed0db134887cf",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.12/rules_nodejs-0.27.12.tar.gz"],
+    sha256 = "1db950bbd27fb2581866e307c0130983471d4c3cd49c46063a2503ca7b6770a4",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.29.0/rules_nodejs-0.29.0.tar.gz"],
 )
 
 # Fetch sass rules for compiling sass files
diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json
index fcbd777e1a..4da69c3a85 100644
--- a/integration/bazel/src/package.json
+++ b/integration/bazel/src/package.json
@@ -19,8 +19,8 @@
     "@angular/bazel": "packages-dist:bazel",
     "@angular/compiler": "packages-dist:compiler",
     "@angular/compiler-cli": "packages-dist:compiler-cli",
-    "@bazel/karma": "0.27.12",
-    "@bazel/typescript": "0.27.12",
+    "@bazel/karma": "0.29.0",
+    "@bazel/typescript": "0.29.0",
     "@types/jasmine": "2.8.8",
     "@types/source-map": "0.5.1",
     "protractor": "5.1.2",
diff --git a/package.json b/package.json
index 2989f92c66..907b9a7bfb 100644
--- a/package.json
+++ b/package.json
@@ -36,9 +36,9 @@
     "@angular-devkit/core": "^8.0.0-beta.15",
     "@angular-devkit/schematics": "^8.0.0-beta.15",
     "@angular/bazel": "file:./tools/npm/@angular_bazel",
-    "@bazel/jasmine": "0.27.12",
-    "@bazel/karma": "0.27.12",
-    "@bazel/typescript": "0.27.12",
+    "@bazel/jasmine": "0.29.0",
+    "@bazel/karma": "0.29.0",
+    "@bazel/typescript": "0.29.0",
     "@microsoft/api-extractor": "^7.0.21",
     "@schematics/angular": "^8.0.0-beta.15",
     "@types/angular": "^1.6.47",
@@ -94,6 +94,7 @@
     "rollup": "^1.1.0",
     "rollup-plugin-amd": "^3.0.0",
     "rollup-plugin-commonjs": "^9.2.1",
+    "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
     "rxjs": "^6.4.0",
diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl
index 8d9e75f841..d010eef32e 100644
--- a/packages/bazel/package.bzl
+++ b/packages/bazel/package.bzl
@@ -40,12 +40,14 @@ def rules_angular_dev_dependencies():
     #############################################
     http_archive(
         name = "io_bazel_rules_sass",
+        sha256 = "76ae498b9a96fa029f026f8358ed44b93c934dde4691a798cb3a4137c307b7dc",
         strip_prefix = "rules_sass-1.15.1",
         url = "https://github.com/bazelbuild/rules_sass/archive/1.15.1.zip",
     )
 
     http_archive(
         name = "io_bazel_skydoc",
+        sha256 = "f88058b43112e9bdc7fdb0abbdc17c5653268708c01194a159641119195e45c6",
         strip_prefix = "skydoc-a9550cb3ca3939cbabe3b589c57b6f531937fa99",
         # TODO: switch to upstream when https://github.com/bazelbuild/skydoc/pull/103 is merged
         url = "https://github.com/alexeagle/skydoc/archive/a9550cb3ca3939cbabe3b589c57b6f531937fa99.zip",
diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel
index 4dba862e0a..3e0adfee11 100644
--- a/packages/bazel/src/BUILD.bazel
+++ b/packages/bazel/src/BUILD.bazel
@@ -18,6 +18,7 @@ nodejs_binary(
         "@npm//rollup",
         "@npm//rollup-plugin-amd",
         "@npm//rollup-plugin-commonjs",
+        "@npm//rollup-plugin-json",
         "@npm//rollup-plugin-node-resolve",
         "@npm//rollup-plugin-sourcemaps",
     ],
diff --git a/packages/bazel/src/builders/files/WORKSPACE.template b/packages/bazel/src/builders/files/WORKSPACE.template
index d87aa93005..cb7bf141f2 100644
--- a/packages/bazel/src/builders/files/WORKSPACE.template
+++ b/packages/bazel/src/builders/files/WORKSPACE.template
@@ -12,8 +12,8 @@ workspace(name = "project")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-RULES_NODEJS_VERSION = "0.27.12"
-RULES_NODEJS_SHA256 = "3a3efbf223f6de733475602844ad3a8faa02abda25ab8cfe1d1ed0db134887cf"
+RULES_NODEJS_VERSION = "0.29.0"
+RULES_NODEJS_SHA256 = "1db950bbd27fb2581866e307c0130983471d4c3cd49c46063a2503ca7b6770a4"
 http_archive(
     name = "build_bazel_rules_nodejs",
     sha256 = RULES_NODEJS_SHA256,
diff --git a/packages/bazel/src/esm5.bzl b/packages/bazel/src/esm5.bzl
index 57d2157ca3..98463cb168 100644
--- a/packages/bazel/src/esm5.bzl
+++ b/packages/bazel/src/esm5.bzl
@@ -108,7 +108,7 @@ def _esm5_outputs_aspect(target, ctx):
 
     ctx.actions.run(
         progress_message = "Compiling TypeScript (ES5 with ES Modules) %s" % target.label,
-        inputs = target.typescript.replay_params.inputs + [tsconfig],
+        inputs = target.typescript.replay_params.inputs.to_list() + [tsconfig],
         outputs = outputs,
         arguments = [tsconfig.path],
         executable = compiler,
diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index 144fdf08d9..3504c16be4 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -427,7 +427,7 @@ def ngc_compile_action(
 
     if is_legacy_ngc and messages_out != None:
         ctx.actions.run(
-            inputs = list(inputs),
+            inputs = inputs,
             outputs = messages_out,
             executable = ctx.executable.ng_xi18n,
             arguments = (_EXTRA_NODE_OPTIONS_FLAGS +
@@ -442,7 +442,7 @@ def ngc_compile_action(
 
     if dts_bundles_out != None:
         # combine the inputs and outputs and filter .d.ts and json files
-        filter_inputs = [f for f in inputs + outputs if f.path.endswith(".d.ts") or f.path.endswith(".json")]
+        filter_inputs = [f for f in list(inputs) + outputs if f.path.endswith(".d.ts") or f.path.endswith(".json")]
 
         if _should_produce_flat_module_outs(ctx):
             dts_entry_points = ["%s.d.ts" % _flat_module_out_file(ctx)]
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index f1a3c7a788..c00b44bec0 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -289,12 +289,13 @@ def _ng_package_impl(ctx):
         for d in ctx.attr.deps:
             if NodeModuleInfo in d:
                 node_modules_files += _filter_js_inputs(d.files)
+        esm5_rollup_inputs = depset(node_modules_files, transitive = [esm5_sources])
 
         esm2015_config = write_rollup_config(ctx, [], "/".join([ctx.bin_dir.path, ctx.label.package, _esm2015_root_dir(ctx)]), filename = "_%s.rollup_esm2015.conf.js")
         esm5_config = write_rollup_config(ctx, [], "/".join([ctx.bin_dir.path, ctx.label.package, esm5_root_dir(ctx)]), filename = "_%s.rollup_esm5.conf.js")
 
-        fesm2015.append(_rollup(ctx, "fesm2015", esm2015_config, es2015_entry_point, esm_2015_files + node_modules_files, fesm2015_output))
-        fesm5.append(_rollup(ctx, "fesm5", esm5_config, es5_entry_point, esm5_sources + node_modules_files, fesm5_output))
+        fesm2015.append(_rollup(ctx, "fesm2015", esm2015_config, es2015_entry_point, depset(node_modules_files, transitive = [esm_2015_files]), fesm2015_output))
+        fesm5.append(_rollup(ctx, "fesm5", esm5_config, es5_entry_point, esm5_rollup_inputs, fesm5_output))
 
         bundles.append(
             _rollup(
@@ -302,7 +303,7 @@ def _ng_package_impl(ctx):
                 "umd",
                 esm5_config,
                 es5_entry_point,
-                esm5_sources + node_modules_files,
+                esm5_rollup_inputs,
                 umd_output,
                 format = "umd",
                 package_name = package_name,
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index d1100520e6..46f9641ead 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -18,7 +18,6 @@ load(
     "@build_bazel_rules_nodejs//internal/rollup:rollup_bundle.bzl",
     "ROLLUP_ATTRS",
     "ROLLUP_DEPS_ASPECTS",
-    "ROLLUP_OUTPUTS",
     "run_rollup",
     "run_sourcemapexplorer",
     "run_terser",
@@ -27,6 +26,18 @@ load(
 load("@build_bazel_rules_nodejs//internal/common:collect_es6_sources.bzl", collect_es2015_sources = "collect_es6_sources")
 load(":esm5.bzl", "esm5_outputs_aspect", "esm5_root_dir", "flatten_esm5")
 
+ROLLUP_OUTPUTS = {
+    "build_cjs": "%{name}.cjs.js",
+    "build_es2015": "%{name}.es2015.js",
+    "build_es2015_min": "%{name}.min.es2015.js",
+    "build_es2015_min_debug": "%{name}.min_debug.es2015.js",
+    "build_es5": "%{name}.js",
+    "build_es5_min": "%{name}.min.js",
+    "build_es5_min_debug": "%{name}.min_debug.js",
+    "build_umd": "%{name}.umd.js",
+    "explore_html": "%{name}.explore.html",
+}
+
 PACKAGES = [
     # Generated paths when using ng_rollup_bundle outside this monorepo.
     "external/angular/packages/core/src",
diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts
index 4ebbb266c0..6bca362fe3 100755
--- a/packages/bazel/src/schematics/ng-add/index.ts
+++ b/packages/bazel/src/schematics/ng-add/index.ts
@@ -50,8 +50,8 @@ function addDevDependenciesToPackageJson(options: Schema) {
       '@angular/bazel': angularCoreVersion,
       '@bazel/bazel': '^0.26.0-rc.5',
       '@bazel/ibazel': '^0.10.2',
-      '@bazel/karma': '0.27.12',
-      '@bazel/typescript': '0.27.12',
+      '@bazel/karma': '0.29.0',
+      '@bazel/typescript': '0.29.0',
     };
 
     const recorder = host.beginUpdate(packageJson);
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index 4ceb6afa7b..2c1eab6262 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -43,6 +43,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/util",
         "@npm//@bazel/typescript",
         "@npm//@types",
+        "@npm//reflect-metadata",
         "@npm//tsickle",
         "@npm//typescript",
     ],
diff --git a/packages/compiler-cli/ngcc/test/helpers/BUILD.bazel b/packages/compiler-cli/ngcc/test/helpers/BUILD.bazel
index 012a925b94..cc237359fe 100644
--- a/packages/compiler-cli/ngcc/test/helpers/BUILD.bazel
+++ b/packages/compiler-cli/ngcc/test/helpers/BUILD.bazel
@@ -12,5 +12,6 @@ ts_library(
         "//packages/compiler-cli/ngcc",
         "//packages/compiler-cli/src/ngtsc/path",
         "//packages/compiler-cli/src/ngtsc/testing",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel
index 381f9cdd88..de435dc818 100644
--- a/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/compiler-cli/src/ngtsc/shims",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/core/schematics/migrations/injectable-pipe/google3/BUILD.bazel b/packages/core/schematics/migrations/injectable-pipe/google3/BUILD.bazel
index 773d18ed6d..ffe09d7d9c 100644
--- a/packages/core/schematics/migrations/injectable-pipe/google3/BUILD.bazel
+++ b/packages/core/schematics/migrations/injectable-pipe/google3/BUILD.bazel
@@ -8,5 +8,6 @@ ts_library(
     deps = [
         "//packages/core/schematics/migrations/injectable-pipe",
         "@npm//tslint",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/core/schematics/migrations/static-queries/BUILD.bazel b/packages/core/schematics/migrations/static-queries/BUILD.bazel
index f8fa0a26ba..25993f3bf4 100644
--- a/packages/core/schematics/migrations/static-queries/BUILD.bazel
+++ b/packages/core/schematics/migrations/static-queries/BUILD.bazel
@@ -13,6 +13,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/core",
         "@npm//@angular-devkit/schematics",
         "@npm//@types/node",
         "@npm//rxjs",
diff --git a/packages/core/schematics/migrations/static-queries/google3/BUILD.bazel b/packages/core/schematics/migrations/static-queries/google3/BUILD.bazel
index a588549552..9467244813 100644
--- a/packages/core/schematics/migrations/static-queries/google3/BUILD.bazel
+++ b/packages/core/schematics/migrations/static-queries/google3/BUILD.bazel
@@ -9,5 +9,6 @@ ts_library(
         "//packages/core/schematics/migrations/static-queries",
         "//packages/core/schematics/utils",
         "@npm//tslint",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/core/schematics/migrations/template-var-assignment/BUILD.bazel b/packages/core/schematics/migrations/template-var-assignment/BUILD.bazel
index a45b58f070..5e0003affc 100644
--- a/packages/core/schematics/migrations/template-var-assignment/BUILD.bazel
+++ b/packages/core/schematics/migrations/template-var-assignment/BUILD.bazel
@@ -12,6 +12,7 @@ ts_library(
     deps = [
         "//packages/compiler",
         "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/core",
         "@npm//@angular-devkit/schematics",
         "@npm//@types/node",
         "@npm//typescript",
diff --git a/packages/core/schematics/migrations/template-var-assignment/google3/BUILD.bazel b/packages/core/schematics/migrations/template-var-assignment/google3/BUILD.bazel
index 83b75a91e6..2beb6d06a4 100644
--- a/packages/core/schematics/migrations/template-var-assignment/google3/BUILD.bazel
+++ b/packages/core/schematics/migrations/template-var-assignment/google3/BUILD.bazel
@@ -10,5 +10,6 @@ ts_library(
         "//packages/core/schematics/utils",
         "//packages/core/schematics/utils/tslint",
         "@npm//tslint",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/core/schematics/test/BUILD.bazel b/packages/core/schematics/test/BUILD.bazel
index f61d48e0dc..b064f3a3af 100644
--- a/packages/core/schematics/test/BUILD.bazel
+++ b/packages/core/schematics/test/BUILD.bazel
@@ -17,6 +17,7 @@ ts_library(
         "//packages/core/schematics/migrations/template-var-assignment",
         "//packages/core/schematics/migrations/template-var-assignment/google3",
         "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/core",
         "@npm//@angular-devkit/schematics",
         "@npm//@types/shelljs",
         "@npm//tslint",
diff --git a/packages/core/schematics/utils/BUILD.bazel b/packages/core/schematics/utils/BUILD.bazel
index 44b3e073e8..5ebf78b9b7 100644
--- a/packages/core/schematics/utils/BUILD.bazel
+++ b/packages/core/schematics/utils/BUILD.bazel
@@ -9,5 +9,8 @@ ts_library(
         "//packages/compiler",
         "@npm//@angular-devkit/core",
         "@npm//@angular-devkit/schematics",
+        "@npm//@schematics/angular",
+        "@npm//@types/node",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/core/schematics/utils/tslint/BUILD.bazel b/packages/core/schematics/utils/tslint/BUILD.bazel
index 320800a510..cae69eca25 100644
--- a/packages/core/schematics/utils/tslint/BUILD.bazel
+++ b/packages/core/schematics/utils/tslint/BUILD.bazel
@@ -7,4 +7,5 @@ ts_library(
     visibility = [
         "//packages/core/schematics/migrations/template-var-assignment/google3:__pkg__",
     ],
+    deps = ["@npm//typescript"],
 )
diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel
index c037d23381..19c700031d 100644
--- a/packages/core/test/acceptance/BUILD.bazel
+++ b/packages/core/test/acceptance/BUILD.bazel
@@ -24,6 +24,7 @@ ts_library(
         "//packages/platform-browser/testing",
         "//packages/platform-server",
         "//packages/private/testing",
+        "@npm//rxjs",
         "@npm//zone.js",
     ],
 )
diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts
index 2687a54e6a..b6bb694786 100644
--- a/packages/core/test/linker/integration_spec.ts
+++ b/packages/core/test/linker/integration_spec.ts
@@ -1522,7 +1522,7 @@ function declareTests(config?: {useJit: boolean}) {
               expect(getDOM().nodeName(c.renderNode).toUpperCase()).toEqual('INPUT');
               expect(getDOM().nodeName(c.componentRenderElement).toUpperCase()).toEqual('DIV');
               expect((<Injector>c.injector).get).toBeTruthy();
-              expect(c.context).toBe(fixture.componentInstance);
+              expect(c.context).toEqual(fixture.componentInstance);
               expect(c.references['local']).toBeDefined();
             }
           });
@@ -1567,7 +1567,7 @@ function declareTests(config?: {useJit: boolean}) {
                 expect(getDOM().nodeName(c.renderNode).toUpperCase()).toEqual('SPAN');
                 expect(getDOM().nodeName(c.componentRenderElement).toUpperCase()).toEqual('DIV');
                 expect((<Injector>c.injector).get).toBeTruthy();
-                expect(c.context).toBe(fixture.componentInstance);
+                expect(c.context).toEqual(fixture.componentInstance);
                 expect(c.references['local']).toBeDefined();
               }));
     });
diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel
index 39e0a8ce87..f5f2ecc499 100644
--- a/packages/core/test/render3/ivy/BUILD.bazel
+++ b/packages/core/test/render3/ivy/BUILD.bazel
@@ -10,6 +10,7 @@ ts_library(
         "//packages:types",
         "//packages/core",
         "//packages/core/src/di/interface",
+        "@npm//reflect-metadata",
     ],
 )
 
diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel
index 0348a26aac..4529a90fa3 100644
--- a/packages/language-service/test/BUILD.bazel
+++ b/packages/language-service/test/BUILD.bazel
@@ -9,6 +9,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli/test:test_utils",
         "//packages/language-service",
+        "@npm//reflect-metadata",
         "@npm//typescript",
     ],
 )
diff --git a/tools/size-tracking/BUILD.bazel b/tools/size-tracking/BUILD.bazel
index 7a040f4832..b01bed4829 100644
--- a/tools/size-tracking/BUILD.bazel
+++ b/tools/size-tracking/BUILD.bazel
@@ -12,6 +12,8 @@ ts_library(
     deps = [
         "@npm//@types/node",
         "@npm//@types/source-map",
+        "@npm//chalk",
+        "@npm//source-map",
     ],
 )
 
@@ -21,7 +23,7 @@ ts_library(
     srcs = glob(["**/*_spec.ts"]),
     deps = [
         ":size-tracking",
-        "@npm//@types/source-map",
+        "@npm//source-map",
     ],
 )
 
diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel
index b830f9842f..cdf3db75d0 100644
--- a/tools/ts-api-guardian/BUILD.bazel
+++ b/tools/ts-api-guardian/BUILD.bazel
@@ -1,9 +1,6 @@
 # BEGIN-INTERNAL
-load(
-    "@build_bazel_rules_nodejs//:defs.bzl",
-    "jasmine_node_test",
-    "npm_package",
-)
+load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:index.bzl", "ts_library")
 
 ts_library(
diff --git a/yarn.lock b/yarn.lock
index f2691cefed..1907ddbbfd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -111,24 +111,25 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd"
   integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow==
 
-"@bazel/jasmine@0.27.12":
-  version "0.27.12"
-  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.27.12.tgz#9319d1fb52723da8ec23d4ce507dc9eb202d4e31"
-  integrity sha512-olsKMLsfqA6F025EPn0glJal4DB0v4E2ISL+0Hu2piewAtjv8DARU0dxzyizgH1X20BooIlgq+ZL2cKdlXfMHg==
+"@bazel/jasmine@0.29.0":
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.29.0.tgz#347d9c512daf8576dcdaa9bb168733fa444c2263"
+  integrity sha512-QH/mLAH4e7gcJrfOT0BmJ4wk+5Ly3RU+RPLaCyacnCjmJCICukZJa/rrjbVtwd8u7ZM+Hf6tRaLLydSeKXGBug==
   dependencies:
     jasmine "~3.3.1"
-    v8-coverage "1.0.8"
+    jasmine-core "~3.3.0"
+    v8-coverage "1.0.9"
 
-"@bazel/karma@0.27.12":
-  version "0.27.12"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.27.12.tgz#a7c1648af93b4d376e4e3b6fc1c7006b4d79c092"
-  integrity sha512-LJAbNe8bR1vRLb8GqIbKzCpf8VMaTnM9jizxmsjkgdGjy9OgsseYbk6+70z1yx7s3QHPjj7JBqcx+d2yeXPo7g==
+"@bazel/karma@0.29.0":
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.29.0.tgz#bcb79750ecec3884136e584b36e3cd3b610455a5"
+  integrity sha512-dSN7iBAz0srGkJxAP7NAyWVdCWoUHBxlGL7YxHObV3kDTwWUDKWKcEwuOC7MTMSQtYM4WcVVvfCO3HhXKUxhPg==
   dependencies:
     jasmine-core "2.8.0"
     karma "^4.0.0"
     karma-chrome-launcher "2.2.0"
     karma-firefox-launcher "1.1.0"
-    karma-jasmine "1.1.1"
+    karma-jasmine "2.0.1"
     karma-requirejs "1.1.0"
     karma-sauce-launcher "2.0.2"
     karma-sourcemap-loader "0.3.7"
@@ -136,10 +137,10 @@
     semver "5.6.0"
     tmp "0.0.33"
 
-"@bazel/typescript@0.27.12":
-  version "0.27.12"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.27.12.tgz#79a6468cd8da096c4da151fac658f7f801a59948"
-  integrity sha512-5cH+x7rvO8P9MCrd8YwJrTyzkET6MLajzngoV5yLDWwcokzs+b3yD9yoa5Vw3Dth2MdKRp+lyGMO7PwyAM3ebw==
+"@bazel/typescript@0.29.0":
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.29.0.tgz#d276afe034f37b5f35ee1369c99dc33c637fc9f6"
+  integrity sha512-Dp5ucrE1vXTORGiwEi6Ur4dlICpLsmZ1dscsEQT4ywF7xTT0/NmIG0ecBghiCFPFQTxt1D05TR3SH06rPtTAew==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"
@@ -6034,6 +6035,11 @@ jasmine-core@^3.1.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"
   integrity sha1-pHheE11d9lAk38kiSVPfWFvSdmw=
 
+jasmine-core@^3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
+
 jasmine-core@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
@@ -6370,10 +6376,12 @@ karma-firefox-launcher@1.1.0:
   resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
   integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==
 
-karma-jasmine@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
-  integrity sha1-b+hA51oRYAydkehLM8RY4cRqNSk=
+karma-jasmine@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
+  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
+  dependencies:
+    jasmine-core "^3.3"
 
 karma-jasmine@^1.1.2:
   version "1.1.2"
@@ -7726,7 +7734,7 @@ node-source-walk@~1.4.0:
   dependencies:
     acorn "^1.0.3"
 
-node-uuid@1.4.8, node-uuid@^1.4.8, node-uuid@~1.4.7:
+node-uuid@1.4.8, node-uuid@~1.4.7:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
   integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
@@ -8888,6 +8896,14 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
+read-pkg-up@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -9389,6 +9405,13 @@ rollup-plugin-commonjs@^9.2.1:
     resolve "^1.10.0"
     rollup-pluginutils "^2.3.3"
 
+rollup-plugin-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
+  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
+  dependencies:
+    rollup-pluginutils "^2.5.0"
+
 rollup-plugin-node-resolve@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422"
@@ -9422,6 +9445,14 @@ rollup-pluginutils@^2.3.3:
     estree-walker "^0.6.0"
     micromatch "^3.1.10"
 
+rollup-pluginutils@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad"
+  integrity sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ==
+  dependencies:
+    estree-walker "^0.6.0"
+    micromatch "^3.1.10"
+
 rollup@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.1.0.tgz#461a7534b55be48aa4a6e6810a1543a5769e75d1"
@@ -10528,16 +10559,15 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-test-exclude@^4.2.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
-  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
+test-exclude@^5.2.2:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
   dependencies:
-    arrify "^1.0.1"
-    micromatch "^2.3.11"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
-    require-main-filename "^1.0.1"
+    glob "^7.1.3"
+    minimatch "^3.0.4"
+    read-pkg-up "^4.0.0"
+    require-main-filename "^2.0.0"
 
 text-extensions@^1.0.0:
   version "1.7.0"
@@ -11233,10 +11263,10 @@ uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-v8-coverage@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/v8-coverage/-/v8-coverage-1.0.8.tgz#3393cb904cd064e2e56e747781641c75a6e7f52c"
-  integrity sha512-DWNS16h1LKyRMZsJ7+2KFUhA4hGbWUWTcUbDwnT6WMQKbolixY1KCSUaw2NVqtpwODGtqCWvHUjQjwfh562U0A==
+v8-coverage@1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/v8-coverage/-/v8-coverage-1.0.9.tgz#780889680c0fea0f587adf22e2b5f443b9434745"
+  integrity sha512-JolsCH1JDI2QULrxkAGZaovJPvg/Q0p20Uj0F5N8fPtYDtz38gNBRPQ/WVXlLLd3d8WHvKN96AfE4XFk4u0g2g==
   dependencies:
     debug "^3.1.0"
     foreground-child "^1.5.6"
@@ -11244,11 +11274,11 @@ v8-coverage@1.0.8:
     istanbul-lib-report "^1.1.3"
     istanbul-reports "^1.3.0"
     mkdirp "^0.5.1"
-    node-uuid "^1.4.8"
     rimraf "^2.6.2"
     signal-exit "^3.0.2"
     spawn-wrap "^1.4.2"
-    test-exclude "^4.2.1"
+    test-exclude "^5.2.2"
+    uuid "^3.3.2"
     v8-to-istanbul "1.2.0"
     yargs "^11.0.0"
 

From c7f9a95a3f2cd5490ab2e5c174e62a1b7736cae0 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 14 May 2019 14:21:30 +0200
Subject: [PATCH 022/275] test: fix tests in windows ci (#30451)

PR Close #30451
---
 .../ngcc/test/packages/entry_point_bundle_spec.ts         | 8 +++++---
 packages/compiler-cli/src/ngtsc/path/src/logical.ts       | 2 +-
 packages/compiler-cli/test/ngtsc/env.ts                   | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts b/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts
index b976f9487a..4049ac9c25 100644
--- a/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts
+++ b/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts
@@ -5,10 +5,12 @@
  * 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 {AbsoluteFsPath} from '../../../src/ngtsc/path';
 import {makeEntryPointBundle} from '../../src/packages/entry_point_bundle';
 import {MockFileSystem} from '../helpers/mock_file_system';
 
+const _ = AbsoluteFsPath.from;
+
 function createMockFileSystem() {
   return new MockFileSystem({
     '/node_modules/test': {
@@ -102,7 +104,7 @@ describe('entry point bundle', () => {
           // Modules resolved from "other" should be declaration files
           '/node_modules/other/public_api.d.ts',
           '/node_modules/other/index.d.ts',
-        ]));
+        ].map(p => _(p).toString())));
 
     expect(esm5bundle.dts !.program.getSourceFiles().map(sf => sf.fileName))
         .toEqual(jasmine.arrayWithExactContents([
@@ -115,6 +117,6 @@ describe('entry point bundle', () => {
           '/node_modules/test/secondary/index.d.ts',
           '/node_modules/other/public_api.d.ts',
           '/node_modules/other/index.d.ts',
-        ]));
+        ].map(p => _(p).toString())));
   });
 });
diff --git a/packages/compiler-cli/src/ngtsc/path/src/logical.ts b/packages/compiler-cli/src/ngtsc/path/src/logical.ts
index e00a74f4ed..4ad75a3f59 100644
--- a/packages/compiler-cli/src/ngtsc/path/src/logical.ts
+++ b/packages/compiler-cli/src/ngtsc/path/src/logical.ts
@@ -67,7 +67,7 @@ export class LogicalFileSystem {
    * `logicalPathOfFile(AbsoluteFsPath.fromSourceFile(sf))`.
    */
   logicalPathOfSf(sf: ts.SourceFile): LogicalProjectPath|null {
-    return this.logicalPathOfFile(sf.fileName as AbsoluteFsPath);
+    return this.logicalPathOfFile(AbsoluteFsPath.from(sf.fileName));
   }
 
   /**
diff --git a/packages/compiler-cli/test/ngtsc/env.ts b/packages/compiler-cli/test/ngtsc/env.ts
index 98e5f4bd0e..3daec54ab5 100644
--- a/packages/compiler-cli/test/ngtsc/env.ts
+++ b/packages/compiler-cli/test/ngtsc/env.ts
@@ -49,7 +49,7 @@ export class NgtscTestEnvironment {
    */
   static setup(): NgtscTestEnvironment {
     const support = setup();
-    const outDir = path.join(support.basePath, 'built');
+    const outDir = path.posix.join(support.basePath, 'built');
     process.chdir(support.basePath);
 
     setupFakeCore(support);
@@ -133,7 +133,7 @@ export class NgtscTestEnvironment {
 
   write(fileName: string, content: string) {
     if (this.multiCompileHostExt !== null) {
-      const absFilePath = path.resolve(this.support.basePath, fileName);
+      const absFilePath = path.posix.resolve(this.support.basePath, fileName);
       this.multiCompileHostExt.invalidate(absFilePath);
     }
     this.support.write(fileName, content);
@@ -143,7 +143,7 @@ export class NgtscTestEnvironment {
     if (this.multiCompileHostExt === null) {
       throw new Error(`Not caching files - call enableMultipleCompilations()`);
     }
-    const fullFile = path.join(this.support.basePath, fileName);
+    const fullFile = path.posix.join(this.support.basePath, fileName);
     this.multiCompileHostExt.invalidate(fullFile);
   }
 

From ff29cccb777b517149fca4aa44048a061c3fcebb Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Mon, 13 May 2019 12:47:58 -0700
Subject: [PATCH 023/275] fix(bazel): Use existing npm/yarn lock files (#30438)

This PR fixes Bazel builder to create yarn_install rule in WORKSPACE if
yarn.lock is present, otherwise npm_install rule if package-lock.json is
present. If none is present, default to yarn_install and create an empty
yarn.lock file.

PR closes https://github.com/angular/angular/issues/30164
PR closes https://github.com/angular/angular/pull/30359

PR Close #30438
---
 packages/bazel/src/builders/bazel.ts | 36 ++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/packages/bazel/src/builders/bazel.ts b/packages/bazel/src/builders/bazel.ts
index 5a15c6503f..a9f143e453 100644
--- a/packages/bazel/src/builders/bazel.ts
+++ b/packages/bazel/src/builders/bazel.ts
@@ -9,7 +9,7 @@
 /// <reference types='node'/>
 
 import {spawn} from 'child_process';
-import {copyFileSync, existsSync, readdirSync, statSync, unlinkSync} from 'fs';
+import {copyFileSync, existsSync, readFileSync, readdirSync, statSync, unlinkSync, writeFileSync} from 'fs';
 import {dirname, join, normalize} from 'path';
 
 export type Executable = 'bazel' | 'ibazel';
@@ -106,6 +106,33 @@ function listR(dir: string): string[] {
   return list(dir, '', []);
 }
 
+/**
+ * Return the name of the lock file that is present in the specified 'root'
+ * directory. If none exists, default to creating an empty yarn.lock file.
+ */
+function getOrCreateLockFile(root: string): 'yarn.lock'|'package-lock.json' {
+  const yarnLock = join(root, 'yarn.lock');
+  if (existsSync(yarnLock)) {
+    return 'yarn.lock';
+  }
+  const npmLock = join(root, 'package-lock.json');
+  if (existsSync(npmLock)) {
+    return 'package-lock.json';
+  }
+  // Prefer yarn if no lock file exists
+  writeFileSync(yarnLock, '');
+  return 'yarn.lock';
+}
+
+// Replace yarn_install rule with npm_install and copy from 'source' to 'dest'.
+function replaceYarnWithNpm(source: string, dest: string) {
+  const srcContent = readFileSync(source, 'utf-8');
+  const destContent = srcContent.replace(/yarn_install/g, 'npm_install')
+                          .replace('yarn_lock', 'package_lock_json')
+                          .replace('yarn.lock', 'package-lock.json');
+  writeFileSync(dest, destContent);
+}
+
 /**
  * Copy Bazel files (WORKSPACE, BUILD.bazel, etc) from the template directory to
  * the project `root` directory, and return the absolute paths of the files
@@ -117,6 +144,7 @@ export function copyBazelFiles(root: string, templateDir: string) {
   templateDir = normalize(templateDir);
   const bazelFiles: string[] = [];
   const templates = listR(templateDir);
+  const useYarn = getOrCreateLockFile(root) === 'yarn.lock';
 
   for (const template of templates) {
     const name = template.replace('__dot__', '.').replace('.template', '');
@@ -124,7 +152,11 @@ export function copyBazelFiles(root: string, templateDir: string) {
     const dest = join(root, name);
     try {
       if (!existsSync(dest)) {
-        copyFileSync(source, dest);
+        if (!useYarn && name === 'WORKSPACE') {
+          replaceYarnWithNpm(source, dest);
+        } else {
+          copyFileSync(source, dest);
+        }
         bazelFiles.push(dest);
       }
     } catch {

From 1b059e595fd6a773b3715d079b75ef6c40d69d9f Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 30 Apr 2019 14:07:48 +0200
Subject: [PATCH 024/275] test(ivy): move common integration tests to
 acceptance (#30213)

PR Close #30213
---
 .../acceptance/common_integration_spec.ts     |  541 ++++++++
 .../test/render3/common_integration_spec.ts   | 1094 -----------------
 2 files changed, 541 insertions(+), 1094 deletions(-)
 create mode 100644 packages/core/test/acceptance/common_integration_spec.ts
 delete mode 100644 packages/core/test/render3/common_integration_spec.ts

diff --git a/packages/core/test/acceptance/common_integration_spec.ts b/packages/core/test/acceptance/common_integration_spec.ts
new file mode 100644
index 0000000000..14615fb8f6
--- /dev/null
+++ b/packages/core/test/acceptance/common_integration_spec.ts
@@ -0,0 +1,541 @@
+/**
+ * @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 {Component, Directive} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+
+describe('@angular/common integration', () => {
+
+  describe('NgForOf', () => {
+    @Directive({selector: '[dir]'})
+    class MyDirective {
+    }
+
+    @Component({selector: 'app-child', template: '<div dir>comp text</div>'})
+    class ChildComponent {
+    }
+
+    @Component({selector: 'app-root', template: ''})
+    class AppComponent {
+      items: string[] = ['first', 'second'];
+    }
+
+    beforeEach(() => {
+      TestBed.configureTestingModule({declarations: [AppComponent, ChildComponent, MyDirective]});
+    });
+
+    it('should update a loop', () => {
+      TestBed.overrideTemplate(
+          AppComponent, '<ul><li *ngFor="let item of items">{{item}}</li></ul>');
+      const fixture = TestBed.createComponent(AppComponent);
+      fixture.detectChanges();
+
+      let listItems =
+          Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.map(li => li.textContent)).toEqual(['first', 'second']);
+
+      // change detection cycle, no model changes
+      fixture.detectChanges();
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.map(li => li.textContent)).toEqual(['first', 'second']);
+
+      // remove the last item
+      const items = fixture.componentInstance.items;
+      items.length = 1;
+      fixture.detectChanges();
+
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.map(li => li.textContent)).toEqual(['first']);
+
+      // change an item
+      items[0] = 'one';
+      fixture.detectChanges();
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.map(li => li.textContent)).toEqual(['one']);
+
+      // add an item
+      items.push('two');
+      fixture.detectChanges();
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.map(li => li.textContent)).toEqual(['one', 'two']);
+    });
+
+    it('should support ngForOf context variables', () => {
+      TestBed.overrideTemplate(
+          AppComponent,
+          '<ul><li *ngFor="let item of items; index as myIndex; count as myCount">{{myIndex}} of {{myCount}}: {{item}}</li></ul>');
+      const fixture = TestBed.createComponent(AppComponent);
+      fixture.detectChanges();
+
+      let listItems =
+          Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.map(li => li.textContent)).toEqual(['0 of 2: first', '1 of 2: second']);
+
+      // add an item in the middle
+      const items = fixture.componentInstance.items;
+      items.splice(1, 0, 'middle');
+      fixture.detectChanges();
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.map(li => li.textContent)).toEqual([
+        '0 of 3: first', '1 of 3: middle', '2 of 3: second'
+      ]);
+    });
+
+    it('should instantiate directives inside directives properly in an ngFor', () => {
+      TestBed.overrideTemplate(AppComponent, '<app-child *ngFor="let item of items"></app-child>');
+      const fixture = TestBed.createComponent(AppComponent);
+      fixture.detectChanges();
+
+      const children = fixture.debugElement.queryAll(By.directive(ChildComponent));
+
+      // expect 2 children, each one with a directive
+      expect(children.length).toBe(2);
+      expect(children.map(child => child.nativeElement.innerHTML)).toEqual([
+        '<div dir="">comp text</div>', '<div dir="">comp text</div>'
+      ]);
+      let directive = children[0].query(By.directive(MyDirective));
+      expect(directive).not.toBeNull();
+      directive = children[1].query(By.directive(MyDirective));
+      expect(directive).not.toBeNull();
+
+      // add an item
+      const items = fixture.componentInstance.items;
+      items.push('third');
+      fixture.detectChanges();
+
+      const childrenAfterAdd = fixture.debugElement.queryAll(By.directive(ChildComponent));
+
+      expect(childrenAfterAdd.length).toBe(3);
+      expect(childrenAfterAdd.map(child => child.nativeElement.innerHTML)).toEqual([
+        '<div dir="">comp text</div>', '<div dir="">comp text</div>', '<div dir="">comp text</div>'
+      ]);
+      directive = childrenAfterAdd[2].query(By.directive(MyDirective));
+      expect(directive).not.toBeNull();
+    });
+
+    it('should retain parent view listeners when the NgFor destroy views', () => {
+      @Component({
+        selector: 'app-toggle',
+        template: `<button (click)="toggle()">Toggle List</button>
+         <ul>
+            <li *ngFor="let item of items">{{item}}</li>
+         </ul>`
+      })
+      class ToggleComponent {
+        private _data: number[] = [1, 2, 3];
+        items: number[] = [];
+
+        toggle() {
+          if (this.items.length) {
+            this.items = [];
+          } else {
+            this.items = this._data;
+          }
+        }
+      }
+
+      TestBed.configureTestingModule({declarations: [ToggleComponent]});
+      const fixture = TestBed.createComponent(ToggleComponent);
+      fixture.detectChanges();
+
+      // no elements in the list
+      let listItems =
+          Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(0);
+
+      // this will fill the list
+      fixture.componentInstance.toggle();
+      fixture.detectChanges();
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(3);
+      expect(listItems.map(li => li.textContent)).toEqual(['1', '2', '3']);
+
+      // now toggle via the button
+      const button: HTMLButtonElement = fixture.nativeElement.querySelector('button');
+      button.click();
+      fixture.detectChanges();
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(0);
+
+      // toggle again
+      button.click();
+      fixture.detectChanges();
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(3);
+    });
+
+    it('should support multiple levels of embedded templates', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `<ul>
+          <li *ngFor="let row of items">
+            <span *ngFor="let cell of row.data">{{cell}} - {{ row.value }} - {{ items.length }}</span>
+          </li>
+       </ul>`
+      })
+      class MultiLevelComponent {
+        items: any[] = [{data: ['1', '2'], value: 'first'}, {data: ['3', '4'], value: 'second'}];
+      }
+
+      TestBed.configureTestingModule({declarations: [MultiLevelComponent]});
+      const fixture = TestBed.createComponent(MultiLevelComponent);
+      fixture.detectChanges();
+
+      // change detection cycle, no model changes
+      let listItems =
+          Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(2);
+      let spanItems = Array.from(listItems[0].querySelectorAll('span'));
+      expect(spanItems.map(span => span.textContent)).toEqual(['1 - first - 2', '2 - first - 2']);
+      spanItems = Array.from(listItems[1].querySelectorAll('span'));
+      expect(spanItems.map(span => span.textContent)).toEqual(['3 - second - 2', '4 - second - 2']);
+
+      // remove the last item
+      const items = fixture.componentInstance.items;
+      items.length = 1;
+      fixture.detectChanges();
+
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(1);
+      spanItems = Array.from(listItems[0].querySelectorAll('span'));
+      expect(spanItems.map(span => span.textContent)).toEqual(['1 - first - 1', '2 - first - 1']);
+
+      // change an item
+      items[0].data[0] = 'one';
+      fixture.detectChanges();
+
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(1);
+      spanItems = Array.from(listItems[0].querySelectorAll('span'));
+      expect(spanItems.map(span => span.textContent)).toEqual(['one - first - 1', '2 - first - 1']);
+
+      // add an item
+      items[1] = {data: ['three', '4'], value: 'third'};
+      fixture.detectChanges();
+
+      listItems = Array.from((fixture.nativeElement as HTMLUListElement).querySelectorAll('li'));
+      expect(listItems.length).toBe(2);
+      spanItems = Array.from(listItems[0].querySelectorAll('span'));
+      expect(spanItems.map(span => span.textContent)).toEqual(['one - first - 2', '2 - first - 2']);
+      spanItems = Array.from(listItems[1].querySelectorAll('span'));
+      expect(spanItems.map(span => span.textContent)).toEqual([
+        'three - third - 2', '4 - third - 2'
+      ]);
+    });
+
+    it('should support multiple levels of embedded templates with listeners', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `<div *ngFor="let row of items">
+          <p *ngFor="let cell of row.data">
+            <span (click)="onClick(row.value, name)"></span>
+            {{ row.value }} - {{ name }}
+          </p>
+        </div>`
+      })
+      class MultiLevelWithListenerComponent {
+        items: any[] = [{data: ['1'], value: 'first'}];
+        name = 'app';
+        events: string[] = [];
+
+        onClick(value: string, name: string) { this.events.push(value, name); }
+      }
+
+      TestBed.configureTestingModule({declarations: [MultiLevelWithListenerComponent]});
+      const fixture = TestBed.createComponent(MultiLevelWithListenerComponent);
+      fixture.detectChanges();
+
+      const elements = fixture.nativeElement.querySelectorAll('p');
+      expect(elements.length).toBe(1);
+      expect(elements[0].innerHTML).toBe('<span></span> first - app ');
+
+      const span: HTMLSpanElement = fixture.nativeElement.querySelector('span');
+      span.click();
+      expect(fixture.componentInstance.events).toEqual(['first', 'app']);
+
+      fixture.componentInstance.name = 'new name';
+      fixture.detectChanges();
+      expect(elements[0].innerHTML).toBe('<span></span> first - new name ');
+
+      span.click();
+      expect(fixture.componentInstance.events).toEqual(['first', 'app', 'first', 'new name']);
+    });
+
+    it('should support skipping contexts', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `<div *ngFor="let row of items">
+           <div *ngFor="let cell of row">
+              <span *ngFor="let span of cell.data">{{ cell.value }} - {{ name }}</span>
+           </div>
+        </div>`
+      })
+      class SkippingContextComponent {
+        name = 'app';
+        items: any[] = [
+          [
+            // row
+            {value: 'one', data: ['1', '2']}  // cell
+          ],
+          [{value: 'two', data: ['3', '4']}]
+        ];
+      }
+
+      TestBed.configureTestingModule({declarations: [SkippingContextComponent]});
+      const fixture = TestBed.createComponent(SkippingContextComponent);
+      fixture.detectChanges();
+
+      const elements = fixture.nativeElement.querySelectorAll('span');
+      expect(elements.length).toBe(4);
+      expect(elements[0].textContent).toBe('one - app');
+      expect(elements[1].textContent).toBe('one - app');
+      expect(elements[2].textContent).toBe('two - app');
+      expect(elements[3].textContent).toBe('two - app');
+
+      fixture.componentInstance.name = 'other';
+      fixture.detectChanges();
+      expect(elements[0].textContent).toBe('one - other');
+      expect(elements[1].textContent).toBe('one - other');
+      expect(elements[2].textContent).toBe('two - other');
+      expect(elements[3].textContent).toBe('two - other');
+    });
+
+    it('should support context for 9+ levels of embedded templates', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `<div *ngFor="let item0 of items">
+            <span *ngFor="let item1 of item0.data">
+               <span *ngFor="let item2 of item1.data">
+                   <span *ngFor="let item3 of item2.data">
+                       <span *ngFor="let item4 of item3.data">
+                           <span *ngFor="let item5 of item4.data">
+                               <span *ngFor="let item6 of item5.data">
+                                   <span *ngFor="let item7 of item6.data">
+                                       <span *ngFor="let item8 of item7.data">{{ item8 }}.{{ item7.value }}.{{ item6.value }}.{{ item5.value }}.{{ item4.value }}.{{ item3.value }}.{{ item2.value }}.{{ item1.value }}.{{ item0.value }}.{{ value }}</span>
+                                   </span>
+                               </span>
+                           </span>
+                       </span>
+                   </span>
+               </span>
+            </span>
+         </div>`
+      })
+      class NineLevelsComponent {
+        value = 'App';
+        items: any[] = [
+          {
+            // item0
+            data: [{
+              // item1
+              data: [{
+                // item2
+                data: [{
+                  // item3
+                  data: [{
+                    // item4
+                    data: [{
+                      // item5
+                      data: [{
+                        // item6
+                        data: [{
+                          // item7
+                          data: [
+                            '1', '2'  // item8
+                          ],
+                          value: 'h'
+                        }],
+                        value: 'g'
+                      }],
+                      value: 'f'
+                    }],
+                    value: 'e'
+                  }],
+                  value: 'd'
+                }],
+                value: 'c'
+              }],
+              value: 'b'
+            }],
+            value: 'a'
+          },
+          {
+            // item0
+            data: [{
+              // item1
+              data: [{
+                // item2
+                data: [{
+                  // item3
+                  data: [{
+                    // item4
+                    data: [{
+                      // item5
+                      data: [{
+                        // item6
+                        data: [{
+                          // item7
+                          data: [
+                            '3', '4'  // item8
+                          ],
+                          value: 'H'
+                        }],
+                        value: 'G'
+                      }],
+                      value: 'F'
+                    }],
+                    value: 'E'
+                  }],
+                  value: 'D'
+                }],
+                value: 'C'
+              }],
+              value: 'B'
+            }],
+            value: 'A'
+          }
+        ];
+      }
+
+      TestBed.configureTestingModule({declarations: [NineLevelsComponent]});
+      const fixture = TestBed.createComponent(NineLevelsComponent);
+      fixture.detectChanges();
+
+      const divItems = (fixture.nativeElement as HTMLElement).querySelectorAll('div');
+      expect(divItems.length).toBe(2);  // 2 outer loops
+      let spanItems =
+          divItems[0].querySelectorAll('span > span > span > span > span > span > span > span');
+      expect(spanItems.length).toBe(2);  // 2 inner elements
+      expect(spanItems[0].textContent).toBe('1.h.g.f.e.d.c.b.a.App');
+      expect(spanItems[1].textContent).toBe('2.h.g.f.e.d.c.b.a.App');
+      spanItems =
+          divItems[1].querySelectorAll('span > span > span > span > span > span > span > span');
+      expect(spanItems.length).toBe(2);  // 2 inner elements
+      expect(spanItems[0].textContent).toBe('3.H.G.F.E.D.C.B.A.App');
+      expect(spanItems[1].textContent).toBe('4.H.G.F.E.D.C.B.A.App');
+    });
+  });
+
+  describe('ngIf', () => {
+    it('should support sibling ngIfs', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `
+          <div *ngIf="showing">{{ valueOne }}</div>
+          <div *ngIf="showing">{{ valueTwo }}</div>
+        `
+      })
+      class SimpleConditionComponent {
+        showing = true;
+        valueOne = 'one';
+        valueTwo = 'two';
+      }
+
+      TestBed.configureTestingModule({declarations: [SimpleConditionComponent]});
+      const fixture = TestBed.createComponent(SimpleConditionComponent);
+      fixture.detectChanges();
+
+      const elements = fixture.nativeElement.querySelectorAll('div');
+      expect(elements.length).toBe(2);
+      expect(elements[0].textContent).toBe('one');
+      expect(elements[1].textContent).toBe('two');
+
+      fixture.componentInstance.valueOne = '$$one$$';
+      fixture.componentInstance.valueTwo = '$$two$$';
+      fixture.detectChanges();
+      expect(elements[0].textContent).toBe('$$one$$');
+      expect(elements[1].textContent).toBe('$$two$$');
+    });
+
+    it('should handle nested ngIfs with no intermediate context vars', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `<div *ngIf="showing">
+          <div *ngIf="outerShowing">
+              <div *ngIf="innerShowing">{{ name }}</div>
+            </div>
+          </div>
+        `
+      })
+      class NestedConditionsComponent {
+        showing = true;
+        outerShowing = true;
+        innerShowing = true;
+        name = 'App name';
+      }
+
+      TestBed.configureTestingModule({declarations: [NestedConditionsComponent]});
+      const fixture = TestBed.createComponent(NestedConditionsComponent);
+      fixture.detectChanges();
+
+      const elements = fixture.nativeElement.querySelectorAll('div');
+      expect(elements.length).toBe(3);
+      expect(elements[2].textContent).toBe('App name');
+
+      fixture.componentInstance.name = 'Other name';
+      fixture.detectChanges();
+      expect(elements[2].textContent).toBe('Other name');
+    });
+  });
+
+  describe('NgTemplateOutlet', () => {
+
+    it('should create and remove embedded views', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `<ng-template #tpl>from tpl</ng-template>
+          <ng-template [ngTemplateOutlet]="showing ? tpl : null"></ng-template>
+        `
+      })
+      class EmbeddedViewsComponent {
+        showing = false;
+      }
+
+      TestBed.configureTestingModule({declarations: [EmbeddedViewsComponent]});
+      const fixture = TestBed.createComponent(EmbeddedViewsComponent);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.textContent).not.toBe('from tpl');
+
+      fixture.componentInstance.showing = true;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent).toBe('from tpl');
+
+      fixture.componentInstance.showing = false;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent).not.toBe('from tpl');
+    });
+
+    it('should create and remove embedded views', () => {
+      @Component({
+        selector: 'app-multi',
+        template: `<ng-template #tpl>from tpl</ng-template>
+          <ng-container [ngTemplateOutlet]="showing ? tpl : null"></ng-container>
+        `
+      })
+      class NgContainerComponent {
+        showing = false;
+      }
+
+      TestBed.configureTestingModule({declarations: [NgContainerComponent]});
+      const fixture = TestBed.createComponent(NgContainerComponent);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.textContent).not.toBe('from tpl');
+
+      fixture.componentInstance.showing = true;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent).toBe('from tpl');
+
+      fixture.componentInstance.showing = false;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent).not.toBe('from tpl');
+    });
+  });
+});
diff --git a/packages/core/test/render3/common_integration_spec.ts b/packages/core/test/render3/common_integration_spec.ts
deleted file mode 100644
index 029c154027..0000000000
--- a/packages/core/test/render3/common_integration_spec.ts
+++ /dev/null
@@ -1,1094 +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 {NgForOfContext} from '@angular/common';
-
-import {AttributeMarker, ɵɵdefineComponent, ɵɵelement, ɵɵgetCurrentView, ɵɵtemplateRefExtractor} from '../../src/render3/index';
-import {ɵɵbind, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolationV, ɵɵlistener, ɵɵload, ɵɵnextContext, ɵɵreference, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
-import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {ɵɵrestoreView} from '../../src/render3/state';
-
-import {NgForOf, NgIf, NgTemplateOutlet} from './common_with_def';
-import {ComponentFixture, createDirective, getDirectiveOnNode} from './render_util';
-
-describe('@angular/common integration', () => {
-
-  describe('NgForOf', () => {
-    it('should update a loop', () => {
-      function liTemplate(rf: RenderFlags, ctx: NgForOfContext<string>) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'li');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item = ctx.$implicit;
-          ɵɵtextBinding(1, ɵɵbind(item));
-        }
-      }
-
-      class MyApp {
-        items: string[] = ['first', 'second'];
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 2,
-          vars: 1,
-          // <ul>
-          //   <li *ngFor="let item of items">{{item}}</li>
-          // </ul>
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'ul');
-              {
-                ɵɵtemplate(
-                    1, liTemplate, 2, 1, 'li', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(1, 'ngForOf', ɵɵbind(ctx.items));
-            }
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html).toEqual('<ul><li>first</li><li>second</li></ul>');
-
-      // change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html).toEqual('<ul><li>first</li><li>second</li></ul>');
-
-      // remove the last item
-      fixture.component.items.length = 1;
-      fixture.update();
-      expect(fixture.html).toEqual('<ul><li>first</li></ul>');
-
-      // change an item
-      fixture.component.items[0] = 'one';
-      fixture.update();
-      expect(fixture.html).toEqual('<ul><li>one</li></ul>');
-
-      // add an item
-      fixture.component.items.push('two');
-      fixture.update();
-      expect(fixture.html).toEqual('<ul><li>one</li><li>two</li></ul>');
-    });
-
-    it('should support ngForOf context variables', () => {
-      function liTemplate(rf: RenderFlags, ctx: NgForOfContext<string>) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'li');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item = ctx.$implicit;
-          ɵɵtextBinding(1, ɵɵinterpolation3('', ctx.index, ' of ', ctx.count, ': ', item, ''));
-        }
-      }
-
-      class MyApp {
-        items: string[] = ['first', 'second'];
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 2,
-          vars: 1,
-          // <ul>
-          //   <li *ngFor="let item of items; index as index; count as count">{{index}} of
-          //   {{count}}: {{item}}</li>
-          // </ul>
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'ul');
-              {
-                ɵɵtemplate(
-                    1, liTemplate, 2, 3, 'li', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(1, 'ngForOf', ɵɵbind(ctx.items));
-            }
-
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html).toEqual('<ul><li>0 of 2: first</li><li>1 of 2: second</li></ul>');
-
-      fixture.component.items.splice(1, 0, 'middle');
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<ul><li>0 of 3: first</li><li>1 of 3: middle</li><li>2 of 3: second</li></ul>');
-    });
-
-    it('should instantiate directives inside directives properly in an ngFor', () => {
-      let dirs: any[] = [];
-
-      const Dir = createDirective('dir');
-
-      class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
-          type: Comp,
-          selectors: [['comp']],
-          factory: () => new Comp(),
-          consts: 2,
-          vars: 0,
-          template: (rf: RenderFlags, cmp: Comp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', ['dir', '']);
-              { ɵɵtext(1, 'comp text'); }
-              ɵɵelementEnd();
-              // testing only
-              dirs.push(getDirectiveOnNode(0));
-            }
-          },
-          directives: [Dir]
-        });
-      }
-
-      function ngForTemplate(rf: RenderFlags, ctx: NgForOfContext<string>) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
-        }
-      }
-
-      /** <comp *ngFor="let row of rows"></comp> */
-      class MyApp {
-        rows: string[] = ['first', 'second'];
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 1,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, ngForTemplate, 1, 0, 'comp', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.rows));
-            }
-          },
-          directives: () => [NgForOf, Comp, Dir]
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html)
-          .toEqual(
-              '<comp><div dir="">comp text</div></comp><comp><div dir="">comp text</div></comp>');
-      expect(dirs.length).toBe(2);
-      expect(dirs[0] instanceof Dir).toBe(true);
-      expect(dirs[1] instanceof Dir).toBe(true);
-
-      fixture.component.rows.push('third');
-      fixture.update();
-      expect(dirs.length).toBe(3);
-      expect(dirs[2] instanceof Dir).toBe(true);
-      expect(fixture.html)
-          .toEqual(
-              '<comp><div dir="">comp text</div></comp><comp><div dir="">comp text</div></comp><comp><div dir="">comp text</div></comp>');
-    });
-
-    it('should retain parent view listeners when the NgFor destroy views', () => {
-
-      function liTemplate(rf: RenderFlags, ctx: NgForOfContext<string>) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'li');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item = ctx.$implicit;
-          ɵɵtextBinding(1, ɵɵinterpolation1('', item, ''));
-        }
-      }
-
-      class MyApp {
-        private _data: number[] = [1, 2, 3];
-        items: number[] = [];
-
-        toggle() {
-          if (this.items.length) {
-            this.items = [];
-          } else {
-            this.items = this._data;
-          }
-        }
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 4,
-          vars: 1,
-          // <button (click)="toggle()">Toggle List</button>
-          // <ul>
-          //   <li *ngFor="let item of items">{{index}}</li>
-          // </ul>
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'button');
-              {
-                ɵɵlistener('click', function() { return ctx.toggle(); });
-                ɵɵtext(1, 'Toggle List');
-              }
-              ɵɵelementEnd();
-              ɵɵelementStart(2, 'ul');
-              {
-                ɵɵtemplate(
-                    3, liTemplate, 2, 1, 'li', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(3, 'ngForOf', ɵɵbind(ctx.items));
-            }
-
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      const button = fixture.hostElement.querySelector('button') !;
-
-      expect(fixture.html).toEqual('<button>Toggle List</button><ul></ul>');
-
-      // this will fill the list
-      fixture.component.toggle();
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<button>Toggle List</button><ul><li>1</li><li>2</li><li>3</li></ul>');
-
-      button.click();
-      fixture.update();
-
-      expect(fixture.html).toEqual('<button>Toggle List</button><ul></ul>');
-
-      button.click();
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<button>Toggle List</button><ul><li>1</li><li>2</li><li>3</li></ul>');
-    });
-
-    it('should support multiple levels of embedded templates', () => {
-      /**
-       * <ul>
-       *   <li *ngFor="let row of items">
-       *      <span *ngFor="let cell of row.data">{{cell}} - {{ row.value }} - {{ items.length }}
-       * </span>
-       *   </li>
-       * </ul>
-       */
-      class MyApp {
-        items: any[] = [{data: ['1', '2'], value: 'first'}, {data: ['3', '4'], value: 'second'}];
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 2,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'ul');
-              {
-                ɵɵtemplate(
-                    1, liTemplate, 2, 1, 'li', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-              }
-              ɵɵelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(1, 'ngForOf', ɵɵbind(ctx.items));
-            }
-
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      function liTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'li');
-          {
-            ɵɵtemplate(
-                1, spanTemplate, 2, 3, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const row = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(row.data));
-        }
-      }
-
-      function spanTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const cell = ctx.$implicit;
-          const row = ɵɵnextContext().$implicit as any;
-          const app = ɵɵnextContext() as any;
-          ɵɵtextBinding(
-              1, ɵɵinterpolation3('', cell, ' - ', row.value, ' - ', app.items.length, ''));
-        }
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-
-      // Change detection cycle, no model changes
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<ul><li><span>1 - first - 2</span><span>2 - first - 2</span></li><li><span>3 - second - 2</span><span>4 - second - 2</span></li></ul>');
-
-      // Remove the last item
-      fixture.component.items.length = 1;
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<ul><li><span>1 - first - 1</span><span>2 - first - 1</span></li></ul>');
-
-      // Change an item
-      fixture.component.items[0].data[0] = 'one';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<ul><li><span>one - first - 1</span><span>2 - first - 1</span></li></ul>');
-
-      // Add an item
-      fixture.component.items[1] = {data: ['three', '4'], value: 'third'};
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<ul><li><span>one - first - 2</span><span>2 - first - 2</span></li><li><span>three - third - 2</span><span>4 - third - 2</span></li></ul>');
-    });
-
-    it('should support multiple levels of embedded templates with listeners', () => {
-      /**
-       * <div *ngFor="let row of items">
-       *    <p *ngFor="let cell of row.data">
-       *        <span (click)="onClick(row.value, name)"></span>
-       *        {{ row.value }} - {{ name }}
-       *    </p>
-       * </div>
-       */
-      class MyApp {
-        items: any[] = [{data: ['1'], value: 'first'}];
-        name = 'app';
-        events: string[] = [];
-
-        onClick(value: string, name: string) { this.events.push(value, name); }
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 1,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, divTemplate, 2, 1, 'div', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.items));
-            }
-
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      function divTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵtemplate(1, pTemplate, 3, 2, 'p', [AttributeMarker.Template, 'ngFor', 'ngForOf']); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const row = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(row.data));
-        }
-      }
-
-      function pTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          const state = ɵɵgetCurrentView();
-          ɵɵelementStart(0, 'p');
-          {
-            ɵɵelementStart(1, 'span');
-            {
-              ɵɵlistener('click', () => {
-                ɵɵrestoreView(state);
-                const row = ɵɵnextContext().$implicit as any;
-                const app = ɵɵnextContext();
-                app.onClick(row.value, app.name);
-              });
-            }
-            ɵɵelementEnd();
-            ɵɵtext(2);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const row = ɵɵnextContext().$implicit as any;
-          const app = ɵɵnextContext() as any;
-          ɵɵtextBinding(2, ɵɵinterpolation2('', row.value, ' - ', app.name, ''));
-        }
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-
-      fixture.update();
-      expect(fixture.html).toEqual('<div><p><span></span>first - app</p></div>');
-
-      const span = fixture.hostElement.querySelector('span') as any;
-      span.click();
-      expect(fixture.component.events).toEqual(['first', 'app']);
-
-      fixture.component.name = 'new name';
-      fixture.update();
-      expect(fixture.html).toEqual('<div><p><span></span>first - new name</p></div>');
-
-      span.click();
-      expect(fixture.component.events).toEqual(['first', 'app', 'first', 'new name']);
-    });
-
-    it('should support skipping contexts', () => {
-      /**
-       * <div *ngFor="let row of items">
-       *    <div *ngFor="let cell of row">
-       *       <span *ngFor="let span of cell.data">
-       *           {{ cell.value }} - {{ name }}
-       *       </span>
-       *    </div>
-       * </div>
-       */
-      class MyApp {
-        name = 'app';
-        items: any[] = [
-          [
-            // row
-            {value: 'one', data: ['1', '2']}  // cell
-          ],
-          [{value: 'two', data: ['3', '4']}]
-        ];
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 1,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, divTemplate, 2, 1, 'div', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.items));
-            }
-
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      function divTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          {
-            ɵɵtemplate(
-                1, innerDivTemplate, 2, 1, 'div', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const row = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(row));
-        }
-      }
-
-      function innerDivTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          {
-            ɵɵtemplate(
-                1, spanTemplate, 2, 2, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const cell = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(cell.data));
-        }
-      }
-
-      function spanTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const cell = ɵɵnextContext().$implicit as any;
-          const app = ɵɵnextContext(2) as any;
-          ɵɵtextBinding(1, ɵɵinterpolation2('', cell.value, ' - ', app.name, ''));
-        }
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              `<div><div><span>one - app</span><span>one - app</span></div></div><div><div><span>two - app</span><span>two - app</span></div></div>`);
-
-      fixture.component.name = 'other';
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              `<div><div><span>one - other</span><span>one - other</span></div></div><div><div><span>two - other</span><span>two - other</span></div></div>`);
-    });
-
-    it('should support context for 9+ levels of embedded templates', () => {
-      /**
-       *
-       * <span *ngFor="let item0 of items">
-       *     <span *ngFor="let item1 of item0.data">
-       *        <span *ngFor="let item2 of item1.data">
-       *            <span *ngFor="let item3 of item2.data">
-       *                <span *ngFor="let item4 of item3.data">
-       *                    <span *ngFor="let item5 of item4.data">
-       *                        <span *ngFor="let item6 of item5.data">
-       *                            <span *ngFor="let item7 of item6.data">
-       *                                <span *ngFor="let item8 of item7.data">
-       *                                    {{ item8 }} - {{ item7.value }} - {{ item6.value }}...
-       *                                 </span>
-       *                            </span>
-       *                        </span>
-       *                    </span>
-       *                </span>
-       *            </span>
-       *        </span>
-       *     </span>
-       * </span>
-       */
-      class MyApp {
-        value = 'App';
-        items: any[] = [
-          {
-            // item0
-            data: [{
-              // item1
-              data: [{
-                // item2
-                data: [{
-                  // item3
-                  data: [{
-                    // item4
-                    data: [{
-                      // item5
-                      data: [{
-                        // item6
-                        data: [{
-                          // item7
-                          data: [
-                            '1', '2'  // item8
-                          ],
-                          value: 'h'
-                        }],
-                        value: 'g'
-                      }],
-                      value: 'f'
-                    }],
-                    value: 'e'
-                  }],
-                  value: 'd'
-                }],
-                value: 'c'
-              }],
-              value: 'b'
-            }],
-            value: 'a'
-          },
-          {
-            // item0
-            data: [{
-              // item1
-              data: [{
-                // item2
-                data: [{
-                  // item3
-                  data: [{
-                    // item4
-                    data: [{
-                      // item5
-                      data: [{
-                        // item6
-                        data: [{
-                          // item7
-                          data: [
-                            '3', '4'  // item8
-                          ],
-                          value: 'H'
-                        }],
-                        value: 'G'
-                      }],
-                      value: 'F'
-                    }],
-                    value: 'E'
-                  }],
-                  value: 'D'
-                }],
-                value: 'C'
-              }],
-              value: 'B'
-            }],
-            value: 'A'
-          }
-        ];
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 1,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
-                  0, itemTemplate0, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.items));
-            }
-
-          },
-          directives: () => [NgForOf]
-        });
-      }
-
-      function itemTemplate0(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate1, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item0 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item0.data));
-        }
-      }
-
-      function itemTemplate1(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate2, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item1 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item1.data));
-        }
-      }
-
-      function itemTemplate2(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate3, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item2 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item2.data));
-        }
-      }
-
-      function itemTemplate3(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate4, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item3 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item3.data));
-        }
-      }
-
-      function itemTemplate4(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate5, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item4 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item4.data));
-        }
-      }
-
-      function itemTemplate5(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate6, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item5 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item5.data));
-        }
-      }
-
-      function itemTemplate6(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate7, 2, 1, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item6 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item6.data));
-        }
-      }
-
-      function itemTemplate7(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          {
-            ɵɵtemplate(
-                1, itemTemplate8, 2, 10, 'span', [AttributeMarker.Template, 'ngFor', 'ngForOf']);
-          }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const item7 = ctx.$implicit as any;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(item7.data));
-        }
-      }
-
-      function itemTemplate8(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-
-        if (rf & RenderFlags.Update) {
-          const value = ctx.$implicit;
-          const item7 = ɵɵnextContext().$implicit;
-          const item6 = ɵɵnextContext().$implicit;
-          const item5 = ɵɵnextContext().$implicit;
-          const item4 = ɵɵnextContext().$implicit;
-          const item3 = ɵɵnextContext().$implicit;
-          const item2 = ɵɵnextContext().$implicit;
-          const item1 = ɵɵnextContext().$implicit;
-          const item0 = ɵɵnextContext().$implicit;
-          const myApp = ɵɵnextContext();
-          ɵɵtextBinding(1, ɵɵinterpolationV([
-                          '',  value,       '.', item7.value, '.', item6.value, '.', item5.value,
-                          '.', item4.value, '.', item3.value, '.', item2.value, '.', item1.value,
-                          '.', item0.value, '.', myApp.value, ''
-                        ]));
-        }
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-
-      expect(fixture.html)
-          .toEqual(
-              '<span><span><span><span><span><span><span><span>' +
-              '<span>1.h.g.f.e.d.c.b.a.App</span>' +
-              '<span>2.h.g.f.e.d.c.b.a.App</span>' +
-              '</span></span></span></span></span></span></span></span>' +
-              '<span><span><span><span><span><span><span><span>' +
-              '<span>3.H.G.F.E.D.C.B.A.App</span>' +
-              '<span>4.H.G.F.E.D.C.B.A.App</span>' +
-              '</span></span></span></span></span></span></span></span>');
-    });
-
-  });
-
-  describe('ngIf', () => {
-    it('should support sibling ngIfs', () => {
-      class MyApp {
-        showing = true;
-        valueOne = 'one';
-        valueTwo = 'two';
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 2,
-          vars: 2,
-          /**
-           * <div *ngIf="showing">{{ valueOne }}</div>
-           * <div *ngIf="showing">{{ valueTwo }}</div>
-           */
-          template: (rf: RenderFlags, ctx: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(0, templateOne, 2, 1, 'div', [AttributeMarker.Template, 'ngIf']);
-              ɵɵtemplate(1, templateTwo, 2, 1, 'div', [AttributeMarker.Template, 'ngIf']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.showing));
-              ɵɵelementProperty(1, 'ngIf', ɵɵbind(ctx.showing));
-            }
-
-          },
-          directives: () => [NgIf]
-        });
-      }
-
-      function templateOne(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const myApp = ɵɵnextContext();
-          ɵɵtextBinding(1, ɵɵbind(myApp.valueOne));
-        }
-      }
-
-      function templateTwo(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const myApp = ɵɵnextContext();
-          ɵɵtextBinding(1, ɵɵbind(myApp.valueTwo));
-        }
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html).toEqual('<div>one</div><div>two</div>');
-
-      fixture.component.valueOne = '$$one$$';
-      fixture.component.valueTwo = '$$two$$';
-      fixture.update();
-      expect(fixture.html).toEqual('<div>$$one$$</div><div>$$two$$</div>');
-    });
-
-    it('should handle nested ngIfs with no intermediate context vars', () => {
-      /**
-       * <div *ngIf="showing">
-       *     <div *ngIf="outerShowing">
-       *         <div *ngIf="innerShowing'>
-       *           {{ name }}
-       *         </div>
-       *     </div>
-       * </div>
-       */
-      class AppComponent {
-        showing = true;
-        outerShowing = true;
-        innerShowing = true;
-        name = 'App name';
-
-        static ngComponentDef = ɵɵdefineComponent({
-          type: AppComponent,
-          factory: () => new AppComponent(),
-          selectors: [['my-app']],
-          consts: 1,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: AppComponent) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(0, divTemplate, 2, 1, 'div', [AttributeMarker.Template, 'ngIf']);
-            }
-            if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.showing));
-            }
-
-          },
-          directives: () => [NgIf]
-        });
-      }
-
-      function divTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵtemplate(1, outerDivTemplate, 2, 1, 'div', [AttributeMarker.Template, 'ngIf']); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const app = ɵɵnextContext();
-          ɵɵelementProperty(1, 'ngIf', ɵɵbind(app.outerShowing));
-        }
-      }
-
-      function outerDivTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵtemplate(1, innerDivTemplate, 2, 1, 'div', [AttributeMarker.Template, 'ngIf']); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const app = ɵɵnextContext(2);
-          ɵɵelementProperty(1, 'ngIf', ɵɵbind(app.innerShowing));
-        }
-      }
-
-      function innerDivTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const app = ɵɵnextContext(3);
-          ɵɵtextBinding(1, ɵɵbind(app.name));
-        }
-      }
-
-      const fixture = new ComponentFixture(AppComponent);
-      expect(fixture.html).toEqual(`<div><div><div>App name</div></div></div>`);
-
-      fixture.component.name = 'Other name';
-      fixture.update();
-      expect(fixture.html).toEqual(`<div><div><div>Other name</div></div></div>`);
-    });
-
-  });
-
-  describe('NgTemplateOutlet', () => {
-
-    it('should create and remove embedded views', () => {
-
-      class MyApp {
-        showing = false;
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 3,
-          vars: 1,
-          /**
-           * <ng-template #tpl>from tpl</ng-template>
-           * <ng-template [ngTemplateOutlet]="showing ? tpl : null"></ng-template>
-           */
-          template: (rf: RenderFlags, myApp: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(0, (rf1: RenderFlags) => {
-                if (rf1 & RenderFlags.Create) {
-                  ɵɵtext(0, 'from tpl');
-                }
-              }, 1, 0, 'ng-template', undefined, ['tpl', ''], ɵɵtemplateRefExtractor);
-              ɵɵtemplate(
-                  2, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'ngTemplateOutlet']);
-            }
-            if (rf & RenderFlags.Update) {
-              const tplRef = ɵɵload(1);
-              ɵɵelementProperty(2, 'ngTemplateOutlet', ɵɵbind(myApp.showing ? tplRef : null));
-            }
-          },
-          directives: () => [NgTemplateOutlet]
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html).toEqual('');
-
-      fixture.component.showing = true;
-      fixture.update();
-      expect(fixture.html).toEqual('from tpl');
-
-      fixture.component.showing = false;
-      fixture.update();
-      expect(fixture.html).toEqual('');
-    });
-
-    it('should allow usage on ng-container', () => {
-      class MyApp {
-        showing = false;
-        static ngComponentDef = ɵɵdefineComponent({
-          type: MyApp,
-          factory: () => new MyApp(),
-          selectors: [['my-app']],
-          consts: 3,
-          vars: 1,
-          /**
-           * <ng-template #tpl>from tpl</ng-template>
-           * <ng-container [ngTemplateOutlet]="showing ? tpl : null"></ng-container>
-           */
-          template: (rf: RenderFlags, myApp: MyApp) => {
-            if (rf & RenderFlags.Create) {
-              ɵɵtemplate(0, (rf1: RenderFlags) => {
-                if (rf1 & RenderFlags.Create) {
-                  ɵɵtext(0, 'from tpl');
-                }
-              }, 1, 0, 'ng-template', undefined, ['tpl', ''], ɵɵtemplateRefExtractor);
-              ɵɵelementContainerStart(2, [AttributeMarker.Bindings, 'ngTemplateOutlet']);
-              ɵɵelementContainerEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              const tplRef = ɵɵreference(1);
-              ɵɵelementProperty(2, 'ngTemplateOutlet', ɵɵbind(myApp.showing ? tplRef : null));
-            }
-          },
-          directives: () => [NgTemplateOutlet]
-        });
-      }
-
-      const fixture = new ComponentFixture(MyApp);
-      expect(fixture.html).toEqual('');
-
-      fixture.component.showing = true;
-      fixture.update();
-      expect(fixture.html).toEqual('from tpl');
-
-      fixture.component.showing = false;
-      fixture.update();
-      expect(fixture.html).toEqual('');
-
-    });
-
-  });
-});

From f9fb921f911d203190f690e4230f043f0b722686 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Thu, 9 May 2019 08:21:06 -0700
Subject: [PATCH 025/275] docs: update ivy preview page (#30355)

PR Close #30355
---
 aio/content/guide/ivy.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/aio/content/guide/ivy.md b/aio/content/guide/ivy.md
index e62baa7ee7..28c5a7ab7f 100644
--- a/aio/content/guide/ivy.md
+++ b/aio/content/guide/ivy.md
@@ -1,6 +1,12 @@
 # Opting into Angular Ivy
 
-Ivy is the code name for Angular's [next-generation compilation and rendering pipeline](https://blog.angular.io/a-plan-for-version-8-0-and-ivy-b3318dfc19f7). Starting with Angular version 8, you can choose to opt in to start using Ivy now, and help in its continuing develpment and tuning.
+Ivy is the code name for Angular's [next-generation compilation and rendering pipeline](https://blog.angular.io/a-plan-for-version-8-0-and-ivy-b3318dfc19f7). Starting with Angular version 8, you can choose to opt in to start using a preview version of Ivy and help in its continuing development and tuning.
+
+<div class="alert is-helpful">
+
+   To preview Ivy, use `@angular/core@next` version of Angular (8.1.x), rather than `@angular/core@latest` (8.0.x), as it contains all the latest bug fixes and improvements.
+
+</div>
 
 
 ## Using Ivy in a new project

From 6ceb9034dc99e5e9f791c988eda2cc9ce99bc2e1 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 14 May 2019 19:59:26 +0200
Subject: [PATCH 026/275] fix(core): static-query migration errors not printed
 properly (#30458)

Apparently the devkit logger is not able to properly print
out error objects, so we need to convert them to a string
before in order to make the error visible to the user.

This is not testable without an e2e test that validates the CLI
terminal output.

PR Close #30458
---
 packages/core/schematics/migrations/static-queries/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index 089d369d7c..efc8a5f525 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -192,7 +192,7 @@ async function runStaticQueryMigration(
           `the update cannot use the template migration strategy. Please ensure ` +
           `there are no AOT compilation errors.`);
     }
-    logger.error(e);
+    logger.error(e.toString());
     logger.info(
         'Migration can be rerun with: "ng update @angular/core --from 7 --to 8 --migrate-only"');
     return [];

From 0cdf5980e299d70434f410421966be403f7f09c3 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 14 May 2019 20:35:27 +0200
Subject: [PATCH 027/275] fix(core): static-query migration should not fallback
 to test strategy (#30458)

Currently if something fails in the selected strategy (e.g. AOT failures),
the migration currently accidentally falls back to the test strategy. This
is not helpful as we want to give developers the possibility to re-run
the migration after fixing potential AOT failures.

PR Close #30458
---
 .../migrations/static-queries/index.ts        | 19 +++++++--
 .../static_queries_migration_template_spec.ts | 42 ++++++++++++++++---
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index efc8a5f525..19bdba3934 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -61,11 +61,12 @@ async function runMigration(tree: Tree, context: SchematicContext) {
         'to explicit timing.');
   }
 
+  const analyzedFiles = new Set<string>();
   const buildProjects = new Set<AnalyzedProject>();
   const failures = [];
 
   for (const tsconfigPath of buildPaths) {
-    const project = analyzeProject(tree, tsconfigPath, basePath);
+    const project = analyzeProject(tree, tsconfigPath, basePath, analyzedFiles);
     if (project) {
       buildProjects.add(project);
     }
@@ -83,7 +84,7 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   // For the "test" tsconfig projects we always want to use the test strategy as
   // we can't detect the proper timing within spec files.
   for (const tsconfigPath of testPaths) {
-    const project = await analyzeProject(tree, tsconfigPath, basePath);
+    const project = await analyzeProject(tree, tsconfigPath, basePath, analyzedFiles);
     if (project) {
       failures.push(
           ...await runStaticQueryMigration(tree, project, SELECTED_STRATEGY.TESTS, logger));
@@ -103,7 +104,8 @@ async function runMigration(tree: Tree, context: SchematicContext) {
  * Analyzes the given TypeScript project by looking for queries that need to be
  * migrated. In case there are no queries that can be migrated, null is returned.
  */
-function analyzeProject(tree: Tree, tsconfigPath: string, basePath: string):
+function analyzeProject(
+    tree: Tree, tsconfigPath: string, basePath: string, analyzedFiles: Set<string>):
     AnalyzedProject|null {
       const parsed = parseTsconfigFile(tsconfigPath, dirname(tsconfigPath));
       const host = ts.createCompilerHost(parsed.options, true);
@@ -125,7 +127,16 @@ function analyzeProject(tree: Tree, tsconfigPath: string, basePath: string):
 
       // Analyze all project source-files and collect all queries that
       // need to be migrated.
-      sourceFiles.forEach(sourceFile => queryVisitor.visitNode(sourceFile));
+      sourceFiles.forEach(sourceFile => {
+        const relativePath = relative(basePath, sourceFile.fileName);
+
+        // Only look for queries within the current source files if the
+        // file has not been analyzed before.
+        if (!analyzedFiles.has(relativePath)) {
+          analyzedFiles.add(relativePath);
+          queryVisitor.visitNode(sourceFile);
+        }
+      });
 
       if (queryVisitor.resolvedQueries.size === 0) {
         return null;
diff --git a/packages/core/schematics/test/static_queries_migration_template_spec.ts b/packages/core/schematics/test/static_queries_migration_template_spec.ts
index e8f6b96815..31483df180 100644
--- a/packages/core/schematics/test/static_queries_migration_template_spec.ts
+++ b/packages/core/schematics/test/static_queries_migration_template_spec.ts
@@ -515,8 +515,6 @@ describe('static-queries migration with template strategy', () => {
       await runMigration();
 
       expect(errorOutput.length).toBe(1);
-      expect(errorOutput[0])
-          .toMatch(/^Error: Could not create Angular AOT compiler to determine query timing./);
       expect(errorOutput[0]).toMatch(/Cannot determine the module for class MyComp/);
     });
 
@@ -673,15 +671,49 @@ describe('static-queries migration with template strategy', () => {
         export class MyModule {}
       `);
 
-      spyOn(console, 'error').and.callThrough();
-
       await runMigration();
 
-      expect(console.error).toHaveBeenCalledTimes(0);
+      expect(errorOutput.length).toBe(0);
       expect(tree.readContent('/src/test.ts'))
           .toContain(`@ViewChild('test', /* TODO: add static flag */ {}) query: any;`);
       expect(tree.readContent('/src/app.component.ts'))
           .toContain(`@ViewChild('test', { static: true }) query: any;`);
     });
+
+    it('should not fall back to test strategy if selected strategy fails', async() => {
+      writeFile('/src/tsconfig.spec.json', JSON.stringify({
+        compilerOptions: {
+          experimentalDecorators: true,
+          lib: ['es2015'],
+        },
+        files: [
+          'test.ts',
+        ],
+      }));
+
+      writeFile('/src/test.ts', `import * as mod from './app.module';`);
+      writeFile('/src/app.component.ts', `
+        import {Component, ViewChild} from '@angular/core';
+
+        @Component({template: '<span #test>Test</span>'})
+        export class AppComponent {
+          @ViewChild('test') query: any;
+        }
+      `);
+
+      writeFile('/src/app.module.ts', `
+        import {NgModule} from '@angular/core';
+        import {AppComponent} from './app.component';
+
+        @NgModule({declarations: [AppComponent, ThisCausesAnError]})
+        export class MyModule {}
+      `);
+
+      await runMigration();
+
+      expect(errorOutput.length).toBe(1);
+      expect(errorOutput[0]).toMatch(/Unexpected value 'undefined'/);
+      expect(tree.readContent('/src/app.component.ts')).toContain(`@ViewChild('test') query: any;`);
+    });
   });
 });

From 9e5377a2e3c4431f73985bc9272f5bf09dc6e30d Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 14 May 2019 20:59:21 +0200
Subject: [PATCH 028/275] refactor(core): improve messages for static-query
 migrations (#30458)

Slightly improves the messages for the static-query migration in order
to make the terminal output less verbose but more helpful. Unfortunately
we are limited in what we can print due to the devkit not providing much
utilities for printing good messages from a migration schematic.

PR Close #30458
---
 .../migrations/static-queries/index.ts        | 22 +++++++++----------
 .../template_strategy/template_strategy.ts    |  6 +----
 .../migrations/static-queries/transform.ts    |  2 +-
 .../static_queries_migration_template_spec.ts |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index 19bdba3934..505c404bde 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -53,7 +53,6 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   logger.info('In preparation for Ivy, developers can now explicitly specify the');
   logger.info('timing of their queries. Read more about this here:');
   logger.info('https://github.com/angular/angular/pull/28810');
-  logger.info('');
 
   if (!buildPaths.length && !testPaths.length) {
     throw new SchematicsException(
@@ -92,6 +91,7 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   }
 
   if (failures.length) {
+    logger.info('');
     logger.info('Some queries could not be migrated automatically. Please go');
     logger.info('through those manually and apply the appropriate timing:');
     failures.forEach(failure => logger.warn(`⮑   ${failure}`));
@@ -153,7 +153,7 @@ function analyzeProject(
  */
 async function runStaticQueryMigration(
     tree: Tree, project: AnalyzedProject, selectedStrategy: SELECTED_STRATEGY,
-    logger: logging.LoggerApi) {
+    logger: logging.LoggerApi): Promise<string[]> {
   const {sourceFiles, typeChecker, host, queryVisitor, tsconfigPath, basePath} = project;
   const printer = ts.createPrinter();
   const failureMessages: string[] = [];
@@ -190,22 +190,22 @@ async function runStaticQueryMigration(
   try {
     strategy.setup();
   } catch (e) {
-    // In case the strategy could not be set up properly, we just exit the
-    // migration. We don't want to throw an exception as this could mean
-    // that other migrations are interrupted.
-    logger.warn(
-        `Could not setup migration strategy for "${project.tsconfigPath}". The ` +
-        `following error has been reported:`);
     if (selectedStrategy === SELECTED_STRATEGY.TEMPLATE) {
       logger.warn(
           `The template migration strategy uses the Angular compiler ` +
           `internally and therefore projects that no longer build successfully after ` +
           `the update cannot use the template migration strategy. Please ensure ` +
-          `there are no AOT compilation errors.`);
+          `there are no AOT compilation errors.\n`);
     }
-    logger.error(e.toString());
+    // In case the strategy could not be set up properly, we just exit the
+    // migration. We don't want to throw an exception as this could mean
+    // that other migrations are interrupted.
+    logger.warn(
+        `Could not setup migration strategy for "${project.tsconfigPath}". The ` +
+        `following error has been reported:\n`);
+    logger.error(`${e.toString()}\n`);
     logger.info(
-        'Migration can be rerun with: "ng update @angular/core --from 7 --to 8 --migrate-only"');
+        'Migration can be rerun with: "ng update @angular/core --from 7 --to 8 --migrate-only"\n');
     return [];
   }
 
diff --git a/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts b/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts
index f7c0084470..6157ab3b99 100644
--- a/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts
+++ b/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts
@@ -179,11 +179,7 @@ export class QueryTemplateStrategy implements TimingStrategy {
   }
 
   private _createDiagnosticsError(diagnostics: (ts.Diagnostic|Diagnostic)[]) {
-    return new Error(
-        `Could not create Angular AOT compiler to determine query timing.\n` +
-        `The following diagnostics were detected:\n` +
-        `${diagnostics.map(d => d.messageText).join(`\n `)}\n` +
-        `Please make sure that there is no AOT compilation failure.`);
+    return new Error(`${diagnostics.map(d => d.messageText).join(`\n `)}`);
   }
 
   private _getViewQueryUniqueKey(filePath: string, className: string, propName: string) {
diff --git a/packages/core/schematics/migrations/static-queries/transform.ts b/packages/core/schematics/migrations/static-queries/transform.ts
index 139df0afa2..f60875799a 100644
--- a/packages/core/schematics/migrations/static-queries/transform.ts
+++ b/packages/core/schematics/migrations/static-queries/transform.ts
@@ -72,7 +72,7 @@ export function getTransformedQueryCallExpr(
       // we create a transformation failure message that shows developers that they need
       // to set the query timing manually to the determined query timing.
       if (timing !== null) {
-        failureMessage = 'Cannot update query declaration to explicit timing. Please manually ' +
+        failureMessage = 'Cannot update query to set explicit timing. Please manually ' +
             `set the query timing to: "{static: ${(timing === QueryTiming.STATIC).toString()}}"`;
       }
     }
diff --git a/packages/core/schematics/test/static_queries_migration_template_spec.ts b/packages/core/schematics/test/static_queries_migration_template_spec.ts
index 31483df180..4376b2d97f 100644
--- a/packages/core/schematics/test/static_queries_migration_template_spec.ts
+++ b/packages/core/schematics/test/static_queries_migration_template_spec.ts
@@ -602,7 +602,7 @@ describe('static-queries migration with template strategy', () => {
           .toContain(`@ViewChild('myRef', /* TODO: add static flag */ myOptionsVar) query: any;`);
       expect(warnOutput.length).toBe(1);
       expect(warnOutput[0])
-          .toMatch(/^⮑ {3}index.ts@8:11: Cannot update query declaration to explicit timing./);
+          .toMatch(/^⮑ {3}index.ts@8:11: Cannot update query to set explicit timing./);
       expect(warnOutput[0]).toMatch(/Please manually set the query timing to.*static: true/);
     });
 

From dbb150a9bdae68dfb92d64d904e85b8c5db5b2ec Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 14 May 2019 14:06:01 -0700
Subject: [PATCH 029/275] Revert "fix(core): CSS sanitizer now allows parens in
 file names (#30322)" (#30463)

This reverts commit 728db882808869e1f52d20535676756d3b63b58a.

We're reverting this commit for now, until it can be subjected to a more
thorough security review.

PR Close #30463
---
 packages/core/src/sanitization/style_sanitizer.ts       | 2 +-
 packages/core/test/sanitization/style_sanitizer_spec.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/sanitization/style_sanitizer.ts b/packages/core/src/sanitization/style_sanitizer.ts
index 16b19de093..62a6ecbe59 100644
--- a/packages/core/src/sanitization/style_sanitizer.ts
+++ b/packages/core/src/sanitization/style_sanitizer.ts
@@ -54,7 +54,7 @@ const SAFE_STYLE_VALUE = new RegExp(
  * Given the common use case, low likelihood of attack vector, and low impact of an attack, this
  * code is permissive and allows URLs that sanitize otherwise.
  */
-const URL_RE = /^url\(([\w\W]*)\)$/;
+const URL_RE = /^url\(([^)]+)\)$/;
 
 /**
  * Checks that quotes (" and ') are properly balanced inside a string. Assumes
diff --git a/packages/core/test/sanitization/style_sanitizer_spec.ts b/packages/core/test/sanitization/style_sanitizer_spec.ts
index e5a9d200e6..5adafceb8e 100644
--- a/packages/core/test/sanitization/style_sanitizer_spec.ts
+++ b/packages/core/test/sanitization/style_sanitizer_spec.ts
@@ -32,7 +32,7 @@ import {_sanitizeStyle} from '../../src/sanitization/style_sanitizer';
       expectSanitize('rgb(255, 0, 0)').toEqual('rgb(255, 0, 0)');
       expectSanitize('expression(haha)').toEqual('unsafe');
     });
-    t.it('rejects unbalanced quotes', () => { expectSanitize('"value" "').toEqual('unsafe'); });
+    t.it('rejects unblanaced quotes', () => { expectSanitize('"value" "').toEqual('unsafe'); });
     t.it('accepts transform functions', () => {
       expectSanitize('rotate(90deg)').toEqual('rotate(90deg)');
       expectSanitize('rotate(javascript:evil())').toEqual('unsafe');
@@ -58,7 +58,6 @@ import {_sanitizeStyle} from '../../src/sanitization/style_sanitizer';
     t.it('accepts quoted URLs', () => {
       expectSanitize('url("foo/bar.png")').toEqual('url("foo/bar.png")');
       expectSanitize(`url('foo/bar.png')`).toEqual(`url('foo/bar.png')`);
-      expectSanitize(`url('foo/bar (1).png')`).toEqual(`url('foo/bar (1).png')`);
       expectSanitize(`url(  'foo/bar.png'\n )`).toEqual(`url(  'foo/bar.png'\n )`);
       expectSanitize('url("javascript:evil()")').toEqual('unsafe');
       expectSanitize('url( " javascript:evil() " )').toEqual('unsafe');

From cf86ed7b29440aa23ed710542a41ffd09563266d Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Thu, 9 May 2019 11:47:25 -0700
Subject: [PATCH 030/275] =?UTF-8?q?refactor(ivy):=20migrate=20=C9=B5=C9=B5?=
 =?UTF-8?q?=20prefix=20back=20to=20=CE=94=20(#30362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that issues are resolved with Closure compiler, we can move back to our desired prefix of `Δ`.

PR Close #30362
---
 aio/content/guide/deprecations.md             |   94 +-
 .../transforms/angular-api-package/index.js   |    2 +-
 docs/PUBLIC_API.md                            |    2 +-
 integration/ngcc/test.sh                      |   14 +-
 .../src/tree/render3_function/index.ts        |   46 +-
 packages/common/src/directives/ng_class.ts    |   10 +-
 packages/common/src/directives/ng_style.ts    |   10 +-
 packages/common/src/viewport_scroller.ts      |    6 +-
 .../ngcc/test/rendering/renderer_spec.ts      |   12 +-
 packages/compiler-cli/src/metadata/bundler.ts |    2 +-
 .../src/ngtsc/imports/src/core.ts             |   16 +-
 .../test/compliance/mock_compile.ts           |    2 +-
 .../test/compliance/mock_compiler_spec.ts     |    2 +-
 .../compliance/r3_compiler_compliance_spec.ts |  762 +++++-----
 .../r3_view_compiler_binding_spec.ts          |  146 +-
 .../compliance/r3_view_compiler_di_spec.ts    |   14 +-
 .../r3_view_compiler_directives_spec.ts       |   56 +-
 .../compliance/r3_view_compiler_i18n_spec.ts  | 1353 +++++++++--------
 .../r3_view_compiler_input_outputs_spec.ts    |    4 +-
 .../r3_view_compiler_listener_spec.ts         |   62 +-
 .../r3_view_compiler_providers_spec.ts        |    6 +-
 .../test/compliance/r3_view_compiler_spec.ts  |   16 +-
 .../r3_view_compiler_styling_spec.ts          |  388 ++---
 .../r3_view_compiler_template_spec.ts         |  192 +--
 packages/compiler-cli/test/ngc_spec.ts        |   12 +-
 .../test/ngtsc/fake_core/index.ts             |    6 +-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     |  322 ++--
 .../compiler-cli/test/ngtsc/scope_spec.ts     |   12 +-
 .../test/ngtsc/template_mapping_spec.ts       |  164 +-
 .../test/ngtsc/template_typecheck_spec.ts     |    6 +-
 packages/compiler/design/architecture.md      |   10 +-
 .../compiler/design/separate_compilation.md   |   14 +-
 packages/compiler/src/identifiers.ts          |    6 +-
 packages/compiler/src/injectable_compiler.ts  |    2 +-
 .../compiler/src/injectable_compiler_2.ts     |    2 +-
 .../compiler/src/render3/r3_identifiers.ts    |  240 +--
 .../src/render3/r3_module_compiler.ts         |    6 +-
 .../compiler/src/render3/view/template.ts     |    2 +-
 .../differs/iterable_differs.ts               |    4 +-
 .../differs/keyvalue_differs.ts               |    4 +-
 packages/core/src/core_private_export.ts      |    4 +-
 .../core/src/core_render3_private_export.ts   |  242 +--
 packages/core/src/di/index.ts                 |    4 +-
 packages/core/src/di/injectable.ts            |    6 +-
 packages/core/src/di/injection_token.ts       |    4 +-
 packages/core/src/di/injector.ts              |    8 +-
 .../core/src/di/injector_compatibility.ts     |   17 +-
 packages/core/src/di/interface/defs.ts        |   20 +-
 packages/core/src/di/jit/environment.ts       |   12 +-
 packages/core/src/di/r3_injector.ts           |    8 +-
 packages/core/src/di/util.ts                  |    4 +-
 packages/core/src/metadata/ng_module.ts       |    8 +-
 packages/core/src/r3_symbols.ts               |    8 +-
 packages/core/src/render3/CODE_GEN_API.md     |    8 +-
 packages/core/src/render3/STATUS.md           |   32 +-
 .../src/render3/STORING_METADATA_IN_D.TS.md   |    6 +-
 packages/core/src/render3/VIEW_DATA.md        |   42 +-
 packages/core/src/render3/component_ref.ts    |    4 +-
 packages/core/src/render3/definition.ts       |   28 +-
 packages/core/src/render3/di.ts               |    6 +-
 packages/core/src/render3/di_setup.ts         |    6 +-
 .../features/inherit_definition_feature.ts    |    6 +-
 .../render3/features/ng_onchanges_feature.ts  |    2 +-
 .../src/render3/features/providers_feature.ts |    2 +-
 packages/core/src/render3/i18n.ts             |   32 +-
 packages/core/src/render3/index.ts            |  230 +--
 .../render3/instructions/alloc_host_vars.ts   |    2 +-
 .../src/render3/instructions/container.ts     |    8 +-
 packages/core/src/render3/instructions/di.ts  |   16 +-
 .../core/src/render3/instructions/element.ts  |   14 +-
 .../render3/instructions/element_container.ts |    4 +-
 .../src/render3/instructions/embedded_view.ts |    5 +-
 .../render3/instructions/get_current_view.ts  |    2 +-
 .../core/src/render3/instructions/listener.ts |    4 +-
 .../src/render3/instructions/namespace.ts     |    2 +-
 .../src/render3/instructions/next_context.ts  |    2 +-
 .../src/render3/instructions/projection.ts    |    4 +-
 .../core/src/render3/instructions/property.ts |   12 +-
 .../instructions/property_interpolation.ts    |   98 +-
 .../core/src/render3/instructions/select.ts   |    4 +-
 .../core/src/render3/instructions/shared.ts   |    4 +-
 .../core/src/render3/instructions/storage.ts  |    4 +-
 .../core/src/render3/instructions/styling.ts  |   12 +-
 .../core/src/render3/instructions/text.ts     |    4 +-
 .../core/src/render3/interfaces/definition.ts |   10 +-
 packages/core/src/render3/jit/environment.ts  |  242 +--
 packages/core/src/render3/pipe.ts             |   39 +-
 packages/core/src/render3/pure_function.ts    |   20 +-
 packages/core/src/render3/query.ts            |   22 +-
 packages/core/src/render3/state.ts            |   20 +-
 packages/core/src/render3/util/misc_utils.ts  |    6 +-
 .../view_engine_compatibility_prebound.ts     |    2 +-
 .../core/src/sanitization/sanitization.ts     |   20 +-
 packages/core/src/view/ng_module.ts           |    6 +-
 packages/core/src/view/services.ts            |    4 +-
 .../cyclic_import/bundle.golden_symbols.json  |   20 +-
 .../hello_world/bundle.golden_symbols.json    |    8 +-
 .../injection/bundle.golden_symbols.json      |    6 +-
 .../core/test/bundling/injection/usage.ts     |    8 +-
 .../bundling/todo/bundle.golden_symbols.json  |   46 +-
 .../core/test/bundling/todo_i18n/index.ts     |    2 +-
 packages/core/test/di/r3_injector_spec.ts     |   60 +-
 .../test/linker/ng_module_integration_spec.ts |    6 +-
 packages/core/test/render3/basic_perf.ts      |   22 +-
 .../test/render3/change_detection_spec.ts     |   62 +-
 packages/core/test/render3/common_with_def.ts |   18 +-
 .../core/test/render3/component_ref_spec.ts   |    8 +-
 packages/core/test/render3/component_spec.ts  |  177 ++-
 packages/core/test/render3/content_spec.ts    |  734 ++++-----
 .../core/test/render3/control_flow_spec.ts    |  450 +++---
 packages/core/test/render3/debug_spec.ts      |   10 +-
 packages/core/test/render3/di_spec.ts         |  180 +--
 packages/core/test/render3/exports_spec.ts    |   24 +-
 packages/core/test/render3/i18n_spec.ts       |   40 +-
 .../inherit_definition_feature_spec.ts        |  128 +-
 .../core/test/render3/instructions_spec.ts    |  168 +-
 .../core/test/render3/integration_spec.ts     | 1005 ++++++------
 packages/core/test/render3/ivy/jit_spec.ts    |   28 +-
 .../core/test/render3/jit_environment_spec.ts |   12 +-
 packages/core/test/render3/lifecycle_spec.ts  | 1028 +++++++------
 packages/core/test/render3/listeners_spec.ts  |  300 ++--
 packages/core/test/render3/outputs_spec.ts    |   42 +-
 packages/core/test/render3/pipe_spec.ts       |   16 +-
 packages/core/test/render3/providers_spec.ts  |  459 +++---
 .../core/test/render3/pure_function_spec.ts   |   28 +-
 packages/core/test/render3/query_spec.ts      |  728 +++++----
 packages/core/test/render3/render_util.ts     |    8 +-
 .../test/render3/renderer_factory_spec.ts     |   60 +-
 .../styling/class_and_style_bindings_spec.ts  |  124 +-
 .../core/test/render3/styling/players_spec.ts |   34 +-
 .../core/test/render3/template_ref_spec.ts    |   34 +-
 .../test/render3/view_container_ref_spec.ts   |  530 +++----
 .../test/sanitization/sanatization_spec.ts    |   77 +-
 .../test/strict_types/inheritance_spec.ts     |    6 +-
 packages/core/test/test_bed_spec.ts           |    2 +-
 packages/core/test/view/ng_module_spec.ts     |   20 +-
 .../core/testing/src/r3_test_bed_compiler.ts  |    2 +-
 packages/core/testing/src/test_bed.ts         |    4 +-
 packages/platform-browser/src/browser/meta.ts |    4 +-
 .../platform-browser/src/browser/title.ts     |    4 +-
 tools/public_api_guard/core/core.d.ts         |  764 +++++-----
 tools/ts-api-guardian/index.bzl               |    4 +-
 142 files changed, 6417 insertions(+), 6453 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index 7903bc9947..023455cdce 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -1,11 +1,11 @@
 # Deprecated APIs and Features
 
-Angular strives to balance innovation and stability. 
-Sometimes, APIs and features become obsolete and need to be removed or replaced so that Angular can stay current with new best practices, changing dependencies, or changes in the (web) platform itself. 
+Angular strives to balance innovation and stability.
+Sometimes, APIs and features become obsolete and need to be removed or replaced so that Angular can stay current with new best practices, changing dependencies, or changes in the (web) platform itself.
 
 To make these transitions as easy as possible, we deprecate APIs and features for a period of time before removing them. This gives you time to update your apps to the latest APIs and best practices.
 
-This guide contains a summary of all Angular APIs and features that are currently deprecated. 
+This guide contains a summary of all Angular APIs and features that are currently deprecated.
 
 
 <div class="alert is-helpful">
@@ -13,7 +13,7 @@ This guide contains a summary of all Angular APIs and features that are currentl
 
 Features and APIs that were deprecated in v6 or earlier are candidates for removal in version 9 or any later major version. For information about Angular's deprecation and removal practices, see [Angular Release Practices](guide/releases#deprecation-practices "Angular Release Practices: Deprecation practices").
 
-For step-by-step instructions on how to update to the latest Angular release, use the interactive update guide at [update.angular.io](https://update.angular.io). 
+For step-by-step instructions on how to update to the latest Angular release, use the interactive update guide at [update.angular.io](https://update.angular.io).
 
 </div>
 
@@ -21,7 +21,7 @@ For step-by-step instructions on how to update to the latest Angular release, us
 
 ## Deprecated APIs
 
-This section contains a complete list all of the currently-deprecated APIs, with details to help you plan your migration to a replacement. 
+This section contains a complete list all of the currently-deprecated APIs, with details to help you plan your migration to a replacement.
 
 
 <div class="alert is-helpful">
@@ -49,16 +49,16 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
-| [`CollectionChangeRecord`](api/core/CollectionChangeRecord) | [`IterableChangeRecord`](api/core/IterableChangeRecord) | v4 | none | 
+| [`CollectionChangeRecord`](api/core/CollectionChangeRecord) | [`IterableChangeRecord`](api/core/IterableChangeRecord) | v4 | none |
 | [`DefaultIterableDiffer`](api/core/DefaultIterableDiffer) | n/a | v4 | Not part of public API. |
-| [`defineInjectable`](api/core/defineInjectable) | `ɵɵdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
-| [`inject`](api/core/inject) | `ɵɵinject` | v8 | Used only in generated code. No source code should depend on this API. |
-| [`ReflectiveInjector`](api/core/ReflectiveInjector) | [`Injector.create`](api/core/Injector#create)  | v5 | See [`ReflectiveInjector`](#reflectiveinjector) | 
+| [`defineInjectable`](api/core/defineInjectable) | `ΔdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
+| [`inject`](api/core/inject) | `Δinject` | v8 | Used only in generated code. No source code should depend on this API. |
+| [`ReflectiveInjector`](api/core/ReflectiveInjector) | [`Injector.create`](api/core/Injector#create)  | v5 | See [`ReflectiveInjector`](#reflectiveinjector) |
 | [`ReflectiveKey`](api/core/ReflectiveKey) | none | v5 | none |
-| [`RenderComponentType`](api/core/RenderComponentType) | [`RendererType2`](api/core/RendererType2) and  [`Renderer2`](api/core/Renderer2) | v4 | none | 
-| [`Renderer`](api/core/Renderer) | [`Renderer2`](api/core/Renderer2) | v4 | none |  
-| [`RootRenderer`](api/core/RootRenderer) | [`RendererFactory2`](api/core/RendererFactory2) | v4 | none | 
-| [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32). 
+| [`RenderComponentType`](api/core/RenderComponentType) | [`RendererType2`](api/core/RendererType2) and  [`Renderer2`](api/core/Renderer2) | v4 | none |
+| [`Renderer`](api/core/Renderer) | [`Renderer2`](api/core/Renderer2) | v4 | none |
+| [`RootRenderer`](api/core/RootRenderer) | [`RendererFactory2`](api/core/RendererFactory2) | v4 | none |
+| [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32).
 
 #### @angular/core/testing
 
@@ -72,7 +72,7 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
-| [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) | n/a | v6 | See [ngForm](#ngform). | 
+| [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) | n/a | v6 | See [ngForm](#ngform). |
 
 
 #### @angular/router
@@ -93,15 +93,15 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
-| [`getAngularLib`](api/upgrade/static/getAngularLib) | [`getAngularJSGlobal`](api/upgrade/static/getAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). | 
-[`setAngularLib`](api/upgrade/static/setAngularLib) | [`setAngularJSGlobal`](api/upgrade/static/setAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). | 
+| [`getAngularLib`](api/upgrade/static/getAngularLib) | [`getAngularJSGlobal`](api/upgrade/static/getAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). |
+[`setAngularLib`](api/upgrade/static/setAngularLib) | [`setAngularJSGlobal`](api/upgrade/static/setAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). |
 
 
 
 {@a deprecated-features}
 ## Deprecated features
 
-This section lists all of the currently-deprecated features, which includes template syntax, configuration options, and any other deprecations not listed in the [Deprecated APIs](#deprecated-apis) section above. It also includes deprecated API usage scenarios or API combinations, to augment the information above. 
+This section lists all of the currently-deprecated features, which includes template syntax, configuration options, and any other deprecations not listed in the [Deprecated APIs](#deprecated-apis) section above. It also includes deprecated API usage scenarios or API combinations, to augment the information above.
 
 
 
@@ -111,20 +111,20 @@ This section lists all of the currently-deprecated features, which includes temp
 The shadow-piercing descendant combinator is deprecated and support is being removed from major browsers and tools. As such, in v4 we deprecated support in Angular for all 3 of `/deep/`, `>>>` and `::ng-deep`. Until removal, `::ng-deep` is preferred for broader compatibility with the tools.
 
 For more information, see [/deep/, >>>, and ::ng-deep](guide/component-styles#deprecated-deep--and-ng-deep "Component Styles guide, Deprecated deep and ngdeep")
- in the Component Styles guide. 
+ in the Component Styles guide.
 
 
 {@a template-tag}
 ### &lt;template&gt; tag
 
-The `<template>` tag was deprecated in v4 to avoid colliding with the DOM's element of the same name (such as when using web components). Use `<ng-template>` instead. For more information, see the [Ahead-of-Time Compilation](guide/aot-compiler#enablelegacytemplate) guide. 
+The `<template>` tag was deprecated in v4 to avoid colliding with the DOM's element of the same name (such as when using web components). Use `<ng-template>` instead. For more information, see the [Ahead-of-Time Compilation](guide/aot-compiler#enablelegacytemplate) guide.
 
 
 
 {@a ngform}
 ### ngForm element selector
 
-Support for using `ngForm` element selector was deprecated in v6. 
+Support for using `ngForm` element selector was deprecated in v6.
 It has been deprecated to be consistent with other core Angular selectors, which are typically written in kebab-case.
 
 Deprecated:
@@ -133,13 +133,13 @@ Deprecated:
 <ngForm #myForm="ngForm">
 ```
 
-Replacement: 
+Replacement:
 
 ```
 <ng-form #myForm="ngForm">
 ```
 
-The [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) directive is solely used to display warnings when the deprecated `ngForm` selector is used. 
+The [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) directive is solely used to display warnings when the deprecated `ngForm` selector is used.
 
 
 {@a ngmodel-reactive}
@@ -147,23 +147,23 @@ The [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) directive is sole
 
 Support for using the `ngModel` input property and `ngModelChange` event with reactive form directives was deprecated in version 6.
 
-For more information, see the usage notes for [`FormControlDirective`](api/forms/FormControlDirective#use-with-ngmodel) and [`FormControlName`](api/forms/FormControlName#use-with-ngmodel). 
+For more information, see the usage notes for [`FormControlDirective`](api/forms/FormControlDirective#use-with-ngmodel) and [`FormControlName`](api/forms/FormControlName#use-with-ngmodel).
 
 
 {@a sw-versionedfiles}
 ### Service worker versionedFiles
 
-In the service worker configuration file `ngsw-config.json`, `versionedFiles` and `files` have the same behavior. As of v6, `versionedFiles` is deprecated; use `files` instead. 
+In the service worker configuration file `ngsw-config.json`, `versionedFiles` and `files` have the same behavior. As of v6, `versionedFiles` is deprecated; use `files` instead.
 
-For more information, see [Service Worker Configuration](guide/service-worker-config#assetgroups). 
+For more information, see [Service Worker Configuration](guide/service-worker-config#assetgroups).
 
 
 {@a reflectiveinjector}
 ### ReflectiveInjector
 
-In v5, Angular replaced the `ReflectiveInjector` with the `StaticInjector`. The injector no longer requires the Reflect polyfill, reducing application size for most developers. 
+In v5, Angular replaced the `ReflectiveInjector` with the `StaticInjector`. The injector no longer requires the Reflect polyfill, reducing application size for most developers.
 
-Before: 
+Before:
 
 ```
 ReflectiveInjector.resolveAndCreate(providers);
@@ -178,18 +178,18 @@ Injector.create({providers});
 {@a i18n-pipes}
 ### Pipes using Intl API
 
-<!-- 
+<!--
 From https://blog.angular.io/version-5-0-0-of-angular-now-available-37e414935ced
 -->
 
 Angular used to rely on the browser to provide number, date, and currency formatting using browser i18n APIs. This practice meant that most apps needed to use a polyfill, users were seeing inconsistent results across browsers, and common formats (such as the currency pipe) didn’t match developer expectations out of the box.
 
-In version 4.3, Angular introduced new number, date, and currency pipes that increase standardization across browsers and eliminate the need for i18n polyfills. These pipes use the Unicode Common Locale Data Repository (CLDR) instead of the JS Intl API to provide extensive locale support. 
+In version 4.3, Angular introduced new number, date, and currency pipes that increase standardization across browsers and eliminate the need for i18n polyfills. These pipes use the Unicode Common Locale Data Repository (CLDR) instead of the JS Intl API to provide extensive locale support.
 
-In version 5.0.0, Angular updated its standard pipes to use the CLRD implementation. 
-At that time, Angular also added [`DeprecatedI18NPipesModule`](api/common/DeprecatedI18NPipesModule) and related APIs to provide limited-time access to the old behavior. If you need to use these `Deprecated*` pipes, see [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md#i18n-pipes) and the [Date Formats mappings](https://docs.google.com/spreadsheets/d/12iygt-_cakNP1VO7MV9g4lq9NsxVWG4tSfc98HpHb0k/edit#gid=0 "Date Formats Google sheet"). 
+In version 5.0.0, Angular updated its standard pipes to use the CLRD implementation.
+At that time, Angular also added [`DeprecatedI18NPipesModule`](api/common/DeprecatedI18NPipesModule) and related APIs to provide limited-time access to the old behavior. If you need to use these `Deprecated*` pipes, see [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md#i18n-pipes) and the [Date Formats mappings](https://docs.google.com/spreadsheets/d/12iygt-_cakNP1VO7MV9g4lq9NsxVWG4tSfc98HpHb0k/edit#gid=0 "Date Formats Google sheet").
 
-Reminder: If you use these `Deprecated*` pipes, you should migrate to the current APIs listed above as soon as possible. These deprecated APIs are candidates for removal in the next major release. 
+Reminder: If you use these `Deprecated*` pipes, you should migrate to the current APIs listed above as soon as possible. These deprecated APIs are candidates for removal in the next major release.
 
 
 {@a loadChildren}
@@ -199,7 +199,7 @@ When Angular first introduced lazy routes, there wasn't browser support for dyna
 
 In v8, the string syntax for the [`loadChildren`](api/router/LoadChildren) route specification was deprecated, in favor of new syntax that uses `import()` syntax.
 
-Before: 
+Before:
 
 ```
 const routes: Routes = [{
@@ -209,12 +209,12 @@ const routes: Routes = [{
 }];
 ```
 
-After: 
+After:
 
 ```
 const routes: Routes = [{
   path: 'lazy',
-  // The new import() syntax 
+  // The new import() syntax
   loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)
 }];
 ```
@@ -223,7 +223,7 @@ const routes: Routes = [{
 <div class="alert is-helpful">
 
 
-**v8 update**: When you update to version 8, the [`ng update`](cli/update) command performs the transformation automatically. Prior to version 7, the `import()` syntax only works in JIT mode (with view engine). 
+**v8 update**: When you update to version 8, the [`ng update`](cli/update) command performs the transformation automatically. Prior to version 7, the `import()` syntax only works in JIT mode (with view engine).
 
 
 </div>
@@ -240,13 +240,13 @@ const routes: Routes = [{
 | `params` | `paramMap` |
 | `queryParams` | `queryParamMap` |
 
-For more information see the [Router guide](guide/router#activated-route). 
+For more information see the [Router guide](guide/router#activated-route).
 
 
 {@a removed}
 ## Removed APIs
 
-The following APIs have been removed starting with version 8.0.0: 
+The following APIs have been removed starting with version 8.0.0:
 
 | Package | API            | Replacement | Notes |
 | ------- | -------------- | ----------- | ----- |
@@ -260,24 +260,24 @@ The following APIs have been removed starting with version 8.0.0:
 {@a http}
 ### @angular/http
 
-<!-- 
-Deprecation announced in version 5 
-https://blog.angular.io/version-5-0-0-of-angular-now-available-37e414935ced) 
+<!--
+Deprecation announced in version 5
+https://blog.angular.io/version-5-0-0-of-angular-now-available-37e414935ced)
 -->
 
 
-The entire [`@angular/http`](http://v7.angular.io/api/http) package has been removed. Use [`@angular/common/http`](api/common/http) instead.  
+The entire [`@angular/http`](http://v7.angular.io/api/http) package has been removed. Use [`@angular/common/http`](api/common/http) instead.
 
-The new API is a smaller, easier, and more powerful way to make HTTP requests in Angular. 
-The new API simplifies the default ergonomics: There is no need to map by invoking the `.json()` method. 
-It also supports typed return values and interceptors. 
+The new API is a smaller, easier, and more powerful way to make HTTP requests in Angular.
+The new API simplifies the default ergonomics: There is no need to map by invoking the `.json()` method.
+It also supports typed return values and interceptors.
 
 To update your apps:
 * Replace `HttpModule` with [`HttpClientModule`](api/common/http/HttpClientModule) (from [`@angular/common/http`](api/common/http)) in each of your modules.
 * Replace the `Http` service with the [`HttpClient`](api/common/http/HttpClient) service.
-* Remove any `map(res => res.json())` calls. They are no longer needed. 
+* Remove any `map(res => res.json())` calls. They are no longer needed.
 
-For more information about using `@angular/common/http`, see the [HttpClient guide](guide/http "HTTP Client guide"). 
+For more information about using `@angular/common/http`, see the [HttpClient guide](guide/http "HTTP Client guide").
 
 
 | `@angular/http` | Closest replacement in `@angular/common/http` |
diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index be7d75cc8a..42d48c605e 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -74,7 +74,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
 
     // API files are typescript
     readTypeScriptModules.basePath = API_SOURCE_PATH;
-    readTypeScriptModules.ignoreExportsMatching = [/^_|^ɵɵ|^VERSION$/];
+    readTypeScriptModules.ignoreExportsMatching = [/^_|^Δ|^VERSION$/];
     readTypeScriptModules.hidePrivateMembers = true;
 
     // NOTE: This list should be in sync with tools/public_api_guard/BUILD.bazel
diff --git a/docs/PUBLIC_API.md b/docs/PUBLIC_API.md
index 53899d5770..cb1e2e94a2 100644
--- a/docs/PUBLIC_API.md
+++ b/docs/PUBLIC_API.md
@@ -37,7 +37,7 @@ We explicitly don't consider the following to be our public API surface:
 
 - any file/import paths within our package except for the `/`, `/testing` and `/bundles/*` and other documented package entry-points.
 - constructors of injectable classes (services and directives) - please use DI to obtain instances of these classes
-- any class members or symbols marked as `private`, or prefixed with underscore (`_`), [barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵ`), and  [double barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵɵ`).
+- any class members or symbols marked as `private`, or prefixed with underscore (`_`), [barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵ`), and  [greek delta](https://en.wikipedia.org/wiki/Delta_(letter)) (`Δ`).
 - extending any of our classes unless the support for this is specifically documented in the API docs
 - the contents and API surface of the code generated by Angular's compiler (with one notable exception: the existence and name of `NgModuleFactory` instances exported from generated code is guaranteed)
 
diff --git a/integration/ngcc/test.sh b/integration/ngcc/test.sh
index 5374cc70fe..58a0c5d964 100755
--- a/integration/ngcc/test.sh
+++ b/integration/ngcc/test.sh
@@ -40,25 +40,25 @@ if [[ $? != 0 ]]; then exit 1; fi
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it compile @angular/core/ApplicationModule correctly?
-  grep "ApplicationModule.ngModuleDef = ɵɵdefineNgModule" node_modules/@angular/core/fesm2015/core.js
+  grep "ApplicationModule.ngModuleDef = ΔdefineNgModule" node_modules/@angular/core/fesm2015/core.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵɵdefineNgModule" node_modules/@angular/core/fesm5/core.js
+  grep "ApplicationModule.ngModuleDef = ΔdefineNgModule" node_modules/@angular/core/fesm5/core.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵɵdefineNgModule" node_modules/@angular/core/esm2015/src/application_module.js
+  grep "ApplicationModule.ngModuleDef = ɵngcc0.ΔdefineNgModule" node_modules/@angular/core/esm2015/src/application_module.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵɵdefineNgModule" node_modules/@angular/core/esm5/src/application_module.js
+  grep "ApplicationModule.ngModuleDef = ɵngcc0.ΔdefineNgModule" node_modules/@angular/core/esm5/src/application_module.js
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it transform @angular/core typing files correctly?
   grep "import [*] as ɵngcc0 from './src/r3_symbols';" node_modules/@angular/core/core.d.ts
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "static ngInjectorDef: ɵngcc0.ɵɵInjectorDef<ApplicationModule>;" node_modules/@angular/core/core.d.ts
+  grep "static ngInjectorDef: ɵngcc0.ΔInjectorDef<ApplicationModule>;" node_modules/@angular/core/core.d.ts
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it generate a base factory call for synthesized constructors correctly?
-  grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table.js
+  grep "const ɵMatTable_BaseFactory = ɵngcc0.ΔgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table.es5.js
+  grep "const ɵMatTable_BaseFactory = ɵngcc0.ΔgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table.es5.js
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Can it be safely run again (as a noop)?
diff --git a/modules/benchmarks/src/tree/render3_function/index.ts b/modules/benchmarks/src/tree/render3_function/index.ts
index e724141a89..7a1fa89d79 100644
--- a/modules/benchmarks/src/tree/render3_function/index.ts
+++ b/modules/benchmarks/src/tree/render3_function/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵRenderFlags, ɵrenderComponent as renderComponent, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdefineComponent, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵselect, ɵɵstyleProp, ɵɵstyling, ɵɵtext, ɵɵtextBinding} from '@angular/core';
+import {ɵRenderFlags, ɵrenderComponent as renderComponent, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdefineComponent, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δselect, ΔstyleProp, Δstyling, Δtext, ΔtextBinding} from '@angular/core';
 
 import {bindAction, profile} from '../../util';
 import {createDom, destroyDom, detectChanges} from '../render3/tree';
@@ -18,7 +18,7 @@ export class TreeFunction {
   data: TreeNode = emptyTree;
 
   /** @nocollapse */
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     type: TreeFunction,
     selectors: [['tree']],
     consts: 5,
@@ -35,41 +35,41 @@ export class TreeFunction {
 const c1 = ['background-color'];
 export function TreeTpl(rf: ɵRenderFlags, ctx: TreeNode) {
   if (rf & ɵRenderFlags.Create) {
-    ɵɵelementStart(0, 'tree');
+    ΔelementStart(0, 'tree');
     {
-      ɵɵelementStart(1, 'span');
-      ɵɵstyling(null, c1);
-      { ɵɵtext(2); }
-      ɵɵelementEnd();
-      ɵɵcontainer(3);
-      ɵɵcontainer(4);
+      ΔelementStart(1, 'span');
+      Δstyling(null, c1);
+      { Δtext(2); }
+      ΔelementEnd();
+      Δcontainer(3);
+      Δcontainer(4);
     }
-    ɵɵelementEnd();
+    ΔelementEnd();
   }
   if (rf & ɵRenderFlags.Update) {
-    ɵɵselect(1);
-    ɵɵstyleProp(0, ctx.depth % 2 ? '' : 'grey');
-    ɵɵstyling();
-    ɵɵselect(2);
-    ɵɵtextBinding(2, ɵɵinterpolation1(' ', ctx.value, ' '));
-    ɵɵcontainerRefreshStart(3);
+    Δselect(1);
+    ΔstyleProp(0, ctx.depth % 2 ? '' : 'grey');
+    Δstyling();
+    Δselect(2);
+    ΔtextBinding(2, Δinterpolation1(' ', ctx.value, ' '));
+    ΔcontainerRefreshStart(3);
     {
       if (ctx.left != null) {
-        let rf0 = ɵɵembeddedViewStart(0, 5, 1);
+        let rf0 = ΔembeddedViewStart(0, 5, 1);
         { TreeTpl(rf0, ctx.left); }
-        ɵɵembeddedViewEnd();
+        ΔembeddedViewEnd();
       }
     }
-    ɵɵcontainerRefreshEnd();
-    ɵɵcontainerRefreshStart(4);
+    ΔcontainerRefreshEnd();
+    ΔcontainerRefreshStart(4);
     {
       if (ctx.right != null) {
-        let rf0 = ɵɵembeddedViewStart(0, 5, 1);
+        let rf0 = ΔembeddedViewStart(0, 5, 1);
         { TreeTpl(rf0, ctx.right); }
-        ɵɵembeddedViewEnd();
+        ΔembeddedViewEnd();
       }
     }
-    ɵɵcontainerRefreshEnd();
+    ΔcontainerRefreshEnd();
   }
 }
 
diff --git a/packages/common/src/directives/ng_class.ts b/packages/common/src/directives/ng_class.ts
index 43fe9d5551..76e3c8a8cc 100644
--- a/packages/common/src/directives/ng_class.ts
+++ b/packages/common/src/directives/ng_class.ts
@@ -5,7 +5,7 @@
  * 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 {Directive, DoCheck, Input, ɵRenderFlags, ɵɵclassMap, ɵɵdefineDirective, ɵɵstyling, ɵɵstylingApply} from '@angular/core';
+import {Directive, DoCheck, Input, ɵRenderFlags, ΔclassMap, ΔdefineDirective, Δstyling, ΔstylingApply} from '@angular/core';
 
 import {NgClassImpl, NgClassImplProvider} from './ng_class_impl';
 
@@ -29,17 +29,17 @@ export const ngClassDirectiveDef__PRE_R3__ = undefined;
 // used when the VE is not present (note the directive will
 // never be instantiated normally because it is apart of a
 // base class)
-export const ngClassDirectiveDef__POST_R3__ = ɵɵdefineDirective({
+export const ngClassDirectiveDef__POST_R3__ = ΔdefineDirective({
   type: function() {} as any,
   selectors: null as any,
   factory: () => {},
   hostBindings: function(rf: ɵRenderFlags, ctx: any, elIndex: number) {
     if (rf & ɵRenderFlags.Create) {
-      ɵɵstyling();
+      Δstyling();
     }
     if (rf & ɵRenderFlags.Update) {
-      ɵɵclassMap(ctx.getValue());
-      ɵɵstylingApply();
+      ΔclassMap(ctx.getValue());
+      ΔstylingApply();
     }
   }
 });
diff --git a/packages/common/src/directives/ng_style.ts b/packages/common/src/directives/ng_style.ts
index 95f0dc7540..67f30efccf 100644
--- a/packages/common/src/directives/ng_style.ts
+++ b/packages/common/src/directives/ng_style.ts
@@ -5,7 +5,7 @@
  * 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 {Directive, DoCheck, Input, ɵRenderFlags, ɵɵdefineDirective, ɵɵstyleMap, ɵɵstyling, ɵɵstylingApply} from '@angular/core';
+import {Directive, DoCheck, Input, ɵRenderFlags, ΔdefineDirective, ΔstyleMap, Δstyling, ΔstylingApply} from '@angular/core';
 
 import {NgStyleImpl, NgStyleImplProvider} from './ng_style_impl';
 
@@ -29,17 +29,17 @@ export const ngStyleDirectiveDef__PRE_R3__ = undefined;
 // used when the VE is not present (note the directive will
 // never be instantiated normally because it is apart of a
 // base class)
-export const ngStyleDirectiveDef__POST_R3__ = ɵɵdefineDirective({
+export const ngStyleDirectiveDef__POST_R3__ = ΔdefineDirective({
   type: function() {} as any,
   selectors: null as any,
   factory: () => {},
   hostBindings: function(rf: ɵRenderFlags, ctx: any, elIndex: number) {
     if (rf & ɵRenderFlags.Create) {
-      ɵɵstyling();
+      Δstyling();
     }
     if (rf & ɵRenderFlags.Update) {
-      ɵɵstyleMap(ctx.getValue());
-      ɵɵstylingApply();
+      ΔstyleMap(ctx.getValue());
+      ΔstylingApply();
     }
   }
 });
diff --git a/packages/common/src/viewport_scroller.ts b/packages/common/src/viewport_scroller.ts
index fad2a4e3af..2ee49bee34 100644
--- a/packages/common/src/viewport_scroller.ts
+++ b/packages/common/src/viewport_scroller.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ErrorHandler, ɵɵdefineInjectable, ɵɵinject} from '@angular/core';
+import {ErrorHandler, ΔdefineInjectable, Δinject} from '@angular/core';
 
 import {DOCUMENT} from './dom_tokens';
 
@@ -21,9 +21,9 @@ export abstract class ViewportScroller {
   // De-sugared tree-shakable injection
   // See #23917
   /** @nocollapse */
-  static ngInjectableDef = ɵɵdefineInjectable({
+  static ngInjectableDef = ΔdefineInjectable({
     providedIn: 'root',
-    factory: () => new BrowserViewportScroller(ɵɵinject(DOCUMENT), window, ɵɵinject(ErrorHandler))
+    factory: () => new BrowserViewportScroller(Δinject(DOCUMENT), window, Δinject(ErrorHandler))
   });
 
   /**
diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index f47ac9b248..9a28d8b01a 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -160,11 +160,11 @@ describe('Renderer', () => {
       const addDefinitionsSpy = renderer.addDefinitions as jasmine.Spy;
       expect(addDefinitionsSpy.calls.first().args[2])
           .toEqual(
-              `A.ngComponentDef = ɵngcc0.ɵɵdefineComponent({ type: A, selectors: [["a"]], factory: function A_Factory(t) { return new (t || A)(); }, consts: 1, vars: 1, template: function A_Template(rf, ctx) { if (rf & 1) {
-        ɵngcc0.ɵɵtext(0);
+              `A.ngComponentDef = ɵngcc0.ΔdefineComponent({ type: A, selectors: [["a"]], factory: function A_Factory(t) { return new (t || A)(); }, consts: 1, vars: 1, template: function A_Template(rf, ctx) { if (rf & 1) {
+        ɵngcc0.Δtext(0);
     } if (rf & 2) {
-        ɵngcc0.ɵɵselect(0);
-        ɵngcc0.ɵɵtextBinding(0, ɵngcc0.ɵɵinterpolation1("", ctx.person.name, ""));
+        ɵngcc0.Δselect(0);
+        ɵngcc0.ΔtextBinding(0, ɵngcc0.Δinterpolation1("", ctx.person.name, ""));
     } }, encapsulation: 2 });
 /*@__PURE__*/ ɵngcc0.ɵsetClassMetadata(A, [{
         type: Component,
@@ -205,7 +205,7 @@ describe('Renderer', () => {
            }));
            expect(addDefinitionsSpy.calls.first().args[2])
                .toEqual(
-                   `A.ngDirectiveDef = ɵngcc0.ɵɵdefineDirective({ type: A, selectors: [["", "a", ""]], factory: function A_Factory(t) { return new (t || A)(); } });
+                   `A.ngDirectiveDef = ɵngcc0.ΔdefineDirective({ type: A, selectors: [["", "a", ""]], factory: function A_Factory(t) { return new (t || A)(); } });
 /*@__PURE__*/ ɵngcc0.ɵsetClassMetadata(A, [{
         type: Directive,
         args: [{ selector: '[a]' }]
@@ -339,7 +339,7 @@ describe('Renderer', () => {
         const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
         expect(typingsFile.contents)
             .toContain(
-                'foo(x: number): number;\n    static ngDirectiveDef: ɵngcc0.ɵɵDirectiveDefWithMeta');
+                'foo(x: number): number;\n    static ngDirectiveDef: ɵngcc0.ΔDirectiveDefWithMeta');
       });
 
       it('should render imports into typings files', () => {
diff --git a/packages/compiler-cli/src/metadata/bundler.ts b/packages/compiler-cli/src/metadata/bundler.ts
index 50be5c11e1..cae740edb6 100644
--- a/packages/compiler-cli/src/metadata/bundler.ts
+++ b/packages/compiler-cli/src/metadata/bundler.ts
@@ -423,7 +423,7 @@ export class MetadataBundler {
         result[key] = this.convertFunction(moduleName, value);
       } else if (isMetadataSymbolicCallExpression(value)) {
         // Class members can also contain static members that call a function with module
-        // references. e.g. "static ngInjectableDef = ɵɵdefineInjectable(..)". We also need to
+        // references. e.g. "static ngInjectableDef = ΔdefineInjectable(..)". We also need to
         // convert these module references because otherwise these resolve to non-existent files.
         result[key] = this.convertValue(moduleName, value);
       } else {
diff --git a/packages/compiler-cli/src/ngtsc/imports/src/core.ts b/packages/compiler-cli/src/ngtsc/imports/src/core.ts
index 457a327347..da60c29482 100644
--- a/packages/compiler-cli/src/ngtsc/imports/src/core.ts
+++ b/packages/compiler-cli/src/ngtsc/imports/src/core.ts
@@ -48,15 +48,15 @@ export class NoopImportRewriter implements ImportRewriter {
  * which they're exported from r3_symbols.
  */
 const CORE_SUPPORTED_SYMBOLS = new Map<string, string>([
-  ['ɵɵdefineInjectable', 'ɵɵdefineInjectable'],
-  ['ɵɵdefineInjector', 'ɵɵdefineInjector'],
-  ['ɵɵdefineNgModule', 'ɵɵdefineNgModule'],
-  ['ɵɵsetNgModuleScope', 'ɵɵsetNgModuleScope'],
-  ['ɵɵinject', 'ɵɵinject'],
+  ['ΔdefineInjectable', 'ΔdefineInjectable'],
+  ['ΔdefineInjector', 'ΔdefineInjector'],
+  ['ΔdefineNgModule', 'ΔdefineNgModule'],
+  ['ΔsetNgModuleScope', 'ΔsetNgModuleScope'],
+  ['Δinject', 'Δinject'],
   ['ɵsetClassMetadata', 'setClassMetadata'],
-  ['ɵɵInjectableDef', 'ɵɵInjectableDef'],
-  ['ɵɵInjectorDef', 'ɵɵInjectorDef'],
-  ['ɵɵNgModuleDefWithMeta', 'ɵɵNgModuleDefWithMeta'],
+  ['ΔInjectableDef', 'ΔInjectableDef'],
+  ['ΔInjectorDef', 'ΔInjectorDef'],
+  ['ΔNgModuleDefWithMeta', 'ΔNgModuleDefWithMeta'],
   ['ɵNgModuleFactory', 'NgModuleFactory'],
 ]);
 
diff --git a/packages/compiler-cli/test/compliance/mock_compile.ts b/packages/compiler-cli/test/compliance/mock_compile.ts
index ec39a099c8..a980af8055 100644
--- a/packages/compiler-cli/test/compliance/mock_compile.ts
+++ b/packages/compiler-cli/test/compliance/mock_compile.ts
@@ -14,7 +14,7 @@ import * as ts from 'typescript';
 import {NgtscProgram} from '../../src/ngtsc/program';
 
 
-const IDENTIFIER = /[A-Za-z_$ɵ][A-Za-z0-9_$]*/;
+const IDENTIFIER = /[A-Za-z_$ɵΔ][A-Za-z0-9_$]*/;
 const OPERATOR =
     /!|\?|%|\*|\/|\^|&&?|\|\|?|\(|\)|\{|\}|\[|\]|:|;|<=?|>=?|={1,3}|!==?|=>|\+\+?|--?|@|,|\.|\.\.\./;
 const STRING = /'[^']*'|"[^"]*"|`[\s\S]*?`/;
diff --git a/packages/compiler-cli/test/compliance/mock_compiler_spec.ts b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
index 94d69b2780..2d6d2cdcbb 100644
--- a/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
@@ -140,7 +140,7 @@ describe('mock_compiler', () => {
     expectEmit(
         result.source, `
     // TODO: this comment should not be taken into account
-    $r3$.ɵɵtext(0, "Hello!");
+    $r3$.Δtext(0, "Hello!");
     // TODO: this comment should not be taken into account
     `,
         'todo comments should be ignored');
diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 6ad1ff8c36..846179485b 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -53,16 +53,16 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $c1$);
-            $r3$.ɵɵnamespaceSVG();
-            $r3$.ɵɵelementStart(1, "svg");
-            $r3$.ɵɵelement(2, "circle", $c2$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵnamespaceHTML();
-            $r3$.ɵɵelementStart(3, "p");
-            $r3$.ɵɵtext(4, "test");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $c1$);
+            $r3$.ΔnamespaceSVG();
+            $r3$.ΔelementStart(1, "svg");
+            $r3$.Δelement(2, "circle", $c2$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔnamespaceHTML();
+            $r3$.ΔelementStart(3, "p");
+            $r3$.Δtext(4, "test");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -102,16 +102,16 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $c1$);
-            $r3$.ɵɵnamespaceMathML();
-            $r3$.ɵɵelementStart(1, "math");
-            $r3$.ɵɵelement(2, "infinity");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵnamespaceHTML();
-            $r3$.ɵɵelementStart(3, "p");
-            $r3$.ɵɵtext(4, "test");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $c1$);
+            $r3$.ΔnamespaceMathML();
+            $r3$.ΔelementStart(1, "math");
+            $r3$.Δelement(2, "infinity");
+            $r3$.ΔelementEnd();
+            $r3$.ΔnamespaceHTML();
+            $r3$.ΔelementStart(3, "p");
+            $r3$.Δtext(4, "test");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -150,13 +150,13 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $c1$);
-            $r3$.ɵɵtext(1, "Hello ");
-            $r3$.ɵɵelementStart(2, "b");
-            $r3$.ɵɵtext(3, "World");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵtext(4, "!");
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $c1$);
+            $r3$.Δtext(1, "Hello ");
+            $r3$.ΔelementStart(2, "b");
+            $r3$.Δtext(3, "World");
+            $r3$.ΔelementEnd();
+            $r3$.Δtext(4, "!");
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -198,13 +198,13 @@ describe('compiler compliance', () => {
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div", $e0_attrs$);
-              $r3$.ɵɵtext(1, "Hello ");
-              $r3$.ɵɵelementStart(2, "b");
-              $r3$.ɵɵtext(3, "World");
-              $r3$.ɵɵelementEnd();
-              $r3$.ɵɵtext(4, "!");
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div", $e0_attrs$);
+              $r3$.Δtext(1, "Hello ");
+              $r3$.ΔelementStart(2, "b");
+              $r3$.Δtext(3, "World");
+              $r3$.ΔelementEnd();
+              $r3$.Δtext(4, "!");
+              $r3$.ΔelementEnd();
             }
           }
         `;
@@ -239,12 +239,12 @@ describe('compiler compliance', () => {
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              i0.ɵɵelementContainerStart(0);
-              i0.ɵɵelementStart(1, "span");
-              i0.ɵɵtext(2, "in a ");
-              i0.ɵɵelementEnd();
-              i0.ɵɵtext(3, "container");
-              i0.ɵɵelementContainerEnd();
+              i0.ΔelementContainerStart(0);
+              i0.ΔelementStart(1, "span");
+              i0.Δtext(2, "in a ");
+              i0.ΔelementEnd();
+              i0.Δtext(3, "container");
+              i0.ΔelementContainerEnd();
             }
           }
         `;
@@ -276,8 +276,8 @@ describe('compiler compliance', () => {
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              i0.ɵɵelementContainerStart(0);
-              i0.ɵɵelementContainerEnd();
+              i0.ΔelementContainerStart(0);
+              i0.ΔelementContainerEnd();
             }
           }
         `;
@@ -313,11 +313,11 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelement(0, "div", $e0_attrs$);
+            $r3$.Δelement(0, "div", $e0_attrs$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵproperty("id", ctx.id);
+            $r3$.Δselect(0);
+            $r3$.Δproperty("id", ctx.id);
           }
         }
       `;
@@ -359,7 +359,7 @@ describe('compiler compliance', () => {
       // generating those.
       //
       // For example:
-      // `$r3$.ɵɵproperty("ternary", (ctx.cond ? $r3$.ɵɵpureFunction1(8, $c0$, ctx.a): $c1$));`
+      // `$r3$.Δproperty("ternary", (ctx.cond ? $r3$.ΔpureFunction1(8, $c0$, ctx.a): $c1$));`
       ///////////////
 
       const $e0_attrs$ = [];
@@ -368,15 +368,15 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelement(0, "div", $e0_attrs$);
-            $r3$.ɵɵpipe(1,"pipe");
+            $r3$.Δelement(0, "div", $e0_attrs$);
+            $r3$.Δpipe(1,"pipe");
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵproperty("ternary", (ctx.cond ? $r3$.ɵɵpureFunction1(8, $c0$, ctx.a): $c1$));
-            $r3$.ɵɵproperty("pipe", $r3$.ɵɵpipeBind3(1, 4, ctx.value, 1, 2));
-            $r3$.ɵɵproperty("and", (ctx.cond && $r3$.ɵɵpureFunction1(10, $c0$, ctx.b)));
-            $r3$.ɵɵproperty("or", (ctx.cond || $r3$.ɵɵpureFunction1(12, $c0$, ctx.c)));
+            $r3$.Δselect(0);
+            $r3$.Δproperty("ternary", (ctx.cond ? $r3$.ΔpureFunction1(8, $c0$, ctx.a): $c1$));
+            $r3$.Δproperty("pipe", $r3$.ΔpipeBind3(1, 4, ctx.value, 1, 2));
+            $r3$.Δproperty("and", (ctx.cond && $r3$.ΔpureFunction1(10, $c0$, ctx.b)));
+            $r3$.Δproperty("or", (ctx.cond || $r3$.ΔpureFunction1(12, $c0$, ctx.c)));
           }
         }
       `;
@@ -441,20 +441,20 @@ describe('compiler compliance', () => {
         …
         hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            $r3$.ɵɵallocHostVars(14);
+            $r3$.ΔallocHostVars(14);
           }
           if (rf & 2) {
-            $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@expansionHeight",
-              $r3$.ɵɵbind(
-                $r3$.ɵɵpureFunction2(5, $_c1$, ctx.getExpandedState(),
-                  $r3$.ɵɵpureFunction2(2, $_c0$, ctx.collapsedHeight, ctx.expandedHeight)
+            $r3$.ΔcomponentHostSyntheticProperty(elIndex, "@expansionHeight",
+              $r3$.Δbind(
+                $r3$.ΔpureFunction2(5, $_c1$, ctx.getExpandedState(),
+                  $r3$.ΔpureFunction2(2, $_c0$, ctx.collapsedHeight, ctx.expandedHeight)
                 )
               ), null, true
             );
-            $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@expansionWidth",
-              $r3$.ɵɵbind(
-                $r3$.ɵɵpureFunction2(11, $_c1$, ctx.getExpandedState(),
-                  $r3$.ɵɵpureFunction2(8, $_c2$, ctx.collapsedWidth, ctx.expandedWidth)
+            $r3$.ΔcomponentHostSyntheticProperty(elIndex, "@expansionWidth",
+              $r3$.Δbind(
+                $r3$.ΔpureFunction2(11, $_c1$, ctx.getExpandedState(),
+                  $r3$.ΔpureFunction2(8, $_c2$, ctx.collapsedWidth, ctx.expandedWidth)
                 )
               ), null, true
             );
@@ -493,7 +493,7 @@ describe('compiler compliance', () => {
         const $e0_classBindings$ = ["error"];
         const $e0_styleBindings$ = ["background-color"];
         …
-        MyComponent.ngComponentDef = i0.ɵɵdefineComponent({type:MyComponent,selectors:[["my-component"]],
+        MyComponent.ngComponentDef = i0.ΔdefineComponent({type:MyComponent,selectors:[["my-component"]],
             factory: function MyComponent_Factory(t){
               return new (t || MyComponent)();
             },
@@ -501,15 +501,15 @@ describe('compiler compliance', () => {
             vars: 0,
             template: function MyComponent_Template(rf,ctx){
               if (rf & 1) {
-                $r3$.ɵɵelementStart(0, "div");
-                $r3$.ɵɵstyling($e0_classBindings$, $e0_styleBindings$);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔelementStart(0, "div");
+                $r3$.Δstyling($e0_classBindings$, $e0_styleBindings$);
+                $r3$.ΔelementEnd();
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵstyleProp(0, ctx.color);
-                $r3$.ɵɵclassProp(0, ctx.error);
-                $r3$.ɵɵstylingApply();
+                $r3$.Δselect(0);
+                $r3$.ΔstyleProp(0, ctx.color);
+                $r3$.ΔclassProp(0, ctx.error);
+                $r3$.ΔstylingApply();
               }
             },
             encapsulation: 2
@@ -549,7 +549,7 @@ describe('compiler compliance', () => {
 
       // ChildComponent definition should be:
       const ChildComponentDefinition = `
-        ChildComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        ChildComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: ChildComponent,
           selectors: [["child"]],
           factory: function ChildComponent_Factory(t) { return new (t || ChildComponent)(); },
@@ -557,7 +557,7 @@ describe('compiler compliance', () => {
           vars: 0,
           template:  function ChildComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵtext(0, "child-view");
+              $r3$.Δtext(0, "child-view");
             }
           },
           encapsulation: 2
@@ -565,7 +565,7 @@ describe('compiler compliance', () => {
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        SomeDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: SomeDirective,
           selectors: [["", "some-directive", ""]],
           factory: function SomeDirective_Factory(t) {return new (t || SomeDirective)(); }
@@ -576,7 +576,7 @@ describe('compiler compliance', () => {
       const MyComponentDefinition = `
         const $c1$ = ["some-directive", ""];
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -584,8 +584,8 @@ describe('compiler compliance', () => {
           vars: 0,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelement(0, "child", $c1$);
-              $r3$.ɵɵtext(1, "!");
+              $r3$.Δelement(0, "child", $c1$);
+              $r3$.Δtext(1, "!");
             }
           },
           directives: [ChildComponent, SomeDirective],
@@ -622,7 +622,7 @@ describe('compiler compliance', () => {
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        SomeDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: SomeDirective,
           selectors: [["div", "some-directive", "", 8, "foo", 3, "title", "", 9, "baz"]],
           factory: function SomeDirective_Factory(t) {return new (t || SomeDirective)(); }
@@ -631,7 +631,7 @@ describe('compiler compliance', () => {
 
       // OtherDirective definition should be:
       const OtherDirectiveDefinition = `
-        OtherDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        OtherDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: OtherDirective,
           selectors: [["", 5, "span", "title", "", 9, "baz"]],
           factory: function OtherDirective_Factory(t) {return new (t || OtherDirective)(); }
@@ -663,7 +663,7 @@ describe('compiler compliance', () => {
       // EmptyOutletComponent definition should be:
       const EmptyOutletComponentDefinition = `
         …
-        EmptyOutletComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        EmptyOutletComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: EmptyOutletComponent,
           selectors: [["ng-component"]],
           factory: function EmptyOutletComponent_Factory(t) { return new (t || EmptyOutletComponent)(); },
@@ -671,7 +671,7 @@ describe('compiler compliance', () => {
           vars: 0,
           template: function EmptyOutletComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelement(0, "router-outlet");
+              $r3$.Δelement(0, "router-outlet");
             }
           },
           encapsulation: 2
@@ -746,13 +746,13 @@ describe('compiler compliance', () => {
 
          const MyComponentDefinition = `
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) {
              return new (t || MyComponent)(
-                $r3$.ɵɵdirectiveInject($i$.ElementRef), $r3$.ɵɵdirectiveInject($i$.ViewContainerRef),
-                $r3$.ɵɵdirectiveInject($i$.ChangeDetectorRef));
+                $r3$.ΔdirectiveInject($i$.ElementRef), $r3$.ΔdirectiveInject($i$.ViewContainerRef),
+                $r3$.ΔdirectiveInject($i$.ChangeDetectorRef));
           },
           consts: 0,
           vars: 0,
@@ -792,29 +792,29 @@ describe('compiler compliance', () => {
       };
 
       const IfDirectiveDefinition = `
-        IfDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        IfDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: IfDirective,
           selectors: [["", "if", ""]],
-          factory: function IfDirective_Factory(t) { return new (t || IfDirective)($r3$.ɵɵdirectiveInject($i$.TemplateRef)); }
+          factory: function IfDirective_Factory(t) { return new (t || IfDirective)($r3$.ΔdirectiveInject($i$.TemplateRef)); }
         });`;
       const MyComponentDefinition = `
         const $c1$ = ["foo", ""];
         const $c2$ = [${AttributeMarker.Template}, "if"];
         function MyComponent_li_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "li");
-            $r3$.ɵɵtext(1);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "li");
+            $r3$.Δtext(1);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            const $myComp$ = $r3$.ɵɵnextContext();
-            const $foo$ = $r3$.ɵɵreference(1);
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2("", $myComp$.salutation, " ", $foo$, ""));
+            const $myComp$ = $r3$.ΔnextContext();
+            const $foo$ = $r3$.Δreference(1);
+            $r3$.Δselect(1);
+            $r3$.ΔtextBinding(1, $r3$.Δinterpolation2("", $myComp$.salutation, " ", $foo$, ""));
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -822,9 +822,9 @@ describe('compiler compliance', () => {
           vars: 0,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "ul", null, $c1$);
-              $r3$.ɵɵtemplate(2, MyComponent_li_2_Template, 2, 2, "li", $c2$);
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "ul", null, $c1$);
+              $r3$.Δtemplate(2, MyComponent_li_2_Template, 2, 2, "li", $c2$);
+              $r3$.ΔelementEnd();
             }
           },
           directives:[IfDirective],
@@ -877,7 +877,7 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = [${AttributeMarker.Bindings}, "names"];
           const $e0_ff$ = function ($v$) { return ["Nancy", $v$]; };
           …
-          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -885,11 +885,11 @@ describe('compiler compliance', () => {
             vars: 3,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelement(0, "my-comp", $e0_attrs$);
+                $r3$.Δelement(0, "my-comp", $e0_attrs$);
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵproperty("names", $r3$.ɵɵpureFunction1(1, $e0_ff$, ctx.customName));
+                $r3$.Δselect(0);
+                $r3$.Δproperty("names", $r3$.ΔpureFunction1(1, $e0_ff$, ctx.customName));
               }
             },
            directives: [MyComp],
@@ -960,7 +960,7 @@ describe('compiler compliance', () => {
             return ["start-", $v0$, $v1$, $v2$, $v3$, $v4$, "-middle-", $v5$, $v6$, $v7$, $v8$, "-end"];
           }
           …
-          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -968,12 +968,12 @@ describe('compiler compliance', () => {
             vars: 11,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelement(0, "my-comp", $e0_attr$);
+                $r3$.Δelement(0, "my-comp", $e0_attr$);
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵproperty("names",
-                    $r3$.ɵɵpureFunctionV(1, $e0_ff$, [ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8]));
+                $r3$.Δselect(0);
+                $r3$.Δproperty("names",
+                    $r3$.ΔpureFunctionV(1, $e0_ff$, [ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8]));
               }
             },
             directives: [MyComp],
@@ -1024,7 +1024,7 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = [${AttributeMarker.Bindings}, "config"];
           const $e0_ff$ = function ($v$) { return {"duration": 500, animation: $v$}; };
           …
-          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -1032,11 +1032,11 @@ describe('compiler compliance', () => {
             vars: 3,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelement(0, "object-comp", $e0_attrs$);
+                $r3$.Δelement(0, "object-comp", $e0_attrs$);
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵproperty("config", $r3$.ɵɵpureFunction1(1, $e0_ff$, ctx.name));
+                $r3$.Δselect(0);
+                $r3$.Δproperty("config", $r3$.ΔpureFunction1(1, $e0_ff$, ctx.name));
               }
             },
             directives: [ObjectComp],
@@ -1093,7 +1093,7 @@ describe('compiler compliance', () => {
           const $e0_ff_1$ = function ($v$) { return [$c0$, $v$]; };
           const $e0_ff_2$ = function ($v1$, $v2$) { return {animation: $v1$, actions: $v2$}; };
           …
-          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -1101,13 +1101,13 @@ describe('compiler compliance', () => {
             vars: 8,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelement(0, "nested-comp", $e0_attrs$);
+                $r3$.Δelement(0, "nested-comp", $e0_attrs$);
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵproperty(
+                $r3$.Δselect(0);
+                $r3$.Δproperty(
                     "config",
-                    $r3$.ɵɵpureFunction2(5, $e0_ff_2$, ctx.name, $r3$.ɵɵpureFunction1(3, $e0_ff_1$, $r3$.ɵɵpureFunction1(1, $e0_ff$, ctx.duration))));
+                    $r3$.ΔpureFunction2(5, $e0_ff_2$, ctx.name, $r3$.ΔpureFunction1(3, $e0_ff_1$, $r3$.ΔpureFunction1(1, $e0_ff$, ctx.duration))));
               }
             },
             directives: [NestedComp],
@@ -1155,7 +1155,7 @@ describe('compiler compliance', () => {
         };
 
         const SimpleComponentDefinition = `
-          SimpleComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          SimpleComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: SimpleComponent,
             selectors: [["simple"]],
             factory: function SimpleComponent_Factory(t) { return new (t || SimpleComponent)(); },
@@ -1164,10 +1164,10 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function SimpleComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵprojectionDef();
-                $r3$.ɵɵelementStart(0, "div");
-                $r3$.ɵɵprojection(1);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔprojectionDef();
+                $r3$.ΔelementStart(0, "div");
+                $r3$.Δprojection(1);
+                $r3$.ΔelementEnd();
               }
             },
             encapsulation: 2
@@ -1178,7 +1178,7 @@ describe('compiler compliance', () => {
           const $c4$ = ["id","second"];
           const $c1$ = [[["span", "title", "tofirst"]], [["span", "title", "tosecond"]]];
           …
-          ComplexComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ComplexComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: ComplexComponent,
             selectors: [["complex"]],
             factory: function ComplexComponent_Factory(t) { return new (t || ComplexComponent)(); },
@@ -1187,13 +1187,13 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function ComplexComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵprojectionDef($c1$);
-                $r3$.ɵɵelementStart(0, "div", $c3$);
-                $r3$.ɵɵprojection(1, 1);
-                $r3$.ɵɵelementEnd();
-                $r3$.ɵɵelementStart(2, "div", $c4$);
-                $r3$.ɵɵprojection(3, 2);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔprojectionDef($c1$);
+                $r3$.ΔelementStart(0, "div", $c3$);
+                $r3$.Δprojection(1, 1);
+                $r3$.ΔelementEnd();
+                $r3$.ΔelementStart(2, "div", $c4$);
+                $r3$.Δprojection(3, 2);
+                $r3$.ΔelementEnd();
               }
             },
             encapsulation: 2
@@ -1240,38 +1240,38 @@ describe('compiler compliance', () => {
           const $_c1$ = ["id", "third", ${AttributeMarker.Template}, "ngIf"];
           const $_c2$ = ["id", "second"];
           function Cmp_div_0_Template(rf, ctx) { if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c2$);
-            $r3$.ɵɵprojection(1, 1);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c2$);
+            $r3$.Δprojection(1, 1);
+            $r3$.ΔelementEnd();
           } }
           const $_c3$ = ["id", "third"];
           function Cmp_div_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div", $_c3$);
-              $r3$.ɵɵtext(1, " No ng-content, no instructions generated. ");
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div", $_c3$);
+              $r3$.Δtext(1, " No ng-content, no instructions generated. ");
+              $r3$.ΔelementEnd();
             }
           }
           function Cmp_ng_template_2_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵtext(0, " '*' selector: ");
-              $r3$.ɵɵprojection(1);
+              $r3$.Δtext(0, " '*' selector: ");
+              $r3$.Δprojection(1);
             }
           }
           const $_c4$ = [[["span", "title", "tofirst"]]];
           …
           template: function Cmp_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵprojectionDef($_c4$);
-              $r3$.ɵɵtemplate(0, Cmp_div_0_Template, 2, 0, "div", $_c0$);
-              $r3$.ɵɵtemplate(1, Cmp_div_1_Template, 2, 0, "div", $_c1$);
-              $r3$.ɵɵtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
+              $r3$.ΔprojectionDef($_c4$);
+              $r3$.Δtemplate(0, Cmp_div_0_Template, 2, 0, "div", $_c0$);
+              $r3$.Δtemplate(1, Cmp_div_1_Template, 2, 0, "div", $_c1$);
+              $r3$.Δtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵproperty("ngIf", ctx.visible);
-              $r3$.ɵɵselect(1);
-              $r3$.ɵɵproperty("ngIf", ctx.visible);
+              $r3$.Δselect(0);
+              $r3$.Δproperty("ngIf", ctx.visible);
+              $r3$.Δselect(1);
+              $r3$.Δproperty("ngIf", ctx.visible);
             }
           }
         `;
@@ -1312,19 +1312,19 @@ describe('compiler compliance', () => {
         const output = `
           function Cmp_ng_template_1_ng_template_1_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵprojection(0, 4);
+                $r3$.Δprojection(0, 4);
             }
           }
           function Cmp_ng_template_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵprojection(0, 3);
-              $r3$.ɵɵtemplate(1, Cmp_ng_template_1_ng_template_1_Template, 1, 0, "ng-template");
+              $r3$.Δprojection(0, 3);
+              $r3$.Δtemplate(1, Cmp_ng_template_1_ng_template_1_Template, 1, 0, "ng-template");
             }
           }
           function Cmp_ng_template_2_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵtext(0, " '*' selector in a template: ");
-              $r3$.ɵɵprojection(1);
+              $r3$.Δtext(0, " '*' selector in a template: ");
+              $r3$.Δprojection(1);
             }
           }
           const $_c0$ = [[["", "id", "tomainbefore"]], [["", "id", "tomainafter"]], [["", "id", "totemplate"]], [["", "id", "tonestedtemplate"]]];
@@ -1332,11 +1332,11 @@ describe('compiler compliance', () => {
           …
           template: function Cmp_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵprojectionDef($_c2$);
-              $r3$.ɵɵprojection(0, 1);
-              $r3$.ɵɵtemplate(1, Cmp_ng_template_1_Template, 2, 0, "ng-template");
-              $r3$.ɵɵtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
-              $r3$.ɵɵprojection(3, 2);
+              $r3$.ΔprojectionDef($_c2$);
+              $r3$.Δprojection(0, 1);
+              $r3$.Δtemplate(1, Cmp_ng_template_1_Template, 2, 0, "ng-template");
+              $r3$.Δtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
+              $r3$.Δprojection(3, 2);
             }
           }
         `;
@@ -1376,7 +1376,7 @@ describe('compiler compliance', () => {
           const $_c1$ = ["[title]"];
           const $_c2$ = [5, ["", "title", ""]];
           …
-          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) {
@@ -1386,9 +1386,9 @@ describe('compiler compliance', () => {
             vars: 0,
             template: function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                    $r3$.ɵɵelementStart(0, "simple");
-                    $r3$.ɵɵelement(1, "h1", $_c2$);
-                    $r3$.ɵɵelementEnd();
+                    $r3$.ΔelementStart(0, "simple");
+                    $r3$.Δelement(1, "h1", $_c2$);
+                    $r3$.ΔelementEnd();
                 }
             },
             encapsulation: 2
@@ -1431,7 +1431,7 @@ describe('compiler compliance', () => {
           const $_c1$ = ["[title]"];
           const $_c2$ = [5, ["", "title", ""]];
           …
-          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) {
@@ -1441,9 +1441,9 @@ describe('compiler compliance', () => {
             vars: 0,
             template: function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                    $r3$.ɵɵelementStart(0, "simple");
-                    $r3$.ɵɵelement(1, "h1", $_c2$);
-                    $r3$.ɵɵelementEnd();
+                    $r3$.ΔelementStart(0, "simple");
+                    $r3$.Δelement(1, "h1", $_c2$);
+                    $r3$.ΔelementEnd();
                 }
             },
             encapsulation: 2
@@ -1497,26 +1497,26 @@ describe('compiler compliance', () => {
         const ViewQueryComponentDefinition = `
           const $e0_attrs$ = ["someDir",""];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: ViewQueryComponent,
             selectors: [["view-query-component"]],
             factory: function ViewQueryComponent_Factory(t) { return new (t || ViewQueryComponent)(); },
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵviewQuery(SomeDirective, true, null);
-                $r3$.ɵɵviewQuery(SomeDirective, true, null);
+                $r3$.ΔviewQuery(SomeDirective, true, null);
+                $r3$.ΔviewQuery(SomeDirective, true, null);
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDirs = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$));
               }
             },
             consts: 1,
             vars: 0,
             template:  function ViewQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelement(0, "div", $e0_attrs$);
+                $r3$.Δelement(0, "div", $e0_attrs$);
               }
             },
             directives: function () { return [SomeDirective]; },
@@ -1557,17 +1557,17 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             …
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵviewQuery($e0_attrs$, true, null);
-                $r3$.ɵɵviewQuery($e1_attrs$, true, null);
+                $r3$.ΔviewQuery($e0_attrs$, true, null);
+                $r3$.ΔviewQuery($e1_attrs$, true, null);
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRefs = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$));
               }
             },
             …
@@ -1608,26 +1608,26 @@ describe('compiler compliance', () => {
           const $refs$ = ["foo"];
           const $e0_attrs$ = ["someDir",""];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: ViewQueryComponent,
             selectors: [["view-query-component"]],
             factory: function ViewQueryComponent_Factory(t) { return new (t || ViewQueryComponent)(); },
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵstaticViewQuery(SomeDirective, true, null);
-                $r3$.ɵɵviewQuery($refs$, true, null);
+                $r3$.ΔstaticViewQuery(SomeDirective, true, null);
+                $r3$.ΔviewQuery($refs$, true, null);
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.foo = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.foo = $tmp$.first));
               }
             },
             consts: 1,
             vars: 0,
             template:  function ViewQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelement(0, "div", $e0_attrs$);
+                $r3$.Δelement(0, "div", $e0_attrs$);
               }
             },
             directives: function () { return [SomeDirective]; },
@@ -1673,21 +1673,21 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             …
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵviewQuery($e0_attrs$, true, TemplateRef);
-                $r3$.ɵɵviewQuery(SomeDirective, true, ElementRef);
-                $r3$.ɵɵviewQuery($e1_attrs$, true, ElementRef);
-                $r3$.ɵɵviewQuery(SomeDirective, true, TemplateRef);
+                $r3$.ΔviewQuery($e0_attrs$, true, TemplateRef);
+                $r3$.ΔviewQuery(SomeDirective, true, ElementRef);
+                $r3$.ΔviewQuery($e1_attrs$, true, ElementRef);
+                $r3$.ΔviewQuery(SomeDirective, true, TemplateRef);
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRefs = $tmp$));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDirs = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$));
               }
             },
             …
@@ -1735,7 +1735,7 @@ describe('compiler compliance', () => {
         };
 
         const ContentQueryComponentDefinition = `
-          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: ContentQueryComponent,
             selectors: [["content-query-component"]],
             factory: function ContentQueryComponent_Factory(t) {
@@ -1743,13 +1743,13 @@ describe('compiler compliance', () => {
             },
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, true, null);
-              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false, null);
+              $r3$.ΔcontentQuery(dirIndex, SomeDirective, true, null);
+              $r3$.ΔcontentQuery(dirIndex, SomeDirective, false, null);
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDirList = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirList = $tmp$));
               }
             },
             ngContentSelectors: _c0,
@@ -1757,10 +1757,10 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function ContentQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵprojectionDef();
-                $r3$.ɵɵelementStart(0, "div");
-                $r3$.ɵɵprojection(1);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔprojectionDef();
+                $r3$.ΔelementStart(0, "div");
+                $r3$.Δprojection(1);
+                $r3$.ΔelementEnd();
               }
             },
             encapsulation: 2
@@ -1799,17 +1799,17 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             …
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-              $r3$.ɵɵcontentQuery(dirIndex, $e0_attrs$, true, null);
-              $r3$.ɵɵcontentQuery(dirIndex, $e1_attrs$, false, null);
+              $r3$.ΔcontentQuery(dirIndex, $e0_attrs$, true, null);
+              $r3$.ΔcontentQuery(dirIndex, $e1_attrs$, false, null);
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRefs = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$));
               }
             },
             …
@@ -1857,7 +1857,7 @@ describe('compiler compliance', () => {
         };
 
         const ContentQueryComponentDefinition = `
-          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: ContentQueryComponent,
             selectors: [["content-query-component"]],
             factory: function ContentQueryComponent_Factory(t) {
@@ -1865,13 +1865,13 @@ describe('compiler compliance', () => {
             },
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-              $r3$.ɵɵstaticContentQuery(dirIndex, SomeDirective, true, null);
-              $r3$.ɵɵcontentQuery(dirIndex, $ref0$, true, null);
+              $r3$.ΔstaticContentQuery(dirIndex, SomeDirective, true, null);
+              $r3$.ΔcontentQuery(dirIndex, $ref0$, true, null);
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.foo = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.foo = $tmp$.first));
               }
             },
             ngContentSelectors: $_c1$,
@@ -1879,10 +1879,10 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function ContentQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵprojectionDef();
-                $r3$.ɵɵelementStart(0, "div");
-                $r3$.ɵɵprojection(1);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔprojectionDef();
+                $r3$.ΔelementStart(0, "div");
+                $r3$.Δprojection(1);
+                $r3$.ΔelementEnd();
               }
             },
             encapsulation: 2
@@ -1926,21 +1926,21 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
             …
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-                $r3$.ɵɵcontentQuery(dirIndex, $e0_attrs$, true, TemplateRef);
-              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, true, ElementRef);
-              $r3$.ɵɵcontentQuery(dirIndex, $e1_attrs$, false, ElementRef);
-              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false, TemplateRef);
+                $r3$.ΔcontentQuery(dirIndex, $e0_attrs$, true, TemplateRef);
+              $r3$.ΔcontentQuery(dirIndex, SomeDirective, true, ElementRef);
+              $r3$.ΔcontentQuery(dirIndex, $e1_attrs$, false, ElementRef);
+              $r3$.ΔcontentQuery(dirIndex, SomeDirective, false, TemplateRef);
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRefs = $tmp$));
-                ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDirs = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$));
+                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirs = $tmp$));
               }
             },
             …
@@ -2034,7 +2034,7 @@ describe('compiler compliance', () => {
         };
 
         const MyPipeDefinition = `
-            MyPipe.ngPipeDef = $r3$.ɵɵdefinePipe({
+            MyPipe.ngPipeDef = $r3$.ΔdefinePipe({
               name: "myPipe",
               type: MyPipe,
               factory: function MyPipe_Factory(t) { return new (t || MyPipe)(); },
@@ -2043,7 +2043,7 @@ describe('compiler compliance', () => {
         `;
 
         const MyPurePipeDefinition = `
-            MyPurePipe.ngPipeDef = $r3$.ɵɵdefinePipe({
+            MyPurePipe.ngPipeDef = $r3$.ΔdefinePipe({
               name: "myPurePipe",
               type: MyPurePipe,
               factory: function MyPurePipe_Factory(t) { return new (t || MyPurePipe)(); },
@@ -2055,7 +2055,7 @@ describe('compiler compliance', () => {
               return [$a0$, 1, 2, 3, 4, 5];
             };
             // ...
-            MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+            MyApp.ngComponentDef = $r3$.ΔdefineComponent({
               type: MyApp,
               selectors: [["my-app"]],
               factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -2063,20 +2063,20 @@ describe('compiler compliance', () => {
               vars: 20,
               template:  function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                  $r3$.ɵɵtext(0);
-                  $r3$.ɵɵpipe(1, "myPurePipe");
-                  $r3$.ɵɵpipe(2, "myPipe");
-                  $r3$.ɵɵelementStart(3, "p");
-                  $r3$.ɵɵtext(4);
-                  $r3$.ɵɵpipe(5, "myPipe");
-                  $r3$.ɵɵpipe(6, "myPipe");
-                  $r3$.ɵɵelementEnd();
+                  $r3$.Δtext(0);
+                  $r3$.Δpipe(1, "myPurePipe");
+                  $r3$.Δpipe(2, "myPipe");
+                  $r3$.ΔelementStart(3, "p");
+                  $r3$.Δtext(4);
+                  $r3$.Δpipe(5, "myPipe");
+                  $r3$.Δpipe(6, "myPipe");
+                  $r3$.ΔelementEnd();
                 }
                 if (rf & 2) {
-                  $r3$.ɵɵselect(0);
-                  $r3$.ɵɵtextBinding(0, $r3$.ɵɵinterpolation1("", $r3$.ɵɵpipeBind2(1, 3, $r3$.ɵɵpipeBind2(2, 6, ctx.name, ctx.size), ctx.size), ""));
-                  $r3$.ɵɵselect(4);
-                  $r3$.ɵɵtextBinding(4, $r3$.ɵɵinterpolation2("", $r3$.ɵɵpipeBindV(5, 9, $r3$.ɵɵpureFunction1(18, $c0$, ctx.name)), " ", (ctx.name ? 1 : $r3$.ɵɵpipeBind1(6, 16, 2)), ""));
+                  $r3$.Δselect(0);
+                  $r3$.ΔtextBinding(0, $r3$.Δinterpolation1("", $r3$.ΔpipeBind2(1, 3, $r3$.ΔpipeBind2(2, 6, ctx.name, ctx.size), ctx.size), ""));
+                  $r3$.Δselect(4);
+                  $r3$.ΔtextBinding(4, $r3$.Δinterpolation2("", $r3$.ΔpipeBindV(5, 9, $r3$.ΔpureFunction1(18, $c0$, ctx.name)), " ", (ctx.name ? 1 : $r3$.ΔpipeBind1(6, 16, 2)), ""));
                 }
               },
               pipes: [MyPurePipe, MyPipe],
@@ -2122,7 +2122,7 @@ describe('compiler compliance', () => {
 
         const MyAppDefinition = `
             // ...
-            MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
+            MyApp.ngComponentDef = $r3$.ΔdefineComponent({
               type: MyApp,
               selectors: [["my-app"]],
               factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -2130,21 +2130,21 @@ describe('compiler compliance', () => {
               vars: 27,
               template:  function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                  $r3$.ɵɵtext(0);
-                  $r3$.ɵɵpipe(1, "myPipe");
-                  $r3$.ɵɵpipe(2, "myPipe");
-                  $r3$.ɵɵpipe(3, "myPipe");
-                  $r3$.ɵɵpipe(4, "myPipe");
-                  $r3$.ɵɵpipe(5, "myPipe");
+                  $r3$.Δtext(0);
+                  $r3$.Δpipe(1, "myPipe");
+                  $r3$.Δpipe(2, "myPipe");
+                  $r3$.Δpipe(3, "myPipe");
+                  $r3$.Δpipe(4, "myPipe");
+                  $r3$.Δpipe(5, "myPipe");
                 }
                 if (rf & 2) {
-                  $r3$.ɵɵselect(0);
-                  $r3$.ɵɵtextBinding(0, $r3$.ɵɵinterpolation5(
-                    "0:", i0.ɵɵpipeBind1(1, 5, ctx.name),
-                    "1:", i0.ɵɵpipeBind2(2, 7, ctx.name, 1),
-                    "2:", i0.ɵɵpipeBind3(3, 10, ctx.name, 1, 2),
-                    "3:", i0.ɵɵpipeBind4(4, 14, ctx.name, 1, 2, 3),
-                    "4:", i0.ɵɵpipeBindV(5, 19, $r3$.ɵɵpureFunction1(25, $c0$, ctx.name)),
+                  $r3$.Δselect(0);
+                  $r3$.ΔtextBinding(0, $r3$.Δinterpolation5(
+                    "0:", i0.ΔpipeBind1(1, 5, ctx.name),
+                    "1:", i0.ΔpipeBind2(2, 7, ctx.name, 1),
+                    "2:", i0.ΔpipeBind3(3, 10, ctx.name, 1, 2),
+                    "3:", i0.ΔpipeBind4(4, 14, ctx.name, 1, 2, 3),
+                    "4:", i0.ΔpipeBindV(5, 19, $r3$.ΔpureFunction1(25, $c0$, ctx.name)),
                     ""
                   ));
                 }
@@ -2178,7 +2178,7 @@ describe('compiler compliance', () => {
       const MyComponentDefinition = `
         const $c1$ = ["user", ""];
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2186,13 +2186,13 @@ describe('compiler compliance', () => {
           vars: 1,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelement(0, "input", null, $c1$);
-              $r3$.ɵɵtext(2);
+              $r3$.Δelement(0, "input", null, $c1$);
+              $r3$.Δtext(2);
             }
             if (rf & 2) {
-              const $user$ = $r3$.ɵɵreference(1);
-              $r3$.ɵɵselect(2);
-              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1("Hello ", $user$.value, "!"));
+              const $user$ = $r3$.Δreference(1);
+              $r3$.Δselect(2);
+              $r3$.ΔtextBinding(2, $r3$.Δinterpolation1("Hello ", $user$.value, "!"));
             }
           },
           encapsulation: 2
@@ -2244,38 +2244,38 @@ describe('compiler compliance', () => {
         const $c4$ = ["bar", ""];
         function MyComponent_div_3_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "span");
-            $r3$.ɵɵtext(1);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "span");
+            $r3$.Δtext(1);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵnextContext();
-            const $bar$ = $r3$.ɵɵreference(4);
-            $r3$.ɵɵnextContext();
-            const $foo$ = $r3$.ɵɵreference(1);
-            const $baz$ = $r3$.ɵɵreference(5);
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation3("", $foo$, "-", $bar$, "-", $baz$, ""));
+            $r3$.ΔnextContext();
+            const $bar$ = $r3$.Δreference(4);
+            $r3$.ΔnextContext();
+            const $foo$ = $r3$.Δreference(1);
+            const $baz$ = $r3$.Δreference(5);
+            $r3$.Δselect(1);
+            $r3$.ΔtextBinding(1, $r3$.Δinterpolation3("", $foo$, "-", $bar$, "-", $baz$, ""));
           }
         }
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵtext(1);
-            $r3$.ɵɵtemplate(2, MyComponent_div_3_span_2_Template, 2, 3, "span", $c2$);
-            $r3$.ɵɵelement(3, "span", null, $c4$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δtext(1);
+            $r3$.Δtemplate(2, MyComponent_div_3_span_2_Template, 2, 3, "span", $c2$);
+            $r3$.Δelement(3, "span", null, $c4$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            const $bar$ = $r3$.ɵɵreference(4);
-            $r3$.ɵɵnextContext();
-            const $foo$ = $r3$.ɵɵreference(1);
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2(" ", $foo$, "-", $bar$, " "));
+            const $bar$ = $r3$.Δreference(4);
+            $r3$.ΔnextContext();
+            const $foo$ = $r3$.Δreference(1);
+            $r3$.Δselect(1);
+            $r3$.ΔtextBinding(1, $r3$.Δinterpolation2(" ", $foo$, "-", $bar$, " "));
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2283,15 +2283,15 @@ describe('compiler compliance', () => {
           vars: 1,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelement(0, "div", null, $c1$);
-              $r3$.ɵɵtext(2);
-              $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 5, 2, "div", $c2$);
-              $r3$.ɵɵelement(4, "div", null, $c3$);
+              $r3$.Δelement(0, "div", null, $c1$);
+              $r3$.Δtext(2);
+              $r3$.Δtemplate(3, MyComponent_div_3_Template, 5, 2, "div", $c2$);
+              $r3$.Δelement(4, "div", null, $c3$);
             }
             if (rf & 2) {
-              const $foo$ = $r3$.ɵɵreference(1);
-              $r3$.ɵɵselect(2);
-              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1(" ", $foo$, " "));
+              const $foo$ = $r3$.Δreference(1);
+              $r3$.Δselect(2);
+              $r3$.ΔtextBinding(2, $r3$.Δinterpolation1(" ", $foo$, " "));
             }
           },
           directives:[IfDirective],
@@ -2336,40 +2336,40 @@ describe('compiler compliance', () => {
 
       function MyComponent_div_0_span_3_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "span");
-          $i0$.ɵɵtext(1);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "span");
+          $i0$.Δtext(1);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
-          const $item$ = $i0$.ɵɵnextContext().$implicit;
-          const $foo$ = $i0$.ɵɵreference(2);
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $foo$, " - ", $item$, " "));
+          const $item$ = $i0$.ΔnextContext().$implicit;
+          const $foo$ = $i0$.Δreference(2);
+          $r3$.Δselect(1);
+          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $foo$, " - ", $item$, " "));
         }
       }
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "div");
-          $i0$.ɵɵelement(1, "div", null, $c1$);
-          $i0$.ɵɵtemplate(3, MyComponent_div_0_span_3_Template, 2, 2, "span", $c2$);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "div");
+          $i0$.Δelement(1, "div", null, $c1$);
+          $i0$.Δtemplate(3, MyComponent_div_0_span_3_Template, 2, 2, "span", $c2$);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
-          const $app$ = $i0$.ɵɵnextContext();
-          $r3$.ɵɵselect(3);
-          $i0$.ɵɵproperty("ngIf", $app$.showing);
+          const $app$ = $i0$.ΔnextContext();
+          $r3$.Δselect(3);
+          $i0$.Δproperty("ngIf", $app$.showing);
         }
       }
 
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 1, "div", $c0$);
+          $i0$.Δtemplate(0, MyComponent_div_0_Template, 4, 1, "div", $c0$);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("ngForOf", ctx.items);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -2424,12 +2424,12 @@ describe('compiler compliance', () => {
 
       it('should gen hooks with a few simple components', () => {
         const LifecycleCompDefinition = `
-          LifecycleComp.ngComponentDef = $r3$.ɵɵdefineComponent({
+          LifecycleComp.ngComponentDef = $r3$.ΔdefineComponent({
             type: LifecycleComp,
             selectors: [["lifecycle-comp"]],
             factory: function LifecycleComp_Factory(t) { return new (t || LifecycleComp)(); },
             inputs: {nameMin: ["name", "nameMin"]},
-            features: [$r3$.ɵɵNgOnChangesFeature()],
+            features: [$r3$.ΔNgOnChangesFeature()],
             consts: 0,
             vars: 0,
             template:  function LifecycleComp_Template(rf, ctx) {},
@@ -2437,7 +2437,7 @@ describe('compiler compliance', () => {
           });`;
 
         const SimpleLayoutDefinition = `
-          SimpleLayout.ngComponentDef = $r3$.ɵɵdefineComponent({
+          SimpleLayout.ngComponentDef = $r3$.ΔdefineComponent({
             type: SimpleLayout,
             selectors: [["simple-layout"]],
             factory: function SimpleLayout_Factory(t) { return new (t || SimpleLayout)(); },
@@ -2445,14 +2445,14 @@ describe('compiler compliance', () => {
             vars: 2,
             template:  function SimpleLayout_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelement(0, "lifecycle-comp", $e0_attrs$);
-                $r3$.ɵɵelement(1, "lifecycle-comp", $e1_attrs$);
+                $r3$.Δelement(0, "lifecycle-comp", $e0_attrs$);
+                $r3$.Δelement(1, "lifecycle-comp", $e1_attrs$);
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵproperty("name", ctx.name1);
-                $r3$.ɵɵselect(1);
-                $r3$.ɵɵproperty("name", ctx.name2);
+                $r3$.Δselect(0);
+                $r3$.Δproperty("name", ctx.name1);
+                $r3$.Δselect(1);
+                $r3$.Δproperty("name", ctx.name2);
               }
             },
             directives: [LifecycleComp],
@@ -2547,13 +2547,13 @@ describe('compiler compliance', () => {
 
         // TODO(benlesh): Enforce this when the directives are specified
         const ForDirectiveDefinition = `
-              ForOfDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+              ForOfDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
                 type: ForOfDirective,
                 selectors: [["", "forOf", ""]],
                 factory: function ForOfDirective_Factory(t) {
-                  return new (t || ForOfDirective)($r3$.ɵɵdirectiveInject(ViewContainerRef), $r3$.ɵɵdirectiveInject(TemplateRef));
+                  return new (t || ForOfDirective)($r3$.ΔdirectiveInject(ViewContainerRef), $r3$.ΔdirectiveInject(TemplateRef));
                 },
-                features: [$r3$.ɵɵNgOnChangesFeature()],
+                features: [$r3$.ΔNgOnChangesFeature()],
                 inputs: {forOf: "forOf"}
               });
             `;
@@ -2562,14 +2562,14 @@ describe('compiler compliance', () => {
               const $t1_attrs$ = [${AttributeMarker.Template}, "for", "forOf"];
               function MyComponent__svg_g_1_Template(rf, ctx) {
                 if (rf & 1) {
-                  $r3$.ɵɵnamespaceSVG();
-                  $r3$.ɵɵelementStart(0,"g");
-                  $r3$.ɵɵelement(1,"circle");
-                  $r3$.ɵɵelementEnd();
+                  $r3$.ΔnamespaceSVG();
+                  $r3$.ΔelementStart(0,"g");
+                  $r3$.Δelement(1,"circle");
+                  $r3$.ΔelementEnd();
                 }
               }
               …
-              MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+              MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
                 type: MyComponent,
                 selectors: [["my-component"]],
                 factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2577,14 +2577,14 @@ describe('compiler compliance', () => {
                 vars: 1,
                 template:  function MyComponent_Template(rf, ctx){
                   if (rf & 1) {
-                    $r3$.ɵɵnamespaceSVG();
-                    $r3$.ɵɵelementStart(0,"svg");
-                    $r3$.ɵɵtemplate(1, MyComponent__svg_g_1_Template, 2, 0, "g", $t1_attrs$);
-                    $r3$.ɵɵelementEnd();
+                    $r3$.ΔnamespaceSVG();
+                    $r3$.ΔelementStart(0,"svg");
+                    $r3$.Δtemplate(1, MyComponent__svg_g_1_Template, 2, 0, "g", $t1_attrs$);
+                    $r3$.ΔelementEnd();
                   }
                   if (rf & 2) {
-                    $r3$.ɵɵselect(1);
-                    $r3$.ɵɵproperty("forOf", ctx.items);
+                    $r3$.Δselect(1);
+                    $r3$.Δproperty("forOf", ctx.items);
                   }
                 },
                 directives: function() { return [ForOfDirective]; },
@@ -2626,13 +2626,13 @@ describe('compiler compliance', () => {
 
         // TODO(chuckj): Enforce this when the directives are specified
         const ForDirectiveDefinition = `
-          ForOfDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+          ForOfDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
             type: ForOfDirective,
             selectors: [["", "forOf", ""]],
             factory: function ForOfDirective_Factory(t) {
-              return new (t || ForOfDirective)($r3$.ɵɵdirectiveInject(ViewContainerRef), $r3$.ɵɵdirectiveInject(TemplateRef));
+              return new (t || ForOfDirective)($r3$.ΔdirectiveInject(ViewContainerRef), $r3$.ΔdirectiveInject(TemplateRef));
             },
-            features: [$r3$.ɵɵNgOnChangesFeature()],
+            features: [$r3$.ΔNgOnChangesFeature()],
             inputs: {forOf: "forOf"}
           });
         `;
@@ -2641,18 +2641,18 @@ describe('compiler compliance', () => {
           const $t1_attrs$ = [${AttributeMarker.Template}, "for", "forOf"];
           function MyComponent_li_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "li");
-              $r3$.ɵɵtext(1);
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "li");
+              $r3$.Δtext(1);
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
               const $item$ = ctx.$implicit;
-              $r3$.ɵɵselect(1);
-              $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation1("", $item$.name, ""));
+              $r3$.Δselect(1);
+              $r3$.ΔtextBinding(1, $r3$.Δinterpolation1("", $item$.name, ""));
             }
           }
           …
-          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyComponent,
             selectors: [["my-component"]],
             factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2660,13 +2660,13 @@ describe('compiler compliance', () => {
             vars: 1,
             template:  function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelementStart(0, "ul");
-                $r3$.ɵɵtemplate(1, MyComponent_li_1_Template, 2, 1, "li", $t1_attrs$);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔelementStart(0, "ul");
+                $r3$.Δtemplate(1, MyComponent_li_1_Template, 2, 1, "li", $t1_attrs$);
+                $r3$.ΔelementEnd();
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(1);
-                $r3$.ɵɵproperty("forOf", ctx.items);
+                $r3$.Δselect(1);
+                $r3$.Δproperty("forOf", ctx.items);
               }
             },
             directives: function() { return [ForOfDirective]; },
@@ -2723,40 +2723,40 @@ describe('compiler compliance', () => {
           const $t4_attrs$ = [${AttributeMarker.Template}, "for", "forOf"];
           function MyComponent_li_1_li_4_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "li");
-              $r3$.ɵɵtext(1);
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "li");
+              $r3$.Δtext(1);
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
               const $info$ = ctx.$implicit;
-              const $item$ = $r3$.ɵɵnextContext().$implicit;
-              $r3$.ɵɵselect(1);
-              $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2(" ", $item$.name, ": ", $info$.description, " "));
+              const $item$ = $r3$.ΔnextContext().$implicit;
+              $r3$.Δselect(1);
+              $r3$.ΔtextBinding(1, $r3$.Δinterpolation2(" ", $item$.name, ": ", $info$.description, " "));
             }
           }
 
           function MyComponent_li_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "li");
-              $r3$.ɵɵelementStart(1, "div");
-              $r3$.ɵɵtext(2);
-              $r3$.ɵɵelementEnd();
-              $r3$.ɵɵelementStart(3, "ul");
-              $r3$.ɵɵtemplate(4, MyComponent_li_1_li_4_Template, 2, 2, "li", $t4_attrs$);
-              $r3$.ɵɵelementEnd();
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "li");
+              $r3$.ΔelementStart(1, "div");
+              $r3$.Δtext(2);
+              $r3$.ΔelementEnd();
+              $r3$.ΔelementStart(3, "ul");
+              $r3$.Δtemplate(4, MyComponent_li_1_li_4_Template, 2, 2, "li", $t4_attrs$);
+              $r3$.ΔelementEnd();
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
               const $item$ = ctx.$implicit;
-              $r3$.ɵɵselect(2);
-              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1("", IDENT.name, ""));
-              $r3$.ɵɵselect(4);
-              $r3$.ɵɵproperty("forOf", IDENT.infos);
+              $r3$.Δselect(2);
+              $r3$.ΔtextBinding(2, $r3$.Δinterpolation1("", IDENT.name, ""));
+              $r3$.Δselect(4);
+              $r3$.Δproperty("forOf", IDENT.infos);
             }
           }
 
           …
-          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyComponent,
             selectors: [["my-component"]],
             factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2764,13 +2764,13 @@ describe('compiler compliance', () => {
             vars: 1,
             template:  function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelementStart(0, "ul");
-                $r3$.ɵɵtemplate(1, MyComponent_li_1_Template, 5, 2, "li", $c1$);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔelementStart(0, "ul");
+                $r3$.Δtemplate(1, MyComponent_li_1_Template, 5, 2, "li", $c1$);
+                $r3$.ΔelementEnd();
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(1);
-                $r3$.ɵɵproperty("forOf", ctx.items);
+                $r3$.Δselect(1);
+                $r3$.Δproperty("forOf", ctx.items);
               }
             },
             directives: function () { return [ForOfDirective]; },
@@ -2874,7 +2874,7 @@ describe('compiler compliance', () => {
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        SomeDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: SomeDirective,
           selectors: [["", "some-directive", ""]],
           factory: function SomeDirective_Factory(t) {return new (t || SomeDirective)(); },
@@ -2931,7 +2931,7 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
+      BaseClass.ngBaseDef = i0.ΔdefineBase({
         inputs: {
           input1: "input1",
           input2: ["alias2", "input2"]
@@ -2977,7 +2977,7 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
+      BaseClass.ngBaseDef = i0.ΔdefineBase({
         outputs: {
           output1: "output1",
           output2: "output2"
@@ -3029,7 +3029,7 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
+      BaseClass.ngBaseDef = i0.ΔdefineBase({
         inputs: {
           input1: "input1",
           input2: ["whatever", "input2"]
@@ -3071,14 +3071,14 @@ describe('compiler compliance', () => {
       const expectedOutput = `
       const $e0_attrs$ = ["something"];
       // ...
-      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
+      BaseClass.ngBaseDef = i0.ΔdefineBase({
         viewQuery: function (rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵviewQuery($e0_attrs$, true, null);
+            $r3$.ΔviewQuery($e0_attrs$, true, null);
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.something = $tmp$.first));
+            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$.first));
           }
         }
       });
@@ -3116,14 +3116,14 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
+      BaseClass.ngBaseDef = i0.ΔdefineBase({
         viewQuery: function (rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵviewQuery(SomeDirective, true, null);
+            $r3$.ΔviewQuery(SomeDirective, true, null);
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.something = $tmp$));
+            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$));
           }
         }
       });
@@ -3159,14 +3159,14 @@ describe('compiler compliance', () => {
       const expectedOutput = `
       const $e0_attrs$ = ["something"];
       // ...
-      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
+      BaseClass.ngBaseDef = i0.ΔdefineBase({
         contentQueries: function (rf, ctx, dirIndex) {
           if (rf & 1) {
-            $r3$.ɵɵcontentQuery(dirIndex, $e0_attrs$, true, null);
+            $r3$.ΔcontentQuery(dirIndex, $e0_attrs$, true, null);
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.something = $tmp$.first));
+            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$.first));
           }
         }
       });
@@ -3204,14 +3204,14 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
+      BaseClass.ngBaseDef = i0.ΔdefineBase({
         contentQueries: function (rf, ctx, dirIndex) {
           if (rf & 1) {
-            $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false, null);
+            $r3$.ΔcontentQuery(dirIndex, SomeDirective, false, null);
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.something = $tmp$));
+            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$));
           }
         }
       });
@@ -3247,13 +3247,13 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = $r3$.ɵɵdefineBase({
+      BaseClass.ngBaseDef = $r3$.ΔdefineBase({
         hostBindings: function (rf, ctx, elIndex) {
           if (rf & 1) {
-            $r3$.ɵɵallocHostVars(1);
+            $r3$.ΔallocHostVars(1);
           }
           if (rf & 2) {
-            $r3$.ɵɵelementAttribute(elIndex, "tabindex", $r3$.ɵɵbind(ctx.tabindex));
+            $r3$.ΔelementAttribute(elIndex, "tabindex", $r3$.Δbind(ctx.tabindex));
           }
         }
       });
@@ -3289,10 +3289,10 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = $r3$.ɵɵdefineBase({
+      BaseClass.ngBaseDef = $r3$.ΔdefineBase({
         hostBindings: function (rf, ctx, elIndex) {
           if (rf & 1) {
-            $r3$.ɵɵlistener("mousedown", function ($event) {
+            $r3$.Δlistener("mousedown", function ($event) {
               return ctx.handleMousedown($event);
             });
           }
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index 7fa4977f60..701c1b8e5b 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -39,13 +39,13 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "div");
-          $i0$.ɵɵtext(1);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "div");
+          $i0$.Δtext(1);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation1("Hello ", $ctx$.name, ""));
+          $r3$.Δselect(1);
+          $i0$.ΔtextBinding(1, $i0$.Δinterpolation1("Hello ", $ctx$.name, ""));
         }
       }`;
       const result = compile(files, angularFiles);
@@ -78,11 +78,11 @@ describe('compiler compliance: bindings', () => {
       …
       template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.ɵɵelement(0, "a", $e0_attrs$);
+          $i0$.Δelement(0, "a", $e0_attrs$);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("title", $ctx$.title);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("title", $ctx$.title);
         }
       }`;
       const result = compile(files, angularFiles);
@@ -113,11 +113,11 @@ describe('compiler compliance: bindings', () => {
       …
       template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.ɵɵelement(0, "a", $e0_attrs$);
+          $i0$.Δelement(0, "a", $e0_attrs$);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵpropertyInterpolate1("title", "Hello ", $ctx$.name, "");
+          $i0$.Δselect(0);
+          $i0$.ΔpropertyInterpolate1("title", "Hello ", $ctx$.name, "");
         }
       }`;
       const result = compile(files, angularFiles);
@@ -138,7 +138,7 @@ describe('compiler compliance: bindings', () => {
         }
       };
       const result = compile(files, angularFiles);
-      expect(result.source).not.toContain('i0.ɵɵelementProperty');
+      expect(result.source).not.toContain('i0.ΔelementProperty');
     });
 
     it('should not remap property names whose names do not correspond to their attribute names',
@@ -170,11 +170,11 @@ describe('compiler compliance: bindings', () => {
 
       function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-            $i0$.ɵɵelement(0, "label", _c0);
+            $i0$.Δelement(0, "label", _c0);
         }
         if (rf & 2) {
-            $i0$.ɵɵselect(0);
-            $i0$.ɵɵproperty("for", ctx.forValue);
+            $i0$.Δselect(0);
+            $i0$.Δproperty("for", ctx.forValue);
         }
       }`;
 
@@ -204,16 +204,16 @@ describe('compiler compliance: bindings', () => {
       };
 
       const HostBindingDirDeclaration = `
-        HostBindingDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        HostBindingDir.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: HostBindingDir,
           selectors: [["", "hostBindingDir", ""]],
           factory: function HostBindingDir_Factory(t) { return new (t || HostBindingDir)(); },
           hostBindings: function HostBindingDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵallocHostVars(1);
+              $r3$.ΔallocHostVars(1);
             }
             if (rf & 2) {
-              $r3$.ɵɵproperty("id", ctx.dirId, null, true);
+              $r3$.Δproperty("id", ctx.dirId, null, true);
             }
           }
         });
@@ -251,16 +251,16 @@ describe('compiler compliance: bindings', () => {
       const HostBindingCompDeclaration = `
         const $ff$ = function ($v$) { return ["red", $v$]; };
         …
-        HostBindingComp.ngComponentDef = $r3$.ɵɵdefineComponent({
+        HostBindingComp.ngComponentDef = $r3$.ΔdefineComponent({
           type: HostBindingComp,
           selectors: [["host-binding-comp"]],
           factory: function HostBindingComp_Factory(t) { return new (t || HostBindingComp)(); },
           hostBindings: function HostBindingComp_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵallocHostVars(3);
+              $r3$.ΔallocHostVars(3);
             }
             if (rf & 2) {
-              $r3$.ɵɵproperty("id", $r3$.ɵɵpureFunction1(1, $ff$, ctx.id), null, true);
+              $r3$.Δproperty("id", $r3$.ΔpureFunction1(1, $ff$, ctx.id), null, true);
             }
           },
           consts: 0,
@@ -299,16 +299,16 @@ describe('compiler compliance: bindings', () => {
       };
 
       const HostAttributeDirDeclaration = `
-        HostAttributeDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        HostAttributeDir.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: HostAttributeDir,
           selectors: [["", "hostAttributeDir", ""]],
           factory: function HostAttributeDir_Factory(t) { return new (t || HostAttributeDir)(); },
           hostBindings: function HostAttributeDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵallocHostVars(1);
+              $r3$.ΔallocHostVars(1);
             }
             if (rf & 2) {
-              $r3$.ɵɵelementAttribute(elIndex, "required", $r3$.ɵɵbind(ctx.required));
+              $r3$.ΔelementAttribute(elIndex, "required", $r3$.Δbind(ctx.required));
             }
           }
         });
@@ -344,13 +344,13 @@ describe('compiler compliance: bindings', () => {
       const HostAttributeDirDeclaration = `
         const $c0$ = ["aria-label", "label"];
         …
-        HostAttributeDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        HostAttributeDir.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: HostAttributeDir,
           selectors: [["", "hostAttributeDir", ""]],
           factory: function HostAttributeDir_Factory(t) { return new (t || HostAttributeDir)(); },
           hostBindings: function HostAttributeDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵelementHostAttrs($c0$);
+              $r3$.ΔelementHostAttrs($c0$);
             }
           }
         });
@@ -402,25 +402,25 @@ describe('compiler compliance: bindings', () => {
         const $c0$ = ["title", "hello there from component", ${AttributeMarker.Styles}, "opacity", "1"];
         const $c1$ = ["title", "hello there from directive", ${AttributeMarker.Classes}, "one", "two", ${AttributeMarker.Styles}, "width", "200px", "height", "500px"];
         …
-        HostAttributeComp.ngComponentDef = $r3$.ɵɵdefineComponent({
+        HostAttributeComp.ngComponentDef = $r3$.ΔdefineComponent({
           type: HostAttributeComp,
           selectors: [["my-host-attribute-component"]],
           factory: function HostAttributeComp_Factory(t) { return new (t || HostAttributeComp)(); },
           hostBindings: function HostAttributeComp_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵelementHostAttrs($c0$);
+              $r3$.ΔelementHostAttrs($c0$);
               …
             }
             …
           }
         …
-        HostAttributeDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        HostAttributeDir.ngDirectiveDef = $r3$.ΔdefineDirective({
           type: HostAttributeDir,
           selectors: [["", "hostAttributeDir", ""]],
           factory: function HostAttributeDir_Factory(t) { return new (t || HostAttributeDir)(); },
           hostBindings: function HostAttributeDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵelementHostAttrs($c1$);
+              $r3$.ΔelementHostAttrs($c1$);
               …
             }
             …
@@ -469,26 +469,26 @@ describe('compiler compliance: bindings', () => {
       const template = `
       …
         if (rf & 2) {
-          i0.ɵɵselect(0);
-          i0.ɵɵpropertyInterpolateV("title", ["a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i", ctx.nine, "j"]);
-          i0.ɵɵselect(1);
-          i0.ɵɵpropertyInterpolate8("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i");
-          i0.ɵɵselect(2);
-          i0.ɵɵpropertyInterpolate7("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h");
-          i0.ɵɵselect(3);
-          i0.ɵɵpropertyInterpolate6("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g");
-          i0.ɵɵselect(4);
-          i0.ɵɵpropertyInterpolate5("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f");
-          i0.ɵɵselect(5);
-          i0.ɵɵpropertyInterpolate4("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e");
-          i0.ɵɵselect(6);
-          i0.ɵɵpropertyInterpolate3("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d");
-          i0.ɵɵselect(7);
-          i0.ɵɵpropertyInterpolate2("title", "a", ctx.one, "b", ctx.two, "c");
-          i0.ɵɵselect(8);
-          i0.ɵɵpropertyInterpolate1("title", "a", ctx.one, "b");
-          i0.ɵɵselect(9);
-          i0.ɵɵpropertyInterpolate("title", ctx.one);
+          i0.Δselect(0);
+          i0.ΔpropertyInterpolateV("title", ["a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i", ctx.nine, "j"]);
+          i0.Δselect(1);
+          i0.ΔpropertyInterpolate8("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i");
+          i0.Δselect(2);
+          i0.ΔpropertyInterpolate7("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h");
+          i0.Δselect(3);
+          i0.ΔpropertyInterpolate6("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g");
+          i0.Δselect(4);
+          i0.ΔpropertyInterpolate5("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f");
+          i0.Δselect(5);
+          i0.ΔpropertyInterpolate4("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e");
+          i0.Δselect(6);
+          i0.ΔpropertyInterpolate3("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d");
+          i0.Δselect(7);
+          i0.ΔpropertyInterpolate2("title", "a", ctx.one, "b", ctx.two, "c");
+          i0.Δselect(8);
+          i0.ΔpropertyInterpolate1("title", "a", ctx.one, "b");
+          i0.Δselect(9);
+          i0.ΔpropertyInterpolate("title", ctx.one);
       }
       …
       `;
@@ -510,19 +510,19 @@ describe('compiler compliance: bindings', () => {
         …
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.ɵɵelementStart(0, "b", $_c0$, $_c1$);
-            $i0$.ɵɵdisableBindings();
-            $i0$.ɵɵelementStart(2, "i");
-            $i0$.ɵɵtext(3, "Hello {{ name }}!");
-            $i0$.ɵɵelementEnd();
-            $i0$.ɵɵenableBindings();
-            $i0$.ɵɵelementEnd();
-            $i0$.ɵɵtext(4);
+            $i0$.ΔelementStart(0, "b", $_c0$, $_c1$);
+            $i0$.ΔdisableBindings();
+            $i0$.ΔelementStart(2, "i");
+            $i0$.Δtext(3, "Hello {{ name }}!");
+            $i0$.ΔelementEnd();
+            $i0$.ΔenableBindings();
+            $i0$.ΔelementEnd();
+            $i0$.Δtext(4);
           }
           if (rf & 2) {
-            const $_r0$ = $i0$.ɵɵreference(1);
-            $r3$.ɵɵselect(4);
-            $i0$.ɵɵtextBinding(4, $i0$.ɵɵinterpolation1(" ", $_r0$.id, " "));
+            const $_r0$ = $i0$.Δreference(1);
+            $r3$.Δselect(4);
+            $i0$.ΔtextBinding(4, $i0$.Δinterpolation1(" ", $_r0$.id, " "));
           }
         }
       `;
@@ -542,12 +542,12 @@ describe('compiler compliance: bindings', () => {
         …
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.ɵɵelementStart(0, "div");
-            $i0$.ɵɵdisableBindings();
-            $i0$.ɵɵelement(1, "input", $_c0$);
-            $i0$.ɵɵtext(2, " {{ myInput.value }} ");
-            $i0$.ɵɵenableBindings();
-            $i0$.ɵɵelementEnd();
+            $i0$.ΔelementStart(0, "div");
+            $i0$.ΔdisableBindings();
+            $i0$.Δelement(1, "input", $_c0$);
+            $i0$.Δtext(2, " {{ myInput.value }} ");
+            $i0$.ΔenableBindings();
+            $i0$.ΔelementEnd();
         }
       `;
       const result = compile(files, angularFiles);
@@ -566,11 +566,11 @@ describe('compiler compliance: bindings', () => {
         …
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.ɵɵelementStart(0, "div");
-            $i0$.ɵɵdisableBindings();
-            $i0$.ɵɵelement(1, "div", $_c0$);
-            $i0$.ɵɵenableBindings();
-            $i0$.ɵɵelementEnd();
+            $i0$.ΔelementStart(0, "div");
+            $i0$.ΔdisableBindings();
+            $i0$.Δelement(1, "div", $_c0$);
+            $i0$.ΔenableBindings();
+            $i0$.ΔelementEnd();
         }
       `;
       const result = compile(files, angularFiles);
@@ -585,7 +585,7 @@ describe('compiler compliance: bindings', () => {
       const template = `
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.ɵɵelement(0, "div");
+            $i0$.Δelement(0, "div");
           }
         }
       `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
index f68c5a037e..6e3fd1d315 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
@@ -50,13 +50,13 @@ describe('compiler compliance: dependency injection', () => {
     const factory = `
       factory: function MyComponent_Factory(t) {
         return new (t || MyComponent)(
-          $r3$.ɵɵinjectAttribute('name'),
-          $r3$.ɵɵdirectiveInject(MyService),
-          $r3$.ɵɵdirectiveInject(MyService, 1),
-          $r3$.ɵɵdirectiveInject(MyService, 2),
-          $r3$.ɵɵdirectiveInject(MyService, 4),
-          $r3$.ɵɵdirectiveInject(MyService, 8),
-          $r3$.ɵɵdirectiveInject(MyService, 10)
+          $r3$.ΔinjectAttribute('name'),
+          $r3$.ΔdirectiveInject(MyService),
+          $r3$.ΔdirectiveInject(MyService, 1),
+          $r3$.ΔdirectiveInject(MyService, 2),
+          $r3$.ΔdirectiveInject(MyService, 4),
+          $r3$.ΔdirectiveInject(MyService, 8),
+          $r3$.ΔdirectiveInject(MyService, 10)
         );
       }`;
 
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts
index 6ef22fdcf0..71085868ea 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts
@@ -38,7 +38,7 @@ describe('compiler compliance: directives', () => {
 
       // MyComponent definition should be:
       const MyComponentDefinition = `
-            MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+            MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
                 type: MyComponent,
                 selectors: [["my-component"]],
                 factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -46,7 +46,7 @@ describe('compiler compliance: directives', () => {
                 vars: 0,
                 template: function MyComponent_Template(rf, ctx) {
                     if (rf & 1) {
-                        $r3$.ɵɵelement(0, "div");
+                        $r3$.Δelement(0, "div");
                     }
                 },
                 encapsulation: 2
@@ -84,7 +84,7 @@ describe('compiler compliance: directives', () => {
 
       // MyComponent definition should be:
       const MyComponentDefinition = `
-            MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+            MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
                 type: MyComponent,
                 selectors: [["my-component"]],
                 factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -92,7 +92,7 @@ describe('compiler compliance: directives', () => {
                 vars: 0,
                 template: function MyComponent_Template(rf, ctx) {
                     if (rf & 1) {
-                        $r3$.ɵɵelement(0, "div");
+                        $r3$.Δelement(0, "div");
                     }
                 },
                 encapsulation: 2
@@ -132,15 +132,15 @@ describe('compiler compliance: directives', () => {
                 …
                 const _c0 = [${AttributeMarker.Bindings}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.ɵɵelement(0, "div", _c0);
+                            $r3$.Δelement(0, "div", _c0);
                         }
                         if (rf & 2) {
-                            $r3$.ɵɵselect(0);
-                            $r3$.ɵɵproperty("someDirective", true);
+                            $r3$.Δselect(0);
+                            $r3$.Δproperty("someDirective", true);
                         }
                     },
                     …
@@ -187,15 +187,15 @@ describe('compiler compliance: directives', () => {
         const $_c0$ = ["directiveA", ""];
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtext(0, "Some content");
+            $r3$.Δtext(0, "Some content");
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $_c0$);
+              $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $_c0$);
             }
           },
           …
@@ -241,21 +241,21 @@ describe('compiler compliance: directives', () => {
         const $_c1$ = ["directiveA", ""];
         function MyComponent_ng_container_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementContainerStart(0, $_c1$);
-            $r3$.ɵɵtext(1, "Some content");
-            $r3$.ɵɵelementContainerEnd();
+            $r3$.ΔelementContainerStart(0, $_c1$);
+            $r3$.Δtext(1, "Some content");
+            $r3$.ΔelementContainerEnd();
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵtemplate(0, MyComponent_ng_container_0_Template, 2, 0, "ng-container", $_c0$);
+              $r3$.Δtemplate(0, MyComponent_ng_container_0_Template, 2, 0, "ng-container", $_c0$);
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵproperty("ngIf", ctx.showing);
+              $r3$.Δselect(0);
+              $r3$.Δproperty("ngIf", ctx.showing);
             }
           },
           …
@@ -295,15 +295,15 @@ describe('compiler compliance: directives', () => {
                 …
                 const $c0_a0$ = [${AttributeMarker.Bindings}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $c0_a0$);
+                            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $c0_a0$);
                         }
                         if (rf & 2) {
-                            $r3$.ɵɵselect(0);
-                            $r3$.ɵɵproperty("someDirective", true);
+                            $r3$.Δselect(0);
+                            $r3$.Δproperty("someDirective", true);
                         }
                     },
                     …
@@ -344,11 +344,11 @@ describe('compiler compliance: directives', () => {
                 …
                 const $c0_a0$ = [${AttributeMarker.Template}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0_a0$);
+                            $r3$.Δtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0_a0$);
                         }
                     },
                     …
@@ -393,13 +393,13 @@ describe('compiler compliance: directives', () => {
                 …
                 const $c0_a0$ = [${AttributeMarker.Bindings}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.ɵɵelementStart(0, "div", $c0_a0$);
-                            $r3$.ɵɵlistener("someDirective", function MyComponent_Template_div_someDirective_0_listener($event) { return ctx.noop(); });
-                            $r3$.ɵɵelementEnd();
+                            $r3$.ΔelementStart(0, "div", $c0_a0$);
+                            $r3$.Δlistener("someDirective", function MyComponent_Template_div_someDirective_0_listener($event) { return ctx.noop(); });
+                            $r3$.ΔelementEnd();
                         }
                     },
                     …
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index fbd0bc5f2e..ba0757b5e7 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -195,7 +195,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_idA$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("Content A");
+            $I18N_0$ = $r3$.Δi18nLocalize("Content A");
         }
         const $_c2$ = ["title", "Title B"];
         var $I18N_3$;
@@ -208,7 +208,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_idB$$APP_SPEC_TS_4$;
         }
         else {
-            $I18N_3$ = $r3$.ɵɵi18nLocalize("Title B");
+            $I18N_3$ = $r3$.Δi18nLocalize("Title B");
         }
         const $_c5$ = ["title", $I18N_3$];
         const $_c6$ = ["title", "Title C"];
@@ -221,7 +221,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_4978592519614169666$$APP_SPEC_TS_8$;
         }
         else {
-            $I18N_7$ = $r3$.ɵɵi18nLocalize("Title C");
+            $I18N_7$ = $r3$.Δi18nLocalize("Title C");
         }
         const $_c9$ = ["title", $I18N_7$];
         const $_c10$ = ["title", "Title D"];
@@ -235,7 +235,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_11$ = $MSG_EXTERNAL_5200291527729162531$$APP_SPEC_TS_12$;
         }
         else {
-            $I18N_11$ = $r3$.ɵɵi18nLocalize("Title D");
+            $I18N_11$ = $r3$.Δi18nLocalize("Title D");
         }
         const $_c13$ = ["title", $I18N_11$];
         const $_c14$ = ["title", "Title E"];
@@ -248,7 +248,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_15$ = $MSG_EXTERNAL_idE$$APP_SPEC_TS_16$;
         }
         else {
-            $I18N_15$ = $r3$.ɵɵi18nLocalize("Title E");
+            $I18N_15$ = $r3$.Δi18nLocalize("Title E");
         }
         const $_c17$ = ["title", $I18N_15$];
         const $_c18$ = ["title", "Title F"];
@@ -258,7 +258,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_19$ = $MSG_EXTERNAL_idF$$APP_SPEC_TS_20$;
         }
         else {
-            $I18N_19$ = $r3$.ɵɵi18nLocalize("Title F");
+            $I18N_19$ = $r3$.Δi18nLocalize("Title F");
         }
         const $_c21$ = ["title", $I18N_19$];
         const $_c22$ = ["title", "Title G"];
@@ -271,39 +271,39 @@ describe('i18n support in the view compiler', () => {
             $I18N_23$ = $MSG_EXTERNAL_idG$$APP_SPEC_TS_24$;
         }
         else {
-            $I18N_23$ = $r3$.ɵɵi18nLocalize("Title G");
+            $I18N_23$ = $r3$.Δi18nLocalize("Title G");
         }
         const $_c25$ = ["title", $I18N_23$];
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(2, "div", $_c2$);
-            $r3$.ɵɵi18nAttributes(3, $_c5$);
-            $r3$.ɵɵtext(4, "Content B");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(5, "div", $_c6$);
-            $r3$.ɵɵi18nAttributes(6, $_c9$);
-            $r3$.ɵɵtext(7, "Content C");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(8, "div", $_c10$);
-            $r3$.ɵɵi18nAttributes(9, $_c13$);
-            $r3$.ɵɵtext(10, "Content D");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(11, "div", $_c14$);
-            $r3$.ɵɵi18nAttributes(12, $_c17$);
-            $r3$.ɵɵtext(13, "Content E");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(14, "div", $_c18$);
-            $r3$.ɵɵi18nAttributes(15, $_c21$);
-            $r3$.ɵɵtext(16, "Content F");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(17, "div", $_c22$);
-            $r3$.ɵɵi18nAttributes(18, $_c25$);
-            $r3$.ɵɵtext(19, "Content G");
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(2, "div", $_c2$);
+            $r3$.Δi18nAttributes(3, $_c5$);
+            $r3$.Δtext(4, "Content B");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(5, "div", $_c6$);
+            $r3$.Δi18nAttributes(6, $_c9$);
+            $r3$.Δtext(7, "Content C");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(8, "div", $_c10$);
+            $r3$.Δi18nAttributes(9, $_c13$);
+            $r3$.Δtext(10, "Content D");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(11, "div", $_c14$);
+            $r3$.Δi18nAttributes(12, $_c17$);
+            $r3$.Δtext(13, "Content E");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(14, "div", $_c18$);
+            $r3$.Δi18nAttributes(15, $_c21$);
+            $r3$.Δtext(16, "Content F");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(17, "div", $_c22$);
+            $r3$.Δi18nAttributes(18, $_c25$);
+            $r3$.Δtext(19, "Content G");
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -321,7 +321,7 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelement(0, "div", $_c0$);
+            $r3$.Δelement(0, "div", $_c0$);
           }
         }
       `;
@@ -346,15 +346,15 @@ describe('i18n support in the view compiler', () => {
           $I18N_1$ = $MSG_EXTERNAL_8809028065680254561$$APP_SPEC_TS_1$;
         }
         else {
-          $I18N_1$ = $r3$.ɵɵi18nLocalize("introduction");
+          $I18N_1$ = $r3$.Δi18nLocalize("introduction");
         }
         const $_c1$ = ["title", $I18N_1$];
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c0$);
-            $r3$.ɵɵi18nAttributes(1, $_c1$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c0$);
+            $r3$.Δi18nAttributes(1, $_c1$);
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -383,7 +383,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_1$ = $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$;
         }
         else {
-          $I18N_1$ = $r3$.ɵɵi18nLocalize("static text");
+          $I18N_1$ = $r3$.Δi18nLocalize("static text");
         }
         var $I18N_2$;
         if (ngI18nClosureMode) {
@@ -397,7 +397,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_2$ = $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$;
         }
         else {
-          $I18N_2$ = $r3$.ɵɵi18nLocalize("intro {$interpolation}", {
+          $I18N_2$ = $r3$.Δi18nLocalize("intro {$interpolation}", {
             "interpolation": "\uFFFD0\uFFFD"
           });
         }
@@ -413,7 +413,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_3$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
+            $I18N_3$ = $r3$.Δi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -435,7 +435,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_6$ = $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$;
         }
         else {
-            $I18N_6$ = $r3$.ɵɵi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
+            $I18N_6$ = $r3$.Δi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
               "interpolation": "\uFFFD0\uFFFD", "interpolation_1": "\uFFFD1\uFFFD", "interpolation_2": "\uFFFD2\uFFFD"
             });
         }
@@ -447,7 +447,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$;
         }
         else {
-            $I18N_7$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
+            $I18N_7$ = $r3$.Δi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -460,25 +460,25 @@ describe('i18n support in the view compiler', () => {
         vars: 8,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c0$);
-            $r3$.ɵɵpipe(1, "uppercase");
-            $r3$.ɵɵi18nAttributes(2, $_c1$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(3, "div", $_c2$);
-            $r3$.ɵɵi18nAttributes(4, $_c3$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c0$);
+            $r3$.Δpipe(1, "uppercase");
+            $r3$.Δi18nAttributes(2, $_c1$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(3, "div", $_c2$);
+            $r3$.Δi18nAttributes(4, $_c3$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
-            $r3$.ɵɵi18nApply(2);
-            $r3$.ɵɵselect(3);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind((ctx.valueA + ctx.valueB)));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueC));
-            $r3$.ɵɵi18nApply(4);
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 0, ctx.valueA)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
+            $r3$.Δi18nApply(2);
+            $r3$.Δselect(3);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
+            $r3$.Δi18nExp($r3$.Δbind((ctx.valueA + ctx.valueB)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
+            $r3$.Δi18nApply(4);
           }
         }
       `;
@@ -505,7 +505,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_8977039798304050198$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("intro {$interpolation}", {
+            $I18N_1$ = $r3$.Δi18nLocalize("intro {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -513,15 +513,15 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c0$);
-            $r3$.ɵɵpipe(1, "uppercase");
-            $r3$.ɵɵi18nAttributes(2, $_c3$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c0$);
+            $r3$.Δpipe(1, "uppercase");
+            $r3$.Δi18nAttributes(2, $_c3$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
-            $r3$.ɵɵi18nApply(2);
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 0, ctx.valueA)));
+            $r3$.Δi18nApply(2);
           }
         }
       `;
@@ -550,25 +550,25 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("different scope {$interpolation}", {
+            $I18N_1$ = $r3$.Δi18nLocalize("different scope {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         const $_c2$ = ["title", $I18N_1$];
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵelementStart(1, "div", $_c1$);
-            $r3$.ɵɵpipe(2, "uppercase");
-            $r3$.ɵɵi18nAttributes(3, $_c2$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.ΔelementStart(1, "div", $_c1$);
+            $r3$.Δpipe(2, "uppercase");
+            $r3$.Δi18nAttributes(3, $_c2$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
             const $outer_r1$ = ctx.$implicit;
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 0, $outer_r1$)));
-            $r3$.ɵɵi18nApply(3);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 0, $outer_r1$)));
+            $r3$.Δi18nApply(3);
           }
         }
         …
@@ -576,11 +576,11 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
+            $r3$.Δtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵproperty("ngForOf", ctx.items);
+            $r3$.Δselect(0);
+            $r3$.Δproperty("ngForOf", ctx.items);
           }
         }
       `;
@@ -612,7 +612,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("static text");
+            $I18N_1$ = $r3$.Δi18nLocalize("static text");
         }
         var $I18N_2$;
         if (ngI18nClosureMode) {
@@ -626,7 +626,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("intro {$interpolation}", {
+            $I18N_2$ = $r3$.Δi18nLocalize("intro {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -642,7 +642,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_3$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
+            $I18N_3$ = $r3$.Δi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -664,7 +664,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_6$ = $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$;
         }
         else {
-            $I18N_6$ = $r3$.ɵɵi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
+            $I18N_6$ = $r3$.Δi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
               "interpolation": "\uFFFD0\uFFFD", "interpolation_1": "\uFFFD1\uFFFD", "interpolation_2": "\uFFFD2\uFFFD"
             });
         }
@@ -676,7 +676,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$;
         }
         else {
-            $I18N_7$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
+            $I18N_7$ = $r3$.Δi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -689,25 +689,25 @@ describe('i18n support in the view compiler', () => {
         vars: 8,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c0$);
-            $r3$.ɵɵpipe(1, "uppercase");
-            $r3$.ɵɵi18nAttributes(2, $_c1$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(3, "div", $_c2$);
-            $r3$.ɵɵi18nAttributes(4, $_c3$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c0$);
+            $r3$.Δpipe(1, "uppercase");
+            $r3$.Δi18nAttributes(2, $_c1$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(3, "div", $_c2$);
+            $r3$.Δi18nAttributes(4, $_c3$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
-            $r3$.ɵɵi18nApply(2);
-            $r3$.ɵɵselect(3);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind((ctx.valueA + ctx.valueB)));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueC));
-            $r3$.ɵɵi18nApply(4);
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 0, ctx.valueA)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
+            $r3$.Δi18nApply(2);
+            $r3$.Δselect(3);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
+            $r3$.Δi18nExp($r3$.Δbind((ctx.valueA + ctx.valueB)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
+            $r3$.Δi18nApply(4);
           }
         }
       `;
@@ -737,25 +737,25 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("different scope {$interpolation}", {
+            $I18N_2$ = $r3$.Δi18nLocalize("different scope {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         const $_c4$ = ["title", $I18N_2$];
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵelementStart(1, "div", $_c1$);
-            $r3$.ɵɵpipe(2, "uppercase");
-            $r3$.ɵɵi18nAttributes(3, $_c4$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.ΔelementStart(1, "div", $_c1$);
+            $r3$.Δpipe(2, "uppercase");
+            $r3$.Δi18nAttributes(3, $_c4$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
             const $outer_r1$ = ctx.$implicit;
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 0, $outer_r1$)));
-            $r3$.ɵɵi18nApply(3);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 0, $outer_r1$)));
+            $r3$.Δi18nApply(3);
           }
         }
         …
@@ -763,11 +763,11 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
+            $r3$.Δtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵproperty("ngForOf", ctx.items);
+            $r3$.Δselect(0);
+            $r3$.Δproperty("ngForOf", ctx.items);
           }
         }
       `;
@@ -792,7 +792,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7727043314656808423$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("Element title");
+            $I18N_0$ = $r3$.Δi18nLocalize("Element title");
         }
         const $_c1$ = ["title", $I18N_0$];
         var $I18N_2$;
@@ -801,15 +801,15 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_4969674997806975147$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("Some content");
+            $I18N_2$ = $r3$.Δi18nLocalize("Some content");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c0$);
-            $r3$.ɵɵi18nAttributes(1, $_c1$);
-            $r3$.ɵɵi18n(2, $I18N_2$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c0$);
+            $r3$.Δi18nAttributes(1, $_c1$);
+            $r3$.Δi18n(2, $I18N_2$);
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -831,7 +831,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_ID_WITH_INVALID_CHARS$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("Element title");
+            $I18N_0$ = $r3$.Δi18nLocalize("Element title");
         }
         const $_c1$ = ["title", $I18N_0$];
         var $I18N_2$;
@@ -840,7 +840,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_ID_WITH_INVALID_CHARS_2$$APP_SPEC_TS_4$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize(" Some content ");
+            $I18N_2$ = $r3$.Δi18nLocalize(" Some content ");
         }
         …
       `;
@@ -866,9 +866,9 @@ describe('i18n support in the view compiler', () => {
       const output = String.raw `
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelement(0, "div");
-            $r3$.ɵɵelement(1, "div");
-            $r3$.ɵɵelement(2, "div");
+            $r3$.Δelement(0, "div");
+            $r3$.Δelement(1, "div");
+            $r3$.Δelement(2, "div");
           }
         }
       `;
@@ -892,7 +892,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4924931801512133405$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("Some text 'with single quotes', \"with double quotes\" and without quotes.");
+            $I18N_0$ = $r3$.Δi18nLocalize("Some text 'with single quotes', \"with double quotes\" and without quotes.");
         }
       `;
 
@@ -915,7 +915,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #1");
+            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #1");
         }
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -923,7 +923,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("My i18n block #2");
+            $I18N_1$ = $r3$.Δi18nLocalize("My i18n block #2");
         }
         var $I18N_2$;
         if (ngI18nClosureMode) {
@@ -931,26 +931,26 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_5023003143537152794$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("My i18n block #3");
+            $I18N_2$ = $r3$.Δi18nLocalize("My i18n block #3");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(2, "div");
-            $r3$.ɵɵtext(3, "My non-i18n block #1");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(4, "div");
-            $r3$.ɵɵi18n(5, $I18N_1$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(6, "div");
-            $r3$.ɵɵtext(7, "My non-i18n block #2");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(8, "div");
-            $r3$.ɵɵi18n(9, $I18N_2$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(2, "div");
+            $r3$.Δtext(3, "My non-i18n block #1");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(4, "div");
+            $r3$.Δi18n(5, $I18N_1$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(6, "div");
+            $r3$.Δtext(7, "My non-i18n block #2");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(8, "div");
+            $r3$.Δi18n(9, $I18N_2$);
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -972,7 +972,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2817319788724342848$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("Some value: {$phA}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("Some value: {$phA}", {
               "phA": "\uFFFD0\uFFFD"
             });
         }
@@ -981,14 +981,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -1010,21 +1010,21 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_6749967533321674787$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -1049,7 +1049,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_1482713963707913023$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize(" {$interpolation} {$interpolation_1} ", {
+            $I18N_0$ = $r3$.Δi18nLocalize(" {$interpolation} {$interpolation_1} ", {
               "interpolation": "\uFFFD0\uFFFD",
               "interpolation_1": "\uFFFD1\uFFFD"
             });
@@ -1057,16 +1057,16 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵpipe(2, "async");
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.Δpipe(2, "async");
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 2, ctx.valueA)));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(((ctx.valueA == null) ? null : ((ctx.valueA.a == null) ? null : ctx.valueA.a.b))));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 2, ctx.valueA)));
+            $r3$.Δi18nExp($r3$.Δbind(((ctx.valueA == null) ? null : ((ctx.valueA.a == null) ? null : ctx.valueA.a.b))));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -1089,7 +1089,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_572579892698764378$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #{$interpolation}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1101,7 +1101,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_609623417156596326$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("My i18n block #{$interpolation}", {
+            $I18N_1$ = $r3$.Δi18nLocalize("My i18n block #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1113,7 +1113,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_3998119318957372120$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("My i18n block #{$interpolation}", {
+            $I18N_2$ = $r3$.Δi18nLocalize("My i18n block #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1122,27 +1122,27 @@ describe('i18n support in the view compiler', () => {
         vars: 5,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(2, "div");
-            $r3$.ɵɵi18n(3, $I18N_1$);
-            $r3$.ɵɵpipe(4, "uppercase");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(5, "div");
-            $r3$.ɵɵi18n(6, $I18N_2$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(2, "div");
+            $r3$.Δi18n(3, $I18N_1$);
+            $r3$.Δpipe(4, "uppercase");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(5, "div");
+            $r3$.Δi18n(6, $I18N_2$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.one));
-            $r3$.ɵɵi18nApply(1);
-            $r3$.ɵɵselect(3);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(4, 3, ctx.two)));
-            $r3$.ɵɵi18nApply(3);
-            $r3$.ɵɵselect(6);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(((ctx.three + ctx.four) + ctx.five)));
-            $r3$.ɵɵi18nApply(6);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.one));
+            $r3$.Δi18nApply(1);
+            $r3$.Δselect(3);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(4, 3, ctx.two)));
+            $r3$.Δi18nApply(3);
+            $r3$.Δselect(6);
+            $r3$.Δi18nExp($r3$.Δbind(((ctx.three + ctx.four) + ctx.five)));
+            $r3$.Δi18nApply(6);
           }
         }
       `;
@@ -1179,7 +1179,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7905233330103651696$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize(" My i18n block #{$interpolation} {$startTagSpan}Plain text in nested element{$closeTagSpan}", {
+            $I18N_0$ = $r3$.Δi18nLocalize(" My i18n block #{$interpolation} {$startTagSpan}Plain text in nested element{$closeTagSpan}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagSpan": "\uFFFD#2\uFFFD",
               "closeTagSpan": "\uFFFD/#2\uFFFD"
@@ -1198,7 +1198,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_5788821996131681377$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize(" My i18n block #{$interpolation} {$startTagDiv}{$startTagDiv}{$startTagSpan} More bindings in more nested element: {$interpolation_1} {$closeTagSpan}{$closeTagDiv}{$closeTagDiv}", {
+            $I18N_1$ = $r3$.Δi18nLocalize(" My i18n block #{$interpolation} {$startTagDiv}{$startTagDiv}{$startTagSpan} More bindings in more nested element: {$interpolation_1} {$closeTagSpan}{$closeTagDiv}{$closeTagDiv}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagDiv": "[\uFFFD#6\uFFFD|\uFFFD#7\uFFFD]",
               "startTagSpan": "\uFFFD#8\uFFFD",
@@ -1207,36 +1207,36 @@ describe('i18n support in the view compiler', () => {
               "closeTagDiv": "[\uFFFD/#7\uFFFD|\uFFFD/#6\uFFFD]"
             });
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$);
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$);
         …
         consts: 9,
         vars: 5,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵelement(2, "span");
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(3, "div");
-            $r3$.ɵɵi18nStart(4, $I18N_1$);
-            $r3$.ɵɵpipe(5, "uppercase");
-            $r3$.ɵɵelementStart(6, "div");
-            $r3$.ɵɵelementStart(7, "div");
-            $r3$.ɵɵelement(8, "span");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δelement(2, "span");
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(3, "div");
+            $r3$.Δi18nStart(4, $I18N_1$);
+            $r3$.Δpipe(5, "uppercase");
+            $r3$.ΔelementStart(6, "div");
+            $r3$.ΔelementStart(7, "div");
+            $r3$.Δelement(8, "span");
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.one));
-            $r3$.ɵɵi18nApply(1);
-            $r3$.ɵɵselect(4);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(5, 3, ctx.two)));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.nestedInBlockTwo));
-            $r3$.ɵɵi18nApply(4);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.one));
+            $r3$.Δi18nApply(1);
+            $r3$.Δselect(4);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(5, 3, ctx.two)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.nestedInBlockTwo));
+            $r3$.Δi18nApply(4);
           }
         }
       `;
@@ -1271,7 +1271,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_4782264005467235841$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("Span title {$interpolation} and {$interpolation_1}", {
+            $I18N_2$ = $r3$.Δi18nLocalize("Span title {$interpolation} and {$interpolation_1}", {
               "interpolation": "\uFFFD0\uFFFD",
               "interpolation_1": "\uFFFD1\uFFFD"
             });
@@ -1287,7 +1287,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4446430594603971069$$APP_SPEC_TS_5$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize(" My i18n block #1 with value: {$interpolation} {$startTagSpan} Plain text in nested element (block #1) {$closeTagSpan}", {
+            $I18N_0$ = $r3$.Δi18nLocalize(" My i18n block #1 with value: {$interpolation} {$startTagSpan} Plain text in nested element (block #1) {$closeTagSpan}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagSpan": "\uFFFD#2\uFFFD",
               "closeTagSpan": "\uFFFD/#2\uFFFD"
@@ -1301,7 +1301,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_2719594642740200058$$APP_SPEC_TS_8$;
         }
         else {
-            $I18N_7$ = $r3$.ɵɵi18nLocalize("Span title {$interpolation}", {
+            $I18N_7$ = $r3$.Δi18nLocalize("Span title {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1316,7 +1316,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_6$ = $MSG_EXTERNAL_2778714953278357902$$APP_SPEC_TS_10$;
         }
         else {
-            $I18N_6$ = $r3$.ɵɵi18nLocalize(" My i18n block #2 with value {$interpolation} {$startTagSpan} Plain text in nested element (block #2) {$closeTagSpan}", {
+            $I18N_6$ = $r3$.Δi18nLocalize(" My i18n block #2 with value {$interpolation} {$startTagSpan} Plain text in nested element (block #2) {$closeTagSpan}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagSpan": "\uFFFD#7\uFFFD",
               "closeTagSpan": "\uFFFD/#7\uFFFD"
@@ -1327,34 +1327,34 @@ describe('i18n support in the view compiler', () => {
         vars: 7,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵelementStart(2, "span", $_c1$);
-            $r3$.ɵɵi18nAttributes(3, $_c4$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(4, "div");
-            $r3$.ɵɵi18nStart(5, $I18N_6$);
-            $r3$.ɵɵpipe(6, "uppercase");
-            $r3$.ɵɵelementStart(7, "span", $_c1$);
-            $r3$.ɵɵi18nAttributes(8, $_c9$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.ΔelementStart(2, "span", $_c1$);
+            $r3$.Δi18nAttributes(3, $_c4$);
+            $r3$.ΔelementEnd();
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(4, "div");
+            $r3$.Δi18nStart(5, $I18N_6$);
+            $r3$.Δpipe(6, "uppercase");
+            $r3$.ΔelementStart(7, "span", $_c1$);
+            $r3$.Δi18nAttributes(8, $_c9$);
+            $r3$.ΔelementEnd();
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueC));
-            $r3$.ɵɵi18nApply(3);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
-            $r3$.ɵɵi18nApply(1);
-            $r3$.ɵɵselect(7);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueE));
-            $r3$.ɵɵi18nApply(8);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(6, 5, ctx.valueD)));
-            $r3$.ɵɵi18nApply(5);
+            $r3$.Δselect(2);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
+            $r3$.Δi18nApply(3);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
+            $r3$.Δi18nApply(1);
+            $r3$.Δselect(7);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueE));
+            $r3$.Δi18nApply(8);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(6, 5, ctx.valueD)));
+            $r3$.Δi18nApply(5);
           }
         }
       `;
@@ -1390,7 +1390,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7679414751795588050$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize(" Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$closeTagDiv}", {
+            $I18N_1$ = $r3$.Δi18nLocalize(" Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$closeTagDiv}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagDiv": "\uFFFD#3\uFFFD",
               "interpolation_1": "\uFFFD1\uFFFD",
@@ -1400,21 +1400,21 @@ describe('i18n support in the view compiler', () => {
         …
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵelementStart(1, "div");
-            $r3$.ɵɵi18nStart(2, $I18N_1$);
-            $r3$.ɵɵelement(3, "div");
-            $r3$.ɵɵpipe(4, "uppercase");
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.ΔelementStart(1, "div");
+            $r3$.Δi18nStart(2, $I18N_1$);
+            $r3$.Δelement(3, "div");
+            $r3$.Δpipe(4, "uppercase");
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.valueA));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(4, 2, $ctx_r0$.valueB)));
-            $r3$.ɵɵi18nApply(2);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(2);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.valueA));
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(4, 2, $ctx_r0$.valueB)));
+            $r3$.Δi18nApply(2);
           }
         }
         …
@@ -1422,14 +1422,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵtext(1, " Some content ");
-            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 5, 4, "div", $_c0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δtext(1, " Some content ");
+            $r3$.Δtemplate(2, MyComponent_div_2_Template, 5, 4, "div", $_c0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵproperty("ngIf", ctx.visible);
+            $r3$.Δselect(2);
+            $r3$.Δproperty("ngIf", ctx.visible);
           }
         }
       `;
@@ -1450,7 +1450,7 @@ describe('i18n support in the view compiler', () => {
         const $_c2$ = ["src", "logo.png", ${AttributeMarker.Bindings}, "title", ${AttributeMarker.Template}, "ngIf"];
         function MyComponent_img_1_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelement(0, "img", $_c0$);
+            $r3$.Δelement(0, "img", $_c0$);
           }
         }
         const $_c3$ = ["src", "logo.png", ${AttributeMarker.Bindings}, "title"];
@@ -1462,22 +1462,22 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_2367729185105559721$$APP_SPEC_TS__2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("App logo #{$interpolation}", {
+            $I18N_2$ = $r3$.Δi18nLocalize("App logo #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         const $_c4$ = ["title", $I18N_2$];
         function MyComponent_img_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "img", $_c3$);
-            $r3$.ɵɵi18nAttributes(1, $_c4$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "img", $_c3$);
+            $r3$.Δi18nAttributes(1, $_c4$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.id));
-            $r3$.ɵɵi18nApply(1);
+            const $ctx_r1$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.id));
+            $r3$.Δi18nApply(1);
           }
         }
         …
@@ -1485,15 +1485,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelement(0, "img", $_c0$);
-            $r3$.ɵɵtemplate(1, MyComponent_img_1_Template, 1, 0, "img", $_c1$);
-            $r3$.ɵɵtemplate(2, MyComponent_img_2_Template, 2, 1, "img", $_c2$);
+            $r3$.Δelement(0, "img", $_c0$);
+            $r3$.Δtemplate(1, MyComponent_img_1_Template, 1, 0, "img", $_c1$);
+            $r3$.Δtemplate(2, MyComponent_img_2_Template, 2, 1, "img", $_c2$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵproperty("ngIf", ctx.visible);
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵproperty("ngIf", ctx.visible);
+            $r3$.Δselect(1);
+            $r3$.Δproperty("ngIf", ctx.visible);
+            $r3$.Δselect(2);
+            $r3$.Δproperty("ngIf", ctx.visible);
           }
         }
       `;
@@ -1530,38 +1530,38 @@ describe('i18n support in the view compiler', () => {
         const $_c0$ = [${AttributeMarker.Template}, "ngIf"];
         function MyComponent_div_2_div_4_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 2);
-            $r3$.ɵɵelementStart(1, "div");
-            $r3$.ɵɵelement(2, "div");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_0$, 2);
+            $r3$.ΔelementStart(1, "div");
+            $r3$.Δelement(2, "div");
+            $r3$.ΔelementEnd();
+            $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r2$ = $r3$.ɵɵnextContext(2);
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r2$.valueC));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r2$.valueD));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r2$ = $r3$.ΔnextContext(2);
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r2$.valueC));
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r2$.valueD));
+            $r3$.Δi18nApply(0);
           }
         }
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
-            $r3$.ɵɵelementStart(1, "div");
-            $r3$.ɵɵelementStart(2, "div");
-            $r3$.ɵɵpipe(3, "uppercase");
-            $r3$.ɵɵtemplate(4, MyComponent_div_2_div_4_Template, 3, 2, "div", $_c1$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_0$, 1);
+            $r3$.ΔelementStart(1, "div");
+            $r3$.ΔelementStart(2, "div");
+            $r3$.Δpipe(3, "uppercase");
+            $r3$.Δtemplate(4, MyComponent_div_2_div_4_Template, 3, 2, "div", $_c1$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
+            $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(4);
-            $r3$.ɵɵproperty("ngIf", $ctx_r0$.exists);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.valueA));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(3, 3, $ctx_r0$.valueB)));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(4);
+            $r3$.Δproperty("ngIf", $ctx_r0$.exists);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.valueA));
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(3, 3, $ctx_r0$.valueB)));
+            $r3$.Δi18nApply(0);
           }
         }
         var $I18N_0$;
@@ -1582,7 +1582,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_1221890473527419724$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize(" Some content {$startTagDiv_2} Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$startTagDiv_1} Content inside sub-template {$interpolation_2} {$startTagDiv} Bottom level element {$interpolation_3} {$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$startTagDiv_3} Some other content {$interpolation_4} {$startTagDiv} More nested levels with bindings {$interpolation_5} {$closeTagDiv}{$closeTagDiv}", {
+            $I18N_0$ = $r3$.Δi18nLocalize(" Some content {$startTagDiv_2} Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$startTagDiv_1} Content inside sub-template {$interpolation_2} {$startTagDiv} Bottom level element {$interpolation_3} {$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$startTagDiv_3} Some other content {$interpolation_4} {$startTagDiv} More nested levels with bindings {$interpolation_5} {$closeTagDiv}{$closeTagDiv}", {
               "startTagDiv_2": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagDiv": "[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]",
               "startTagDiv_3": "\uFFFD*3:3\uFFFD\uFFFD#1:3\uFFFD",
@@ -1596,22 +1596,22 @@ describe('i18n support in the view compiler', () => {
               "interpolation_5": "\uFFFD1:3\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$);
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$);
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 3);
-            $r3$.ɵɵelementStart(1, "div");
-            $r3$.ɵɵelement(2, "div");
-            $r3$.ɵɵpipe(3, "uppercase");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_0$, 3);
+            $r3$.ΔelementStart(1, "div");
+            $r3$.Δelement(2, "div");
+            $r3$.Δpipe(3, "uppercase");
+            $r3$.ΔelementEnd();
+            $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(($ctx_r1$.valueE + $ctx_r1$.valueF)));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(3, 2, $ctx_r1$.valueG)));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r1$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind(($ctx_r1$.valueE + $ctx_r1$.valueF)));
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(3, 2, $ctx_r1$.valueG)));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -1619,18 +1619,18 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 5, 5, "div", $_c1$);
-            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 4, "div", $_c1$);
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δtemplate(2, MyComponent_div_2_Template, 5, 5, "div", $_c1$);
+            $r3$.Δtemplate(3, MyComponent_div_3_Template, 4, 4, "div", $_c1$);
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵproperty("ngIf", ctx.visible);
-            $r3$.ɵɵselect(3);
-            $r3$.ɵɵproperty("ngIf", !ctx.visible);
+            $r3$.Δselect(2);
+            $r3$.Δproperty("ngIf", ctx.visible);
+            $r3$.Δselect(3);
+            $r3$.Δproperty("ngIf", !ctx.visible);
           }
         }
       `;
@@ -1655,7 +1655,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_119975189388320493$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("Some other content {$startTagSpan}{$interpolation}{$closeTagSpan}", {
+            $I18N_1$ = $r3$.Δi18nLocalize("Some other content {$startTagSpan}{$interpolation}{$closeTagSpan}", {
               "startTagSpan": "\uFFFD#2\uFFFD",
               "interpolation": "\uFFFD0\uFFFD",
               "closeTagSpan": "\uFFFD/#2\uFFFD"
@@ -1664,17 +1664,17 @@ describe('i18n support in the view compiler', () => {
         …
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵi18nStart(1, $I18N_1$);
-              $r3$.ɵɵelement(2, "span");
-              $r3$.ɵɵi18nEnd();
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δi18nStart(1, $I18N_1$);
+              $r3$.Δelement(2, "span");
+              $r3$.Δi18nEnd();
+              $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-              const $ctx_r0$ = $r3$.ɵɵnextContext();
-              $r3$.ɵɵselect(1);
-              $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.valueA));
-              $r3$.ɵɵi18nApply(1);
+              const $ctx_r0$ = $r3$.ΔnextContext();
+              $r3$.Δselect(1);
+              $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.valueA));
+              $r3$.Δi18nApply(1);
           }
         }
         …
@@ -1682,11 +1682,11 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 3, 1, "div", $_c0$);
+            $r3$.Δtemplate(0, MyComponent_div_0_Template, 3, 1, "div", $_c0$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵproperty("ngIf", ctx.visible);
+            $r3$.Δselect(0);
+            $r3$.Δproperty("ngIf", ctx.visible);
           }
         }
       `;
@@ -1707,15 +1707,15 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_APP_SPEC_TS_2$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("Hello");
+            $I18N_1$ = $r3$.Δi18nLocalize("Hello");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c0$);
-            $r3$.ɵɵlistener("click", function MyComponent_Template_div_click_0_listener($event) { return ctx.onClick(); });
-            $r3$.ɵɵi18n(1, $I18N_1$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c0$);
+            $r3$.Δlistener("click", function MyComponent_Template_div_click_0_listener($event) { return ctx.onClick(); });
+            $r3$.Δi18n(1, $I18N_1$);
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -1737,14 +1737,14 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #1");
+            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #1");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -1764,9 +1764,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -1774,14 +1774,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -1802,7 +1802,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #2");
+            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #2");
         }
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -1810,20 +1810,20 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("My i18n block #1");
+            $I18N_1$ = $r3$.Δi18nLocalize("My i18n block #1");
         }
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_1$);
+            $r3$.Δi18n(0, $I18N_1$);
           }
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template");
-            $r3$.ɵɵelementContainerStart(1);
-            $r3$.ɵɵi18n(2, $I18N_0$);
-            $r3$.ɵɵelementContainerEnd();
+            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template");
+            $r3$.ΔelementContainerStart(1);
+            $r3$.Δi18n(2, $I18N_0$);
+            $r3$.ΔelementContainerEnd();
           }
         }
       `;
@@ -1845,7 +1845,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_5295701706185791735$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("Text #1");
+            $I18N_1$ = $r3$.Δi18nLocalize("Text #1");
         }
         const $_c2$ = [${AttributeMarker.Styles}, "padding", "10px"];
         var $I18N_3$;
@@ -1854,19 +1854,19 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_4722270221386399294$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_3$ = $r3$.ɵɵi18nLocalize("Text #2");
+            $I18N_3$ = $r3$.Δi18nLocalize("Text #2");
         }
         …
         consts: 4,
         vars: 0,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "span", $_c0$);
-            $r3$.ɵɵi18n(1, $I18N_1$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(2, "span", $_c1$);
-            $r3$.ɵɵi18n(3, $I18N_3$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "span", $_c0$);
+            $r3$.Δi18n(1, $I18N_1$);
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(2, "span", $_c1$);
+            $r3$.Δi18n(3, $I18N_3$);
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -1890,7 +1890,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_0$ = $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS_0$;
         }
         else {
-          $I18N_0$ = $r3$.ɵɵi18nLocalize("Some content: {$interpolation}", {
+          $I18N_0$ = $r3$.Δi18nLocalize("Some content: {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1899,15 +1899,15 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementContainerStart(0);
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵpipe(2, "uppercase");
-            $r3$.ɵɵelementContainerEnd();
+            $r3$.ΔelementContainerStart(0);
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.Δpipe(2, "uppercase");
+            $r3$.ΔelementContainerEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 1, ctx.valueA)));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 1, ctx.valueA)));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -1929,19 +1929,19 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS__0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("Some content: {$interpolation}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("Some content: {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$);
-            $r3$.ɵɵpipe(1, "uppercase");
+            $r3$.Δi18n(0, $I18N_0$);
+            $r3$.Δpipe(1, "uppercase");
           } if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 1, $ctx_r0$.valueA)));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 1, $ctx_r0$.valueA)));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -1949,7 +1949,7 @@ describe('i18n support in the view compiler', () => {
         vars: 0,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 2, 3, "ng-template");
+            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 2, 3, "ng-template");
           }
         }
       `;
@@ -1979,7 +1979,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_0$ = $MSG_EXTERNAL_702706566400598764$$APP_SPEC_TS_0$;
         }
         else {
-          $I18N_0$ = $r3$.ɵɵi18nLocalize("{$startTagNgTemplate}Template content: {$interpolation}{$closeTagNgTemplate}{$startTagNgContainer}Container content: {$interpolation_1}{$closeTagNgContainer}", {
+          $I18N_0$ = $r3$.Δi18nLocalize("{$startTagNgTemplate}Template content: {$interpolation}{$closeTagNgTemplate}{$startTagNgContainer}Container content: {$interpolation_1}{$closeTagNgContainer}", {
             "startTagNgTemplate": "\uFFFD*2:1\uFFFD",
             "closeTagNgTemplate": "\uFFFD/*2:1\uFFFD",
             "startTagNgContainer": "\uFFFD#3\uFFFD",
@@ -1990,14 +1990,14 @@ describe('i18n support in the view compiler', () => {
         }
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$, 1);
-            $r3$.ɵɵpipe(1, "uppercase");
+            $r3$.Δi18n(0, $I18N_0$, 1);
+            $r3$.Δpipe(1, "uppercase");
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 1, $ctx_r0$.valueA)));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 1, $ctx_r0$.valueA)));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -2005,19 +2005,19 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 2, 3, "ng-template");
-            $r3$.ɵɵelementContainerStart(3);
-            $r3$.ɵɵpipe(4, "uppercase");
-            $r3$.ɵɵelementContainerEnd();
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δtemplate(2, MyComponent_ng_template_2_Template, 2, 3, "ng-template");
+            $r3$.ΔelementContainerStart(3);
+            $r3$.Δpipe(4, "uppercase");
+            $r3$.ΔelementContainerEnd();
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(4, 1, ctx.valueB)));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(4, 1, ctx.valueB)));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -2038,9 +2038,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_1$;
@@ -2049,20 +2049,20 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_1$);
+            $r3$.Δi18n(0, $I18N_1$);
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.gender));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.gender));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -2070,15 +2070,15 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 1, "ng-template");
-            $r3$.ɵɵelementContainerStart(1);
-            $r3$.ɵɵi18n(2, $I18N_0$);
-            $r3$.ɵɵelementContainerEnd();
+            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 1, "ng-template");
+            $r3$.ΔelementContainerStart(1);
+            $r3$.Δi18n(2, $I18N_0$);
+            $r3$.ΔelementContainerEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
-            $r3$.ɵɵi18nApply(2);
+            $r3$.Δselect(2);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
+            $r3$.Δi18nApply(2);
           }
         }
       `;
@@ -2104,26 +2104,26 @@ describe('i18n support in the view compiler', () => {
       const output = String.raw `
         function MyComponent_ng_template_2_ng_template_2_ng_template_1_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$, 3);
+            $r3$.Δi18n(0, $I18N_0$, 3);
           }
           if (rf & 2) {
-            const $ctx_r2$ = $r3$.ɵɵnextContext(3);
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r2$.valueC));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r2$ = $r3$.ΔnextContext(3);
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r2$.valueC));
+            $r3$.Δi18nApply(0);
           }
         }
         function MyComponent_ng_template_2_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 2);
-            $r3$.ɵɵtemplate(1, MyComponent_ng_template_2_ng_template_2_ng_template_1_Template, 1, 1, "ng-template");
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_0$, 2);
+            $r3$.Δtemplate(1, MyComponent_ng_template_2_ng_template_2_ng_template_1_Template, 1, 1, "ng-template");
+            $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ɵɵnextContext(2);
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.valueB));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r1$ = $r3$.ΔnextContext(2);
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.valueB));
+            $r3$.Δi18nApply(0);
           }
         }
         var $I18N_0$;
@@ -2138,7 +2138,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2051477021417799640$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$startTagNgTemplate} Template A: {$interpolation} {$startTagNgTemplate} Template B: {$interpolation_1} {$startTagNgTemplate} Template C: {$interpolation_2} {$closeTagNgTemplate}{$closeTagNgTemplate}{$closeTagNgTemplate}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$startTagNgTemplate} Template A: {$interpolation} {$startTagNgTemplate} Template B: {$interpolation_1} {$startTagNgTemplate} Template C: {$interpolation_2} {$closeTagNgTemplate}{$closeTagNgTemplate}{$closeTagNgTemplate}", {
               "startTagNgTemplate": "[\uFFFD*2:1\uFFFD|\uFFFD*2:2\uFFFD|\uFFFD*1:3\uFFFD]",
               "closeTagNgTemplate": "[\uFFFD/*1:3\uFFFD|\uFFFD/*2:2\uFFFD|\uFFFD/*2:1\uFFFD]",
               "interpolation": "\uFFFD0:1\uFFFD",
@@ -2146,19 +2146,19 @@ describe('i18n support in the view compiler', () => {
               "interpolation_2": "\uFFFD0:3\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$);
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$);
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
-            $r3$.ɵɵpipe(1, "uppercase");
-            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_ng_template_2_Template, 2, 1, "ng-template");
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_0$, 1);
+            $r3$.Δpipe(1, "uppercase");
+            $r3$.Δtemplate(2, MyComponent_ng_template_2_ng_template_2_Template, 2, 1, "ng-template");
+            $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 1, $ctx_r0$.valueA)));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 1, $ctx_r0$.valueA)));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -2166,11 +2166,11 @@ describe('i18n support in the view compiler', () => {
         vars: 0,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 3, 3, "ng-template");
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δtemplate(2, MyComponent_ng_template_2_Template, 3, 3, "ng-template");
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
         }
       `;
@@ -2191,9 +2191,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_1$;
@@ -2202,20 +2202,20 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_1$);
+            $r3$.Δi18n(0, $I18N_1$);
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -2223,15 +2223,15 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementContainerStart(0);
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementContainerEnd();
-            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 1, 1, "ng-template");
+            $r3$.ΔelementContainerStart(0);
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementContainerEnd();
+            $r3$.Δtemplate(2, MyComponent_ng_template_2_Template, 1, 1, "ng-template");
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -2259,7 +2259,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4891196282781544695$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$tagImg} is my logo #1 ", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$tagImg} is my logo #1 ", {
               "tagImg": "\uFFFD#2\uFFFD\uFFFD/#2\uFFFD"
             });
         }
@@ -2271,26 +2271,26 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_461986953980355147$$APP_SPEC_TS__2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("{$tagImg} is my logo #2 ", {
+            $I18N_2$ = $r3$.Δi18nLocalize("{$tagImg} is my logo #2 ", {
               "tagImg": "\uFFFD#1\uFFFD\uFFFD/#1\uFFFD"
             });
         }
         function MyComponent_ng_template_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_2$);
-            $r3$.ɵɵelement(1, "img", $_c0$);
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_2$);
+            $r3$.Δelement(1, "img", $_c0$);
+            $r3$.Δi18nEnd();
           }
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementContainerStart(0);
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵelement(2, "img", $_c0$);
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementContainerEnd();
-            $r3$.ɵɵtemplate(3, MyComponent_ng_template_3_Template, 2, 0, "ng-template");
+            $r3$.ΔelementContainerStart(0);
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δelement(2, "img", $_c0$);
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementContainerEnd();
+            $r3$.Δtemplate(3, MyComponent_ng_template_3_Template, 2, 0, "ng-template");
           }
         }
       `;
@@ -2318,7 +2318,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8537814667662432133$$APP_SPEC_TS__0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize(" Root content {$startTagNgContainer} Nested content {$closeTagNgContainer}", {
+            $I18N_0$ = $r3$.Δi18nLocalize(" Root content {$startTagNgContainer} Nested content {$closeTagNgContainer}", {
               "startTagNgContainer": "\uFFFD*1:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagNgContainer": "\uFFFD/#1:1\uFFFD\uFFFD/*1:1\uFFFD"
             });
@@ -2345,7 +2345,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("Test");
+            $I18N_0$ = $r3$.Δi18nLocalize("Test");
         }
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -2353,7 +2353,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("Test");
+            $I18N_1$ = $r3$.Δi18nLocalize("Test");
         }
         …
       `;
@@ -2381,7 +2381,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_963542717423364282$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("\n          Some text\n          {$startTagSpan}Text inside span{$closeTagSpan}\n        ", {
+            $I18N_0$ = $r3$.Δi18nLocalize("\n          Some text\n          {$startTagSpan}Text inside span{$closeTagSpan}\n        ", {
               "startTagSpan": "\uFFFD#3\uFFFD",
               "closeTagSpan": "\uFFFD/#3\uFFFD"
             });
@@ -2389,13 +2389,13 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtext(0, "\n        ");
-            $r3$.ɵɵelementStart(1, "div");
-            $r3$.ɵɵi18nStart(2, $I18N_0$);
-            $r3$.ɵɵelement(3, "span");
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵtext(4, "\n      ");
+            $r3$.Δtext(0, "\n        ");
+            $r3$.ΔelementStart(1, "div");
+            $r3$.Δi18nStart(2, $I18N_0$);
+            $r3$.Δelement(3, "span");
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
+            $r3$.Δtext(4, "\n      ");
           }
         }
       `;
@@ -2417,9 +2417,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -2427,14 +2427,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -2454,9 +2454,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4166854826696768832$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, single {'single quotes'} double {\"double quotes\"} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, single {'single quotes'} double {\"double quotes\"} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
       `;
@@ -2476,9 +2476,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -2486,12 +2486,12 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$);
+            $r3$.Δi18n(0, $I18N_0$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
-            $r3$.ɵɵi18nApply(0);
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
+            $r3$.Δi18nApply(0);
           }
         }
       `;
@@ -2517,9 +2517,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c0$ = ["title", "icu only", ${AttributeMarker.Template}, "ngIf"];
@@ -2531,22 +2531,22 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_3$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_3$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
+        $I18N_3$ = $r3$.Δi18nPostprocess($I18N_3$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c2$);
-            $r3$.ɵɵi18n(1, $I18N_3$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c2$);
+            $r3$.Δi18n(1, $I18N_3$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
-            $r3$.ɵɵi18nApply(1);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
+            $r3$.Δi18nApply(1);
           }
         }
         const $_c3$ = ["title", "icu and text"];
@@ -2558,27 +2558,27 @@ describe('i18n support in the view compiler', () => {
             $I18N_5$ = $MSG_EXTERNAL_1922743304863699161$$APP_SPEC_TS__5$;
         }
         else {
-            $I18N_5$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 0 {no emails} 1 {one email} other {{$interpolation} emails}}", {
+            $I18N_5$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 0 {no emails} 1 {one email} other {{$interpolation} emails}}", {
               "interpolation": "\uFFFD1\uFFFD"
             });
         }
-        $I18N_5$ = $r3$.ɵɵi18nPostprocess($I18N_5$, {
+        $I18N_5$ = $r3$.Δi18nPostprocess($I18N_5$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $_c3$);
-            $r3$.ɵɵtext(1, " You have ");
-            $r3$.ɵɵi18n(2, $I18N_5$);
-            $r3$.ɵɵtext(3, ". ");
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div", $_c3$);
+            $r3$.Δtext(1, " You have ");
+            $r3$.Δi18n(2, $I18N_5$);
+            $r3$.Δtext(3, ". ");
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.count));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.count));
-            $r3$.ɵɵi18nApply(2);
+            const $ctx_r1$ = $r3$.ΔnextContext();
+            $r3$.Δselect(2);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.count));
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.count));
+            $r3$.Δi18nApply(2);
           }
         }
         …
@@ -2586,20 +2586,20 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 2, 1, "div", $_c0$);
-            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 2, "div", $_c1$);
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
+            $r3$.Δtemplate(2, MyComponent_div_2_Template, 2, 1, "div", $_c0$);
+            $r3$.Δtemplate(3, MyComponent_div_3_Template, 4, 2, "div", $_c1$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nApply(1);
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵproperty("ngIf", ctx.visible);
-            $r3$.ɵɵselect(3);
-            $r3$.ɵɵproperty("ngIf", ctx.available);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nApply(1);
+            $r3$.Δselect(2);
+            $r3$.Δproperty("ngIf", ctx.visible);
+            $r3$.Δselect(3);
+            $r3$.Δproperty("ngIf", ctx.available);
           }
         }
       `;
@@ -2621,28 +2621,29 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2949673783721159566$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {{$interpolation}}}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {{$interpolation}}}", {
               "interpolation": "\uFFFD1\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.other));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.other));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
+
       verify(input, output, {inputArgs: {interpolation: ['{%', '%}']}});
     });
 
@@ -2669,7 +2670,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_2417296354340576868$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male - {$startBoldText}male{$closeBoldText}} female {female {$startBoldText}female{$closeBoldText}} other {{$startTagDiv}{$startItalicText}other{$closeItalicText}{$closeTagDiv}}}", {
+            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male - {$startBoldText}male{$closeBoldText}} female {female {$startBoldText}female{$closeBoldText}} other {{$startTagDiv}{$startItalicText}other{$closeItalicText}{$closeTagDiv}}}", {
               "startBoldText": "<b>",
               "closeBoldText": "</b>",
               "startItalicText": "<i>",
@@ -2678,7 +2679,7 @@ describe('i18n support in the view compiler', () => {
               "closeTagDiv": "</div>"
             });
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c2$ = [1, "other"];
@@ -2696,7 +2697,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_5791551881115084301$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startBoldText}Other content{$closeBoldText}{$startTagDiv}{$startItalicText}Another content{$closeItalicText}{$closeTagDiv}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startBoldText}Other content{$closeBoldText}{$startTagDiv}{$startItalicText}Another content{$closeItalicText}{$closeTagDiv}", {
               "startBoldText": "\uFFFD#2\uFFFD",
               "closeBoldText": "\uFFFD/#2\uFFFD",
               "startTagDiv": "\uFFFD#3\uFFFD",
@@ -2711,19 +2712,19 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵelement(2, "b");
-            $r3$.ɵɵelementStart(3, "div");
-            $r3$.ɵɵstyling($_c2$);
-            $r3$.ɵɵelement(4, "i");
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δelement(2, "b");
+            $r3$.ΔelementStart(3, "div");
+            $r3$.Δstyling($_c2$);
+            $r3$.Δelement(4, "i");
+            $r3$.ΔelementEnd();
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -2745,11 +2746,11 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_6879461626778511059$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male of age: {$interpolation}} female {female} other {other}}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male of age: {$interpolation}} female {female} other {other}}", {
               "interpolation": "\uFFFD1\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -2757,15 +2758,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(((ctx.ageA + ctx.ageB) + ctx.ageC)));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nExp($r3$.Δbind(((ctx.ageA + ctx.ageB) + ctx.ageC)));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -2788,9 +2789,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_2$;
@@ -2799,9 +2800,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
+            $I18N_2$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
         }
-        $I18N_2$ = $r3$.ɵɵi18nPostprocess($I18N_2$, {
+        $I18N_2$ = $r3$.Δi18nPostprocess($I18N_2$, {
           "VAR_SELECT": "\uFFFD1\uFFFD"
         });
         var $I18N_0$;
@@ -2813,7 +2814,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2967249209167308918$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$icu_1}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$icu_1}", {
               "icu": $I18N_1$,
               "icu_1": $I18N_2$
             });
@@ -2823,15 +2824,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -2859,9 +2860,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_2$;
@@ -2870,9 +2871,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_2$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_2$ = $r3$.ɵɵi18nPostprocess($I18N_2$, {
+        $I18N_2$ = $r3$.Δi18nPostprocess($I18N_2$, {
           "VAR_SELECT": "\uFFFD1\uFFFD"
         });
         const $_c3$ = [${AttributeMarker.Template}, "ngIf"];
@@ -2882,9 +2883,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_4$ = $MSG_APP_SPEC_TS__4$;
         }
         else {
-            $I18N_4$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_4$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_4$ = $r3$.ɵɵi18nPostprocess($I18N_4$, {
+        $I18N_4$ = $r3$.Δi18nPostprocess($I18N_4$, {
           "VAR_SELECT": "\uFFFD0:1\uFFFD"
         });
         var $I18N_0$;
@@ -2898,27 +2899,27 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startTagDiv}{$icu}{$closeTagDiv}{$startTagDiv_1}{$icu}{$closeTagDiv}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startTagDiv}{$icu}{$closeTagDiv}{$startTagDiv_1}{$icu}{$closeTagDiv}", {
               "startTagDiv": "\uFFFD#2\uFFFD",
               "closeTagDiv": "[\uFFFD/#2\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*3:1\uFFFD]",
               "startTagDiv_1": "\uFFFD*3:1\uFFFD\uFFFD#1:1\uFFFD",
               "icu": "\uFFFDI18N_EXP_ICU\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "ICU": [$I18N_1$, $I18N_2$, $I18N_4$]
         });
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-              $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
-              $r3$.ɵɵelement(1, "div");
-              $r3$.ɵɵi18nEnd();
+              $r3$.Δi18nStart(0, $I18N_0$, 1);
+              $r3$.Δelement(1, "div");
+              $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.gender));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.gender));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -2926,19 +2927,19 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵelement(2, "div");
-            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 2, 1, "div", $_c3$);
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δelement(2, "div");
+            $r3$.Δtemplate(3, MyComponent_div_3_Template, 2, 1, "div", $_c3$);
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(3);
-            $r3$.ɵɵproperty("ngIf", ctx.visible);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(3);
+            $r3$.Δproperty("ngIf", ctx.visible);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -2967,9 +2968,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_343563413083115114$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT_1, select, male {male of age: {VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}} female {female} other {other}}");
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT_1, select, male {male of age: {VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD",
           "VAR_SELECT_1": "\uFFFD1\uFFFD"
         });
@@ -2978,15 +2979,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -3014,9 +3015,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c2$ = [${AttributeMarker.Template}, "ngIf"];
@@ -3026,9 +3027,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_3$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
+            $I18N_3$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
         }
-        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
+        $I18N_3$ = $r3$.Δi18nPostprocess($I18N_3$, {
           "VAR_SELECT": "\uFFFD0:1\uFFFD"
         });
         var $I18N_0$;
@@ -3042,7 +3043,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_1194472282609532229$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
               "startTagSpan": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagSpan": "\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD",
               "icu": $I18N_1$,
@@ -3051,15 +3052,15 @@ describe('i18n support in the view compiler', () => {
         }
         function MyComponent_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
-            $r3$.ɵɵelement(1, "span");
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_0$, 1);
+            $r3$.Δelement(1, "span");
+            $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -3067,17 +3068,17 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 1, "span", $_c2$);
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δtemplate(2, MyComponent_span_2_Template, 2, 1, "span", $_c2$);
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵproperty("ngIf", ctx.ageVisible);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(2);
+            $r3$.Δproperty("ngIf", ctx.ageVisible);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -3105,12 +3106,12 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7825031864601787094$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male {$interpolation}} female {female {$interpolation_1}} other {other}}", {
+            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male {$interpolation}} female {female {$interpolation_1}} other {other}}", {
               "interpolation": "\uFFFD1\uFFFD",
               "interpolation_1": "\uFFFD2\uFFFD"
             });
         }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c0$ = [${AttributeMarker.Template}, "ngIf"];
@@ -3122,11 +3123,11 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_2310343208266678305$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_3$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other: {$interpolation}}}", {
+            $I18N_3$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other: {$interpolation}}}", {
               "interpolation": "\uFFFD1:1\uFFFD"
             });
         }
-        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
+        $I18N_3$ = $r3$.Δi18nPostprocess($I18N_3$, {
           "VAR_SELECT": "\uFFFD0:1\uFFFD"
         });
         var $I18N_0$;
@@ -3140,7 +3141,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7186042105600518133$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
               "startTagSpan": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagSpan": "\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD",
               "icu": $I18N_1$,
@@ -3149,16 +3150,16 @@ describe('i18n support in the view compiler', () => {
         }
         function MyComponent_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
-            $r3$.ɵɵelement(1, "span");
-            $r3$.ɵɵi18nEnd();
+            $r3$.Δi18nStart(0, $I18N_0$, 1);
+            $r3$.Δelement(1, "span");
+            $r3$.Δi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ɵɵnextContext();
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.otherAge));
-            $r3$.ɵɵi18nApply(0);
+            const $ctx_r0$ = $r3$.ΔnextContext();
+            $r3$.Δselect(0);
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.otherAge));
+            $r3$.Δi18nApply(0);
           }
         }
         …
@@ -3166,19 +3167,19 @@ describe('i18n support in the view compiler', () => {
         vars: 4,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 2, "span", $_c2$);
-            $r3$.ɵɵi18nEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18nStart(1, $I18N_0$);
+            $r3$.Δtemplate(2, MyComponent_span_2_Template, 2, 2, "span", $_c2$);
+            $r3$.Δi18nEnd();
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(2);
-            $r3$.ɵɵproperty("ngIf", ctx.ageVisible);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.weight));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.height));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(2);
+            $r3$.Δproperty("ngIf", ctx.ageVisible);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.weight));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.height));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
@@ -3208,13 +3209,13 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4853189513362404940$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male {$phA}} female {female {$phB}} other {other {$phC}}}", {
+            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male {$phA}} female {female {$phB}} other {other {$phC}}}", {
               "phA": "\uFFFD1\uFFFD",
               "phB": "\uFFFD2\uFFFD",
               "phC": "\uFFFD3\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -3222,17 +3223,17 @@ describe('i18n support in the view compiler', () => {
         vars: 4,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.Δi18n(1, $I18N_0$);
+            $r3$.ΔelementEnd();
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.weight));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.height));
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
-            $r3$.ɵɵi18nApply(1);
+            $r3$.Δselect(1);
+            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.weight));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.height));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
+            $r3$.Δi18nApply(1);
           }
         }
       `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
index 97dadc1562..1baa56d05c 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
@@ -52,7 +52,7 @@ describe('compiler compliance: listen()', () => {
     };
 
     const componentDef = `
-      MyComponent.ngComponentDef = IDENT.ɵɵdefineComponent({
+      MyComponent.ngComponentDef = IDENT.ΔdefineComponent({
           …
           inputs:{
             componentInput: "componentInput",
@@ -66,7 +66,7 @@ describe('compiler compliance: listen()', () => {
         });`;
 
     const directiveDef = `
-      MyDirective.ngDirectiveDef = IDENT.ɵɵdefineDirective({
+      MyDirective.ngDirectiveDef = IDENT.ΔdefineDirective({
         …
         inputs:{
           directiveInput: "directiveInput",
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
index c7368bfda5..179851d796 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
@@ -45,12 +45,12 @@ describe('compiler compliance: listen()', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", $e0_attrs$);
-            $r3$.ɵɵlistener("click", function MyComponent_Template_div_click_0_listener($event) {
+            $r3$.ΔelementStart(0, "div", $e0_attrs$);
+            $r3$.Δlistener("click", function MyComponent_Template_div_click_0_listener($event) {
               ctx.onClick($event);
               return (1 == 2);
             });
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementEnd();
           }
         }
         `;
@@ -91,11 +91,11 @@ describe('compiler compliance: listen()', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "my-app", $e0_attrs$);
-            $r3$.ɵɵlistener("click", function MyComponent_Template_my_app_click_0_listener($event) {
+            $r3$.ΔelementStart(0, "my-app", $e0_attrs$);
+            $r3$.Δlistener("click", function MyComponent_Template_my_app_click_0_listener($event) {
               return ctx.onClick($event);
             });
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementEnd();
           }
         }
         `;
@@ -138,33 +138,33 @@ describe('compiler compliance: listen()', () => {
 
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            const $s$ = $r3$.ɵɵgetCurrentView();
-            $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵelementStart(1, "div", $e_attrs$);
-            $r3$.ɵɵlistener("click", function MyComponent_div_0_Template_div_click_1_listener($event) {
-              $r3$.ɵɵrestoreView($s$);
-              const $comp$ = $r3$.ɵɵnextContext();
+            const $s$ = $r3$.ΔgetCurrentView();
+            $r3$.ΔelementStart(0, "div");
+            $r3$.ΔelementStart(1, "div", $e_attrs$);
+            $r3$.Δlistener("click", function MyComponent_div_0_Template_div_click_1_listener($event) {
+              $r3$.ΔrestoreView($s$);
+              const $comp$ = $r3$.ΔnextContext();
               return $comp$.onClick($comp$.foo);
             });
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(2, "button", $e_attrs$);
-            $r3$.ɵɵlistener("click", function MyComponent_div_0_Template_button_click_2_listener($event) {
-              $r3$.ɵɵrestoreView($s$);
-              const $comp2$ = $r3$.ɵɵnextContext();
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementStart(2, "button", $e_attrs$);
+            $r3$.Δlistener("click", function MyComponent_div_0_Template_button_click_2_listener($event) {
+              $r3$.ΔrestoreView($s$);
+              const $comp2$ = $r3$.ΔnextContext();
               return $comp2$.onClick2($comp2$.bar);
             });
-            $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementEnd();
+            $r3$.ΔelementEnd();
           }
         }
         // ...
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 3, 0, "div", $c0$);
+            $r3$.Δtemplate(0, MyComponent_div_0_Template, 3, 0, "div", $c0$);
           }
           if (rf & 2) {
-            $i0$.ɵɵselect(0);
-            $i0$.ɵɵproperty("ngIf", ctx.showing);
+            $i0$.Δselect(0);
+            $i0$.Δproperty("ngIf", ctx.showing);
           }
         }
         `;
@@ -199,7 +199,7 @@ describe('compiler compliance: listen()', () => {
         const $e0_attrs$ = [${AttributeMarker.Bindings}, "click"];
         const $e2_refs$ = ["user", ""];
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -207,16 +207,16 @@ describe('compiler compliance: listen()', () => {
           vars: 0,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              const $s$ = $r3$.ɵɵgetCurrentView();
-              $r3$.ɵɵelementStart(0, "button", $e0_attrs$);
-                $r3$.ɵɵlistener("click", function MyComponent_Template_button_click_0_listener($event) {
-                   $r3$.ɵɵrestoreView($s$);
-                   const $user$ = $r3$.ɵɵreference(3);
+              const $s$ = $r3$.ΔgetCurrentView();
+              $r3$.ΔelementStart(0, "button", $e0_attrs$);
+                $r3$.Δlistener("click", function MyComponent_Template_button_click_0_listener($event) {
+                   $r3$.ΔrestoreView($s$);
+                   const $user$ = $r3$.Δreference(3);
                    return ctx.onClick($user$.value);
                 });
-                $r3$.ɵɵtext(1, "Save");
-              $r3$.ɵɵelementEnd();
-              $r3$.ɵɵelement(2, "input", null, $e2_refs$);
+                $r3$.Δtext(1, "Save");
+              $r3$.ΔelementEnd();
+              $r3$.Δelement(2, "input", null, $e2_refs$);
             }
           },
           encapsulation: 2
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
index 0a0eaed14e..6198a03d02 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
@@ -46,7 +46,7 @@ describe('compiler compliance: providers', () => {
     const result = compile(files, angularFiles);
     expectEmit(
         result.source,
-        'features: [i0.ɵɵProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}], [GreeterEN])],',
+        'features: [i0.ΔProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}], [GreeterEN])],',
         'Incorrect features');
   });
 
@@ -79,7 +79,7 @@ describe('compiler compliance: providers', () => {
     const result = compile(files, angularFiles);
     expectEmit(
         result.source,
-        'features: [i0.ɵɵProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}])],',
+        'features: [i0.ΔProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}])],',
         'Incorrect features');
   });
 
@@ -111,7 +111,7 @@ describe('compiler compliance: providers', () => {
 
     const result = compile(files, angularFiles);
     expectEmit(
-        result.source, 'features: [i0.ɵɵProvidersFeature([], [GreeterEN])],', 'Incorrect features');
+        result.source, 'features: [i0.ΔProvidersFeature([], [GreeterEN])],', 'Incorrect features');
   });
 
   it('should not emit the ProvidersFeature feature when no providers', () => {
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
index 10dbc48055..5e271f339a 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
@@ -113,7 +113,7 @@ describe('r3_view_compiler', () => {
       };
 
       const bV_call =
-          `$r3$.ɵɵinterpolationV([" ",ctx.list[0]," ",ctx.list[1]," ",ctx.list[2]," ",ctx.list[3],
+          `$r3$.ΔinterpolationV([" ",ctx.list[0]," ",ctx.list[1]," ",ctx.list[2]," ",ctx.list[3],
         " ",ctx.list[4]," ",ctx.list[5]," ",ctx.list[6]," ",ctx.list[7]," ",ctx.list[8],
         " "])`;
       const result = compile(files, angularFiles);
@@ -143,12 +143,12 @@ describe('r3_view_compiler', () => {
       const template = `
       template: function MyApp_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelement(0, "div");
+          $i0$.Δelement(0, "div");
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("@attr", …);
-          $i0$.ɵɵproperty("@binding", …);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("@attr", …);
+          $i0$.Δproperty("@binding", …);
         }
       }`;
       const result = compile(files, angularFiles);
@@ -176,10 +176,10 @@ describe('r3_view_compiler', () => {
       const template = `
       template: function MyApp_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "div");
+          $i0$.ΔelementStart(0, "div");
           …
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("@mySelector", …);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("@mySelector", …);
         }
       }`;
       const result = compile(files, angularFiles);
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index 250cb6bf56..43256c46d1 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -95,7 +95,7 @@ describe('compiler compliance: styling', () => {
          };
 
          const template = `
-         MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+         MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
            …
            styles: ["div.cool { color: blue; }", ":host.nice p { color: gold; }"],
            encapsulation: 1
@@ -128,7 +128,7 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors:[["my-component"]],
           factory:function MyComponent_Factory(t){
@@ -170,7 +170,7 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           type: MyComponent,
           selectors:[["my-component"]],
           factory:function MyComponent_Factory(t){
@@ -215,23 +215,23 @@ describe('compiler compliance: styling', () => {
 
       const template = `
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           …
           consts: 3,
           vars: 3,
           template:  function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelement(0, "div");
-              $r3$.ɵɵelement(1, "div");
-              $r3$.ɵɵelement(2, "div");
+              $r3$.Δelement(0, "div");
+              $r3$.Δelement(1, "div");
+              $r3$.Δelement(2, "div");
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵproperty("@foo", ctx.exp);
-              $r3$.ɵɵselect(1);
-              $r3$.ɵɵproperty("@bar", undefined);
-              $r3$.ɵɵselect(2);
-              $r3$.ɵɵproperty("@baz", undefined);
+              $r3$.Δselect(0);
+              $r3$.Δproperty("@foo", ctx.exp);
+              $r3$.Δselect(1);
+              $r3$.Δproperty("@bar", undefined);
+              $r3$.Δselect(2);
+              $r3$.Δproperty("@baz", undefined);
             }
           },
           encapsulation: 2
@@ -277,19 +277,19 @@ describe('compiler compliance: styling', () => {
 
       const template = `
         …
-        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
           …
           consts: 1,
           vars: 1,
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵlistener("@myAnimation.start", function MyComponent_Template_div_animation_myAnimation_start_0_listener($event) { return ctx.onStart($event); });
-              $r3$.ɵɵlistener("@myAnimation.done", function MyComponent_Template_div_animation_myAnimation_done_0_listener($event) { return ctx.onDone($event); });
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δlistener("@myAnimation.start", function MyComponent_Template_div_animation_myAnimation_start_0_listener($event) { return ctx.onStart($event); });
+              $r3$.Δlistener("@myAnimation.done", function MyComponent_Template_div_animation_myAnimation_done_0_listener($event) { return ctx.onDone($event); });
+              $r3$.ΔelementEnd();
             } if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵproperty("@myAnimation", ctx.exp);
+              $r3$.Δselect(0);
+              $r3$.Δproperty("@myAnimation", ctx.exp);
             }
           },
           encapsulation: 2,
@@ -340,15 +340,15 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-        MyAnimDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
+        MyAnimDir.ngDirectiveDef = $r3$.ΔdefineDirective({
           …
           hostBindings: function MyAnimDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵallocHostVars(1);
-              $r3$.ɵɵcomponentHostSyntheticListener("@myAnim.start", function MyAnimDir_animation_myAnim_start_HostBindingHandler($event) { return ctx.onStart(); });
-              $r3$.ɵɵcomponentHostSyntheticListener("@myAnim.done", function MyAnimDir_animation_myAnim_done_HostBindingHandler($event) { return ctx.onDone(); });
+              $r3$.ΔallocHostVars(1);
+              $r3$.ΔcomponentHostSyntheticListener("@myAnim.start", function MyAnimDir_animation_myAnim_start_HostBindingHandler($event) { return ctx.onStart(); });
+              $r3$.ΔcomponentHostSyntheticListener("@myAnim.done", function MyAnimDir_animation_myAnim_done_HostBindingHandler($event) { return ctx.onDone(); });
             } if (rf & 2) {
-              $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@myAnim", $r3$.ɵɵbind(ctx.myAnimState), null, true);
+              $r3$.ΔcomponentHostSyntheticProperty(elIndex, "@myAnim", $r3$.Δbind(ctx.myAnimState), null, true);
             }
           }
           …
@@ -384,14 +384,14 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵstyleMap($ctx$.myStyleExp);
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔstyleMap($ctx$.myStyleExp);
+              $r3$.ΔstylingApply();
             }
           }
           `;
@@ -450,14 +450,14 @@ describe('compiler compliance: styling', () => {
           vars: 1,
           template: function MyComponentWithInterpolation_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling();
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling();
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵclassMap($r3$.ɵɵinterpolation1("foo foo-", $ctx$.fooId, ""));
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔclassMap($r3$.Δinterpolation1("foo foo-", $ctx$.fooId, ""));
+              $r3$.ΔstylingApply();
             }
           }
         …
@@ -465,14 +465,14 @@ describe('compiler compliance: styling', () => {
           vars: 2,
           template: function MyComponentWithMuchosInterpolation_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling();
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling();
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵclassMap($r3$.ɵɵinterpolation2("foo foo-", $ctx$.fooId, "-", $ctx$.fooUsername, ""));
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔclassMap($r3$.Δinterpolation2("foo foo-", $ctx$.fooId, "-", $ctx$.fooUsername, ""));
+              $r3$.ΔstylingApply();
             }
           }
         …
@@ -480,14 +480,14 @@ describe('compiler compliance: styling', () => {
           vars: 0,
           template: function MyComponentWithoutInterpolation_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling();
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling();
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵclassMap($ctx$.exp);
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔclassMap($ctx$.exp);
+              $r3$.ΔstylingApply();
             }
           }
           `;
@@ -527,7 +527,7 @@ describe('compiler compliance: styling', () => {
           const $_c0$ = [${AttributeMarker.Styles}, "opacity", "1", ${AttributeMarker.Bindings}, "style"];
           const $_c1$ = ["width", "height"];
           …
-          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
               type: MyComponent,
               selectors:[["my-component"]],
               factory:function MyComponent_Factory(t){
@@ -537,17 +537,17 @@ describe('compiler compliance: styling', () => {
               vars: 1,
               template:  function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ɵɵelementStart(0, "div", $_c0$);
-                  $r3$.ɵɵstyling(null, $_c1$, $r3$.ɵɵdefaultStyleSanitizer);
-                  $r3$.ɵɵelementEnd();
+                  $r3$.ΔelementStart(0, "div", $_c0$);
+                  $r3$.Δstyling(null, $_c1$, $r3$.ΔdefaultStyleSanitizer);
+                  $r3$.ΔelementEnd();
                 }
                 if (rf & 2) {
-                  $r3$.ɵɵselect(0);
-                  $r3$.ɵɵstyleMap($ctx$.myStyleExp);
-                  $r3$.ɵɵstyleProp(0, $ctx$.myWidth);
-                  $r3$.ɵɵstyleProp(1, $ctx$.myHeight);
-                  $r3$.ɵɵstylingApply();
-                  $r3$.ɵɵelementAttribute(0, "style", $r3$.ɵɵbind("border-width: 10px"), $r3$.ɵɵsanitizeStyle);
+                  $r3$.Δselect(0);
+                  $r3$.ΔstyleMap($ctx$.myStyleExp);
+                  $r3$.ΔstyleProp(0, $ctx$.myWidth);
+                  $r3$.ΔstyleProp(1, $ctx$.myHeight);
+                  $r3$.ΔstylingApply();
+                  $r3$.ΔelementAttribute(0, "style", $r3$.Δbind("border-width: 10px"), $r3$.ΔsanitizeStyle);
                 }
               },
               encapsulation: 2
@@ -587,7 +587,7 @@ describe('compiler compliance: styling', () => {
               }
           }
 
-          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
             type: MyComponent,
             selectors: [["my-component"]],
             factory: function MyComponent_Factory(t) {
@@ -597,14 +597,14 @@ describe('compiler compliance: styling', () => {
             vars: 0,
             template:  function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelementStart(0, "div");
-                $r3$.ɵɵstyling(null, _c0, $r3$.ɵɵdefaultStyleSanitizer);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔelementStart(0, "div");
+                $r3$.Δstyling(null, _c0, $r3$.ΔdefaultStyleSanitizer);
+                $r3$.ΔelementEnd();
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵstyleProp(0, ctx.myImage);
-                $r3$.ɵɵstylingApply();
+                $r3$.Δselect(0);
+                $r3$.ΔstyleProp(0, ctx.myImage);
+                $r3$.ΔstylingApply();
               }
             },
             encapsulation: 2
@@ -639,14 +639,14 @@ describe('compiler compliance: styling', () => {
           …
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling(null, _c0);
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling(null, _c0);
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵstyleProp(0, 12, "px");
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔstyleProp(0, 12, "px");
+              $r3$.ΔstylingApply();
             }
           }
      `;
@@ -705,14 +705,14 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling();
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling();
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵclassMap($ctx$.myClassExp);
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔclassMap($ctx$.myClassExp);
+              $r3$.ΔstylingApply();
             }
           }
           `;
@@ -752,7 +752,7 @@ describe('compiler compliance: styling', () => {
           const $e0_attrs$ = [${AttributeMarker.Classes}, "grape", ${AttributeMarker.Bindings}, "class"];
           const $e0_bindings$ = ["apple", "orange"];
           …
-          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
               type: MyComponent,
               selectors:[["my-component"]],
               factory:function MyComponent_Factory(t){
@@ -762,17 +762,17 @@ describe('compiler compliance: styling', () => {
               vars: 1,
               template:  function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ɵɵelementStart(0, "div", $e0_attrs$);
-                  $r3$.ɵɵstyling($e0_bindings$);
-                  $r3$.ɵɵelementEnd();
+                  $r3$.ΔelementStart(0, "div", $e0_attrs$);
+                  $r3$.Δstyling($e0_bindings$);
+                  $r3$.ΔelementEnd();
                 }
                 if (rf & 2) {
-                  $r3$.ɵɵselect(0);
-                  $r3$.ɵɵclassMap($ctx$.myClassExp);
-                  $r3$.ɵɵclassProp(0, $ctx$.yesToApple);
-                  $r3$.ɵɵclassProp(1, $ctx$.yesToOrange);
-                  $r3$.ɵɵstylingApply();
-                  $r3$.ɵɵelementAttribute(0, "class", $r3$.ɵɵbind("banana"));
+                  $r3$.Δselect(0);
+                  $r3$.ΔclassMap($ctx$.myClassExp);
+                  $r3$.ΔclassProp(0, $ctx$.yesToApple);
+                  $r3$.ΔclassProp(1, $ctx$.yesToOrange);
+                  $r3$.ΔstylingApply();
+                  $r3$.ΔelementAttribute(0, "class", $r3$.Δbind("banana"));
                 }
               },
               encapsulation: 2
@@ -808,7 +808,7 @@ describe('compiler compliance: styling', () => {
          const template = `
           const $e0_attrs$ = [${AttributeMarker.Classes}, "foo", ${AttributeMarker.Styles}, "width", "100px", ${AttributeMarker.Bindings}, "class", "style"];
           …
-          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
               type: MyComponent,
               selectors:[["my-component"]],
               factory:function MyComponent_Factory(t){
@@ -818,12 +818,12 @@ describe('compiler compliance: styling', () => {
               vars: 2,
               template:  function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ɵɵelement(0, "div", $e0_attrs$);
+                  $r3$.Δelement(0, "div", $e0_attrs$);
                 }
                 if (rf & 2) {
-                  $r3$.ɵɵselect(0);
-                  $r3$.ɵɵelementAttribute(0, "class", $r3$.ɵɵbind("round"));
-                  $r3$.ɵɵelementAttribute(0, "style", $r3$.ɵɵbind("height:100px"), $r3$.ɵɵsanitizeStyle);
+                  $r3$.Δselect(0);
+                  $r3$.ΔelementAttribute(0, "class", $r3$.Δbind("round"));
+                  $r3$.ΔelementAttribute(0, "style", $r3$.Δbind("height:100px"), $r3$.ΔsanitizeStyle);
                 }
               },
               encapsulation: 2
@@ -884,15 +884,15 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵstyleMap($ctx$.myStyleExp);
-              $r3$.ɵɵclassMap($ctx$.myClassExp);
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔstyleMap($ctx$.myStyleExp);
+              $r3$.ΔclassMap($ctx$.myClassExp);
+              $r3$.ΔstylingApply();
             }
           }
           `;
@@ -926,17 +926,17 @@ describe('compiler compliance: styling', () => {
          const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
-              $r3$.ɵɵpipe(1, "stylePipe");
-              $r3$.ɵɵpipe(2, "classPipe");
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
+              $r3$.Δpipe(1, "stylePipe");
+              $r3$.Δpipe(2, "classPipe");
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵstyleMap($r3$.ɵɵpipeBind1(1, 0, $ctx$.myStyleExp));
-              $r3$.ɵɵclassMap($r3$.ɵɵpipeBind1(2, 2, $ctx$.myClassExp));
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔstyleMap($r3$.ΔpipeBind1(1, 0, $ctx$.myStyleExp));
+              $r3$.ΔclassMap($r3$.ΔpipeBind1(2, 2, $ctx$.myClassExp));
+              $r3$.ΔstylingApply();
             }
           }
           `;
@@ -981,25 +981,25 @@ describe('compiler compliance: styling', () => {
           …
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ɵɵdefaultStyleSanitizer);
-              $r3$.ɵɵpipe(1, "pipe");
-              $r3$.ɵɵpipe(2, "pipe");
-              $r3$.ɵɵpipe(3, "pipe");
-              $r3$.ɵɵpipe(4, "pipe");
-              $r3$.ɵɵtext(5);
-              $r3$.ɵɵelementEnd();
+              $r3$.ΔelementStart(0, "div");
+              $r3$.Δstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ΔdefaultStyleSanitizer);
+              $r3$.Δpipe(1, "pipe");
+              $r3$.Δpipe(2, "pipe");
+              $r3$.Δpipe(3, "pipe");
+              $r3$.Δpipe(4, "pipe");
+              $r3$.Δtext(5);
+              $r3$.ΔelementEnd();
             }
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵstyleMap($r3$.ɵɵpipeBind2(1, 1, $ctx$.myStyleExp, 1000));
-              $r3$.ɵɵclassMap($e2_styling$);
-              $r3$.ɵɵstyleProp(0, $r3$.ɵɵpipeBind2(2, 4, $ctx$.barExp, 3000));
-              $r3$.ɵɵstyleProp(1, $r3$.ɵɵpipeBind2(3, 7, $ctx$.bazExp, 4000));
-              $r3$.ɵɵclassProp(0, $r3$.ɵɵpipeBind2(4, 10, $ctx$.fooExp, 2000));
-              $r3$.ɵɵstylingApply();
-              $r3$.ɵɵselect(5);
-              $r3$.ɵɵtextBinding(5, $r3$.ɵɵinterpolation1(" ", $ctx$.item, ""));
+              $r3$.Δselect(0);
+              $r3$.ΔstyleMap($r3$.ΔpipeBind2(1, 1, $ctx$.myStyleExp, 1000));
+              $r3$.ΔclassMap($e2_styling$);
+              $r3$.ΔstyleProp(0, $r3$.ΔpipeBind2(2, 4, $ctx$.barExp, 3000));
+              $r3$.ΔstyleProp(1, $r3$.ΔpipeBind2(3, 7, $ctx$.bazExp, 4000));
+              $r3$.ΔclassProp(0, $r3$.ΔpipeBind2(4, 10, $ctx$.fooExp, 2000));
+              $r3$.ΔstylingApply();
+              $r3$.Δselect(5);
+              $r3$.ΔtextBinding(5, $r3$.Δinterpolation1(" ", $ctx$.item, ""));
             }
           }
           `;
@@ -1041,18 +1041,18 @@ describe('compiler compliance: styling', () => {
           template: function MyComponent_Template(rf, $ctx$) {
             …
             if (rf & 2) {
-              $r3$.ɵɵselect(0);
-              $r3$.ɵɵstyleProp(0, $ctx$.w1);
-              $r3$.ɵɵstylingApply();
-              $r3$.ɵɵselect(1);
-              $r3$.ɵɵstyleProp(0, $ctx$.h1);
-              $r3$.ɵɵstylingApply();
-              $r3$.ɵɵselect(2);
-              $r3$.ɵɵclassProp(0, $ctx$.a1);
-              $r3$.ɵɵstylingApply();
-              $r3$.ɵɵselect(3);
-              $r3$.ɵɵclassProp(0, $ctx$.r1);
-              $r3$.ɵɵstylingApply();
+              $r3$.Δselect(0);
+              $r3$.ΔstyleProp(0, $ctx$.w1);
+              $r3$.ΔstylingApply();
+              $r3$.Δselect(1);
+              $r3$.ΔstyleProp(0, $ctx$.h1);
+              $r3$.ΔstylingApply();
+              $r3$.Δselect(2);
+              $r3$.ΔclassProp(0, $ctx$.a1);
+              $r3$.ΔstylingApply();
+              $r3$.Δselect(3);
+              $r3$.ΔclassProp(0, $ctx$.r1);
+              $r3$.ΔstylingApply();
             }
           }
           `;
@@ -1104,15 +1104,15 @@ describe('compiler compliance: styling', () => {
           …
           hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵelementHostAttrs($e0_attrs$);
-              $r3$.ɵɵstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ɵɵdefaultStyleSanitizer);
+              $r3$.ΔelementHostAttrs($e0_attrs$);
+              $r3$.Δstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ΔdefaultStyleSanitizer);
             }
             if (rf & 2) {
-              $r3$.ɵɵstyleMap(ctx.myStyle);
-              $r3$.ɵɵclassMap(ctx.myClass);
-              $r3$.ɵɵstyleProp(0, ctx.myColorProp);
-              $r3$.ɵɵclassProp(0, ctx.myFooClass);
-              $r3$.ɵɵstylingApply();
+              $r3$.ΔstyleMap(ctx.myStyle);
+              $r3$.ΔclassMap(ctx.myClass);
+              $r3$.ΔstyleProp(0, ctx.myColorProp);
+              $r3$.ΔclassProp(0, ctx.myFooClass);
+              $r3$.ΔstylingApply();
             }
           },
           consts: 0,
@@ -1166,16 +1166,16 @@ describe('compiler compliance: styling', () => {
           …
           hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵstyling(_c0, _c1, $r3$.ɵɵdefaultStyleSanitizer);
+              $r3$.Δstyling(_c0, _c1, $r3$.ΔdefaultStyleSanitizer);
             }
             if (rf & 2) {
-              $r3$.ɵɵstyleMap(ctx.myStyle);
-              $r3$.ɵɵclassMap(ctx.myClasses);
-              $r3$.ɵɵstyleProp(0, ctx.myHeightProp, "pt");
-              $r3$.ɵɵstyleProp(1, ctx.myWidthProp);
-              $r3$.ɵɵclassProp(0, ctx.myBarClass);
-              $r3$.ɵɵclassProp(1, ctx.myFooClass);
-              $r3$.ɵɵstylingApply();
+              $r3$.ΔstyleMap(ctx.myStyle);
+              $r3$.ΔclassMap(ctx.myClasses);
+              $r3$.ΔstyleProp(0, ctx.myHeightProp, "pt");
+              $r3$.ΔstyleProp(1, ctx.myWidthProp);
+              $r3$.ΔclassProp(0, ctx.myBarClass);
+              $r3$.ΔclassProp(1, ctx.myFooClass);
+              $r3$.ΔstylingApply();
             }
           },
           consts: 0,
@@ -1229,17 +1229,17 @@ describe('compiler compliance: styling', () => {
             …
             function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵelementStart(0, "div");
-                $r3$.ɵɵstyling(_c2, _c3, $r3$.ɵɵdefaultStyleSanitizer);
-                $r3$.ɵɵelementEnd();
+                $r3$.ΔelementStart(0, "div");
+                $r3$.Δstyling(_c2, _c3, $r3$.ΔdefaultStyleSanitizer);
+                $r3$.ΔelementEnd();
               }
               if (rf & 2) {
-                $r3$.ɵɵselect(0);
-                $r3$.ɵɵstyleMap(ctx.myStyleExp);
-                $r3$.ɵɵclassMap(ctx.myClassExp);
-                $r3$.ɵɵstyleProp(0, ctx.myHeightExp, null, true);
-                $r3$.ɵɵclassProp(0, ctx.myBarClassExp, true);
-                $r3$.ɵɵstylingApply();
+                $r3$.Δselect(0);
+                $r3$.ΔstyleMap(ctx.myStyleExp);
+                $r3$.ΔclassMap(ctx.myClassExp);
+                $r3$.ΔstyleProp(0, ctx.myHeightExp, null, true);
+                $r3$.ΔclassProp(0, ctx.myBarClassExp, true);
+                $r3$.ΔstylingApply();
               }
             },
           `;
@@ -1250,14 +1250,14 @@ describe('compiler compliance: styling', () => {
             …
             hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
               if (rf & 1) {
-                $r3$.ɵɵstyling(_c0, _c1, $r3$.ɵɵdefaultStyleSanitizer);
+                $r3$.Δstyling(_c0, _c1, $r3$.ΔdefaultStyleSanitizer);
               }
               if (rf & 2) {
-                $r3$.ɵɵstyleMap(ctx.myStyleExp);
-                $r3$.ɵɵclassMap(ctx.myClassExp);
-                $r3$.ɵɵstyleProp(0, ctx.myWidthExp, null, true);
-                $r3$.ɵɵclassProp(0, ctx.myFooClassExp, true);
-                $r3$.ɵɵstylingApply();
+                $r3$.ΔstyleMap(ctx.myStyleExp);
+                $r3$.ΔclassMap(ctx.myClassExp);
+                $r3$.ΔstyleProp(0, ctx.myWidthExp, null, true);
+                $r3$.ΔclassProp(0, ctx.myFooClassExp, true);
+                $r3$.ΔstylingApply();
               }
             },
           `;
@@ -1319,33 +1319,33 @@ describe('compiler compliance: styling', () => {
           …
           function ClassDirective_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵstyling();
+              $r3$.Δstyling();
             }
             if (rf & 2) {
-              $r3$.ɵɵclassMap(ctx.myClassMap);
-              $r3$.ɵɵstylingApply();
+              $r3$.ΔclassMap(ctx.myClassMap);
+              $r3$.ΔstylingApply();
             }
           }
           …
           function WidthDirective_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵstyling($widthDir_classes$, $widthDir_styles$);
+              $r3$.Δstyling($widthDir_classes$, $widthDir_styles$);
             }
             if (rf & 2) {
-              $r3$.ɵɵstyleProp(0, ctx.myWidth);
-              $r3$.ɵɵclassProp(0, ctx.myFooClass);
-              $r3$.ɵɵstylingApply();
+              $r3$.ΔstyleProp(0, ctx.myWidth);
+              $r3$.ΔclassProp(0, ctx.myFooClass);
+              $r3$.ΔstylingApply();
             }
           }
           …
           function HeightDirective_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ɵɵstyling($heightDir_classes$, $heightDir_styles$);
+              $r3$.Δstyling($heightDir_classes$, $heightDir_styles$);
             }
             if (rf & 2) {
-              $r3$.ɵɵstyleProp(0, ctx.myHeight);
-              $r3$.ɵɵclassProp(0, ctx.myBarClass);
-              $r3$.ɵɵstylingApply();
+              $r3$.ΔstyleProp(0, ctx.myHeight);
+              $r3$.ΔclassProp(0, ctx.myBarClass);
+              $r3$.ΔstylingApply();
             }
           }
           …
@@ -1399,16 +1399,16 @@ describe('compiler compliance: styling', () => {
       …
       hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          $r3$.ɵɵallocHostVars(2);
-          $r3$.ɵɵelementHostAttrs($_c0$);
-          $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
+          $r3$.ΔallocHostVars(2);
+          $r3$.ΔelementHostAttrs($_c0$);
+          $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
         }
         if (rf & 2) {
-          $r3$.ɵɵproperty("id", ctx.id, null, true);
-          $r3$.ɵɵproperty("title", ctx.title, null, true);
-          $r3$.ɵɵstyleMap(ctx.myStyle);
-          $r3$.ɵɵclassMap(ctx.myClass);
-          $r3$.ɵɵstylingApply();
+          $r3$.Δproperty("id", ctx.id, null, true);
+          $r3$.Δproperty("title", ctx.title, null, true);
+          $r3$.ΔstyleMap(ctx.myStyle);
+          $r3$.ΔclassMap(ctx.myClass);
+          $r3$.ΔstylingApply();
         }
       }
     `;
@@ -1447,15 +1447,15 @@ describe('compiler compliance: styling', () => {
       …
       hostBindings: function WidthDirective_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          $r3$.ɵɵallocHostVars(2);
-          $r3$.ɵɵstyling($_c0$, $_c1$);
+          $r3$.ΔallocHostVars(2);
+          $r3$.Δstyling($_c0$, $_c1$);
         }
         if (rf & 2) {
-          $r3$.ɵɵproperty("id", ctx.id, null, true);
-          $r3$.ɵɵproperty("title", ctx.title, null, true);
-          $r3$.ɵɵstyleProp(0, ctx.myWidth);
-          $r3$.ɵɵclassProp(0, ctx.myFooClass);
-          $r3$.ɵɵstylingApply();
+          $r3$.Δproperty("id", ctx.id, null, true);
+          $r3$.Δproperty("title", ctx.title, null, true);
+          $r3$.ΔstyleProp(0, ctx.myWidth);
+          $r3$.ΔclassProp(0, ctx.myFooClass);
+          $r3$.ΔstylingApply();
         }
       }
     `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
index 09d702fc86..4adf227d14 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
@@ -56,65 +56,65 @@ describe('compiler compliance: template', () => {
       function MyComponent_ul_0_li_1_div_1_Template(rf, ctx) {
 
         if (rf & 1) {
-          const $s$ = $i0$.ɵɵgetCurrentView();
-          $i0$.ɵɵelementStart(0, "div", $c2$);
-          $i0$.ɵɵlistener("click", function MyComponent_ul_0_li_1_div_1_Template_div_click_0_listener($event){
-            $i0$.ɵɵrestoreView($s$);
+          const $s$ = $i0$.ΔgetCurrentView();
+          $i0$.ΔelementStart(0, "div", $c2$);
+          $i0$.Δlistener("click", function MyComponent_ul_0_li_1_div_1_Template_div_click_0_listener($event){
+            $i0$.ΔrestoreView($s$);
             const $inner$ = ctx.$implicit;
-            const $middle$ = $i0$.ɵɵnextContext().$implicit;
-            const $outer$ = $i0$.ɵɵnextContext().$implicit;
-            const $myComp$ = $i0$.ɵɵnextContext();
+            const $middle$ = $i0$.ΔnextContext().$implicit;
+            const $outer$ = $i0$.ΔnextContext().$implicit;
+            const $myComp$ = $i0$.ΔnextContext();
             return $myComp$.onClick($outer$, $middle$, $inner$);
           });
-          $i0$.ɵɵtext(1);
-          $i0$.ɵɵelementEnd();
+          $i0$.Δtext(1);
+          $i0$.ΔelementEnd();
         }
 
         if (rf & 2) {
           const $inner1$ = ctx.$implicit;
-          const $middle1$ = $i0$.ɵɵnextContext().$implicit;
-          const $outer1$ = $i0$.ɵɵnextContext().$implicit;
-          const $myComp1$ = $i0$.ɵɵnextContext();
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("title", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component));
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation1(" ", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component), " "));
+          const $middle1$ = $i0$.ΔnextContext().$implicit;
+          const $outer1$ = $i0$.ΔnextContext().$implicit;
+          const $myComp1$ = $i0$.ΔnextContext();
+          $i0$.Δselect(0);
+          $i0$.Δproperty("title", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component));
+          $r3$.Δselect(1);
+          $i0$.ΔtextBinding(1, $i0$.Δinterpolation1(" ", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component), " "));
         }
       }
 
       function MyComponent_ul_0_li_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "li");
-          $i0$.ɵɵtemplate(1, MyComponent_ul_0_li_1_div_1_Template, 2, 2, "div", $c1$);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "li");
+          $i0$.Δtemplate(1, MyComponent_ul_0_li_1_div_1_Template, 2, 2, "div", $c1$);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
-          const $myComp2$ = $i0$.ɵɵnextContext(2);
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵproperty("ngForOf", $myComp2$.items);
+          const $myComp2$ = $i0$.ΔnextContext(2);
+          $r3$.Δselect(1);
+          $i0$.Δproperty("ngForOf", $myComp2$.items);
         }
       }
 
       function MyComponent_ul_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "ul");
-          $i0$.ɵɵtemplate(1, MyComponent_ul_0_li_1_Template, 2, 1, "li", $c0$);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "ul");
+          $i0$.Δtemplate(1, MyComponent_ul_0_li_1_Template, 2, 1, "li", $c0$);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
           const $outer2$ = ctx.$implicit;
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵproperty("ngForOf", $outer2$.items);
+          $r3$.Δselect(1);
+          $i0$.Δproperty("ngForOf", $outer2$.items);
         }
       }
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_ul_0_Template, 2, 1, "ul", $c0$);
+          $i0$.Δtemplate(0, MyComponent_ul_0_Template, 2, 1, "ul", $c0$);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("ngForOf", ctx.items);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -152,26 +152,26 @@ describe('compiler compliance: template', () => {
 
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            const $s$ = $r3$.ɵɵgetCurrentView();
-            $r3$.ɵɵelementStart(0, "div", $e_attrs$);
-            $r3$.ɵɵlistener("click", function MyComponent_div_0_Template_div_click_0_listener($event) {
-              $r3$.ɵɵrestoreView($s$);
+            const $s$ = $r3$.ΔgetCurrentView();
+            $r3$.ΔelementStart(0, "div", $e_attrs$);
+            $r3$.Δlistener("click", function MyComponent_div_0_Template_div_click_0_listener($event) {
+              $r3$.ΔrestoreView($s$);
               const $d$ = ctx.$implicit;
               const $i$ = ctx.index;
-              const $comp$ = $r3$.ɵɵnextContext();
+              const $comp$ = $r3$.ΔnextContext();
               return $comp$._handleClick($d$, $i$);
             });
-            $r3$.ɵɵelementEnd();
+            $r3$.ΔelementEnd();
           }
         }
         // ...
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $t0_attrs$);
+            $r3$.Δtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $t0_attrs$);
           }
           if (rf & 2) {
-            $r3$.ɵɵselect(0);
-            $r3$.ɵɵproperty("ngForOf", ctx._data);
+            $r3$.Δselect(0);
+            $r3$.Δproperty("ngForOf", ctx._data);
           }
         }
         `;
@@ -207,25 +207,25 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_span_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "span");
-          $i0$.ɵɵtext(1);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "span");
+          $i0$.Δtext(1);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
           const $item$ = ctx.$implicit;
           const $i$ = ctx.index;
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $i$, " - ", $item$, " "));
+          $r3$.Δselect(1);
+          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $i$, " - ", $item$, " "));
         }
       }
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_span_0_Template, 2, 2, "span", _c0);
+          $i0$.Δtemplate(0, MyComponent_span_0_Template, 2, 2, "span", _c0);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("ngForOf", ctx.items);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -263,40 +263,40 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_div_0_span_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "span");
-          $i0$.ɵɵtext(1);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "span");
+          $i0$.Δtext(1);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
-          const $div$ = $i0$.ɵɵnextContext();
+          const $div$ = $i0$.ΔnextContext();
           const $i$ = $div$.index;
           const $item$ = $div$.$implicit;
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $i$, " - ", $item$, " "));
+          $r3$.Δselect(1);
+          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $i$, " - ", $item$, " "));
         }
       }
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "div");
-          $i0$.ɵɵtemplate(1, MyComponent_div_0_span_1_Template, 2, 2, "span", $c1$);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "div");
+          $i0$.Δtemplate(1, MyComponent_div_0_span_1_Template, 2, 2, "span", $c1$);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
-          const $app$ = $i0$.ɵɵnextContext();
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵproperty("ngIf", $app$.showing);
+          const $app$ = $i0$.ΔnextContext();
+          $r3$.Δselect(1);
+          $i0$.Δproperty("ngIf", $app$.showing);
         }
       }
 
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
+          $i0$.Δtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("ngForOf", ctx.items);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -335,51 +335,51 @@ describe('compiler compliance: template', () => {
       const $c0$ = [${AttributeMarker.Template}, "ngFor", "ngForOf"];
       function MyComponent_div_0_div_1_div_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "div");
-          $i0$.ɵɵtext(1);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "div");
+          $i0$.Δtext(1);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
-          const $middle$ = $i0$.ɵɵnextContext().$implicit;
-          const $myComp$ = $i0$.ɵɵnextContext(2);
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $middle$.value, " - ", $myComp$.name, " "));
+          const $middle$ = $i0$.ΔnextContext().$implicit;
+          const $myComp$ = $i0$.ΔnextContext(2);
+          $r3$.Δselect(1);
+          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $middle$.value, " - ", $myComp$.name, " "));
         }
       }
 
       function MyComponent_div_0_div_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "div");
-          $i0$.ɵɵtemplate(1, MyComponent_div_0_div_1_div_1_Template, 2, 2, "div", $c0$);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "div");
+          $i0$.Δtemplate(1, MyComponent_div_0_div_1_div_1_Template, 2, 2, "div", $c0$);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
           const $middle$ = ctx.$implicit;
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵproperty("ngForOf", $middle$.items);
+          $r3$.Δselect(1);
+          $i0$.Δproperty("ngForOf", $middle$.items);
         }
       }
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelementStart(0, "div");
-          $i0$.ɵɵtemplate(1, MyComponent_div_0_div_1_Template, 2, 1, "div", $c0$);
-          $i0$.ɵɵelementEnd();
+          $i0$.ΔelementStart(0, "div");
+          $i0$.Δtemplate(1, MyComponent_div_0_div_1_Template, 2, 1, "div", $c0$);
+          $i0$.ΔelementEnd();
         }
         if (rf & 2) {
           const $outer$ = ctx.$implicit;
-          $r3$.ɵɵselect(1);
-          $i0$.ɵɵproperty("ngForOf", $outer$.items);
+          $r3$.Δselect(1);
+          $i0$.Δproperty("ngForOf", $outer$.items);
         }
       }
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
+          $i0$.Δtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("ngForOf", ctx.items);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -414,7 +414,7 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_ng_template_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵtext(0, " some-content ");
+          $i0$.Δtext(0, " some-content ");
         }
       }
 
@@ -422,11 +422,11 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $c0$);
+          $i0$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $c0$);
         }
         if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("boundAttr", ctx.b);
+          $i0$.Δselect(0);
+          $i0$.Δproperty("boundAttr", ctx.b);
         }
       }`;
 
@@ -459,7 +459,7 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_ng_template_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵtext(0, "some-content");
+          $i0$.Δtext(0, "some-content");
         }
       }
 
@@ -467,7 +467,7 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", null, $t0_refs$, $i0$.ɵɵtemplateRefExtractor);
+          $i0$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", null, $t0_refs$, $i0$.ΔtemplateRefExtractor);
         }
       }`;
 
@@ -504,8 +504,8 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $t0_attrs$);
-          $i0$.ɵɵlistener("outDirective", function MyComponent_Template_ng_template_outDirective_0_listener($event) { return $event.doSth(); });
+          $i0$.Δtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $t0_attrs$);
+          $i0$.Δlistener("outDirective", function MyComponent_Template_ng_template_outDirective_0_listener($event) { return $event.doSth(); });
         }
       }`;
 
@@ -607,7 +607,7 @@ describe('compiler compliance: template', () => {
           export class AComponent {
             show = true;
           }
-          
+
           @Component({
             selector: 'b-component',
             template: \`
@@ -705,7 +705,7 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵelement(0, "div");
+          $i0$.Δelement(0, "div");
         }
       }
 
@@ -713,11 +713,11 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0$);
-          $i0$.ɵɵpipe(1, "pipe");
+          $i0$.Δtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0$);
+          $i0$.Δpipe(1, "pipe");
         } if (rf & 2) {
-          $i0$.ɵɵselect(0);
-          $i0$.ɵɵproperty("ngIf", $i0$.ɵɵpipeBind1(1, 1, ctx.val));
+          $i0$.Δselect(0);
+          $i0$.Δproperty("ngIf", $i0$.ΔpipeBind1(1, 1, ctx.val));
         }
       }`;
 
diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts
index 665bd37c98..cee9296932 100644
--- a/packages/compiler-cli/test/ngc_spec.ts
+++ b/packages/compiler-cli/test/ngc_spec.ts
@@ -2113,7 +2113,7 @@ describe('ngc transformer command-line', () => {
         })
         export class Service {}
       `);
-      expect(source).toMatch(/ngInjectableDef = .+\.ɵɵdefineInjectable\(/);
+      expect(source).toMatch(/ngInjectableDef = .+\.ΔdefineInjectable\(/);
       expect(source).toMatch(/ngInjectableDef.*token: Service/);
       expect(source).toMatch(/ngInjectableDef.*providedIn: .+\.Module/);
     });
@@ -2169,7 +2169,7 @@ describe('ngc transformer command-line', () => {
         })
         export class Service {}
       `);
-      expect(source).toMatch(/ngInjectableDef.*return ..\.ɵɵinject\(Existing\)/);
+      expect(source).toMatch(/ngInjectableDef.*return ..\.Δinject\(Existing\)/);
     });
 
     it('compiles a useFactory InjectableDef with optional dep', () => {
@@ -2189,7 +2189,7 @@ describe('ngc transformer command-line', () => {
           constructor(e: Existing|null) {}
         }
       `);
-      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.ɵɵinject\(Existing, 8\)/);
+      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.Δinject\(Existing, 8\)/);
     });
 
     it('compiles a useFactory InjectableDef with skip-self dep', () => {
@@ -2209,7 +2209,7 @@ describe('ngc transformer command-line', () => {
           constructor(e: Existing) {}
         }
       `);
-      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.ɵɵinject\(Existing, 4\)/);
+      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.Δinject\(Existing, 4\)/);
     });
 
     it('compiles a service that depends on a token', () => {
@@ -2226,7 +2226,7 @@ describe('ngc transformer command-line', () => {
           constructor(@Inject(TOKEN) value: boolean) {}
         }
       `);
-      expect(source).toMatch(/ngInjectableDef = .+\.ɵɵdefineInjectable\(/);
+      expect(source).toMatch(/ngInjectableDef = .+\.ΔdefineInjectable\(/);
       expect(source).toMatch(/ngInjectableDef.*token: Service/);
       expect(source).toMatch(/ngInjectableDef.*providedIn: .+\.Module/);
     });
@@ -2253,7 +2253,7 @@ describe('ngc transformer command-line', () => {
           constructor(@Inject(TOKEN) token: any) {}
         }
       `);
-      expect(source).toMatch(/new Service\(i0\.ɵɵinject\(exports\.TOKEN\)\);/);
+      expect(source).toMatch(/new Service\(i0\.Δinject\(exports\.TOKEN\)\);/);
     });
   });
 
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index 3e5fc4eba6..e4f66a272c 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -62,9 +62,9 @@ export function forwardRef<T>(fn: () => T): T {
 
 export interface SimpleChanges { [propName: string]: any; }
 
-export type ɵɵNgModuleDefWithMeta<ModuleT, DeclarationsT, ImportsT, ExportsT> = any;
-export type ɵɵDirectiveDefWithMeta<DirT, SelectorT, ExportAsT, InputsT, OutputsT, QueriesT> = any;
-export type ɵɵPipeDefWithMeta<PipeT, NameT> = any;
+export type ΔNgModuleDefWithMeta<ModuleT, DeclarationsT, ImportsT, ExportsT> = any;
+export type ΔDirectiveDefWithMeta<DirT, SelectorT, ExportAsT, InputsT, OutputsT, QueriesT> = any;
+export type ΔPipeDefWithMeta<PipeT, NameT> = any;
 
 export enum ViewEncapsulation {
   Emulated = 0,
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index f9fd964068..d57d117494 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -18,13 +18,12 @@ const varRegExp = (name: string): RegExp => new RegExp(`var \\w+ = \\[\"${name}\
 
 const viewQueryRegExp = (descend: boolean, ref?: string): RegExp => {
   const maybeRef = ref ? `${ref}` : `null`;
-  return new RegExp(`i0\\.\u0275\u0275viewQuery\\(\\w+, ${descend}, ${maybeRef}\\)`);
+  return new RegExp(`i0\\.ΔviewQuery\\(\\w+, ${descend}, ${maybeRef}\\)`);
 };
 
 const contentQueryRegExp = (predicate: string, descend: boolean, ref?: string): RegExp => {
   const maybeRef = ref ? `${ref}` : `null`;
-  return new RegExp(
-      `i0\\.\u0275\u0275contentQuery\\(dirIndex, ${predicate}, ${descend}, ${maybeRef}\\)`);
+  return new RegExp(`i0\\.ΔcontentQuery\\(dirIndex, ${predicate}, ${descend}, ${maybeRef}\\)`);
 };
 
 const setClassMetadataRegExp = (expectedType: string): RegExp =>
@@ -57,8 +56,8 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('Service.ngInjectableDef =');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Dep>;');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Dep>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
   });
 
   it('should compile Injectables with a generic service', () => {
@@ -76,8 +75,7 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents).toContain('Store.ngInjectableDef =');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents)
-        .toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Store<any>>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Store<any>>;');
   });
 
   it('should compile Injectables with providedIn without errors', () => {
@@ -101,12 +99,11 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('Dep.ngInjectableDef =');
     expect(jsContents).toContain('Service.ngInjectableDef =');
     expect(jsContents)
-        .toContain(
-            'return new (t || Service)(i0.\u0275\u0275inject(Dep)); }, providedIn: \'root\' });');
+        .toContain('return new (t || Service)(i0.Δinject(Dep)); }, providedIn: \'root\' });');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Dep>;');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Dep>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
   });
 
   it('should compile Injectables with providedIn and factory without errors', () => {
@@ -131,7 +128,7 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('return r; }, providedIn: \'root\' });');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
   });
 
   it('should compile Injectables with providedIn and factory with deps without errors', () => {
@@ -154,14 +151,13 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents).toContain('Service.ngInjectableDef =');
     expect(jsContents).toContain('factory: function Service_Factory(t) { var r = null; if (t) {');
-    expect(jsContents).toContain('(r = new t(i0.\u0275\u0275inject(Dep)));');
+    expect(jsContents).toContain('(r = new t(i0.Δinject(Dep)));');
     expect(jsContents)
-        .toContain(
-            '(r = (function (dep) { return new Service(dep); })(i0.\u0275\u0275inject(Dep)));');
+        .toContain('(r = (function (dep) { return new Service(dep); })(i0.Δinject(Dep)));');
     expect(jsContents).toContain('return r; }, providedIn: \'root\' });');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
   });
 
   it('should compile @Injectable with an @Optional dependency', () => {
@@ -197,13 +193,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.\u0275\u0275defineComponent');
+    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ΔdefineComponent');
     expect(jsContents).not.toContain('__decorate');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
   });
 
   it('should compile Components (dynamic inline template) without errors', () => {
@@ -221,13 +217,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.\u0275\u0275defineComponent');
+    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ΔdefineComponent');
     expect(jsContents).not.toContain('__decorate');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
   });
 
   it('should compile Components (function call inline template) without errors', () => {
@@ -248,13 +244,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.\u0275\u0275defineComponent');
+    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ΔdefineComponent');
     expect(jsContents).not.toContain('__decorate');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
   });
 
   it('should compile Components (external template) without errors', () => {
@@ -355,14 +351,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestBase.ngBaseDef = i0.\u0275\u0275defineBase');
-    expect(jsContents).toContain('TestComponent.ngComponentDef = i0.\u0275\u0275defineComponent');
-    expect(jsContents).toContain('TestDirective.ngDirectiveDef = i0.\u0275\u0275defineDirective');
-    expect(jsContents).toContain('TestPipe.ngPipeDef = i0.\u0275\u0275definePipe');
-    expect(jsContents)
-        .toContain('TestInjectable.ngInjectableDef = i0.\u0275\u0275defineInjectable');
-    expect(jsContents).toContain('MyModule.ngModuleDef = i0.\u0275\u0275defineNgModule');
-    expect(jsContents).toContain('MyModule.ngInjectorDef = i0.\u0275\u0275defineInjector');
+    expect(jsContents).toContain('TestBase.ngBaseDef = i0.ΔdefineBase');
+    expect(jsContents).toContain('TestComponent.ngComponentDef = i0.ΔdefineComponent');
+    expect(jsContents).toContain('TestDirective.ngDirectiveDef = i0.ΔdefineDirective');
+    expect(jsContents).toContain('TestPipe.ngPipeDef = i0.ΔdefinePipe');
+    expect(jsContents).toContain('TestInjectable.ngInjectableDef = i0.ΔdefineInjectable');
+    expect(jsContents).toContain('MyModule.ngModuleDef = i0.ΔdefineNgModule');
+    expect(jsContents).toContain('MyModule.ngInjectorDef = i0.ΔdefineInjector');
     expect(jsContents).toContain('inputs: { input: "input" }');
     expect(jsContents).toContain('outputs: { output: "output" }');
   });
@@ -447,42 +442,39 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
+    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule, bootstrap: [TestCmp] });');
     expect(jsContents)
-        .toContain('i0.\u0275\u0275defineNgModule({ type: TestModule, bootstrap: [TestCmp] });');
+        .toContain('/*@__PURE__*/ i0.ΔsetNgModuleScope(TestModule, { declarations: [TestCmp] });');
     expect(jsContents)
         .toContain(
-            '/*@__PURE__*/ i0.\u0275\u0275setNgModuleScope(TestModule, { declarations: [TestCmp] });');
-    expect(jsContents)
-        .toContain(
-            'i0.\u0275\u0275defineInjector({ factory: ' +
+            'i0.ΔdefineInjector({ factory: ' +
             'function TestModule_Factory(t) { return new (t || TestModule)(); } });');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], never, never>');
+            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], never, never>');
     expect(dtsContents).not.toContain('__decorate');
   });
 
-  it('should not emit a \u0275\u0275setNgModuleScope call when no scope metadata is present',
-     () => {
-       env.tsconfig();
-       env.write('test.ts', `
+  it('should not emit a ΔsetNgModuleScope call when no scope metadata is present', () => {
+    env.tsconfig();
+    env.write('test.ts', `
         import {NgModule} from '@angular/core';
 
         @NgModule({})
         export class TestModule {}
     `);
 
-       env.driveMain();
+    env.driveMain();
 
-       const jsContents = env.getContents('test.js');
-       expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
-       expect(jsContents).not.toContain('\u0275\u0275setNgModuleScope(TestModule,');
-     });
+    const jsContents = env.getContents('test.js');
+    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
+    expect(jsContents).not.toContain('ΔsetNgModuleScope(TestModule,');
+  });
 
   it('should emit the id when the module\'s id is a string', () => {
     env.tsconfig();
@@ -496,7 +488,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain(`i0.\u0275\u0275defineNgModule({ type: TestModule, id: 'test' })`);
+    expect(jsContents).toContain(`i0.ΔdefineNgModule({ type: TestModule, id: 'test' })`);
   });
 
   it('should emit the id when the module\'s id is defined as `module.id`', () => {
@@ -514,8 +506,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents)
-        .toContain('i0.\u0275\u0275defineNgModule({ type: TestModule, id: module.id })');
+    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule, id: module.id })');
   });
 
   it('should filter out directives and pipes from module exports in the injector def', () => {
@@ -556,15 +547,15 @@ describe('ngtsc behavioral tests', () => {
       export class Comp {}
     `);
     env.write('node_modules/@angular/router/index.d.ts', `
-      import {\u0275\u0275ComponentDefWithMeta, ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+      import {ΔComponentDefWithMeta, ModuleWithProviders, ΔNgModuleDefWithMeta} from '@angular/core';
 
       export declare class RouterComp {
-        static ngComponentDef: \u0275\u0275ComponentDefWithMeta<RouterComp, "lib-cmp", never, {}, {}, never>
+        static ngComponentDef: ΔComponentDefWithMeta<RouterComp, "lib-cmp", never, {}, {}, never>
       }
 
       declare class RouterModule {
         static forRoot(): ModuleWithProviders<RouterModule>;
-        static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, [typeof RouterComp], never, [typeof RouterComp]>;
+        static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, [typeof RouterComp], never, [typeof RouterComp]>;
       }
     `);
 
@@ -573,7 +564,7 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents)
         .toContain(
-            'i0.\u0275\u0275defineInjector({ factory: function TestModule_Factory(t) ' +
+            'i0.ΔdefineInjector({ factory: function TestModule_Factory(t) ' +
             '{ return new (t || TestModule)(); }, imports: [[OtherModule, RouterModule.forRoot()],' +
             '\n            OtherModule,\n            RouterModule] });');
   });
@@ -605,18 +596,18 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
+    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
     expect(jsContents)
         .toContain(
-            `TestModule.ngInjectorDef = i0.\u0275\u0275defineInjector({ factory: ` +
+            `TestModule.ngInjectorDef = i0.ΔdefineInjector({ factory: ` +
             `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
             `Token, useValue: 'test' }], imports: [[OtherModule]] });`);
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
-    expect(dtsContents).toContain('static ngInjectorDef: i0.\u0275\u0275InjectorDef');
+            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.ΔInjectorDef');
   });
 
   it('should compile NgModules with factory providers without errors', () => {
@@ -646,18 +637,18 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
+    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
     expect(jsContents)
         .toContain(
-            `TestModule.ngInjectorDef = i0.\u0275\u0275defineInjector({ factory: ` +
+            `TestModule.ngInjectorDef = i0.ΔdefineInjector({ factory: ` +
             `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
             `Token, useFactory: function () { return new Token(); } }], imports: [[OtherModule]] });`);
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
-    expect(dtsContents).toContain('static ngInjectorDef: i0.\u0275\u0275InjectorDef');
+            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.ΔInjectorDef');
   });
 
   it('should compile NgModules with factory providers and deps without errors', () => {
@@ -691,18 +682,18 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
+    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
     expect(jsContents)
         .toContain(
-            `TestModule.ngInjectorDef = i0.\u0275\u0275defineInjector({ factory: ` +
+            `TestModule.ngInjectorDef = i0.ΔdefineInjector({ factory: ` +
             `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
             `Token, useFactory: function (dep) { return new Token(dep); }, deps: [Dep] }], imports: [[OtherModule]] });`);
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
-    expect(dtsContents).toContain('static ngInjectorDef: i0.\u0275\u0275InjectorDef');
+            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.ΔInjectorDef');
   });
 
   it('should compile NgModules with references to local components', () => {
@@ -863,10 +854,9 @@ describe('ngtsc behavioral tests', () => {
 
     expect(jsContents)
         .toContain(
-            'TestPipe.ngPipeDef = i0.\u0275\u0275definePipe({ name: "test-pipe", type: TestPipe, ' +
+            'TestPipe.ngPipeDef = i0.ΔdefinePipe({ name: "test-pipe", type: TestPipe, ' +
             'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: false })');
-    expect(dtsContents)
-        .toContain('static ngPipeDef: i0.\u0275\u0275PipeDefWithMeta<TestPipe, "test-pipe">;');
+    expect(dtsContents).toContain('static ngPipeDef: i0.ΔPipeDefWithMeta<TestPipe, "test-pipe">;');
   });
 
   it('should compile pure Pipes without errors', () => {
@@ -887,10 +877,9 @@ describe('ngtsc behavioral tests', () => {
 
     expect(jsContents)
         .toContain(
-            'TestPipe.ngPipeDef = i0.\u0275\u0275definePipe({ name: "test-pipe", type: TestPipe, ' +
+            'TestPipe.ngPipeDef = i0.ΔdefinePipe({ name: "test-pipe", type: TestPipe, ' +
             'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: true })');
-    expect(dtsContents)
-        .toContain('static ngPipeDef: i0.\u0275\u0275PipeDefWithMeta<TestPipe, "test-pipe">;');
+    expect(dtsContents).toContain('static ngPipeDef: i0.ΔPipeDefWithMeta<TestPipe, "test-pipe">;');
   });
 
   it('should compile Pipes with dependencies', () => {
@@ -912,8 +901,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents)
-        .toContain('return new (t || TestPipe)(i0.\u0275\u0275directiveInject(Dep));');
+    expect(jsContents).toContain('return new (t || TestPipe)(i0.ΔdirectiveInject(Dep));');
   });
 
   it('should compile Pipes with generic types', () => {
@@ -933,7 +921,7 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('TestPipe.ngPipeDef =');
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
-        .toContain('static ngPipeDef: i0.\u0275\u0275PipeDefWithMeta<TestPipe<any>, "test-pipe">;');
+        .toContain('static ngPipeDef: i0.ΔPipeDefWithMeta<TestPipe<any>, "test-pipe">;');
   });
 
   it('should include @Pipes in @NgModule scopes', () => {
@@ -959,7 +947,7 @@ describe('ngtsc behavioral tests', () => {
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestPipe, typeof TestCmp], never, never>');
+            'i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestPipe, typeof TestCmp], never, never>');
   });
 
   describe('empty and missing selectors', () => {
@@ -1074,7 +1062,7 @@ describe('ngtsc behavioral tests', () => {
       expect(dtsContents).toContain('ComponentDefWithMeta<TestCmp');
       expect(dtsContents).toContain('DirectiveDefWithMeta<TestDir');
       expect(dtsContents).toContain('PipeDefWithMeta<TestPipe');
-      expect(dtsContents).toContain('\u0275\u0275NgModuleDefWithMeta<TestNgModule');
+      expect(dtsContents).toContain('ΔNgModuleDefWithMeta<TestNgModule');
 
       // Validate that each class's .d.ts declaration also has an injectable definition.
       expect(dtsContents).toContain('InjectableDef<TestCmp');
@@ -1299,7 +1287,7 @@ describe('ngtsc behavioral tests', () => {
       `);
 
       env.driveMain();
-      expect(env.getContents('test.js')).toContain('i0.\u0275\u0275pureFunction1');
+      expect(env.getContents('test.js')).toContain('i0.ΔpureFunction1');
     });
 
     it('should compile array literals inside function arguments', () => {
@@ -1321,7 +1309,7 @@ describe('ngtsc behavioral tests', () => {
       `);
 
       env.driveMain();
-      expect(env.getContents('test.js')).toContain('i0.\u0275\u0275pureFunction1');
+      expect(env.getContents('test.js')).toContain('i0.ΔpureFunction1');
     });
   });
 
@@ -1337,11 +1325,11 @@ describe('ngtsc behavioral tests', () => {
     `);
 
       env.write('node_modules/router/index.d.ts', `
-        import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ModuleWithProviders, ΔNgModuleDefWithMeta} from '@angular/core';
 
         declare class RouterModule {
           static forRoot(): ModuleWithProviders<RouterModule>;
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
         }
     `);
 
@@ -1353,8 +1341,7 @@ describe('ngtsc behavioral tests', () => {
       const dtsContents = env.getContents('test.d.ts');
       expect(dtsContents).toContain(`import * as i1 from "router";`);
       expect(dtsContents)
-          .toContain(
-              'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
+          .toContain('i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
     });
 
     it('should extract the generic type if it is provided as qualified type name', () => {
@@ -1379,9 +1366,9 @@ describe('ngtsc behavioral tests', () => {
     `);
 
       env.write('node_modules/router/internal.d.ts', `
-        import {\u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔNgModuleDefWithMeta} from '@angular/core';
         export declare class InternalRouterModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<InternalRouterModule, never, never, never>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<InternalRouterModule, never, never, never>;
         }
     `);
 
@@ -1394,18 +1381,18 @@ describe('ngtsc behavioral tests', () => {
       expect(dtsContents).toContain(`import * as i1 from "router";`);
       expect(dtsContents)
           .toContain(
-              'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.InternalRouterModule], never>');
+              'i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.InternalRouterModule], never>');
     });
 
     it('should not reference a constant with a ModuleWithProviders value in ngModuleDef imports',
        () => {
          env.tsconfig();
          env.write('dep.d.ts', `
-          import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta as \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+          import {ModuleWithProviders, ΔNgModuleDefWithMeta as ΔNgModuleDefWithMeta} from '@angular/core';
 
           export declare class DepModule {
             static forRoot(arg1: any, arg2: any): ModuleWithProviders<DepModule>;
-            static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<DepModule, never, never, never>;
+            static ngModuleDef: ΔNgModuleDefWithMeta<DepModule, never, never, never>;
           }
         `);
          env.write('test.ts', `
@@ -1440,13 +1427,13 @@ describe('ngtsc behavioral tests', () => {
   `);
 
        env.write('node_modules/router/index.d.ts', `
-      import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+      import {ModuleWithProviders, ΔNgModuleDefWithMeta} from '@angular/core';
 
       export interface MyType extends ModuleWithProviders {}
 
       declare class RouterModule {
         static forRoot(): (MyType)&{ngModule:RouterModule};
-        static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
+        static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
       }
   `);
 
@@ -1459,7 +1446,7 @@ describe('ngtsc behavioral tests', () => {
        expect(dtsContents).toContain(`import * as i1 from "router";`);
        expect(dtsContents)
            .toContain(
-               'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
+               'i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
      });
 
   it('should unwrap a namespace imported ModuleWithProviders function if a generic type is provided for it',
@@ -1479,7 +1466,7 @@ describe('ngtsc behavioral tests', () => {
 
         declare class RouterModule {
           static forRoot(): core.ModuleWithProviders<RouterModule>;
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
         }
     `);
 
@@ -1492,7 +1479,7 @@ describe('ngtsc behavioral tests', () => {
        expect(dtsContents).toContain(`import * as i1 from "router";`);
        expect(dtsContents)
            .toContain(
-               'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
+               'i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
      });
 
   it('should inject special types according to the metadata', () => {
@@ -1530,7 +1517,7 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents)
         .toContain(
-            `factory: function FooCmp_Factory(t) { return new (t || FooCmp)(i0.\u0275\u0275injectAttribute("test"), i0.\u0275\u0275directiveInject(i0.ChangeDetectorRef), i0.\u0275\u0275directiveInject(i0.ElementRef), i0.\u0275\u0275directiveInject(i0.Injector), i0.\u0275\u0275directiveInject(i0.Renderer2), i0.\u0275\u0275directiveInject(i0.TemplateRef), i0.\u0275\u0275directiveInject(i0.ViewContainerRef)); }`);
+            `factory: function FooCmp_Factory(t) { return new (t || FooCmp)(i0.ΔinjectAttribute("test"), i0.ΔdirectiveInject(i0.ChangeDetectorRef), i0.ΔdirectiveInject(i0.ElementRef), i0.ΔdirectiveInject(i0.Injector), i0.ΔdirectiveInject(i0.Renderer2), i0.ΔdirectiveInject(i0.TemplateRef), i0.ΔdirectiveInject(i0.ViewContainerRef)); }`);
   });
 
   it('should generate queries for components', () => {
@@ -1560,9 +1547,9 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toMatch(varRegExp('test1'));
     expect(jsContents).toMatch(varRegExp('test2'));
     expect(jsContents).toMatch(varRegExp('accessor'));
-    // match `i0.\u0275\u0275contentQuery(dirIndex, _c1, true, TemplateRef)`
+    // match `i0.ΔcontentQuery(dirIndex, _c1, true, TemplateRef)`
     expect(jsContents).toMatch(contentQueryRegExp('\\w+', true, 'TemplateRef'));
-    // match `i0.\u0275\u0275viewQuery(_c2, true, null)`
+    // match `i0.ΔviewQuery(_c2, true, null)`
     expect(jsContents).toMatch(viewQueryRegExp(true));
   });
 
@@ -1592,10 +1579,10 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toMatch(varRegExp('test1'));
     expect(jsContents).toMatch(varRegExp('test2'));
     expect(jsContents).toMatch(varRegExp('accessor'));
-    // match `i0.\u0275\u0275contentQuery(dirIndex, _c1, true, TemplateRef)`
+    // match `i0.ΔcontentQuery(dirIndex, _c1, true, TemplateRef)`
     expect(jsContents).toMatch(contentQueryRegExp('\\w+', true, 'TemplateRef'));
 
-    // match `i0.\u0275\u0275viewQuery(_c2, true, null)`
+    // match `i0.ΔviewQuery(_c2, true, null)`
     // Note that while ViewQuery doesn't necessarily make sense on a directive, because it doesn't
     // have a view, we still need to handle it because a component could extend the directive.
     expect(jsContents).toMatch(viewQueryRegExp(true));
@@ -1621,11 +1608,11 @@ describe('ngtsc behavioral tests', () => {
 
     env.driveMain();
     const jsContents = env.getContents('test.js');
-    // match `i0.\u0275\u0275contentQuery(dirIndex, TemplateRef, true, null)`
+    // match `i0.ΔcontentQuery(dirIndex, TemplateRef, true, null)`
     expect(jsContents).toMatch(contentQueryRegExp('TemplateRef', true));
-    // match `i0.\u0275\u0275contentQuery(dirIndex, ViewContainerRef, true, null)`
+    // match `i0.ΔcontentQuery(dirIndex, ViewContainerRef, true, null)`
     expect(jsContents).toMatch(contentQueryRegExp('ViewContainerRef', true));
-    // match `i0.\u0275\u0275contentQuery(dirIndex, _c0, true, null)`
+    // match `i0.ΔcontentQuery(dirIndex, _c0, true, null)`
     expect(jsContents).toContain('_c0 = ["parens"];');
     expect(jsContents).toMatch(contentQueryRegExp('_c0', true));
   });
@@ -1675,9 +1662,9 @@ describe('ngtsc behavioral tests', () => {
     const hostBindingsFn = `
       hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick(); });
-          i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onDocumentClick($event.target); }, false, i0.\u0275\u0275resolveDocument);
-          i0.\u0275\u0275listener("scroll", function FooCmp_scroll_HostBindingHandler($event) { return ctx.onWindowScroll(); }, false, i0.\u0275\u0275resolveWindow);
+          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick(); });
+          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onDocumentClick($event.target); }, false, i0.ΔresolveDocument);
+          i0.Δlistener("scroll", function FooCmp_scroll_HostBindingHandler($event) { return ctx.onWindowScroll(); }, false, i0.ΔresolveWindow);
         }
       }
     `;
@@ -1773,17 +1760,17 @@ describe('ngtsc behavioral tests', () => {
     const hostBindingsFn = `
       hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          i0.\u0275\u0275allocHostVars(2);
-          i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick($event); });
-          i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onBodyClick($event); }, false, i0.\u0275\u0275resolveBody);
-          i0.\u0275\u0275listener("change", function FooCmp_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg1, ctx.arg2, ctx.arg3); });
-          i0.\u0275\u0275styling(_c0);
+          i0.ΔallocHostVars(2);
+          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick($event); });
+          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onBodyClick($event); }, false, i0.ΔresolveBody);
+          i0.Δlistener("change", function FooCmp_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg1, ctx.arg2, ctx.arg3); });
+          i0.Δstyling(_c0);
         }
         if (rf & 2) {
-          i0.\u0275\u0275elementAttribute(elIndex, "hello", i0.\u0275\u0275bind(ctx.foo));
-          i0.\u0275\u0275property("prop", ctx.bar, null, true);
-          i0.\u0275\u0275classProp(0, ctx.someClass);
-          i0.\u0275\u0275stylingApply();
+          i0.ΔelementAttribute(elIndex, "hello", i0.Δbind(ctx.foo));
+          i0.Δproperty("prop", ctx.bar, null, true);
+          i0.ΔclassProp(0, ctx.someClass);
+          i0.ΔstylingApply();
         }
       }
     `;
@@ -1812,7 +1799,7 @@ describe('ngtsc behavioral tests', () => {
     `);
     env.driveMain();
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.\u0275\u0275elementHostAttrs(["test", test])');
+    expect(jsContents).toContain('i0.ΔelementHostAttrs(["test", test])');
   });
 
   it('should accept enum values as host bindings', () => {
@@ -1837,7 +1824,7 @@ describe('ngtsc behavioral tests', () => {
     `);
 
     env.driveMain();
-    expect(env.getContents('test.js')).toContain('"hello", i0.\u0275\u0275bind(ctx.foo)');
+    expect(env.getContents('test.js')).toContain('"hello", i0.Δbind(ctx.foo)');
   });
 
   it('should generate host listeners for directives within hostBindings section', () => {
@@ -1859,7 +1846,7 @@ describe('ngtsc behavioral tests', () => {
     const hostBindingsFn = `
       hostBindings: function Dir_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          i0.\u0275\u0275listener("change", function Dir_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg); });
+          i0.Δlistener("change", function Dir_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg); });
         }
       }
     `;
@@ -2054,7 +2041,7 @@ describe('ngtsc behavioral tests', () => {
     `);
     env.driveMain();
     const jsContents = env.getContents('test.js');
-    expect(jsContents).not.toContain('i0.\u0275\u0275elementProperty');
+    expect(jsContents).not.toContain('i0.ΔelementProperty');
   });
 
   it('should correctly recognize local symbols', () => {
@@ -2309,10 +2296,8 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
 
     expect(jsContents)
-        .toContain(
-            'function Base_Factory(t) { return new (t || Base)(i0.\u0275\u0275inject(Dep)); }');
-    expect(jsContents)
-        .toContain('var \u0275Child_BaseFactory = i0.\u0275\u0275getInheritedFactory(Child)');
+        .toContain('function Base_Factory(t) { return new (t || Base)(i0.Δinject(Dep)); }');
+    expect(jsContents).toContain('var \u0275Child_BaseFactory = i0.ΔgetInheritedFactory(Child)');
     expect(jsContents)
         .toContain('function Child_Factory(t) { return \u0275Child_BaseFactory((t || Child)); }');
     expect(jsContents)
@@ -2337,8 +2322,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
     const jsContents = env.getContents('test.js');
 
-    expect(jsContents)
-        .toContain('var \u0275Dir_BaseFactory = i0.\u0275\u0275getInheritedFactory(Dir)');
+    expect(jsContents).toContain('var \u0275Dir_BaseFactory = i0.ΔgetInheritedFactory(Dir)');
   });
 
   it('should wrap "directives" in component metadata in a closure when forward references are present',
@@ -2479,8 +2463,8 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = trim(env.getContents('test.js'));
     expect(jsContents).toContain(`import Default from './types';`);
     expect(jsContents).toContain(`import * as i1 from "./types";`);
-    expect(jsContents).toContain('i0.\u0275\u0275directiveInject(Default)');
-    expect(jsContents).toContain('i0.\u0275\u0275directiveInject(i1.Other)');
+    expect(jsContents).toContain('i0.ΔdirectiveInject(Default)');
+    expect(jsContents).toContain('i0.ΔdirectiveInject(i1.Other)');
     expect(jsContents).toMatch(setClassMetadataRegExp('type: Default'));
     expect(jsContents).toMatch(setClassMetadataRegExp('type: i1.Other'));
   });
@@ -2591,8 +2575,8 @@ describe('ngtsc behavioral tests', () => {
       const jsContents = env.getContents('test.js');
       expect(jsContents)
           .toMatch(
-              /i\d\.\u0275\u0275setComponentScope\(NormalComponent,\s+\[NormalComponent,\s+CyclicComponent\],\s+\[\]\)/);
-      expect(jsContents).not.toContain('/*__PURE__*/ i0.\u0275\u0275setComponentScope');
+              /i\d\.ΔsetComponentScope\(NormalComponent,\s+\[NormalComponent,\s+CyclicComponent\],\s+\[\]\)/);
+      expect(jsContents).not.toContain('/*__PURE__*/ i0.ΔsetComponentScope');
     });
 
     it('should detect a cycle added entirely during compilation', () => {
@@ -2783,14 +2767,14 @@ describe('ngtsc behavioral tests', () => {
     it('should not emit multiple references to the same directive', () => {
       env.tsconfig();
       env.write('node_modules/external/index.d.ts', `
-        import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class ExternalModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
         }
       `);
       env.write('test.ts', `
@@ -2819,19 +2803,19 @@ describe('ngtsc behavioral tests', () => {
     it('should import directives by their external name', () => {
       env.tsconfig();
       env.write('node_modules/external/index.d.ts', `
-        import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
         import {InternalDir} from './internal';
 
         export {InternalDir as ExternalDir} from './internal';
 
         export declare class ExternalModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof InternalDir], never, [typeof InternalDir]>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof InternalDir], never, [typeof InternalDir]>;
         }
       `);
       env.write('node_modules/external/internal.d.ts', `
 
         export declare class InternalDir {
-          static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<InternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ΔDirectiveDefWithMeta<InternalDir, '[test]', never, never, never, never>;
         }
       `);
       env.write('test.ts', `
@@ -3040,14 +3024,14 @@ describe('ngtsc behavioral tests', () => {
         export class Module {}
       `);
       env.write('node_modules/external/index.d.ts', `
-        import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class ExternalModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
         }
       `);
 
@@ -3227,15 +3211,15 @@ describe('ngtsc behavioral tests', () => {
       const hostBindingsFn = `
         hostBindings: function UnsafeAttrsDirective_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            i0.\u0275\u0275allocHostVars(6);
+            i0.ΔallocHostVars(6);
           }
           if (rf & 2) {
-            i0.\u0275\u0275elementAttribute(elIndex, "href", i0.\u0275\u0275bind(ctx.attrHref), i0.\u0275\u0275sanitizeUrlOrResourceUrl);
-            i0.\u0275\u0275elementAttribute(elIndex, "src", i0.\u0275\u0275bind(ctx.attrSrc), i0.\u0275\u0275sanitizeUrlOrResourceUrl);
-            i0.\u0275\u0275elementAttribute(elIndex, "action", i0.\u0275\u0275bind(ctx.attrAction), i0.\u0275\u0275sanitizeUrl);
-            i0.\u0275\u0275elementAttribute(elIndex, "profile", i0.\u0275\u0275bind(ctx.attrProfile), i0.\u0275\u0275sanitizeResourceUrl);
-            i0.\u0275\u0275elementAttribute(elIndex, "innerHTML", i0.\u0275\u0275bind(ctx.attrInnerHTML), i0.\u0275\u0275sanitizeHtml);
-            i0.\u0275\u0275elementAttribute(elIndex, "title", i0.\u0275\u0275bind(ctx.attrSafeTitle));
+            i0.ΔelementAttribute(elIndex, "href", i0.Δbind(ctx.attrHref), i0.ΔsanitizeUrlOrResourceUrl);
+            i0.ΔelementAttribute(elIndex, "src", i0.Δbind(ctx.attrSrc), i0.ΔsanitizeUrlOrResourceUrl);
+            i0.ΔelementAttribute(elIndex, "action", i0.Δbind(ctx.attrAction), i0.ΔsanitizeUrl);
+            i0.ΔelementAttribute(elIndex, "profile", i0.Δbind(ctx.attrProfile), i0.ΔsanitizeResourceUrl);
+            i0.ΔelementAttribute(elIndex, "innerHTML", i0.Δbind(ctx.attrInnerHTML), i0.ΔsanitizeHtml);
+            i0.ΔelementAttribute(elIndex, "title", i0.Δbind(ctx.attrSafeTitle));
           }
         }
       `;
@@ -3282,15 +3266,15 @@ describe('ngtsc behavioral tests', () => {
       const hostBindingsFn = `
         hostBindings: function UnsafePropsDirective_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            i0.\u0275\u0275allocHostVars(6);
+            i0.ΔallocHostVars(6);
           }
           if (rf & 2) {
-            i0.\u0275\u0275property("href", ctx.propHref, i0.\u0275\u0275sanitizeUrlOrResourceUrl, true);
-            i0.\u0275\u0275property("src", ctx.propSrc, i0.\u0275\u0275sanitizeUrlOrResourceUrl, true);
-            i0.\u0275\u0275property("action", ctx.propAction, i0.\u0275\u0275sanitizeUrl, true);
-            i0.\u0275\u0275property("profile", ctx.propProfile, i0.\u0275\u0275sanitizeResourceUrl, true);
-            i0.\u0275\u0275property("innerHTML", ctx.propInnerHTML, i0.\u0275\u0275sanitizeHtml, true);
-            i0.\u0275\u0275property("title", ctx.propSafeTitle, null, true);
+            i0.Δproperty("href", ctx.propHref, i0.ΔsanitizeUrlOrResourceUrl, true);
+            i0.Δproperty("src", ctx.propSrc, i0.ΔsanitizeUrlOrResourceUrl, true);
+            i0.Δproperty("action", ctx.propAction, i0.ΔsanitizeUrl, true);
+            i0.Δproperty("profile", ctx.propProfile, i0.ΔsanitizeResourceUrl, true);
+            i0.Δproperty("innerHTML", ctx.propInnerHTML, i0.ΔsanitizeHtml, true);
+            i0.Δproperty("title", ctx.propSafeTitle, null, true);
           }
         }
       `;
@@ -3322,15 +3306,15 @@ describe('ngtsc behavioral tests', () => {
       const hostBindingsFn = `
         hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            i0.\u0275\u0275allocHostVars(6);
+            i0.ΔallocHostVars(6);
           }
           if (rf & 2) {
-            i0.\u0275\u0275property("src", ctx.srcProp, null, true);
-            i0.\u0275\u0275property("href", ctx.hrefProp, null, true);
-            i0.\u0275\u0275property("title", ctx.titleProp, null, true);
-            i0.\u0275\u0275elementAttribute(elIndex, "src", i0.\u0275\u0275bind(ctx.srcAttr));
-            i0.\u0275\u0275elementAttribute(elIndex, "href", i0.\u0275\u0275bind(ctx.hrefAttr));
-            i0.\u0275\u0275elementAttribute(elIndex, "title", i0.\u0275\u0275bind(ctx.titleAttr));
+            i0.Δproperty("src", ctx.srcProp, null, true);
+            i0.Δproperty("href", ctx.hrefProp, null, true);
+            i0.Δproperty("title", ctx.titleProp, null, true);
+            i0.ΔelementAttribute(elIndex, "src", i0.Δbind(ctx.srcAttr));
+            i0.ΔelementAttribute(elIndex, "href", i0.Δbind(ctx.hrefAttr));
+            i0.ΔelementAttribute(elIndex, "title", i0.Δbind(ctx.titleAttr));
           }
         }
       `;
@@ -3360,13 +3344,13 @@ describe('ngtsc behavioral tests', () => {
     beforeEach(() => {
       env.tsconfig();
       env.write('node_modules/@angular/router/index.d.ts', `
-        import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta as \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ModuleWithProviders, ΔNgModuleDefWithMeta as ΔNgModuleDefWithMeta} from '@angular/core';
 
         export declare var ROUTES;
         export declare class RouterModule {
           static forRoot(arg1: any, arg2: any): ModuleWithProviders<RouterModule>;
           static forChild(arg1: any): ModuleWithProviders<RouterModule>;
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
         }
       `);
     });
@@ -3996,24 +3980,24 @@ export const Foo = Foo__PRE_R3__;
 
       // 'alpha' declares the directive which will ultimately be imported.
       env.write('alpha.d.ts', `
-        import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class AlphaModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<AlphaModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<AlphaModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
         }
       `);
 
       // 'beta' re-exports AlphaModule from alpha.
       env.write('beta.d.ts', `
-        import {\u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔNgModuleDefWithMeta} from '@angular/core';
         import {AlphaModule} from './alpha';
 
         export declare class BetaModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<AlphaModule, never, never, [typeof AlphaModule]>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<AlphaModule, never, never, [typeof AlphaModule]>;
         }
       `);
 
@@ -4045,26 +4029,26 @@ export const Foo = Foo__PRE_R3__;
     it('should write alias ES2015 exports for NgModule exported directives', () => {
       env.tsconfig({'_useHostForImportGeneration': true});
       env.write('external.d.ts', `
-        import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
         import {LibModule} from './lib';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class ExternalModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir, typeof LibModule]>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir, typeof LibModule]>;
         }
       `);
       env.write('lib.d.ts', `
-        import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
+        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
 
         export declare class LibDir {
-          static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<LibDir, '[lib]', never, never, never, never>;
+          static ngDirectiveDef: ΔDirectiveDefWithMeta<LibDir, '[lib]', never, never, never, never>;
         }
 
         export declare class LibModule {
-          static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<LibModule, [typeof LibDir], never, [typeof LibDir]>;
+          static ngModuleDef: ΔNgModuleDefWithMeta<LibModule, [typeof LibDir], never, [typeof LibDir]>;
         }
       `);
       env.write('foo.ts', `
diff --git a/packages/compiler-cli/test/ngtsc/scope_spec.ts b/packages/compiler-cli/test/ngtsc/scope_spec.ts
index 10127f9947..5ea177671f 100644
--- a/packages/compiler-cli/test/ngtsc/scope_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/scope_spec.ts
@@ -36,15 +36,15 @@ describe('ngtsc module scopes', () => {
         env.driveMain();
 
         const jsContents = env.getContents('test.js');
-        expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
+        expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
         expect(jsContents)
             .toContain(
-                '/*@__PURE__*/ i0.ɵɵsetNgModuleScope(TestModule, { imports: [OtherModule] });');
+                '/*@__PURE__*/ i0.ΔsetNgModuleScope(TestModule, { imports: [OtherModule] });');
 
         const dtsContents = env.getContents('test.d.ts');
         expect(dtsContents)
             .toContain(
-                'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, never, [typeof OtherModule], never>');
+                'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof OtherModule], never>');
       });
 
       it('should produce an error when an invalid class is imported', () => {
@@ -98,15 +98,15 @@ describe('ngtsc module scopes', () => {
         env.driveMain();
 
         const jsContents = env.getContents('test.js');
-        expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
+        expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
         expect(jsContents)
             .toContain(
-                '/*@__PURE__*/ i0.ɵɵsetNgModuleScope(TestModule, { exports: [OtherModule] });');
+                '/*@__PURE__*/ i0.ΔsetNgModuleScope(TestModule, { exports: [OtherModule] });');
 
         const dtsContents = env.getContents('test.d.ts');
         expect(dtsContents)
             .toContain(
-                'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, never, never, [typeof OtherModule]>');
+                'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, never, never, [typeof OtherModule]>');
       });
 
       it('should produce an error when a non-NgModule class is exported', () => {
diff --git a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
index ed1d6cee85..1fb37030bf 100644
--- a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
@@ -23,17 +23,17 @@ describe('template source-mapping', () => {
       it('should map simple element with content', () => {
         const mappings = compileAndMap('<h1>Heading 1</h1>');
         expect(mappings).toContain(
-            {source: '<h1>', generated: 'i0.ɵɵelementStart(0, "h1")', sourceUrl: '../test.ts'});
+            {source: '<h1>', generated: 'i0.ΔelementStart(0, "h1")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: 'Heading 1', generated: 'i0.ɵɵtext(1, "Heading 1")', sourceUrl: '../test.ts'});
+            {source: 'Heading 1', generated: 'i0.Δtext(1, "Heading 1")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</h1>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h1>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map void element', () => {
         const mappings = compileAndMap('<hr>');
         expect(mappings).toContain(
-            {source: '<hr>', generated: 'i0.ɵɵelement(0, "hr")', sourceUrl: '../test.ts'});
+            {source: '<hr>', generated: 'i0.Δelement(0, "hr")', sourceUrl: '../test.ts'});
       });
     });
 
@@ -41,40 +41,40 @@ describe('template source-mapping', () => {
       it('should map a mix of interpolated and static content', () => {
         const mappings = compileAndMap('<h3>Hello {{ name }}</h3>');
         expect(mappings).toContain(
-            {source: '<h3>', generated: 'i0.ɵɵelementStart(0, "h3")', sourceUrl: '../test.ts'});
+            {source: '<h3>', generated: 'i0.ΔelementStart(0, "h3")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: 'Hello {{ name }}',
-          generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("Hello ", ctx.name, ""))',
+          generated: 'i0.ΔtextBinding(1, i0.Δinterpolation1("Hello ", ctx.name, ""))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</h3>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h3>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a complex interpolated expression', () => {
         const mappings = compileAndMap('<h2>{{ greeting + " " + name }}</h2>');
         expect(mappings).toContain(
-            {source: '<h2>', generated: 'i0.ɵɵelementStart(0, "h2")', sourceUrl: '../test.ts'});
+            {source: '<h2>', generated: 'i0.ΔelementStart(0, "h2")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '{{ greeting + " " + name }}',
           generated:
-              'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ((ctx.greeting + " ") + ctx.name), ""))',
+              'i0.ΔtextBinding(1, i0.Δinterpolation1("", ((ctx.greeting + " ") + ctx.name), ""))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</h2>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h2>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map interpolated properties', () => {
         const mappings = compileAndMap('<div id="{{name}}"></div>');
         expect(mappings).toContain({
           source: '<div id="{{name}}"></div>',
-          generated: 'i0.ɵɵelement(0, "div", _c0)',
+          generated: 'i0.Δelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: 'id="{{name}}"',
-          generated: 'i0.ɵɵpropertyInterpolate("id", ctx.name)',
+          generated: 'i0.ΔpropertyInterpolate("id", ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -82,15 +82,15 @@ describe('template source-mapping', () => {
       it('should map interpolation with pipe', () => {
         const mappings = compileAndMap('<div>{{200.3 | percent : 2 }}</div>');
         expect(mappings).toContain(
-            {source: '<div>', generated: 'i0.ɵɵelementStart(0, "div")', sourceUrl: '../test.ts'});
+            {source: '<div>', generated: 'i0.ΔelementStart(0, "div")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '{{200.3 | percent : 2 }}',
           generated:
-              'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", i0.ɵɵpipeBind2(2, 1, 200.3, 2), ""))',
+              'i0.ΔtextBinding(1, i0.Δinterpolation1("", i0.ΔpipeBind2(2, 1, 200.3, 2), ""))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
     });
 
@@ -99,12 +99,12 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<div [attr]="name"></div>');
         expect(mappings).toContain({
           source: '<div [attr]="name"></div>',
-          generated: 'i0.ɵɵelement(0, "div", _c0)',
+          generated: 'i0.Δelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '[attr]="name"',
-          generated: 'i0.ɵɵproperty("attr", ctx.name)',
+          generated: 'i0.Δproperty("attr", ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -114,12 +114,12 @@ describe('template source-mapping', () => {
 
         expect(mappings).toContain({
           source: '<div [attr]="greeting + name"></div>',
-          generated: 'i0.ɵɵelement(0, "div", _c0)',
+          generated: 'i0.Δelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '[attr]="greeting + name"',
-          generated: 'i0.ɵɵproperty("attr", (ctx.greeting + ctx.name))',
+          generated: 'i0.Δproperty("attr", (ctx.greeting + ctx.name))',
           sourceUrl: '../test.ts'
         });
       });
@@ -128,12 +128,12 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<div bind-attr="name"></div>');
         expect(mappings).toContain({
           source: '<div bind-attr="name"></div>',
-          generated: 'i0.ɵɵelement(0, "div", _c0)',
+          generated: 'i0.Δelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: 'bind-attr="name"',
-          generated: 'i0.ɵɵproperty("attr", ctx.name)',
+          generated: 'i0.Δproperty("attr", ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -142,15 +142,15 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<button (click)="doSomething()">Do it</button>');
         expect(mappings).toContain({
           source: '<button (click)="doSomething()">',
-          generated: 'i0.ɵɵelementStart(0, "button", _c0)',
+          generated: 'i0.ΔelementStart(0, "button", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: 'Do it', generated: 'i0.ɵɵtext(1, "Do it")', sourceUrl: '../test.ts'});
+            {source: 'Do it', generated: 'i0.Δtext(1, "Do it")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: 'doSomething()', generated: 'ctx.doSomething()', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</button>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</button>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a complex output binding expression', () => {
@@ -158,11 +158,11 @@ describe('template source-mapping', () => {
             compileAndMap(`<button (click)="items.push('item' + items.length)">Add Item</button>`);
         expect(mappings).toContain({
           source: `<button (click)="items.push('item' + items.length)">`,
-          generated: 'i0.ɵɵelementStart(0, "button", _c0)',
+          generated: 'i0.ΔelementStart(0, "button", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: 'Add Item', generated: 'i0.ɵɵtext(1, "Add Item")', sourceUrl: '../test.ts'});
+            {source: 'Add Item', generated: 'i0.Δtext(1, "Add Item")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: 'items.push(', generated: 'ctx.items.push((', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
@@ -173,41 +173,41 @@ describe('template source-mapping', () => {
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</button>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</button>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a longhand output binding expression', () => {
         const mappings = compileAndMap('<button on-click="doSomething()">Do it</button>');
         expect(mappings).toContain({
           source: '<button on-click="doSomething()">',
-          generated: 'i0.ɵɵelementStart(0, "button", _c0)',
+          generated: 'i0.ΔelementStart(0, "button", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: 'Do it', generated: 'i0.ɵɵtext(1, "Do it")', sourceUrl: '../test.ts'});
+            {source: 'Do it', generated: 'i0.Δtext(1, "Do it")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: 'doSomething()', generated: 'ctx.doSomething()', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</button>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</button>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a two-way binding expression', () => {
         const mappings = compileAndMap('Name: <input [(ngModel)]="name">');
         expect(mappings).toContain({
           source: '<input [(ngModel)]="name">',
-          generated: 'i0.ɵɵelementStart(1, "input", _c0)',
+          generated: 'i0.ΔelementStart(1, "input", _c0)',
           sourceUrl: '../test.ts'
         });
         // TODO: improve mappings here
         expect(mappings).toContain({
           source: '[(ngModel)]="name"',
           generated:
-              'i0.ɵɵlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
+              'i0.Δlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '<input [(ngModel)]="name">',
-          generated: 'i0.ɵɵelementEnd()',
+          generated: 'i0.ΔelementEnd()',
           sourceUrl: '../test.ts'
         });
       });
@@ -216,19 +216,19 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('Name: <input bindon-ngModel="name">');
         expect(mappings).toContain({
           source: '<input bindon-ngModel="name">',
-          generated: 'i0.ɵɵelementStart(1, "input", _c0)',
+          generated: 'i0.ΔelementStart(1, "input", _c0)',
           sourceUrl: '../test.ts'
         });
         // TODO: improve mappings here
         expect(mappings).toContain({
           source: 'bindon-ngModel="name"',
           generated:
-              'i0.ɵɵlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
+              'i0.Δlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '<input bindon-ngModel="name">',
-          generated: 'i0.ɵɵelementEnd()',
+          generated: 'i0.ΔelementEnd()',
           sourceUrl: '../test.ts'
         });
       });
@@ -237,17 +237,17 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<div [class.initial]="isInitial">Message</div>');
         expect(mappings).toContain({
           source: '<div [class.initial]="isInitial">',
-          generated: 'i0.ɵɵelementStart(0, "div")',
+          generated: 'i0.ΔelementStart(0, "div")',
           sourceUrl: '../test.ts'
         });
 
         // TODO: Add better mappings for binding
 
         expect(mappings).toContain(
-            {source: 'Message', generated: 'i0.ɵɵtext(1, "Message")', sourceUrl: '../test.ts'});
+            {source: 'Message', generated: 'i0.Δtext(1, "Message")', sourceUrl: '../test.ts'});
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
     });
 
@@ -257,20 +257,20 @@ describe('template source-mapping', () => {
 
         expect(mappings).toContain({
           source: '<div *ngIf="showMessage()">',
-          generated: 'i0.ɵɵelementStart(0, "div")',
+          generated: 'i0.ΔelementStart(0, "div")',
           sourceUrl: '../test.ts'
         });
 
         // TODO - map the bindings better
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
 
         // TODO: the `ctx_r...` appears to be dependent upon previous tests!!!
 
         // expect(mappings).toContain({
         //   source: '{{ name }}',
-        //   generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx_r0.name, ""))',
+        //   generated: 'i0.ΔtextBinding(1, i0.Δinterpolation1("", ctx_r0.name, ""))',
         //   sourceUrl: '../test.ts'
         // });
       });
@@ -283,18 +283,18 @@ describe('template source-mapping', () => {
             `</ng-template>`);
 
         expect(mappings).toContain(
-            {source: '<div>', generated: 'i0.ɵɵelementStart(0, "div")', sourceUrl: '../test.ts'});
+            {source: '<div>', generated: 'i0.ΔelementStart(0, "div")', sourceUrl: '../test.ts'});
 
         // TODO - map the bindings better
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
 
         // TODO: the `ctx_r...` appears to be dependent upon previous tests!!!
 
         // expect(mappings).toContain({
         //   source: '{{ name }}',
-        //   generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx_r0.name, ""))',
+        //   generated: 'i0.ΔtextBinding(1, i0.Δinterpolation1("", ctx_r0.name, ""))',
         //   sourceUrl: '../test.ts'
         // });
       });
@@ -305,14 +305,14 @@ describe('template source-mapping', () => {
 
         expect(mappings).toContain({
           source: '<div *ngFor="let item of items; index as i; trackBy: trackByFn">',
-          generated: 'i0.ɵɵelementStart(0, "div")',
+          generated: 'i0.ΔelementStart(0, "div")',
           sourceUrl: '../test.ts'
         });
 
         // TODO - map the bindings better
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
 
       });
 
@@ -331,20 +331,20 @@ describe('template source-mapping', () => {
             `<div><ng-content></ng-content></div>`);
 
         expect(mappings).toContain(
-            {source: '<h3>', generated: 'i0.ɵɵelementStart(0, "h3")', sourceUrl: '../test.ts'});
+            {source: '<h3>', generated: 'i0.ΔelementStart(0, "h3")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '<ng-content select="title">',
-          generated: 'i0.ɵɵprojection(1, 1)',
+          generated: 'i0.Δprojection(1, 1)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</h3>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h3>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '<div>', generated: 'i0.ɵɵelementStart(2, "div")', sourceUrl: '../test.ts'});
+            {source: '<div>', generated: 'i0.ΔelementStart(2, "div")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '<ng-content>', generated: 'i0.ɵɵprojection(3)', sourceUrl: '../test.ts'});
+            {source: '<ng-content>', generated: 'i0.Δprojection(3)', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
       });
     });
 
@@ -353,24 +353,24 @@ describe('template source-mapping', () => {
 
       // Creation mode
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain({
-        generated: 'i0.ɵɵtext(1, "this is a test")',
+        generated: 'i0.Δtext(1, "this is a test")',
         source: 'this is a test',
         sourceUrl: '../test.ts'
       });
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
+          {generated: 'i0.Δtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
 
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", (1 + 2), ""))',
+        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -381,24 +381,24 @@ describe('template source-mapping', () => {
 
       // Creation mode
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain({
-        generated: 'i0.ɵɵtext(1, "this is a test")',
+        generated: 'i0.Δtext(1, "this is a test")',
         source: 'this is a test',
         sourceUrl: '../test.ts'
       });
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
+          {generated: 'i0.Δtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
 
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", (1 + 2), ""))',
+        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -410,7 +410,7 @@ describe('template source-mapping', () => {
          const mappings = compileAndMap('<div class=\\"some-class\\">this is a test</div>');
 
          expect(mappings).toContain({
-           generated: 'i0.ɵɵelementStart(0, "div", _c0)',
+           generated: 'i0.ΔelementStart(0, "div", _c0)',
            source: '<div class=\\"some-class\\">',
            sourceUrl: '../test.ts'
          });
@@ -429,30 +429,30 @@ describe('template source-mapping', () => {
 
         // Creation mode
         expect(mappings).toContain({
-          generated: 'i0.ɵɵelementStart(0, "div")',
+          generated: 'i0.ΔelementStart(0, "div")',
           source: '<div>',
           sourceUrl: '../dir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ɵɵtext(1, "this is a test")',
+          generated: 'i0.Δtext(1, "this is a test")',
           source: 'this is a test',
           sourceUrl: '../dir/test.html'
         });
         expect(mappings).toContain(
-            {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
+            {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
         expect(mappings).toContain({
-          generated: 'i0.ɵɵelementStart(2, "div")',
+          generated: 'i0.ΔelementStart(2, "div")',
           source: '<div>',
           sourceUrl: '../dir/test.html'
         });
         expect(mappings).toContain(
-            {generated: 'i0.ɵɵtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../dir/test.html'});
+            {generated: 'i0.Δtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../dir/test.html'});
         expect(mappings).toContain(
-            {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
+            {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", (1 + 2), ""))',
+          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../dir/test.html'
         });
@@ -464,39 +464,39 @@ describe('template source-mapping', () => {
 
         // Creation mode
         expect(mappings).toContain({
-          generated: 'i0.ɵɵelementStart(0, "div")',
+          generated: 'i0.ΔelementStart(0, "div")',
           source: '<div>',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ɵɵtext(1, "this is a test")',
+          generated: 'i0.Δtext(1, "this is a test")',
           source: 'this is a test',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ɵɵelementEnd()',
+          generated: 'i0.ΔelementEnd()',
           source: '</div>',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ɵɵelementStart(2, "div")',
+          generated: 'i0.ΔelementStart(2, "div")',
           source: '<div>',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ɵɵtext(3)',
+          generated: 'i0.Δtext(3)',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ɵɵelementEnd()',
+          generated: 'i0.ΔelementEnd()',
           source: '</div>',
           sourceUrl: '../extraRootDir/test.html'
         });
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", (1 + 2), ""))',
+          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../extraRootDir/test.html'
         });
diff --git a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
index e4f86e318d..00fc2b5e57 100644
--- a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
@@ -34,17 +34,17 @@ export declare class IndexPipe {
 export declare class NgForOf<T> {
   ngForOf: T[];
   static ngTemplateContextGuard<T>(dir: NgForOf<T>, ctx: any): ctx is NgForOfContext<T>;
-  static ngDirectiveDef: i0.ɵɵDirectiveDefWithMeta<NgForOf<any>, '[ngFor][ngForOf]', never, {'ngForOf': 'ngForOf'}, {}, never>;
+  static ngDirectiveDef: i0.ΔDirectiveDefWithMeta<NgForOf<any>, '[ngFor][ngForOf]', never, {'ngForOf': 'ngForOf'}, {}, never>;
 }
 
 export declare class NgIf {
   ngIf: any;
   static ngTemplateGuard_ngIf<E>(dir: NgIf, expr: E): expr is NonNullable<E>
-  static ngDirectiveDef: i0.ɵɵDirectiveDefWithMeta<NgForOf<any>, '[ngIf]', never, {'ngIf': 'ngIf'}, {}, never>;
+  static ngDirectiveDef: i0.ΔDirectiveDefWithMeta<NgForOf<any>, '[ngIf]', never, {'ngIf': 'ngIf'}, {}, never>;
 }
 
 export declare class CommonModule {
-  static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<CommonModule, [typeof NgIf, typeof NgForOf, typeof IndexPipe], never, [typeof NgIf, typeof NgForOf, typeof IndexPipe]>;
+  static ngModuleDef: i0.ΔNgModuleDefWithMeta<CommonModule, [typeof NgIf, typeof NgForOf, typeof IndexPipe], never, [typeof NgIf, typeof NgForOf, typeof IndexPipe]>;
 }
 `);
 }
diff --git a/packages/compiler/design/architecture.md b/packages/compiler/design/architecture.md
index 81591efb9b..6076110fde 100644
--- a/packages/compiler/design/architecture.md
+++ b/packages/compiler/design/architecture.md
@@ -81,18 +81,18 @@ In `ngtsc` this is instead emitted as,
 ```js
 const i0 = require("@angular/core");
 class GreetComponent {}
-GreetComponent.ngComponentDef = i0.ɵɵdefineComponent({
+GreetComponent.ngComponentDef = i0.ΔdefineComponent({
     type: GreetComponent,
     tag: 'greet',
     factory: () => new GreetComponent(),
     template: function (rf, ctx) {
         if (rf & RenderFlags.Create) {
-            i0.ɵɵelementStart(0, 'div');
-            i0.ɵɵtext(1);
-            i0.ɵɵelementEnd();
+            i0.ΔelementStart(0, 'div');
+            i0.Δtext(1);
+            i0.ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-            i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1('Hello ', ctx.name, '!'));
+            i0.ΔtextBinding(1, i0.Δinterpolation1('Hello ', ctx.name, '!'));
         }
     }
 });
diff --git a/packages/compiler/design/separate_compilation.md b/packages/compiler/design/separate_compilation.md
index 49fe89efcc..899d7a0ecc 100644
--- a/packages/compiler/design/separate_compilation.md
+++ b/packages/compiler/design/separate_compilation.md
@@ -161,7 +161,7 @@ export class MyComponent {
 ```js
 export class MyComponent {
   name: string;
-  static ngComponentDef = ɵɵdefineComponent({...});
+  static ngComponentDef = ΔdefineComponent({...});
 }
 ```
 
@@ -213,7 +213,7 @@ export class MyDirective {
   constructor() {
     this.dirId = 'some id';
   }
-  static ngDirectiveDef = ɵɵdefineDirective({...});
+  static ngDirectiveDef = ΔdefineDirective({...});
 }
 ```
 
@@ -256,7 +256,7 @@ export class MyPipe implements PipeTransform {
 ```js
 export class MyPipe {
   transform(...) ...
-  static ngPipeDef = ɵɵdefinePipe({...});
+  static ngPipeDef = ΔdefinePipe({...});
 }
 ```
 
@@ -329,7 +329,7 @@ export class MyModule {}
 *my.module.js*
 ```js
 export class MyModule {
-  static ngInjectorDef = ɵɵdefineInjector(...);
+  static ngInjectorDef = ΔdefineInjector(...);
 }
 ```
 
@@ -389,7 +389,7 @@ manually written as:
 
 ```ts
 export class MyModule {
-  static ngInjectorDef = ɵɵdefineInjector({
+  static ngInjectorDef = ΔdefineInjector({
     providers: [{
       provide: Service, useClass: ServiceImpl
     }],
@@ -411,7 +411,7 @@ export class MyModule {
 }
 ```
 
-except for the call to `ɵɵdefineInjector` would generate a `{ __symbolic: 'error' }`
+except for the call to `ΔdefineInjector` would generate a `{ __symbolic: 'error' }`
 value which is ignored by the ivy compiler. This allows the system to ignore
 the difference between manually and mechanically created module definitions.
 
@@ -440,7 +440,7 @@ properties by including a `// @__BUILD_OPTIMIZER_REMOVE_` comment:
 
 ```ts
 export class MyModule {
-  static ngInjectorDef = ɵɵdefineInjector({
+  static ngInjectorDef = ΔdefineInjector({
     providers: [{
       provide: Service, useClass: ServiceImpl
     }],
diff --git a/packages/compiler/src/identifiers.ts b/packages/compiler/src/identifiers.ts
index dd2b88f603..4978a6996e 100644
--- a/packages/compiler/src/identifiers.ts
+++ b/packages/compiler/src/identifiers.ts
@@ -62,11 +62,11 @@ export class Identifiers {
     moduleName: CORE,
 
   };
-  static inject: o.ExternalReference = {name: 'ɵɵinject', moduleName: CORE};
+  static inject: o.ExternalReference = {name: 'Δinject', moduleName: CORE};
   static INJECTOR: o.ExternalReference = {name: 'INJECTOR', moduleName: CORE};
   static Injector: o.ExternalReference = {name: 'Injector', moduleName: CORE};
-  static ɵɵdefineInjectable: o.ExternalReference = {name: 'ɵɵdefineInjectable', moduleName: CORE};
-  static InjectableDef: o.ExternalReference = {name: 'ɵɵInjectableDef', moduleName: CORE};
+  static ΔdefineInjectable: o.ExternalReference = {name: 'ΔdefineInjectable', moduleName: CORE};
+  static InjectableDef: o.ExternalReference = {name: 'ΔInjectableDef', moduleName: CORE};
   static ViewEncapsulation: o.ExternalReference = {
     name: 'ViewEncapsulation',
     moduleName: CORE,
diff --git a/packages/compiler/src/injectable_compiler.ts b/packages/compiler/src/injectable_compiler.ts
index d915800852..4e1291369e 100644
--- a/packages/compiler/src/injectable_compiler.ts
+++ b/packages/compiler/src/injectable_compiler.ts
@@ -116,7 +116,7 @@ export class InjectableCompiler {
       mapEntry('token', ctx.importExpr(injectable.type.reference)),
       mapEntry('providedIn', providedIn),
     ];
-    return o.importExpr(Identifiers.ɵɵdefineInjectable).callFn([o.literalMap(def)]);
+    return o.importExpr(Identifiers.ΔdefineInjectable).callFn([o.literalMap(def)]);
   }
 
   compile(injectable: CompileInjectableMetadata, ctx: OutputContext): void {
diff --git a/packages/compiler/src/injectable_compiler_2.ts b/packages/compiler/src/injectable_compiler_2.ts
index 068697f00a..6158b92a91 100644
--- a/packages/compiler/src/injectable_compiler_2.ts
+++ b/packages/compiler/src/injectable_compiler_2.ts
@@ -100,7 +100,7 @@ export function compileInjectable(meta: R3InjectableMetadata): InjectableDef {
   const token = meta.type;
   const providedIn = meta.providedIn;
 
-  const expression = o.importExpr(Identifiers.ɵɵdefineInjectable).callFn([mapToMapExpression(
+  const expression = o.importExpr(Identifiers.ΔdefineInjectable).callFn([mapToMapExpression(
       {token, factory: result.factory, providedIn})]);
   const type = new o.ExpressionType(o.importExpr(
       Identifiers.InjectableDef, [typeWithParameters(meta.type, meta.typeArgumentCount)]));
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index af400aa98c..fb9944cf36 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -17,237 +17,237 @@ export class Identifiers {
   static PATCH_DEPS = 'patchedDeps';
 
   /* Instructions */
-  static namespaceHTML: o.ExternalReference = {name: 'ɵɵnamespaceHTML', moduleName: CORE};
+  static namespaceHTML: o.ExternalReference = {name: 'ΔnamespaceHTML', moduleName: CORE};
 
-  static namespaceMathML: o.ExternalReference = {name: 'ɵɵnamespaceMathML', moduleName: CORE};
+  static namespaceMathML: o.ExternalReference = {name: 'ΔnamespaceMathML', moduleName: CORE};
 
-  static namespaceSVG: o.ExternalReference = {name: 'ɵɵnamespaceSVG', moduleName: CORE};
+  static namespaceSVG: o.ExternalReference = {name: 'ΔnamespaceSVG', moduleName: CORE};
 
-  static element: o.ExternalReference = {name: 'ɵɵelement', moduleName: CORE};
+  static element: o.ExternalReference = {name: 'Δelement', moduleName: CORE};
 
-  static elementStart: o.ExternalReference = {name: 'ɵɵelementStart', moduleName: CORE};
+  static elementStart: o.ExternalReference = {name: 'ΔelementStart', moduleName: CORE};
 
-  static elementEnd: o.ExternalReference = {name: 'ɵɵelementEnd', moduleName: CORE};
+  static elementEnd: o.ExternalReference = {name: 'ΔelementEnd', moduleName: CORE};
 
-  static elementProperty: o.ExternalReference = {name: 'ɵɵelementProperty', moduleName: CORE};
+  static elementProperty: o.ExternalReference = {name: 'ΔelementProperty', moduleName: CORE};
 
-  static select: o.ExternalReference = {name: 'ɵɵselect', moduleName: CORE};
+  static select: o.ExternalReference = {name: 'Δselect', moduleName: CORE};
 
   static componentHostSyntheticProperty:
-      o.ExternalReference = {name: 'ɵɵcomponentHostSyntheticProperty', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔcomponentHostSyntheticProperty', moduleName: CORE};
 
   static componentHostSyntheticListener:
-      o.ExternalReference = {name: 'ɵɵcomponentHostSyntheticListener', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔcomponentHostSyntheticListener', moduleName: CORE};
 
-  static elementAttribute: o.ExternalReference = {name: 'ɵɵelementAttribute', moduleName: CORE};
+  static elementAttribute: o.ExternalReference = {name: 'ΔelementAttribute', moduleName: CORE};
 
-  static classProp: o.ExternalReference = {name: 'ɵɵclassProp', moduleName: CORE};
+  static classProp: o.ExternalReference = {name: 'ΔclassProp', moduleName: CORE};
 
   static elementContainerStart:
-      o.ExternalReference = {name: 'ɵɵelementContainerStart', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔelementContainerStart', moduleName: CORE};
 
   static elementContainerEnd:
-      o.ExternalReference = {name: 'ɵɵelementContainerEnd', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔelementContainerEnd', moduleName: CORE};
 
-  static styling: o.ExternalReference = {name: 'ɵɵstyling', moduleName: CORE};
+  static styling: o.ExternalReference = {name: 'Δstyling', moduleName: CORE};
 
-  static styleMap: o.ExternalReference = {name: 'ɵɵstyleMap', moduleName: CORE};
+  static styleMap: o.ExternalReference = {name: 'ΔstyleMap', moduleName: CORE};
 
-  static classMap: o.ExternalReference = {name: 'ɵɵclassMap', moduleName: CORE};
+  static classMap: o.ExternalReference = {name: 'ΔclassMap', moduleName: CORE};
 
-  static styleProp: o.ExternalReference = {name: 'ɵɵstyleProp', moduleName: CORE};
+  static styleProp: o.ExternalReference = {name: 'ΔstyleProp', moduleName: CORE};
 
-  static stylingApply: o.ExternalReference = {name: 'ɵɵstylingApply', moduleName: CORE};
+  static stylingApply: o.ExternalReference = {name: 'ΔstylingApply', moduleName: CORE};
 
-  static elementHostAttrs: o.ExternalReference = {name: 'ɵɵelementHostAttrs', moduleName: CORE};
+  static elementHostAttrs: o.ExternalReference = {name: 'ΔelementHostAttrs', moduleName: CORE};
 
-  static containerCreate: o.ExternalReference = {name: 'ɵɵcontainer', moduleName: CORE};
+  static containerCreate: o.ExternalReference = {name: 'Δcontainer', moduleName: CORE};
 
-  static nextContext: o.ExternalReference = {name: 'ɵɵnextContext', moduleName: CORE};
+  static nextContext: o.ExternalReference = {name: 'ΔnextContext', moduleName: CORE};
 
-  static templateCreate: o.ExternalReference = {name: 'ɵɵtemplate', moduleName: CORE};
+  static templateCreate: o.ExternalReference = {name: 'Δtemplate', moduleName: CORE};
 
-  static text: o.ExternalReference = {name: 'ɵɵtext', moduleName: CORE};
+  static text: o.ExternalReference = {name: 'Δtext', moduleName: CORE};
 
-  static textBinding: o.ExternalReference = {name: 'ɵɵtextBinding', moduleName: CORE};
+  static textBinding: o.ExternalReference = {name: 'ΔtextBinding', moduleName: CORE};
 
-  static bind: o.ExternalReference = {name: 'ɵɵbind', moduleName: CORE};
+  static bind: o.ExternalReference = {name: 'Δbind', moduleName: CORE};
 
-  static enableBindings: o.ExternalReference = {name: 'ɵɵenableBindings', moduleName: CORE};
+  static enableBindings: o.ExternalReference = {name: 'ΔenableBindings', moduleName: CORE};
 
-  static disableBindings: o.ExternalReference = {name: 'ɵɵdisableBindings', moduleName: CORE};
+  static disableBindings: o.ExternalReference = {name: 'ΔdisableBindings', moduleName: CORE};
 
-  static allocHostVars: o.ExternalReference = {name: 'ɵɵallocHostVars', moduleName: CORE};
+  static allocHostVars: o.ExternalReference = {name: 'ΔallocHostVars', moduleName: CORE};
 
-  static getCurrentView: o.ExternalReference = {name: 'ɵɵgetCurrentView', moduleName: CORE};
+  static getCurrentView: o.ExternalReference = {name: 'ΔgetCurrentView', moduleName: CORE};
 
-  static restoreView: o.ExternalReference = {name: 'ɵɵrestoreView', moduleName: CORE};
+  static restoreView: o.ExternalReference = {name: 'ΔrestoreView', moduleName: CORE};
 
-  static interpolation1: o.ExternalReference = {name: 'ɵɵinterpolation1', moduleName: CORE};
-  static interpolation2: o.ExternalReference = {name: 'ɵɵinterpolation2', moduleName: CORE};
-  static interpolation3: o.ExternalReference = {name: 'ɵɵinterpolation3', moduleName: CORE};
-  static interpolation4: o.ExternalReference = {name: 'ɵɵinterpolation4', moduleName: CORE};
-  static interpolation5: o.ExternalReference = {name: 'ɵɵinterpolation5', moduleName: CORE};
-  static interpolation6: o.ExternalReference = {name: 'ɵɵinterpolation6', moduleName: CORE};
-  static interpolation7: o.ExternalReference = {name: 'ɵɵinterpolation7', moduleName: CORE};
-  static interpolation8: o.ExternalReference = {name: 'ɵɵinterpolation8', moduleName: CORE};
-  static interpolationV: o.ExternalReference = {name: 'ɵɵinterpolationV', moduleName: CORE};
+  static interpolation1: o.ExternalReference = {name: 'Δinterpolation1', moduleName: CORE};
+  static interpolation2: o.ExternalReference = {name: 'Δinterpolation2', moduleName: CORE};
+  static interpolation3: o.ExternalReference = {name: 'Δinterpolation3', moduleName: CORE};
+  static interpolation4: o.ExternalReference = {name: 'Δinterpolation4', moduleName: CORE};
+  static interpolation5: o.ExternalReference = {name: 'Δinterpolation5', moduleName: CORE};
+  static interpolation6: o.ExternalReference = {name: 'Δinterpolation6', moduleName: CORE};
+  static interpolation7: o.ExternalReference = {name: 'Δinterpolation7', moduleName: CORE};
+  static interpolation8: o.ExternalReference = {name: 'Δinterpolation8', moduleName: CORE};
+  static interpolationV: o.ExternalReference = {name: 'ΔinterpolationV', moduleName: CORE};
 
-  static pureFunction0: o.ExternalReference = {name: 'ɵɵpureFunction0', moduleName: CORE};
-  static pureFunction1: o.ExternalReference = {name: 'ɵɵpureFunction1', moduleName: CORE};
-  static pureFunction2: o.ExternalReference = {name: 'ɵɵpureFunction2', moduleName: CORE};
-  static pureFunction3: o.ExternalReference = {name: 'ɵɵpureFunction3', moduleName: CORE};
-  static pureFunction4: o.ExternalReference = {name: 'ɵɵpureFunction4', moduleName: CORE};
-  static pureFunction5: o.ExternalReference = {name: 'ɵɵpureFunction5', moduleName: CORE};
-  static pureFunction6: o.ExternalReference = {name: 'ɵɵpureFunction6', moduleName: CORE};
-  static pureFunction7: o.ExternalReference = {name: 'ɵɵpureFunction7', moduleName: CORE};
-  static pureFunction8: o.ExternalReference = {name: 'ɵɵpureFunction8', moduleName: CORE};
-  static pureFunctionV: o.ExternalReference = {name: 'ɵɵpureFunctionV', moduleName: CORE};
+  static pureFunction0: o.ExternalReference = {name: 'ΔpureFunction0', moduleName: CORE};
+  static pureFunction1: o.ExternalReference = {name: 'ΔpureFunction1', moduleName: CORE};
+  static pureFunction2: o.ExternalReference = {name: 'ΔpureFunction2', moduleName: CORE};
+  static pureFunction3: o.ExternalReference = {name: 'ΔpureFunction3', moduleName: CORE};
+  static pureFunction4: o.ExternalReference = {name: 'ΔpureFunction4', moduleName: CORE};
+  static pureFunction5: o.ExternalReference = {name: 'ΔpureFunction5', moduleName: CORE};
+  static pureFunction6: o.ExternalReference = {name: 'ΔpureFunction6', moduleName: CORE};
+  static pureFunction7: o.ExternalReference = {name: 'ΔpureFunction7', moduleName: CORE};
+  static pureFunction8: o.ExternalReference = {name: 'ΔpureFunction8', moduleName: CORE};
+  static pureFunctionV: o.ExternalReference = {name: 'ΔpureFunctionV', moduleName: CORE};
 
-  static pipeBind1: o.ExternalReference = {name: 'ɵɵpipeBind1', moduleName: CORE};
-  static pipeBind2: o.ExternalReference = {name: 'ɵɵpipeBind2', moduleName: CORE};
-  static pipeBind3: o.ExternalReference = {name: 'ɵɵpipeBind3', moduleName: CORE};
-  static pipeBind4: o.ExternalReference = {name: 'ɵɵpipeBind4', moduleName: CORE};
-  static pipeBindV: o.ExternalReference = {name: 'ɵɵpipeBindV', moduleName: CORE};
+  static pipeBind1: o.ExternalReference = {name: 'ΔpipeBind1', moduleName: CORE};
+  static pipeBind2: o.ExternalReference = {name: 'ΔpipeBind2', moduleName: CORE};
+  static pipeBind3: o.ExternalReference = {name: 'ΔpipeBind3', moduleName: CORE};
+  static pipeBind4: o.ExternalReference = {name: 'ΔpipeBind4', moduleName: CORE};
+  static pipeBindV: o.ExternalReference = {name: 'ΔpipeBindV', moduleName: CORE};
 
-  static property: o.ExternalReference = {name: 'ɵɵproperty', moduleName: CORE};
+  static property: o.ExternalReference = {name: 'Δproperty', moduleName: CORE};
 
   static propertyInterpolate:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate', moduleName: CORE};
   static propertyInterpolate1:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate1', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate1', moduleName: CORE};
   static propertyInterpolate2:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate2', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate2', moduleName: CORE};
   static propertyInterpolate3:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate3', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate3', moduleName: CORE};
   static propertyInterpolate4:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate4', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate4', moduleName: CORE};
   static propertyInterpolate5:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate5', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate5', moduleName: CORE};
   static propertyInterpolate6:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate6', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate6', moduleName: CORE};
   static propertyInterpolate7:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate7', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate7', moduleName: CORE};
   static propertyInterpolate8:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolate8', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolate8', moduleName: CORE};
   static propertyInterpolateV:
-      o.ExternalReference = {name: 'ɵɵpropertyInterpolateV', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔpropertyInterpolateV', moduleName: CORE};
 
-  static i18n: o.ExternalReference = {name: 'ɵɵi18n', moduleName: CORE};
-  static i18nAttributes: o.ExternalReference = {name: 'ɵɵi18nAttributes', moduleName: CORE};
-  static i18nExp: o.ExternalReference = {name: 'ɵɵi18nExp', moduleName: CORE};
-  static i18nStart: o.ExternalReference = {name: 'ɵɵi18nStart', moduleName: CORE};
-  static i18nEnd: o.ExternalReference = {name: 'ɵɵi18nEnd', moduleName: CORE};
-  static i18nApply: o.ExternalReference = {name: 'ɵɵi18nApply', moduleName: CORE};
-  static i18nPostprocess: o.ExternalReference = {name: 'ɵɵi18nPostprocess', moduleName: CORE};
-  static i18nLocalize: o.ExternalReference = {name: 'ɵɵi18nLocalize', moduleName: CORE};
+  static i18n: o.ExternalReference = {name: 'Δi18n', moduleName: CORE};
+  static i18nAttributes: o.ExternalReference = {name: 'Δi18nAttributes', moduleName: CORE};
+  static i18nExp: o.ExternalReference = {name: 'Δi18nExp', moduleName: CORE};
+  static i18nStart: o.ExternalReference = {name: 'Δi18nStart', moduleName: CORE};
+  static i18nEnd: o.ExternalReference = {name: 'Δi18nEnd', moduleName: CORE};
+  static i18nApply: o.ExternalReference = {name: 'Δi18nApply', moduleName: CORE};
+  static i18nPostprocess: o.ExternalReference = {name: 'Δi18nPostprocess', moduleName: CORE};
+  static i18nLocalize: o.ExternalReference = {name: 'Δi18nLocalize', moduleName: CORE};
 
-  static load: o.ExternalReference = {name: 'ɵɵload', moduleName: CORE};
+  static load: o.ExternalReference = {name: 'Δload', moduleName: CORE};
 
-  static pipe: o.ExternalReference = {name: 'ɵɵpipe', moduleName: CORE};
+  static pipe: o.ExternalReference = {name: 'Δpipe', moduleName: CORE};
 
-  static projection: o.ExternalReference = {name: 'ɵɵprojection', moduleName: CORE};
-  static projectionDef: o.ExternalReference = {name: 'ɵɵprojectionDef', moduleName: CORE};
+  static projection: o.ExternalReference = {name: 'Δprojection', moduleName: CORE};
+  static projectionDef: o.ExternalReference = {name: 'ΔprojectionDef', moduleName: CORE};
 
-  static reference: o.ExternalReference = {name: 'ɵɵreference', moduleName: CORE};
+  static reference: o.ExternalReference = {name: 'Δreference', moduleName: CORE};
 
-  static inject: o.ExternalReference = {name: 'ɵɵinject', moduleName: CORE};
+  static inject: o.ExternalReference = {name: 'Δinject', moduleName: CORE};
 
-  static injectAttribute: o.ExternalReference = {name: 'ɵɵinjectAttribute', moduleName: CORE};
+  static injectAttribute: o.ExternalReference = {name: 'ΔinjectAttribute', moduleName: CORE};
 
-  static directiveInject: o.ExternalReference = {name: 'ɵɵdirectiveInject', moduleName: CORE};
+  static directiveInject: o.ExternalReference = {name: 'ΔdirectiveInject', moduleName: CORE};
 
   static templateRefExtractor:
-      o.ExternalReference = {name: 'ɵɵtemplateRefExtractor', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔtemplateRefExtractor', moduleName: CORE};
 
-  static resolveWindow: o.ExternalReference = {name: 'ɵɵresolveWindow', moduleName: CORE};
-  static resolveDocument: o.ExternalReference = {name: 'ɵɵresolveDocument', moduleName: CORE};
-  static resolveBody: o.ExternalReference = {name: 'ɵɵresolveBody', moduleName: CORE};
+  static resolveWindow: o.ExternalReference = {name: 'ΔresolveWindow', moduleName: CORE};
+  static resolveDocument: o.ExternalReference = {name: 'ΔresolveDocument', moduleName: CORE};
+  static resolveBody: o.ExternalReference = {name: 'ΔresolveBody', moduleName: CORE};
 
-  static defineBase: o.ExternalReference = {name: 'ɵɵdefineBase', moduleName: CORE};
+  static defineBase: o.ExternalReference = {name: 'ΔdefineBase', moduleName: CORE};
 
   static BaseDef: o.ExternalReference = {
-    name: 'ɵɵBaseDef',
+    name: 'ΔBaseDef',
     moduleName: CORE,
   };
 
-  static defineComponent: o.ExternalReference = {name: 'ɵɵdefineComponent', moduleName: CORE};
+  static defineComponent: o.ExternalReference = {name: 'ΔdefineComponent', moduleName: CORE};
 
-  static setComponentScope: o.ExternalReference = {name: 'ɵɵsetComponentScope', moduleName: CORE};
+  static setComponentScope: o.ExternalReference = {name: 'ΔsetComponentScope', moduleName: CORE};
 
   static ComponentDefWithMeta: o.ExternalReference = {
-    name: 'ɵɵComponentDefWithMeta',
+    name: 'ΔComponentDefWithMeta',
     moduleName: CORE,
   };
 
   static defineDirective: o.ExternalReference = {
-    name: 'ɵɵdefineDirective',
+    name: 'ΔdefineDirective',
     moduleName: CORE,
   };
 
   static DirectiveDefWithMeta: o.ExternalReference = {
-    name: 'ɵɵDirectiveDefWithMeta',
+    name: 'ΔDirectiveDefWithMeta',
     moduleName: CORE,
   };
 
   static InjectorDef: o.ExternalReference = {
-    name: 'ɵɵInjectorDef',
+    name: 'ΔInjectorDef',
     moduleName: CORE,
   };
 
   static defineInjector: o.ExternalReference = {
-    name: 'ɵɵdefineInjector',
+    name: 'ΔdefineInjector',
     moduleName: CORE,
   };
 
   static NgModuleDefWithMeta: o.ExternalReference = {
-    name: 'ɵɵNgModuleDefWithMeta',
+    name: 'ΔNgModuleDefWithMeta',
     moduleName: CORE,
   };
 
-  static defineNgModule: o.ExternalReference = {name: 'ɵɵdefineNgModule', moduleName: CORE};
-  static setNgModuleScope: o.ExternalReference = {name: 'ɵɵsetNgModuleScope', moduleName: CORE};
+  static defineNgModule: o.ExternalReference = {name: 'ΔdefineNgModule', moduleName: CORE};
+  static setNgModuleScope: o.ExternalReference = {name: 'ΔsetNgModuleScope', moduleName: CORE};
 
-  static PipeDefWithMeta: o.ExternalReference = {name: 'ɵɵPipeDefWithMeta', moduleName: CORE};
+  static PipeDefWithMeta: o.ExternalReference = {name: 'ΔPipeDefWithMeta', moduleName: CORE};
 
-  static definePipe: o.ExternalReference = {name: 'ɵɵdefinePipe', moduleName: CORE};
+  static definePipe: o.ExternalReference = {name: 'ΔdefinePipe', moduleName: CORE};
 
-  static queryRefresh: o.ExternalReference = {name: 'ɵɵqueryRefresh', moduleName: CORE};
-  static viewQuery: o.ExternalReference = {name: 'ɵɵviewQuery', moduleName: CORE};
-  static staticViewQuery: o.ExternalReference = {name: 'ɵɵstaticViewQuery', moduleName: CORE};
-  static staticContentQuery: o.ExternalReference = {name: 'ɵɵstaticContentQuery', moduleName: CORE};
-  static loadViewQuery: o.ExternalReference = {name: 'ɵɵloadViewQuery', moduleName: CORE};
-  static contentQuery: o.ExternalReference = {name: 'ɵɵcontentQuery', moduleName: CORE};
-  static loadContentQuery: o.ExternalReference = {name: 'ɵɵloadContentQuery', moduleName: CORE};
+  static queryRefresh: o.ExternalReference = {name: 'ΔqueryRefresh', moduleName: CORE};
+  static viewQuery: o.ExternalReference = {name: 'ΔviewQuery', moduleName: CORE};
+  static staticViewQuery: o.ExternalReference = {name: 'ΔstaticViewQuery', moduleName: CORE};
+  static staticContentQuery: o.ExternalReference = {name: 'ΔstaticContentQuery', moduleName: CORE};
+  static loadViewQuery: o.ExternalReference = {name: 'ΔloadViewQuery', moduleName: CORE};
+  static contentQuery: o.ExternalReference = {name: 'ΔcontentQuery', moduleName: CORE};
+  static loadContentQuery: o.ExternalReference = {name: 'ΔloadContentQuery', moduleName: CORE};
 
-  static NgOnChangesFeature: o.ExternalReference = {name: 'ɵɵNgOnChangesFeature', moduleName: CORE};
+  static NgOnChangesFeature: o.ExternalReference = {name: 'ΔNgOnChangesFeature', moduleName: CORE};
 
   static InheritDefinitionFeature:
-      o.ExternalReference = {name: 'ɵɵInheritDefinitionFeature', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔInheritDefinitionFeature', moduleName: CORE};
 
-  static ProvidersFeature: o.ExternalReference = {name: 'ɵɵProvidersFeature', moduleName: CORE};
+  static ProvidersFeature: o.ExternalReference = {name: 'ΔProvidersFeature', moduleName: CORE};
 
-  static listener: o.ExternalReference = {name: 'ɵɵlistener', moduleName: CORE};
+  static listener: o.ExternalReference = {name: 'Δlistener', moduleName: CORE};
 
   static getFactoryOf: o.ExternalReference = {
-    name: 'ɵɵgetFactoryOf',
+    name: 'ΔgetFactoryOf',
     moduleName: CORE,
   };
 
   static getInheritedFactory: o.ExternalReference = {
-    name: 'ɵɵgetInheritedFactory',
+    name: 'ΔgetInheritedFactory',
     moduleName: CORE,
   };
 
   // sanitization-related functions
-  static sanitizeHtml: o.ExternalReference = {name: 'ɵɵsanitizeHtml', moduleName: CORE};
-  static sanitizeStyle: o.ExternalReference = {name: 'ɵɵsanitizeStyle', moduleName: CORE};
+  static sanitizeHtml: o.ExternalReference = {name: 'ΔsanitizeHtml', moduleName: CORE};
+  static sanitizeStyle: o.ExternalReference = {name: 'ΔsanitizeStyle', moduleName: CORE};
   static defaultStyleSanitizer:
-      o.ExternalReference = {name: 'ɵɵdefaultStyleSanitizer', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔdefaultStyleSanitizer', moduleName: CORE};
   static sanitizeResourceUrl:
-      o.ExternalReference = {name: 'ɵɵsanitizeResourceUrl', moduleName: CORE};
-  static sanitizeScript: o.ExternalReference = {name: 'ɵɵsanitizeScript', moduleName: CORE};
-  static sanitizeUrl: o.ExternalReference = {name: 'ɵɵsanitizeUrl', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔsanitizeResourceUrl', moduleName: CORE};
+  static sanitizeScript: o.ExternalReference = {name: 'ΔsanitizeScript', moduleName: CORE};
+  static sanitizeUrl: o.ExternalReference = {name: 'ΔsanitizeUrl', moduleName: CORE};
   static sanitizeUrlOrResourceUrl:
-      o.ExternalReference = {name: 'ɵɵsanitizeUrlOrResourceUrl', moduleName: CORE};
+      o.ExternalReference = {name: 'ΔsanitizeUrlOrResourceUrl', moduleName: CORE};
 }
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index df83a468d6..e45f8f0acb 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -107,7 +107,7 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
   }
 
   // If requested to emit scope information inline, pass the declarations, imports and exports to
-  // the `ɵɵdefineNgModule` call. The JIT compilation uses this.
+  // the `ΔdefineNgModule` call. The JIT compilation uses this.
   if (emitInline) {
     if (declarations.length) {
       definitionMap.declarations = refsToArray(declarations, containsForwardDecls);
@@ -122,7 +122,7 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
     }
   }
 
-  // If not emitting inline, the scope information is not passed into `ɵɵdefineNgModule` as it would
+  // If not emitting inline, the scope information is not passed into `ΔdefineNgModule` as it would
   // prevent tree-shaking of the declarations, imports and exports references.
   else {
     const setNgModuleScopeCall = generateSetNgModuleScopeCall(meta);
@@ -150,7 +150,7 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
 }
 
 /**
- * Generates a function call to `ɵɵsetNgModuleScope` with all necessary information so that the
+ * Generates a function call to `ΔsetNgModuleScope` with all necessary information so that the
  * transitive module scope can be computed during runtime in JIT mode. This call is marked pure
  * such that the references to declarations, imports and exports may be elided causing these
  * symbols to become tree-shakeable.
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 758ceb66ea..17c1fbf41d 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -874,7 +874,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       return trimTrailingNulls(parameters);
     });
 
-    // handle property bindings e.g. ɵɵproperty('ngForOf', ctx.items), et al;
+    // handle property bindings e.g. Δproperty('ngForOf', ctx.items), et al;
     const context = o.variable(CONTEXT_NAME);
     this.templatePropertyBindings(template, templateIndex, context, template.templateAttrs);
 
diff --git a/packages/core/src/change_detection/differs/iterable_differs.ts b/packages/core/src/change_detection/differs/iterable_differs.ts
index 2d08ea8b5a..f8727adb5e 100644
--- a/packages/core/src/change_detection/differs/iterable_differs.ts
+++ b/packages/core/src/change_detection/differs/iterable_differs.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵɵdefineInjectable} from '../../di/interface/defs';
+import {ΔdefineInjectable} from '../../di/interface/defs';
 import {StaticProvider} from '../../di/interface/provider';
 import {Optional, SkipSelf} from '../../di/metadata';
 import {DefaultIterableDifferFactory} from '../differs/default_iterable_differ';
@@ -143,7 +143,7 @@ export interface IterableDifferFactory {
  */
 export class IterableDiffers {
   /** @nocollapse */
-  static ngInjectableDef = ɵɵdefineInjectable({
+  static ngInjectableDef = ΔdefineInjectable({
     providedIn: 'root',
     factory: () => new IterableDiffers([new DefaultIterableDifferFactory()])
   });
diff --git a/packages/core/src/change_detection/differs/keyvalue_differs.ts b/packages/core/src/change_detection/differs/keyvalue_differs.ts
index 5c9571ef05..d511134b72 100644
--- a/packages/core/src/change_detection/differs/keyvalue_differs.ts
+++ b/packages/core/src/change_detection/differs/keyvalue_differs.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Optional, SkipSelf, StaticProvider, ɵɵdefineInjectable} from '../../di';
+import {Optional, SkipSelf, StaticProvider, ΔdefineInjectable} from '../../di';
 import {DefaultKeyValueDifferFactory} from './default_keyvalue_differ';
 
 
@@ -118,7 +118,7 @@ export interface KeyValueDifferFactory {
  */
 export class KeyValueDiffers {
   /** @nocollapse */
-  static ngInjectableDef = ɵɵdefineInjectable({
+  static ngInjectableDef = ΔdefineInjectable({
     providedIn: 'root',
     factory: () => new KeyValueDiffers([new DefaultKeyValueDifferFactory()])
   });
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index 1a446cbee5..98595d9b27 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -13,8 +13,8 @@ export {devModeEqual as ɵdevModeEqual} from './change_detection/change_detectio
 export {isListLikeIterable as ɵisListLikeIterable} from './change_detection/change_detection_util';
 export {ChangeDetectorStatus as ɵChangeDetectorStatus, isDefaultChangeDetectionStrategy as ɵisDefaultChangeDetectionStrategy} from './change_detection/constants';
 export {Console as ɵConsole} from './console';
-export {inject, setCurrentInjector as ɵsetCurrentInjector, ɵɵinject} from './di/injector_compatibility';
-export {getInjectableDef as ɵgetInjectableDef, ɵɵInjectableDef as ɵɵInjectableDef, ɵɵInjectorDef} from './di/interface/defs';
+export {inject, setCurrentInjector as ɵsetCurrentInjector, Δinject} from './di/injector_compatibility';
+export {getInjectableDef as ɵgetInjectableDef, ΔInjectableDef as ΔInjectableDef, ΔInjectorDef} from './di/interface/defs';
 export {APP_ROOT as ɵAPP_ROOT} from './di/scope';
 export {ivyEnabled as ɵivyEnabled} from './ivy_switch';
 export {ComponentFactory as ɵComponentFactory} from './linker/component_factory';
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index f2b48983e4..0bd5a86bab 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -8,11 +8,11 @@
 
 // clang-format off
 export {
-  ɵɵdefineBase,
-  ɵɵdefineComponent,
-  ɵɵdefineDirective,
-  ɵɵdefinePipe,
-  ɵɵdefineNgModule,
+  ΔdefineBase,
+  ΔdefineComponent,
+  ΔdefineDirective,
+  ΔdefinePipe,
+  ΔdefineNgModule,
   detectChanges as ɵdetectChanges,
   renderComponent as ɵrenderComponent,
   AttributeMarker as ɵAttributeMarker,
@@ -21,16 +21,16 @@ export {
   ComponentRef as ɵRender3ComponentRef,
   DirectiveType as ɵDirectiveType,
   RenderFlags as ɵRenderFlags,
-  ɵɵdirectiveInject,
-  ɵɵinjectAttribute,
-  ɵɵgetFactoryOf,
-  ɵɵgetInheritedFactory,
-  ɵɵsetComponentScope,
-  ɵɵsetNgModuleScope,
-  ɵɵtemplateRefExtractor,
-  ɵɵProvidersFeature,
-  ɵɵInheritDefinitionFeature,
-  ɵɵNgOnChangesFeature,
+  ΔdirectiveInject,
+  ΔinjectAttribute,
+  ΔgetFactoryOf,
+  ΔgetInheritedFactory,
+  ΔsetComponentScope,
+  ΔsetNgModuleScope,
+  ΔtemplateRefExtractor,
+  ΔProvidersFeature,
+  ΔInheritDefinitionFeature,
+  ΔNgOnChangesFeature,
   LifecycleHooksFeature as ɵLifecycleHooksFeature,
   NgModuleType as ɵNgModuleType,
   NgModuleRef as ɵRender3NgModuleRef,
@@ -38,114 +38,114 @@ export {
   markDirty as ɵmarkDirty,
   NgModuleFactory as ɵNgModuleFactory,
   NO_CHANGE as ɵNO_CHANGE,
-  ɵɵcontainer,
-  ɵɵnextContext,
-  ɵɵelementStart,
-  ɵɵnamespaceHTML,
-  ɵɵnamespaceMathML,
-  ɵɵnamespaceSVG,
-  ɵɵelement,
-  ɵɵlistener,
-  ɵɵtext,
-  ɵɵembeddedViewStart,
-  ɵɵprojection,
-  ɵɵbind,
-  ɵɵinterpolation1,
-  ɵɵinterpolation2,
-  ɵɵinterpolation3,
-  ɵɵinterpolation4,
-  ɵɵinterpolation5,
-  ɵɵinterpolation6,
-  ɵɵinterpolation7,
-  ɵɵinterpolation8,
-  ɵɵinterpolationV,
-  ɵɵpipeBind1,
-  ɵɵpipeBind2,
-  ɵɵpipeBind3,
-  ɵɵpipeBind4,
-  ɵɵpipeBindV,
-  ɵɵpureFunction0,
-  ɵɵpureFunction1,
-  ɵɵpureFunction2,
-  ɵɵpureFunction3,
-  ɵɵpureFunction4,
-  ɵɵpureFunction5,
-  ɵɵpureFunction6,
-  ɵɵpureFunction7,
-  ɵɵpureFunction8,
-  ɵɵpureFunctionV,
-  ɵɵgetCurrentView,
+  Δcontainer,
+  ΔnextContext,
+  ΔelementStart,
+  ΔnamespaceHTML,
+  ΔnamespaceMathML,
+  ΔnamespaceSVG,
+  Δelement,
+  Δlistener,
+  Δtext,
+  ΔembeddedViewStart,
+  Δprojection,
+  Δbind,
+  Δinterpolation1,
+  Δinterpolation2,
+  Δinterpolation3,
+  Δinterpolation4,
+  Δinterpolation5,
+  Δinterpolation6,
+  Δinterpolation7,
+  Δinterpolation8,
+  ΔinterpolationV,
+  ΔpipeBind1,
+  ΔpipeBind2,
+  ΔpipeBind3,
+  ΔpipeBind4,
+  ΔpipeBindV,
+  ΔpureFunction0,
+  ΔpureFunction1,
+  ΔpureFunction2,
+  ΔpureFunction3,
+  ΔpureFunction4,
+  ΔpureFunction5,
+  ΔpureFunction6,
+  ΔpureFunction7,
+  ΔpureFunction8,
+  ΔpureFunctionV,
+  ΔgetCurrentView,
   getDirectives as ɵgetDirectives,
   getHostElement as ɵgetHostElement,
-  ɵɵrestoreView,
-  ɵɵcontainerRefreshStart,
-  ɵɵcontainerRefreshEnd,
-  ɵɵqueryRefresh,
-  ɵɵviewQuery,
-  ɵɵstaticViewQuery,
-  ɵɵstaticContentQuery,
-  ɵɵloadViewQuery,
-  ɵɵcontentQuery,
-  ɵɵloadContentQuery,
-  ɵɵelementEnd,
-  ɵɵelementProperty,
-  ɵɵproperty,
-  ɵɵpropertyInterpolate,
-  ɵɵpropertyInterpolate1,
-  ɵɵpropertyInterpolate2,
-  ɵɵpropertyInterpolate3,
-  ɵɵpropertyInterpolate4,
-  ɵɵpropertyInterpolate5,
-  ɵɵpropertyInterpolate6,
-  ɵɵpropertyInterpolate7,
-  ɵɵpropertyInterpolate8,
-  ɵɵpropertyInterpolateV,
-  ɵɵcomponentHostSyntheticProperty,
-  ɵɵcomponentHostSyntheticListener,
-  ɵɵprojectionDef,
-  ɵɵreference,
-  ɵɵenableBindings,
-  ɵɵdisableBindings,
-  ɵɵallocHostVars,
-  ɵɵelementAttribute,
-  ɵɵelementContainerStart,
-  ɵɵelementContainerEnd,
-  ɵɵstyling,
-  ɵɵstyleMap,
-  ɵɵclassMap,
-  ɵɵstyleProp,
-  ɵɵstylingApply,
-  ɵɵclassProp,
-  ɵɵelementHostAttrs,
+  ΔrestoreView,
+  ΔcontainerRefreshStart,
+  ΔcontainerRefreshEnd,
+  ΔqueryRefresh,
+  ΔviewQuery,
+  ΔstaticViewQuery,
+  ΔstaticContentQuery,
+  ΔloadViewQuery,
+  ΔcontentQuery,
+  ΔloadContentQuery,
+  ΔelementEnd,
+  ΔelementProperty,
+  Δproperty,
+  ΔpropertyInterpolate,
+  ΔpropertyInterpolate1,
+  ΔpropertyInterpolate2,
+  ΔpropertyInterpolate3,
+  ΔpropertyInterpolate4,
+  ΔpropertyInterpolate5,
+  ΔpropertyInterpolate6,
+  ΔpropertyInterpolate7,
+  ΔpropertyInterpolate8,
+  ΔpropertyInterpolateV,
+  ΔcomponentHostSyntheticProperty,
+  ΔcomponentHostSyntheticListener,
+  ΔprojectionDef,
+  Δreference,
+  ΔenableBindings,
+  ΔdisableBindings,
+  ΔallocHostVars,
+  ΔelementAttribute,
+  ΔelementContainerStart,
+  ΔelementContainerEnd,
+  Δstyling,
+  ΔstyleMap,
+  ΔclassMap,
+  ΔstyleProp,
+  ΔstylingApply,
+  ΔclassProp,
+  ΔelementHostAttrs,
 
-  ɵɵselect,
-  ɵɵtextBinding,
-  ɵɵtemplate,
-  ɵɵembeddedViewEnd,
+  Δselect,
+  ΔtextBinding,
+  Δtemplate,
+  ΔembeddedViewEnd,
   store as ɵstore,
-  ɵɵload,
-  ɵɵpipe,
-  ɵɵBaseDef,
+  Δload,
+  Δpipe,
+  ΔBaseDef,
   ComponentDef as ɵComponentDef,
-  ɵɵComponentDefWithMeta,
+  ΔComponentDefWithMeta,
   DirectiveDef as ɵDirectiveDef,
-  ɵɵDirectiveDefWithMeta,
+  ΔDirectiveDefWithMeta,
   PipeDef as ɵPipeDef,
-  ɵɵPipeDefWithMeta,
+  ΔPipeDefWithMeta,
   whenRendered as ɵwhenRendered,
-  ɵɵi18n,
-  ɵɵi18nAttributes,
-  ɵɵi18nExp,
-  ɵɵi18nStart,
-  ɵɵi18nEnd,
-  ɵɵi18nApply,
-  ɵɵi18nPostprocess,
+  Δi18n,
+  Δi18nAttributes,
+  Δi18nExp,
+  Δi18nStart,
+  Δi18nEnd,
+  Δi18nApply,
+  Δi18nPostprocess,
   i18nConfigureLocalize as ɵi18nConfigureLocalize,
-  ɵɵi18nLocalize,
+  Δi18nLocalize,
   setClassMetadata as ɵsetClassMetadata,
-  ɵɵresolveWindow,
-  ɵɵresolveDocument,
-  ɵɵresolveBody,
+  ΔresolveWindow,
+  ΔresolveDocument,
+  ΔresolveBody,
 } from './render3/index';
 
 
@@ -167,18 +167,18 @@ export {
 
 export {
   NgModuleDef as ɵNgModuleDef,
-  ɵɵNgModuleDefWithMeta,
+  ΔNgModuleDefWithMeta,
   NgModuleTransitiveScopes as ɵNgModuleTransitiveScopes,
 } from './metadata/ng_module';
 
 export {
-  ɵɵsanitizeHtml,
-  ɵɵsanitizeStyle,
-  ɵɵdefaultStyleSanitizer,
-  ɵɵsanitizeScript,
-  ɵɵsanitizeUrl,
-  ɵɵsanitizeResourceUrl,
-  ɵɵsanitizeUrlOrResourceUrl,
+  ΔsanitizeHtml,
+  ΔsanitizeStyle,
+  ΔdefaultStyleSanitizer,
+  ΔsanitizeScript,
+  ΔsanitizeUrl,
+  ΔsanitizeResourceUrl,
+  ΔsanitizeUrlOrResourceUrl,
 } from './sanitization/sanitization';
 
 export {
diff --git a/packages/core/src/di/index.ts b/packages/core/src/di/index.ts
index 6435213cad..02f2ed5631 100644
--- a/packages/core/src/di/index.ts
+++ b/packages/core/src/di/index.ts
@@ -14,11 +14,11 @@
 
 export * from './metadata';
 export {InjectFlags} from './interface/injector';
-export {ɵɵdefineInjectable, defineInjectable, ɵɵdefineInjector, InjectableType, InjectorType} from './interface/defs';
+export {ΔdefineInjectable, defineInjectable, ΔdefineInjector, InjectableType, InjectorType} from './interface/defs';
 export {forwardRef, resolveForwardRef, ForwardRefFn} from './forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './injectable';
 export {Injector} from './injector';
-export {ɵɵinject, inject, INJECTOR} from './injector_compatibility';
+export {Δinject, inject, INJECTOR} from './injector_compatibility';
 export {ReflectiveInjector} from './reflective_injector';
 export {StaticProvider, ValueProvider, ConstructorSansProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './interface/provider';
 export {ResolvedReflectiveFactory, ResolvedReflectiveProvider} from './reflective_provider';
diff --git a/packages/core/src/di/injectable.ts b/packages/core/src/di/injectable.ts
index 19767f6f4b..784c9b72a8 100644
--- a/packages/core/src/di/injectable.ts
+++ b/packages/core/src/di/injectable.ts
@@ -9,7 +9,7 @@
 import {Type} from '../interface/type';
 import {TypeDecorator, makeDecorator} from '../util/decorators';
 
-import {InjectableType, getInjectableDef, ɵɵInjectableDef, ɵɵdefineInjectable} from './interface/defs';
+import {InjectableType, getInjectableDef, ΔInjectableDef, ΔdefineInjectable} from './interface/defs';
 import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueSansProvider} from './interface/provider';
 import {compileInjectable as render3CompileInjectable} from './jit/injectable';
 import {convertInjectableProviderToFactory} from './util';
@@ -80,7 +80,7 @@ export const Injectable: InjectableDecorator = makeDecorator(
  *
  * @publicApi
  */
-export interface InjectableType<T> extends Type<T> { ngInjectableDef: ɵɵInjectableDef<T>; }
+export interface InjectableType<T> extends Type<T> { ngInjectableDef: ΔInjectableDef<T>; }
 
 /**
  * Supports @Injectable() in JIT mode for Render2.
@@ -89,7 +89,7 @@ function render2CompileInjectable(
     injectableType: InjectableType<any>,
     options: {providedIn?: Type<any>| 'root' | null} & InjectableProvider): void {
   if (options && options.providedIn !== undefined && !getInjectableDef(injectableType)) {
-    injectableType.ngInjectableDef = ɵɵdefineInjectable({
+    injectableType.ngInjectableDef = ΔdefineInjectable({
       providedIn: options.providedIn,
       factory: convertInjectableProviderToFactory(injectableType, options),
     });
diff --git a/packages/core/src/di/injection_token.ts b/packages/core/src/di/injection_token.ts
index ac16ca838a..496d6bb765 100644
--- a/packages/core/src/di/injection_token.ts
+++ b/packages/core/src/di/injection_token.ts
@@ -8,7 +8,7 @@
 
 import {Type} from '../interface/type';
 
-import {ɵɵdefineInjectable} from './interface/defs';
+import {ΔdefineInjectable} from './interface/defs';
 
 /**
  * Creates a token that can be used in a DI Provider.
@@ -67,7 +67,7 @@ export class InjectionToken<T> {
       // We are using it to assign `-1` which is used to identify `Injector`.
       (this as any).__NG_ELEMENT_ID__ = options;
     } else if (options !== undefined) {
-      this.ngInjectableDef = ɵɵdefineInjectable({
+      this.ngInjectableDef = ΔdefineInjectable({
         providedIn: options.providedIn || 'root',
         factory: options.factory,
       });
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index bac0d1fe20..cff4e614e7 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -11,8 +11,8 @@ import {stringify} from '../util/stringify';
 
 import {resolveForwardRef} from './forward_ref';
 import {InjectionToken} from './injection_token';
-import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, formatError, ɵɵinject} from './injector_compatibility';
-import {ɵɵdefineInjectable} from './interface/defs';
+import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, formatError, Δinject} from './injector_compatibility';
+import {ΔdefineInjectable} from './interface/defs';
 import {InjectFlags} from './interface/injector';
 import {ConstructorProvider, ExistingProvider, FactoryProvider, StaticClassProvider, StaticProvider, ValueProvider} from './interface/provider';
 import {Inject, Optional, Self, SkipSelf} from './metadata';
@@ -88,9 +88,9 @@ export abstract class Injector {
   }
 
   /** @nocollapse */
-  static ngInjectableDef = ɵɵdefineInjectable({
+  static ngInjectableDef = ΔdefineInjectable({
     providedIn: 'any' as any,
-    factory: () => ɵɵinject(INJECTOR),
+    factory: () => Δinject(INJECTOR),
   });
 
   /**
diff --git a/packages/core/src/di/injector_compatibility.ts b/packages/core/src/di/injector_compatibility.ts
index 83cc2638ab..1b1b291738 100644
--- a/packages/core/src/di/injector_compatibility.ts
+++ b/packages/core/src/di/injector_compatibility.ts
@@ -13,7 +13,7 @@ import {stringify} from '../util/stringify';
 import {resolveForwardRef} from './forward_ref';
 import {InjectionToken} from './injection_token';
 import {Injector} from './injector';
-import {getInjectableDef, ɵɵInjectableDef} from './interface/defs';
+import {getInjectableDef, ΔInjectableDef} from './interface/defs';
 import {InjectFlags} from './interface/injector';
 import {ValueProvider} from './interface/provider';
 import {Inject, Optional, Self, SkipSelf} from './metadata';
@@ -107,10 +107,9 @@ export function injectInjectorOnly<T>(
  * @see inject
  * @codeGenApi
  */
-export function ɵɵinject<T>(token: Type<T>| InjectionToken<T>): T;
-export function ɵɵinject<T>(token: Type<T>| InjectionToken<T>, flags?: InjectFlags): T|null;
-export function ɵɵinject<T>(token: Type<T>| InjectionToken<T>, flags = InjectFlags.Default): T|
-    null {
+export function Δinject<T>(token: Type<T>| InjectionToken<T>): T;
+export function Δinject<T>(token: Type<T>| InjectionToken<T>, flags?: InjectFlags): T|null;
+export function Δinject<T>(token: Type<T>| InjectionToken<T>, flags = InjectFlags.Default): T|null {
   return (_injectImplementation || injectInjectorOnly)(token, flags);
 }
 
@@ -138,7 +137,7 @@ export function ɵɵinject<T>(token: Type<T>| InjectionToken<T>, flags = InjectF
  *
  * @publicApi
  */
-export const inject = ɵɵinject;
+export const inject = Δinject;
 
 /**
  * Injects `root` tokens in limp mode.
@@ -149,7 +148,7 @@ export const inject = ɵɵinject;
  */
 export function injectRootLimpMode<T>(
     token: Type<T>| InjectionToken<T>, notFoundValue: T | undefined, flags: InjectFlags): T|null {
-  const injectableDef: ɵɵInjectableDef<T>|null = getInjectableDef(token);
+  const injectableDef: ΔInjectableDef<T>|null = getInjectableDef(token);
   if (injectableDef && injectableDef.providedIn == 'root') {
     return injectableDef.value === undefined ? injectableDef.value = injectableDef.factory() :
                                                injectableDef.value;
@@ -186,9 +185,9 @@ export function injectArgs(types: (Type<any>| InjectionToken<any>| any[])[]): an
         }
       }
 
-      args.push(ɵɵinject(type !, flags));
+      args.push(Δinject(type !, flags));
     } else {
-      args.push(ɵɵinject(arg));
+      args.push(Δinject(arg));
     }
   }
   return args;
diff --git a/packages/core/src/di/interface/defs.ts b/packages/core/src/di/interface/defs.ts
index dd00972be8..593e16a06b 100644
--- a/packages/core/src/di/interface/defs.ts
+++ b/packages/core/src/di/interface/defs.ts
@@ -26,7 +26,7 @@ import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, S
  *
  * @publicApi
  */
-export interface ɵɵInjectableDef<T> {
+export interface ΔInjectableDef<T> {
   /**
    * Specifies that the given type belongs to a particular injector:
    * - `InjectorType` such as `NgModule`,
@@ -60,7 +60,7 @@ export interface ɵɵInjectableDef<T> {
  *
  * @publicApi
  */
-export interface ɵɵInjectorDef<T> {
+export interface ΔInjectorDef<T> {
   factory: () => T;
 
   // TODO(alxhub): Narrow down the type here once decorators properly change the return type of the
@@ -131,21 +131,21 @@ export interface InjectorTypeWithProviders<T> {
  *
  * @publicApi
  */
-export function ɵɵdefineInjectable<T>(opts: {
+export function ΔdefineInjectable<T>(opts: {
   providedIn?: Type<any>| 'root' | 'any' | null,
   factory: () => T,
 }): never {
   return ({
     providedIn: opts.providedIn as any || null, factory: opts.factory, value: undefined,
-  } as ɵɵInjectableDef<T>) as never;
+  } as ΔInjectableDef<T>) as never;
 }
 
 /**
  * @deprecated in v8, delete after v10. This API should be used only be generated code, and that
- * code should now use ɵɵdefineInjectable instead.
+ * code should now use ΔdefineInjectable instead.
  * @publicApi
  */
-export const defineInjectable = ɵɵdefineInjectable;
+export const defineInjectable = ΔdefineInjectable;
 
 /**
  * Construct an `InjectorDef` which configures an injector.
@@ -167,11 +167,11 @@ export const defineInjectable = ɵɵdefineInjectable;
  *
  * @publicApi
  */
-export function ɵɵdefineInjector(options: {factory: () => any, providers?: any[], imports?: any[]}):
+export function ΔdefineInjector(options: {factory: () => any, providers?: any[], imports?: any[]}):
     never {
   return ({
     factory: options.factory, providers: options.providers || [], imports: options.imports || [],
-  } as ɵɵInjectorDef<any>) as never;
+  } as ΔInjectorDef<any>) as never;
 }
 
 /**
@@ -179,7 +179,7 @@ export function ɵɵdefineInjector(options: {factory: () => any, providers?: any
  *
  * @param type type which may have `ngInjectableDef`
  */
-export function getInjectableDef<T>(type: any): ɵɵInjectableDef<T>|null {
+export function getInjectableDef<T>(type: any): ΔInjectableDef<T>|null {
   return type && type.hasOwnProperty(NG_INJECTABLE_DEF) ? (type as any)[NG_INJECTABLE_DEF] : null;
 }
 
@@ -188,7 +188,7 @@ export function getInjectableDef<T>(type: any): ɵɵInjectableDef<T>|null {
  *
  * @param type type which may have `ngInjectorDef`
  */
-export function getInjectorDef<T>(type: any): ɵɵInjectorDef<T>|null {
+export function getInjectorDef<T>(type: any): ΔInjectorDef<T>|null {
   return type && type.hasOwnProperty(NG_INJECTOR_DEF) ? (type as any)[NG_INJECTOR_DEF] : null;
 }
 
diff --git a/packages/core/src/di/jit/environment.ts b/packages/core/src/di/jit/environment.ts
index 9bd8141b10..a702bb6943 100644
--- a/packages/core/src/di/jit/environment.ts
+++ b/packages/core/src/di/jit/environment.ts
@@ -7,8 +7,8 @@
  */
 
 import {Type} from '../../interface/type';
-import {ɵɵinject} from '../injector_compatibility';
-import {getInjectableDef, getInjectorDef, ɵɵdefineInjectable, ɵɵdefineInjector} from '../interface/defs';
+import {Δinject} from '../injector_compatibility';
+import {getInjectableDef, getInjectorDef, ΔdefineInjectable, ΔdefineInjector} from '../interface/defs';
 
 
 
@@ -18,10 +18,10 @@ import {getInjectableDef, getInjectorDef, ɵɵdefineInjectable, ɵɵdefineInject
  * This should be kept up to date with the public exports of @angular/core.
  */
 export const angularCoreDiEnv: {[name: string]: Function} = {
-  'ɵɵdefineInjectable': ɵɵdefineInjectable,
-  'ɵɵdefineInjector': ɵɵdefineInjector,
-  'ɵɵinject': ɵɵinject,
-  'ɵɵgetFactoryOf': getFactoryOf,
+  'ΔdefineInjectable': ΔdefineInjectable,
+  'ΔdefineInjector': ΔdefineInjector,
+  'Δinject': Δinject,
+  'ΔgetFactoryOf': getFactoryOf,
 };
 
 function getFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T)|null {
diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index 670c9902c5..5a61c08c88 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -14,8 +14,8 @@ import {stringify} from '../util/stringify';
 import {resolveForwardRef} from './forward_ref';
 import {InjectionToken} from './injection_token';
 import {Injector} from './injector';
-import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, injectArgs, setCurrentInjector, ɵɵinject} from './injector_compatibility';
-import {InjectableType, InjectorType, InjectorTypeWithProviders, getInjectableDef, getInjectorDef, ɵɵInjectableDef} from './interface/defs';
+import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, injectArgs, setCurrentInjector, Δinject} from './injector_compatibility';
+import {InjectableType, InjectorType, InjectorTypeWithProviders, getInjectableDef, getInjectorDef, ΔInjectableDef} from './interface/defs';
 import {InjectFlags} from './interface/injector';
 import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider} from './interface/provider';
 import {APP_ROOT} from './scope';
@@ -366,7 +366,7 @@ export class R3Injector {
     return record.value as T;
   }
 
-  private injectableDefInScope(def: ɵɵInjectableDef<any>): boolean {
+  private injectableDefInScope(def: ΔInjectableDef<any>): boolean {
     if (!def.providedIn) {
       return false;
     } else if (typeof def.providedIn === 'string') {
@@ -423,7 +423,7 @@ export function providerToFactory(
     if (isValueProvider(provider)) {
       factory = () => resolveForwardRef(provider.useValue);
     } else if (isExistingProvider(provider)) {
-      factory = () => ɵɵinject(resolveForwardRef(provider.useExisting));
+      factory = () => Δinject(resolveForwardRef(provider.useExisting));
     } else if (isFactoryProvider(provider)) {
       factory = () => provider.useFactory(...injectArgs(provider.deps || []));
     } else {
diff --git a/packages/core/src/di/util.ts b/packages/core/src/di/util.ts
index ccc78def56..d5e5830ad2 100644
--- a/packages/core/src/di/util.ts
+++ b/packages/core/src/di/util.ts
@@ -10,7 +10,7 @@ import {Type} from '../interface/type';
 import {ReflectionCapabilities} from '../reflection/reflection_capabilities';
 import {getClosureSafeProperty} from '../util/property';
 
-import {injectArgs, ɵɵinject} from './injector_compatibility';
+import {injectArgs, Δinject} from './injector_compatibility';
 import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from './interface/provider';
 
 const USE_VALUE =
@@ -32,7 +32,7 @@ export function convertInjectableProviderToFactory(
     return () => valueProvider.useValue;
   } else if ((provider as ExistingSansProvider).useExisting) {
     const existingProvider = (provider as ExistingSansProvider);
-    return () => ɵɵinject(existingProvider.useExisting);
+    return () => Δinject(existingProvider.useExisting);
   } else if ((provider as FactorySansProvider).useFactory) {
     const factoryProvider = (provider as FactorySansProvider);
     return () => factoryProvider.useFactory(...injectArgs(factoryProvider.deps || EMPTY_ARRAY));
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index 0b7638f0ad..b4fcb65be5 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -7,7 +7,7 @@
  */
 
 import {ApplicationRef} from '../application_ref';
-import {InjectorType, ɵɵdefineInjector} from '../di/interface/defs';
+import {InjectorType, ΔdefineInjector} from '../di/interface/defs';
 import {Provider} from '../di/interface/provider';
 import {convertInjectableProviderToFactory} from '../di/util';
 import {Type} from '../interface/type';
@@ -35,7 +35,7 @@ export interface NgModuleTransitiveScopes {
 /**
  * @publicApi
  */
-export type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
+export type ΔNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
 
 /**
  * Runtime link information for NgModules.
@@ -43,7 +43,7 @@ export type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModul
  * This is the internal data structure used by the runtime to assemble components, directives,
  * pipes, and injectors.
  *
- * NOTE: Always use `ɵɵdefineNgModule` function to create this object,
+ * NOTE: Always use `ΔdefineNgModule` function to create this object,
  * never create the object directly since the shape of this object
  * can change between versions.
  */
@@ -350,7 +350,7 @@ function preR3NgModuleCompile(moduleType: InjectorType<any>, metadata: NgModule)
     imports = [...imports, metadata.exports];
   }
 
-  moduleType.ngInjectorDef = ɵɵdefineInjector({
+  moduleType.ngInjectorDef = ΔdefineInjector({
     factory: convertInjectableProviderToFactory(moduleType, {useClass: moduleType}),
     providers: metadata && metadata.providers,
     imports: imports,
diff --git a/packages/core/src/r3_symbols.ts b/packages/core/src/r3_symbols.ts
index 6f8a80bbdb..073cf4f9a5 100644
--- a/packages/core/src/r3_symbols.ts
+++ b/packages/core/src/r3_symbols.ts
@@ -21,10 +21,10 @@
  * The below symbols are used for @Injectable and @NgModule compilation.
  */
 
-export {ɵɵinject} from './di/injector_compatibility';
-export {ɵɵInjectableDef, ɵɵInjectorDef, ɵɵdefineInjectable, ɵɵdefineInjector} from './di/interface/defs';
-export {NgModuleDef, ɵɵNgModuleDefWithMeta} from './metadata/ng_module';
-export {ɵɵdefineNgModule} from './render3/definition';
+export {Δinject} from './di/injector_compatibility';
+export {ΔInjectableDef, ΔInjectorDef, ΔdefineInjectable, ΔdefineInjector} from './di/interface/defs';
+export {NgModuleDef, ΔNgModuleDefWithMeta} from './metadata/ng_module';
+export {ΔdefineNgModule} from './render3/definition';
 export {setClassMetadata} from './render3/metadata';
 export {NgModuleFactory} from './render3/ng_module_ref';
 
diff --git a/packages/core/src/render3/CODE_GEN_API.md b/packages/core/src/render3/CODE_GEN_API.md
index 359ae0937f..dc7fcba617 100644
--- a/packages/core/src/render3/CODE_GEN_API.md
+++ b/packages/core/src/render3/CODE_GEN_API.md
@@ -1,11 +1,11 @@
 # Code Gen API
 
-### Prefix ɵɵ
+### Prefix Δ
 
-Ivy exports a number of functions prefixed with `ɵɵ`, for example `ɵɵelementStart`, or `ɵɵinject`, et al. These functions are part of API required for code generation by the Angular compiler. These functions are called by generated code, and they must be publicly exposed in order to be consumed by this generated code. **They are not meant for developer consumption**. The reason they are prefixed with `ɵɵ` is not only to identify them as different from other functions, but also to make them not show up at the top of IDE code completion in environments such as Visual Studio code.
+Ivy exports a number of functions prefixed with `Δ`, for example `ΔelementStart`, or `Δinject`, et al. These functions are part of API required for code generation by the Angular compiler. These functions are called by generated code, and they must be publicly exposed in order to be consumed by this generated code. **They are not meant for developer consumption**. The reason they are prefixed with `Δ` is not only to identify them as different from other functions, but also to make them not show up at the top of IDE code completion in environments such as Visual Studio code.
 
 
 ### Guidance
 
-- Do not use `ɵɵ` functions directly. They are meant to be used in generated code.
-- Do not create new `ɵɵ` functions, it's not a convention that Angular consumes, and it is liable to confuse other developers into thinking consuming Angular's `ɵɵ` functions is a good pattern to follow.
+- Do not use `Δ` functions directly. They are meant to be used in generated code.
+- Do not create new `Δ` functions, it's not a convention that Angular consumes, and it is liable to confuse other developers into thinking consuming Angular's `Δ` functions is a good pattern to follow.
diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index c2648c11c5..c26cece2d1 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -10,8 +10,8 @@ We currently expect Ivy to remain behind the flag until it's feature complete an
 
 The work can be divided into three categories:
 - `@angular/compiler-cli`: TypeScript transformer pipeline which includes two command line tools:
-  - `ngtsc`: (Angular TypeScript Compiler) Angular compiler which strips out `@Component` (and friends) and replaces it with `ɵɵdefineComponent` (and friends).
-  - `ngcc`: (Angular Compatibility Compiler) NPM upgrade compiler which reads the `STORING_METADATA_IN_D.TS.json` files and `.js` files and adds `ɵɵdefineComponent` (and friends) into the `node_module`. This in effect converts a pre-ivy module into ivy module.
+  - `ngtsc`: (Angular TypeScript Compiler) Angular compiler which strips out `@Component` (and friends) and replaces it with `ΔdefineComponent` (and friends).
+  - `ngcc`: (Angular Compatibility Compiler) NPM upgrade compiler which reads the `STORING_METADATA_IN_D.TS.json` files and `.js` files and adds `ΔdefineComponent` (and friends) into the `node_module`. This in effect converts a pre-ivy module into ivy module.
 - `@angular/compiler`: Ivy Compiler which converts decorator into ivy
 - `@angular/core`: Decorators which can be patched with `@angular/compiler`.
 
@@ -20,7 +20,7 @@ The work can be divided into three categories:
 ### `ngtsc` TSC compiler transformer
 
 TSC transformer which removes and converts `@Pipe`, `@Component`, `@Directive` and `@NgModule`
-to the corresponding `ɵɵdefinePipe`, `ɵɵdefineComponent`, `ɵɵdefineDirective` and `ɵɵdefineInjector`.
+to the corresponding `ΔdefinePipe`, `ΔdefineComponent`, `ΔdefineDirective` and `ΔdefineInjector`.
 
 - ✅ Basic setup of the transformer into `tsc`
 - ✅ Can read STORING_METADATA_IN_D.TS from `.d.ts` (see: [STORING_METADATA_IN_D.TS.md](./STORING_METADATA_IN_D.TS.md))
@@ -40,19 +40,19 @@ A tool which "upgrades" `node_module` compiled with non-ivy `ngc` into ivy compl
 
 ## `@angular/compiler` changes
 
-- ✅ Component compilation: Translates `@Component` => `ɵɵdefineComponent`
+- ✅ Component compilation: Translates `@Component` => `ΔdefineComponent`
   - ✅ `TemplateCompiler` (current known as `ViewCompiler`)
   - ✅ `StyleCompiler`
-- ✅ `PipeCompiler`: Translates `@Pipe` => `ɵɵdefinePipe`
-- ✅ `DirectiveCompiler`: Translates `@Directive` => `ɵɵdefineDirective`
-- ✅ `InjectableCompiler`: Translates `@Injectable` => `ɵɵdefineInjectable`
-- ✅ `NgModuleCompiler`: Translates `@NgModule` => `ɵɵdefineInjector` (and `ɵɵdefineNgModule` only in jit)
+- ✅ `PipeCompiler`: Translates `@Pipe` => `ΔdefinePipe`
+- ✅ `DirectiveCompiler`: Translates `@Directive` => `ΔdefineDirective`
+- ✅ `InjectableCompiler`: Translates `@Injectable` => `ΔdefineInjectable`
+- ✅ `NgModuleCompiler`: Translates `@NgModule` => `ΔdefineInjector` (and `ΔdefineNgModule` only in jit)
 - ❌ Documentation
 
 
 ## `@angular/core` changes
 
-The goal is for the `@Component` (and friends) to be the compiler of template. Since decorators are functions which execute during parsing of the `.js` file, the decorator can compile the template into Ivy. The AoT compiler's job is to remove the `@Component` and replace it with call to `ɵɵdefineComponent`.
+The goal is for the `@Component` (and friends) to be the compiler of template. Since decorators are functions which execute during parsing of the `.js` file, the decorator can compile the template into Ivy. The AoT compiler's job is to remove the `@Component` and replace it with call to `ΔdefineComponent`.
 
 - ✅ `@angular/compiler` can patch itself onto:
   - ✅ `@Injectable`
@@ -70,13 +70,13 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 ## Decorators
 | Annotation          | `defineXXX()`                  | Run time | Spec     | Compiler |
 | -------------------- | ------------------------------ | ------- | -------- | -------- |
-| `@Component`         | ✅ `ɵɵdefineComponent()`         |    ✅    |  ✅      |  ✅      |
-| `@Directive`         | ✅ `ɵɵdefineDirective()`         |    ✅    |  ✅      |  ✅      |
-| `@Directive`         | ✅ `ɵɵdefineBase()`              |    ✅    |  ✅      |  ✅      |
-| `@Pipe`              | ✅ `ɵɵdefinePipe()`              |    ✅    |  ✅      |  ✅      |
-| `@Injectable`        | ✅ `ɵɵdefineInjectable()`        |    ✅    |  ✅      |  ✅      |
-| `@NgModule`          | ✅ `ɵɵdefineInjector()`          |    ✅    |  ✅      |  ✅      |
-| `@ConfigureInjector` | ✅ `ɵɵdefineInjector()`          |    ❌    |  ❌      |  ❌      |
+| `@Component`         | ✅ `ΔdefineComponent()`         |    ✅    |  ✅      |  ✅      |
+| `@Directive`         | ✅ `ΔdefineDirective()`         |    ✅    |  ✅      |  ✅      |
+| `@Directive`         | ✅ `ΔdefineBase()`              |    ✅    |  ✅      |  ✅      |
+| `@Pipe`              | ✅ `ΔdefinePipe()`              |    ✅    |  ✅      |  ✅      |
+| `@Injectable`        | ✅ `ΔdefineInjectable()`        |    ✅    |  ✅      |  ✅      |
+| `@NgModule`          | ✅ `ΔdefineInjector()`          |    ✅    |  ✅      |  ✅      |
+| `@ConfigureInjector` | ✅ `ΔdefineInjector()`          |    ❌    |  ❌      |  ❌      |
 
 
 
diff --git a/packages/core/src/render3/STORING_METADATA_IN_D.TS.md b/packages/core/src/render3/STORING_METADATA_IN_D.TS.md
index 9b2f9b7517..82690386b2 100644
--- a/packages/core/src/render3/STORING_METADATA_IN_D.TS.md
+++ b/packages/core/src/render3/STORING_METADATA_IN_D.TS.md
@@ -13,7 +13,7 @@ Here is an abbreviated example of breakage of tree-shake-ability.
 })
 export class TooltipDirective {
   // ngtsc generates this:
-  static ngDirectiveDef = ɵɵdefineDirective(...);
+  static ngDirectiveDef = ΔdefineDirective(...);
 }
 
 @Component({
@@ -22,7 +22,7 @@ export class TooltipDirective {
 })
 class MyAppComponent {
   // ngtsc generates this:
-  static ngDirectiveDef = ɵɵdefineComponent({
+  static ngDirectiveDef = ΔdefineComponent({
     ...
     directives: [
       // BREAKS TREE-SHAKING!!!
@@ -41,7 +41,7 @@ class MyAppComponent {
 })
 class MyAppModule {
     // ngtsc generates this:
-  static ngDirectiveDef = ɵɵdefineNgModule(...);
+  static ngDirectiveDef = ΔdefineNgModule(...);
 }
 ```
 
diff --git a/packages/core/src/render3/VIEW_DATA.md b/packages/core/src/render3/VIEW_DATA.md
index 4cab860b01..607b6b48c8 100644
--- a/packages/core/src/render3/VIEW_DATA.md
+++ b/packages/core/src/render3/VIEW_DATA.md
@@ -36,18 +36,18 @@ The size of the `CONSTS` section is declared in the property `consts` of the com
 })
 class MyApp {
 
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     ...,
     consts: 5,
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        ɵɵtext(1, 'Hello ');
-        ɵɵelementStart(2, 'b');
-        ɵɵtext(3, 'World');
-        ɵɵelementEnd();
-        ɵɵtext(4, '!');
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        Δtext(1, 'Hello ');
+        ΔelementStart(2, 'b');
+        Δtext(3, 'World');
+        ΔelementEnd();
+        Δtext(4, '!');
+        ΔelementEnd();
       }
       ...
     }
@@ -87,19 +87,19 @@ The size of the `VARS `section is declared in the property `vars` of the compone
 class MyApp {
   name = 'World';
 
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     ...,
     consts: 2, // Two DOM Elements.
     vars: 2,   // Two bindings.
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        ɵɵtext(1);
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        Δtext(1);
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'title', ɵɵbind(ctx.name));
-        ɵɵtextBinding(1, ɵɵinterpolation1('Hello ', ctx.name, '!'));
+        ΔelementProperty(0, 'title', Δbind(ctx.name));
+        ΔtextBinding(1, Δinterpolation1('Hello ', ctx.name, '!'));
       }
       ...
     }
@@ -139,12 +139,12 @@ Examples include:
 })
 class MyApp {
 
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     ...,
     consts: 1,
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'child', ['tooltip', null]);
+        Δelement(0, 'child', ['tooltip', null]);
       }
       ...
     },
@@ -159,7 +159,7 @@ class MyApp {
 })
 class Child {
   @HostBinding('tooltip') hostTitle = 'Hello World!';
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     ...
     hostVars: 1
   });
@@ -171,7 +171,7 @@ class Child {
 })
 class Tooltip {
   @HostBinding('title') hostTitle = 'greeting';
-  static ngDirectiveDef = ɵɵdefineDirective({
+  static ngDirectiveDef = ΔdefineDirective({
     ...
     hostVars: 1
   });
@@ -273,12 +273,12 @@ Injection tokens are sorted into three sections:
 })
 class MyApp {
 
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     ...,
     consts: 1,
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'child');
+        Δelement(0, 'child');
       }
       ...
     },
@@ -301,7 +301,7 @@ class MyApp {
 })
 class Child {
   construction(injector: Injector) {}
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     ...
     features: [
       ProvidesFeature(
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index 77fca80daf..979f5aa113 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -9,7 +9,7 @@
 import {ChangeDetectorRef as ViewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {InjectionToken} from '../di/injection_token';
 import {Injector} from '../di/injector';
-import {ɵɵinject} from '../di/injector_compatibility';
+import {Δinject} from '../di/injector_compatibility';
 import {InjectFlags} from '../di/interface/injector';
 import {Type} from '../interface/type';
 import {ComponentFactory as viewEngine_ComponentFactory, ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
@@ -66,7 +66,7 @@ function toRefArray(map: {[key: string]: string}): {propName: string; templateNa
  */
 export const ROOT_CONTEXT = new InjectionToken<RootContext>(
     'ROOT_CONTEXT_TOKEN',
-    {providedIn: 'root', factory: () => createRootContext(ɵɵinject(SCHEDULER))});
+    {providedIn: 'root', factory: () => createRootContext(Δinject(SCHEDULER))});
 
 /**
  * A change detection scheduler token for {@link RootContext}. This token is the default value used
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index a5eb841056..7d08c94d23 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -9,7 +9,7 @@
 import '../util/ng_dev_mode';
 
 import {ChangeDetectionStrategy} from '../change_detection/constants';
-import {NG_INJECTABLE_DEF, ɵɵdefineInjectable} from '../di/interface/defs';
+import {NG_INJECTABLE_DEF, ΔdefineInjectable} from '../di/interface/defs';
 import {Mutable, Type} from '../interface/type';
 import {NgModuleDef} from '../metadata/ng_module';
 import {SchemaMetadata} from '../metadata/schema';
@@ -19,7 +19,7 @@ import {stringify} from '../util/stringify';
 
 import {EMPTY_ARRAY, EMPTY_OBJ} from './empty';
 import {NG_BASE_DEF, NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
-import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature, DirectiveType, DirectiveTypesOrFactory, FactoryFn, HostBindingsFunction, PipeDef, PipeType, PipeTypesOrFactory, ViewQueriesFunction, ɵɵBaseDef} from './interfaces/definition';
+import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature, DirectiveType, DirectiveTypesOrFactory, FactoryFn, HostBindingsFunction, PipeDef, PipeType, PipeTypesOrFactory, ViewQueriesFunction, ΔBaseDef} from './interfaces/definition';
 // while SelectorFlags is unused here, it's required so that types don't get resolved lazily
 // see: https://github.com/Microsoft/web-build-tools/issues/1050
 import {CssSelectorList, SelectorFlags} from './interfaces/projection';
@@ -42,7 +42,7 @@ let _renderCompCount = 0;
  * ```
  * @codeGenApi
  */
-export function ɵɵdefineComponent<T>(componentDefinition: {
+export function ΔdefineComponent<T>(componentDefinition: {
   /**
    * Directive type, needed to configure the injector.
    */
@@ -308,7 +308,7 @@ export function ɵɵdefineComponent<T>(componentDefinition: {
     // be retrieved through the node injector, so this isn't a problem.
     if (!type.hasOwnProperty(NG_INJECTABLE_DEF)) {
       (type as any)[NG_INJECTABLE_DEF] =
-          ɵɵdefineInjectable<T>({factory: componentDefinition.factory as() => T});
+          ΔdefineInjectable<T>({factory: componentDefinition.factory as() => T});
     }
   }) as never;
 
@@ -318,7 +318,7 @@ export function ɵɵdefineComponent<T>(componentDefinition: {
 /**
  * @codeGenApi
  */
-export function ɵɵsetComponentScope(
+export function ΔsetComponentScope(
     type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void {
   const def = (type.ngComponentDef as ComponentDef<any>);
   def.directiveDefs = () => directives.map(extractDirectiveDef);
@@ -345,7 +345,7 @@ export function extractPipeDef(type: PipeType<any>): PipeDef<any> {
 /**
  * @codeGenApi
  */
-export function ɵɵdefineNgModule<T>(def: {
+export function ΔdefineNgModule<T>(def: {
   /** Token representing the module. Used by DI. */
   type: T;
 
@@ -393,7 +393,7 @@ export function ɵɵdefineNgModule<T>(def: {
  *
  * @codeGenApi
  */
-export function ɵɵsetNgModuleScope(type: any, scope: {
+export function ΔsetNgModuleScope(type: any, scope: {
   /** List of components, directives, and pipes declared by this module. */
   declarations?: Type<any>[] | (() => Type<any>[]);
 
@@ -497,7 +497,7 @@ function invertObject<T>(
  * # Example
  * ```ts
  * class ShouldBeInherited {
- *   static ngBaseDef = ɵɵdefineBase({
+ *   static ngBaseDef = ΔdefineBase({
  *      ...
  *   })
  * }
@@ -507,7 +507,7 @@ function invertObject<T>(
  *
  * @codeGenApi
  */
-export function ɵɵdefineBase<T>(baseDefinition: {
+export function ΔdefineBase<T>(baseDefinition: {
   /**
    * A map of input names.
    *
@@ -580,7 +580,7 @@ export function ɵɵdefineBase<T>(baseDefinition: {
    * Function executed by the parent template to allow children to apply host bindings.
    */
   hostBindings?: HostBindingsFunction<T>;
-}): ɵɵBaseDef<T> {
+}): ΔBaseDef<T> {
   const declaredInputs: {[P in keyof T]: string} = {} as any;
   return {
     inputs: invertObject<T>(baseDefinition.inputs as any, declaredInputs),
@@ -600,7 +600,7 @@ export function ɵɵdefineBase<T>(baseDefinition: {
  * class MyDirective {
  *   // Generated by Angular Template Compiler
  *   // [Symbol] syntax will not be supported by TypeScript until v2.7
- *   static ngDirectiveDef = ɵɵdefineDirective({
+ *   static ngDirectiveDef = ΔdefineDirective({
  *     ...
  *   });
  * }
@@ -608,7 +608,7 @@ export function ɵɵdefineBase<T>(baseDefinition: {
  *
  * @codeGenApi
  */
-export const ɵɵdefineDirective = ɵɵdefineComponent as any as<T>(directiveDefinition: {
+export const ΔdefineDirective = ΔdefineComponent as any as<T>(directiveDefinition: {
   /**
    * Directive type, needed to configure the injector.
    */
@@ -726,7 +726,7 @@ export const ɵɵdefineDirective = ɵɵdefineComponent as any as<T>(directiveDef
  *
  * @codeGenApi
  */
-export function ɵɵdefinePipe<T>(pipeDef: {
+export function ΔdefinePipe<T>(pipeDef: {
   /** Name of the pipe. Used for matching pipes in template to pipe defs. */
   name: string,
 
@@ -765,7 +765,7 @@ export function getPipeDef<T>(type: any): PipeDef<T>|null {
   return (type as any)[NG_PIPE_DEF] || null;
 }
 
-export function getBaseDef<T>(type: any): ɵɵBaseDef<T>|null {
+export function getBaseDef<T>(type: any): ΔBaseDef<T>|null {
   return (type as any)[NG_BASE_DEF] || null;
 }
 
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index c8507b871a..6302c26ea3 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -637,7 +637,7 @@ export class NodeInjector implements Injector {
 /**
  * @codeGenApi
  */
-export function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T)|null {
+export function ΔgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T)|null {
   const typeAny = type as any;
   const def = getComponentDef<T>(typeAny) || getDirectiveDef<T>(typeAny) ||
       getPipeDef<T>(typeAny) || getInjectableDef<T>(typeAny) || getInjectorDef<T>(typeAny);
@@ -650,9 +650,9 @@ export function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) =>
 /**
  * @codeGenApi
  */
-export function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T {
+export function ΔgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T {
   const proto = Object.getPrototypeOf(type.prototype).constructor as Type<any>;
-  const factory = ɵɵgetFactoryOf<T>(proto);
+  const factory = ΔgetFactoryOf<T>(proto);
   if (factory !== null) {
     return factory;
   } else {
diff --git a/packages/core/src/render3/di_setup.ts b/packages/core/src/render3/di_setup.ts
index 3dfb9bbb70..9d177153d4 100644
--- a/packages/core/src/render3/di_setup.ts
+++ b/packages/core/src/render3/di_setup.ts
@@ -12,7 +12,7 @@ import {ClassProvider, Provider} from '../di/interface/provider';
 import {isClassProvider, isTypeProvider, providerToFactory} from '../di/r3_injector';
 
 import {diPublicInInjector, getNodeInjectable, getOrCreateNodeInjectorForNode} from './di';
-import {ɵɵdirectiveInject} from './instructions/all';
+import {ΔdirectiveInject} from './instructions/all';
 import {DirectiveDef} from './interfaces/definition';
 import {NodeInjectorFactory} from './interfaces/injector';
 import {TContainerNode, TElementContainerNode, TElementNode, TNodeProviderIndexes} from './interfaces/node';
@@ -93,7 +93,7 @@ function resolveProvider(
 
     if (isTypeProvider(provider) || !provider.multi) {
       // Single provider case: the factory is created and pushed immediately
-      const factory = new NodeInjectorFactory(providerFactory, isViewProvider, ɵɵdirectiveInject);
+      const factory = new NodeInjectorFactory(providerFactory, isViewProvider, ΔdirectiveInject);
       const existingFactoryIndex = indexOf(
           token, tInjectables, isViewProvider ? beginIndex : beginIndex + cptViewProvidersCount,
           endIndex);
@@ -255,7 +255,7 @@ function multiFactory(
         this: NodeInjectorFactory, _: null, tData: TData, lData: LView, tNode: TElementNode) => any,
     index: number, isViewProvider: boolean, isComponent: boolean,
     f: () => any): NodeInjectorFactory {
-  const factory = new NodeInjectorFactory(factoryFn, isViewProvider, ɵɵdirectiveInject);
+  const factory = new NodeInjectorFactory(factoryFn, isViewProvider, ΔdirectiveInject);
   factory.multi = [];
   factory.index = index;
   factory.componentProviders = 0;
diff --git a/packages/core/src/render3/features/inherit_definition_feature.ts b/packages/core/src/render3/features/inherit_definition_feature.ts
index 441af1e386..a025ab9375 100644
--- a/packages/core/src/render3/features/inherit_definition_feature.ts
+++ b/packages/core/src/render3/features/inherit_definition_feature.ts
@@ -13,7 +13,7 @@ import {ComponentDef, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature,
 import {adjustActiveDirectiveSuperClassDepthPosition} from '../state';
 import {isComponentDef} from '../util/view_utils';
 
-import {ɵɵNgOnChangesFeature} from './ng_onchanges_feature';
+import {ΔNgOnChangesFeature} from './ng_onchanges_feature';
 
 function getSuperType(type: Type<any>): Type<any>&
     {ngComponentDef?: ComponentDef<any>, ngDirectiveDef?: DirectiveDef<any>} {
@@ -26,7 +26,7 @@ function getSuperType(type: Type<any>): Type<any>&
  *
  * @codeGenApi
  */
-export function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any>| ComponentDef<any>): void {
+export function ΔInheritDefinitionFeature(definition: DirectiveDef<any>| ComponentDef<any>): void {
   let superType = getSuperType(definition.type);
 
   while (superType) {
@@ -117,7 +117,7 @@ export function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any>| Comp
         definition.onInit = definition.onInit || superPrototype.ngOnInit;
 
         if (superPrototype.ngOnChanges) {
-          ɵɵNgOnChangesFeature()(definition);
+          ΔNgOnChangesFeature()(definition);
         }
       }
     }
diff --git a/packages/core/src/render3/features/ng_onchanges_feature.ts b/packages/core/src/render3/features/ng_onchanges_feature.ts
index 1b37fc752c..a237afe9ea 100644
--- a/packages/core/src/render3/features/ng_onchanges_feature.ts
+++ b/packages/core/src/render3/features/ng_onchanges_feature.ts
@@ -41,7 +41,7 @@ type OnChangesExpando = OnChanges & {
  *
  * @codeGenApi
  */
-export function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature {
+export function ΔNgOnChangesFeature<T>(): DirectiveDefFeature {
   // This option ensures that the ngOnChanges lifecycle hook will be inherited
   // from superclasses (in InheritDefinitionFeature).
   (NgOnChangesFeatureImpl as DirectiveDefFeature).ngInherit = true;
diff --git a/packages/core/src/render3/features/providers_feature.ts b/packages/core/src/render3/features/providers_feature.ts
index 9c67cf0e87..df6223dcf2 100644
--- a/packages/core/src/render3/features/providers_feature.ts
+++ b/packages/core/src/render3/features/providers_feature.ts
@@ -39,7 +39,7 @@ import {DirectiveDef} from '../interfaces/definition';
  *
  * @codeGenApi
  */
-export function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders: Provider[] = []) {
+export function ΔProvidersFeature<T>(providers: Provider[], viewProviders: Provider[] = []) {
   return (definition: DirectiveDef<T>) => {
     definition.providersResolver =
         (def: DirectiveDef<T>, processProvidersFn?: ProcessProvidersFunction) => {
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 26e7eae042..7951220236 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -16,7 +16,7 @@ import {assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
 
 import {attachPatchData} from './context_discovery';
 import {attachI18nOpCodesDebug} from './debug';
-import {ɵɵelementAttribute, ɵɵload, ɵɵtextBinding} from './instructions/all';
+import {ΔelementAttribute, Δload, ΔtextBinding} from './instructions/all';
 import {allocExpando, createNodeAtIndex} from './instructions/shared';
 import {LContainer, NATIVE} from './interfaces/container';
 import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
@@ -351,7 +351,7 @@ const parentIndexStack: number[] = [];
  *
  * @codeGenApi
  */
-export function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void {
+export function Δi18nStart(index: number, message: string, subTemplateIndex?: number): void {
   const tView = getLView()[TVIEW];
   ngDevMode && assertDefined(tView, `tView should be defined`);
   i18nIndexStack[++i18nIndexStackPointer] = index;
@@ -538,7 +538,7 @@ function appendI18nNode(tNode: TNode, parentTNode: TNode, previousTNode: TNode |
  *
  * @codeGenApi
  */
-export function ɵɵi18nPostprocess(
+export function Δi18nPostprocess(
     message: string, replacements: {[key: string]: (string | string[])} = {}): string {
   /**
    * Step 1: resolve all multi-value placeholders like [�#5�|�*1:1��#2:1�|�#4:1�]
@@ -634,7 +634,7 @@ export function ɵɵi18nPostprocess(
  *
  * @codeGenApi
  */
-export function ɵɵi18nEnd(): void {
+export function Δi18nEnd(): void {
   const tView = getLView()[TVIEW];
   ngDevMode && assertDefined(tView, `tView should be defined`);
   i18nEndFirstPass(tView);
@@ -742,7 +742,7 @@ function readCreateOpCodes(
           const elementNodeIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;
           const attrName = createOpCodes[++i] as string;
           const attrValue = createOpCodes[++i] as string;
-          ɵɵelementAttribute(elementNodeIndex, attrName, attrValue);
+          ΔelementAttribute(elementNodeIndex, attrName, attrValue);
           break;
         default:
           throw new Error(`Unable to determine the type of mutate operation for "${opCode}"`);
@@ -819,10 +819,10 @@ function readUpdateOpCodes(
               case I18nUpdateOpCode.Attr:
                 const attrName = updateOpCodes[++j] as string;
                 const sanitizeFn = updateOpCodes[++j] as SanitizerFn | null;
-                ɵɵelementAttribute(nodeIndex, attrName, value, sanitizeFn);
+                ΔelementAttribute(nodeIndex, attrName, value, sanitizeFn);
                 break;
               case I18nUpdateOpCode.Text:
-                ɵɵtextBinding(nodeIndex, value);
+                ΔtextBinding(nodeIndex, value);
                 break;
               case I18nUpdateOpCode.IcuSwitch:
                 tIcuIndex = updateOpCodes[++j] as number;
@@ -886,7 +886,7 @@ function removeNode(index: number, viewData: LView) {
     nativeRemoveNode(viewData[RENDERER], removedPhRNode);
   }
 
-  const slotValue = ɵɵload(index) as RElement | RComment | LContainer | StylingContext;
+  const slotValue = Δload(index) as RElement | RComment | LContainer | StylingContext;
   if (isLContainer(slotValue)) {
     const lContainer = slotValue as LContainer;
     if (removedPhTNode.type !== TNodeType.Container) {
@@ -923,9 +923,9 @@ function removeNode(index: number, viewData: LView) {
  *
  * @codeGenApi
  */
-export function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void {
-  ɵɵi18nStart(index, message, subTemplateIndex);
-  ɵɵi18nEnd();
+export function Δi18n(index: number, message: string, subTemplateIndex?: number): void {
+  Δi18nStart(index, message, subTemplateIndex);
+  Δi18nEnd();
 }
 
 /**
@@ -936,7 +936,7 @@ export function ɵɵi18n(index: number, message: string, subTemplateIndex?: numb
  *
  * @codeGenApi
  */
-export function ɵɵi18nAttributes(index: number, values: string[]): void {
+export function Δi18nAttributes(index: number, values: string[]): void {
   const tView = getLView()[TVIEW];
   ngDevMode && assertDefined(tView, `tView should be defined`);
   if (tView.firstTemplatePass && tView.data[index + HEADER_OFFSET] === null) {
@@ -968,7 +968,7 @@ function i18nAttributesFirstPass(tView: TView, index: number, values: string[])
           addAllToArray(
               generateBindingUpdateOpCodes(value, previousElementIndex, attrName), updateOpCodes);
         } else {
-          ɵɵelementAttribute(previousElementIndex, attrName, value);
+          ΔelementAttribute(previousElementIndex, attrName, value);
         }
       }
     }
@@ -988,7 +988,7 @@ let shiftsCounter = 0;
  *
  * @codeGenApi
  */
-export function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void {
+export function Δi18nExp<T>(expression: T | NO_CHANGE): void {
   if (expression !== NO_CHANGE) {
     changeMask = changeMask | (1 << shiftsCounter);
   }
@@ -1003,7 +1003,7 @@ export function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void {
  *
  * @codeGenApi
  */
-export function ɵɵi18nApply(index: number) {
+export function Δi18nApply(index: number) {
   if (shiftsCounter) {
     const lView = getLView();
     const tView = lView[TVIEW];
@@ -1633,7 +1633,7 @@ const LOCALIZE_PH_REGEXP = /\{\$(.*?)\}/g;
  * @publicApi
  * @deprecated this method is temporary & should not be used as it will be removed soon
  */
-export function ɵɵi18nLocalize(input: string, placeholders: {[key: string]: string} = {}) {
+export function Δi18nLocalize(input: string, placeholders: {[key: string]: string} = {}) {
   if (typeof TRANSLATIONS[input] !== 'undefined') {  // to account for empty string
     input = TRANSLATIONS[input];
   }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 34c39ec47f..f2a0cff59e 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -6,115 +6,115 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {LifecycleHooksFeature, renderComponent, whenRendered} from './component';
-import {ɵɵdefineBase, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdefineNgModule, ɵɵdefinePipe, ɵɵsetComponentScope, ɵɵsetNgModuleScope} from './definition';
-import {ɵɵInheritDefinitionFeature} from './features/inherit_definition_feature';
-import {ɵɵNgOnChangesFeature} from './features/ng_onchanges_feature';
-import {ɵɵProvidersFeature} from './features/providers_feature';
-import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef, ɵɵBaseDef, ɵɵComponentDefWithMeta, ɵɵDirectiveDefWithMeta, ɵɵPipeDefWithMeta} from './interfaces/definition';
+import {ΔdefineBase, ΔdefineComponent, ΔdefineDirective, ΔdefineNgModule, ΔdefinePipe, ΔsetComponentScope, ΔsetNgModuleScope} from './definition';
+import {ΔInheritDefinitionFeature} from './features/inherit_definition_feature';
+import {ΔNgOnChangesFeature} from './features/ng_onchanges_feature';
+import {ΔProvidersFeature} from './features/providers_feature';
+import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef, ΔBaseDef, ΔComponentDefWithMeta, ΔDirectiveDefWithMeta, ΔPipeDefWithMeta} from './interfaces/definition';
 import {getComponent, getDirectives, getHostElement, getRenderedText} from './util/discovery_utils';
 
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef, injectComponentFactoryResolver} from './component_ref';
-export {ɵɵgetFactoryOf, ɵɵgetInheritedFactory} from './di';
+export {ΔgetFactoryOf, ΔgetInheritedFactory} from './di';
 // clang-format off
 export {
   detectChanges,
   markDirty,
   store,
   tick,
-  ɵɵallocHostVars,
-  ɵɵbind,
-  ɵɵclassMap,
-  ɵɵclassProp,
-  ɵɵcomponentHostSyntheticListener,
-  ɵɵcomponentHostSyntheticProperty,
+  ΔallocHostVars,
+  Δbind,
+  ΔclassMap,
+  ΔclassProp,
+  ΔcomponentHostSyntheticListener,
+  ΔcomponentHostSyntheticProperty,
 
-  ɵɵcontainer,
-  ɵɵcontainerRefreshEnd,
-  ɵɵcontainerRefreshStart,
+  Δcontainer,
+  ΔcontainerRefreshEnd,
+  ΔcontainerRefreshStart,
 
-  ɵɵdirectiveInject,
+  ΔdirectiveInject,
 
-  ɵɵelement,
-  ɵɵelementAttribute,
-  ɵɵelementContainerEnd,
+  Δelement,
+  ΔelementAttribute,
+  ΔelementContainerEnd,
 
-  ɵɵelementContainerStart,
-  ɵɵelementEnd,
+  ΔelementContainerStart,
+  ΔelementEnd,
 
-  ɵɵelementHostAttrs,
-  ɵɵelementProperty,
-  ɵɵelementStart,
-  ɵɵembeddedViewEnd,
+  ΔelementHostAttrs,
+  ΔelementProperty,
+  ΔelementStart,
+  ΔembeddedViewEnd,
 
-  ɵɵembeddedViewStart,
+  ΔembeddedViewStart,
 
-  ɵɵgetCurrentView,
-  ɵɵinjectAttribute,
+  ΔgetCurrentView,
+  ΔinjectAttribute,
 
-  ɵɵinterpolation1,
-  ɵɵinterpolation2,
-  ɵɵinterpolation3,
-  ɵɵinterpolation4,
-  ɵɵinterpolation5,
-  ɵɵinterpolation6,
-  ɵɵinterpolation7,
-  ɵɵinterpolation8,
-  ɵɵinterpolationV,
+  Δinterpolation1,
+  Δinterpolation2,
+  Δinterpolation3,
+  Δinterpolation4,
+  Δinterpolation5,
+  Δinterpolation6,
+  Δinterpolation7,
+  Δinterpolation8,
+  ΔinterpolationV,
 
-  ɵɵlistener,
-  ɵɵload,
+  Δlistener,
+  Δload,
 
-  ɵɵnamespaceHTML,
-  ɵɵnamespaceMathML,
-  ɵɵnamespaceSVG,
+  ΔnamespaceHTML,
+  ΔnamespaceMathML,
+  ΔnamespaceSVG,
 
-  ɵɵnextContext,
+  ΔnextContext,
 
-  ɵɵprojection,
-  ɵɵprojectionDef,
-  ɵɵproperty,
-  ɵɵpropertyInterpolate,
-  ɵɵpropertyInterpolate1,
-  ɵɵpropertyInterpolate2,
-  ɵɵpropertyInterpolate3,
-  ɵɵpropertyInterpolate4,
-  ɵɵpropertyInterpolate5,
-  ɵɵpropertyInterpolate6,
-  ɵɵpropertyInterpolate7,
-  ɵɵpropertyInterpolate8,
-  ɵɵpropertyInterpolateV,
+  Δprojection,
+  ΔprojectionDef,
+  Δproperty,
+  ΔpropertyInterpolate,
+  ΔpropertyInterpolate1,
+  ΔpropertyInterpolate2,
+  ΔpropertyInterpolate3,
+  ΔpropertyInterpolate4,
+  ΔpropertyInterpolate5,
+  ΔpropertyInterpolate6,
+  ΔpropertyInterpolate7,
+  ΔpropertyInterpolate8,
+  ΔpropertyInterpolateV,
 
-  ɵɵreference,
+  Δreference,
 
-  ɵɵselect,
-  ɵɵstyleMap,
-  ɵɵstyleProp,
-  ɵɵstyling,
-  ɵɵstylingApply,
-  ɵɵtemplate,
+  Δselect,
+  ΔstyleMap,
+  ΔstyleProp,
+  Δstyling,
+  ΔstylingApply,
+  Δtemplate,
 
-  ɵɵtext,
-  ɵɵtextBinding} from './instructions/all';
+  Δtext,
+  ΔtextBinding} from './instructions/all';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
 export {
-  ɵɵrestoreView,
+  ΔrestoreView,
 
-  ɵɵenableBindings,
-  ɵɵdisableBindings,
+  ΔenableBindings,
+  ΔdisableBindings,
 } from './state';
 
 export {
-  ɵɵi18n,
-  ɵɵi18nAttributes,
-  ɵɵi18nExp,
-  ɵɵi18nStart,
-  ɵɵi18nEnd,
-  ɵɵi18nApply,
-  ɵɵi18nPostprocess,
+  Δi18n,
+  Δi18nAttributes,
+  Δi18nExp,
+  Δi18nStart,
+  Δi18nEnd,
+  Δi18nApply,
+  Δi18nPostprocess,
   i18nConfigureLocalize,
-  ɵɵi18nLocalize,
+  Δi18nLocalize,
 } from './i18n';
 
 export {NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
@@ -128,71 +128,71 @@ export {
 } from './metadata';
 
 export {
-  ɵɵpipe,
-  ɵɵpipeBind1,
-  ɵɵpipeBind2,
-  ɵɵpipeBind3,
-  ɵɵpipeBind4,
-  ɵɵpipeBindV,
+  Δpipe,
+  ΔpipeBind1,
+  ΔpipeBind2,
+  ΔpipeBind3,
+  ΔpipeBind4,
+  ΔpipeBindV,
 } from './pipe';
 
 export {
-  ɵɵqueryRefresh,
-  ɵɵviewQuery,
-  ɵɵstaticViewQuery,
-  ɵɵloadViewQuery,
-  ɵɵcontentQuery,
-  ɵɵloadContentQuery,
-  ɵɵstaticContentQuery
+  ΔqueryRefresh,
+  ΔviewQuery,
+  ΔstaticViewQuery,
+  ΔloadViewQuery,
+  ΔcontentQuery,
+  ΔloadContentQuery,
+  ΔstaticContentQuery
 } from './query';
 
 export {
-  ɵɵpureFunction0,
-  ɵɵpureFunction1,
-  ɵɵpureFunction2,
-  ɵɵpureFunction3,
-  ɵɵpureFunction4,
-  ɵɵpureFunction5,
-  ɵɵpureFunction6,
-  ɵɵpureFunction7,
-  ɵɵpureFunction8,
-  ɵɵpureFunctionV,
+  ΔpureFunction0,
+  ΔpureFunction1,
+  ΔpureFunction2,
+  ΔpureFunction3,
+  ΔpureFunction4,
+  ΔpureFunction5,
+  ΔpureFunction6,
+  ΔpureFunction7,
+  ΔpureFunction8,
+  ΔpureFunctionV,
 } from './pure_function';
 
-export {ɵɵtemplateRefExtractor} from './view_engine_compatibility_prebound';
+export {ΔtemplateRefExtractor} from './view_engine_compatibility_prebound';
 
-export {ɵɵresolveWindow, ɵɵresolveDocument, ɵɵresolveBody} from './util/misc_utils';
+export {ΔresolveWindow, ΔresolveDocument, ΔresolveBody} from './util/misc_utils';
 
 // clang-format on
 
 export {
-  ɵɵBaseDef,
+  ΔBaseDef,
   ComponentDef,
-  ɵɵComponentDefWithMeta,
+  ΔComponentDefWithMeta,
   ComponentTemplate,
   ComponentType,
   DirectiveDef,
   DirectiveDefFlags,
-  ɵɵDirectiveDefWithMeta,
+  ΔDirectiveDefWithMeta,
   DirectiveType,
-  ɵɵNgOnChangesFeature,
-  ɵɵInheritDefinitionFeature,
-  ɵɵProvidersFeature,
+  ΔNgOnChangesFeature,
+  ΔInheritDefinitionFeature,
+  ΔProvidersFeature,
   PipeDef,
-  ɵɵPipeDefWithMeta,
+  ΔPipeDefWithMeta,
   LifecycleHooksFeature,
-  ɵɵdefineComponent,
-  ɵɵdefineDirective,
-  ɵɵdefineNgModule,
-  ɵɵdefineBase,
-  ɵɵdefinePipe,
+  ΔdefineComponent,
+  ΔdefineDirective,
+  ΔdefineNgModule,
+  ΔdefineBase,
+  ΔdefinePipe,
   getHostElement,
   getComponent,
   getDirectives,
   getRenderedText,
   renderComponent,
-  ɵɵsetComponentScope,
-  ɵɵsetNgModuleScope,
+  ΔsetComponentScope,
+  ΔsetNgModuleScope,
   whenRendered,
 };
 
diff --git a/packages/core/src/render3/instructions/alloc_host_vars.ts b/packages/core/src/render3/instructions/alloc_host_vars.ts
index 7301c9726f..2e12f1a9e9 100644
--- a/packages/core/src/render3/instructions/alloc_host_vars.ts
+++ b/packages/core/src/render3/instructions/alloc_host_vars.ts
@@ -19,7 +19,7 @@ import {NO_CHANGE} from '../tokens';
  *
  * @codeGenApi
  */
-export function ɵɵallocHostVars(count: number): void {
+export function ΔallocHostVars(count: number): void {
   const lView = getLView();
   const tView = lView[TVIEW];
   if (!tView.firstTemplatePass) return;
diff --git a/packages/core/src/render3/instructions/container.ts b/packages/core/src/render3/instructions/container.ts
index f5909b2947..fcea0fbc5d 100644
--- a/packages/core/src/render3/instructions/container.ts
+++ b/packages/core/src/render3/instructions/container.ts
@@ -30,7 +30,7 @@ import {addToViewTree, createDirectivesAndLocals, createLContainer, createNodeAt
  *
  * @codeGenApi
  */
-export function ɵɵcontainer(index: number): void {
+export function Δcontainer(index: number): void {
   const tNode = containerInternal(index, null, null);
   const lView = getLView();
   if (lView[TVIEW].firstTemplatePass) {
@@ -59,7 +59,7 @@ export function ɵɵcontainer(index: number): void {
  *
  * @codeGenApi
  */
-export function ɵɵtemplate(
+export function Δtemplate(
     index: number, templateFn: ComponentTemplate<any>| null, consts: number, vars: number,
     tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null,
     localRefExtractor?: LocalRefExtractor) {
@@ -87,7 +87,7 @@ export function ɵɵtemplate(
  *
  * @codeGenApi
  */
-export function ɵɵcontainerRefreshStart(index: number): void {
+export function ΔcontainerRefreshStart(index: number): void {
   const lView = getLView();
   const tView = lView[TVIEW];
   let previousOrParentTNode = loadInternal(tView.data, index) as TNode;
@@ -110,7 +110,7 @@ export function ɵɵcontainerRefreshStart(index: number): void {
  *
  * @codeGenApi
  */
-export function ɵɵcontainerRefreshEnd(): void {
+export function ΔcontainerRefreshEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
   if (getIsParent()) {
     setIsParent(false);
diff --git a/packages/core/src/render3/instructions/di.ts b/packages/core/src/render3/instructions/di.ts
index 7bb92341a7..f8fc6c19c5 100644
--- a/packages/core/src/render3/instructions/di.ts
+++ b/packages/core/src/render3/instructions/di.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {InjectFlags, InjectionToken, resolveForwardRef} from '../../di';
-import {ɵɵinject} from '../../di/injector_compatibility';
+import {Δinject} from '../../di/injector_compatibility';
 import {Type} from '../../interface/type';
 import {getOrCreateInjectable, injectAttributeImpl} from '../di';
 import {TContainerNode, TElementContainerNode, TElementNode} from '../interfaces/node';
@@ -24,9 +24,9 @@ import {getLView, getPreviousOrParentTNode} from '../state';
  * class SomeDirective {
  *   constructor(directive: DirectiveA) {}
  *
- *   static ngDirectiveDef = ɵɵdefineDirective({
+ *   static ngDirectiveDef = ΔdefineDirective({
  *     type: SomeDirective,
- *     factory: () => new SomeDirective(ɵɵdirectiveInject(DirectiveA))
+ *     factory: () => new SomeDirective(ΔdirectiveInject(DirectiveA))
  *   });
  * }
  * ```
@@ -36,15 +36,15 @@ import {getLView, getPreviousOrParentTNode} from '../state';
  *
  * @codeGenApi
  */
-export function ɵɵdirectiveInject<T>(token: Type<T>| InjectionToken<T>): T;
-export function ɵɵdirectiveInject<T>(token: Type<T>| InjectionToken<T>, flags: InjectFlags): T;
-export function ɵɵdirectiveInject<T>(
+export function ΔdirectiveInject<T>(token: Type<T>| InjectionToken<T>): T;
+export function ΔdirectiveInject<T>(token: Type<T>| InjectionToken<T>, flags: InjectFlags): T;
+export function ΔdirectiveInject<T>(
     token: Type<T>| InjectionToken<T>, flags = InjectFlags.Default): T|null {
   token = resolveForwardRef(token);
   const lView = getLView();
   // Fall back to inject() if view hasn't been created. This situation can happen in tests
   // if inject utilities are used before bootstrapping.
-  if (lView == null) return ɵɵinject(token, flags);
+  if (lView == null) return Δinject(token, flags);
 
   return getOrCreateInjectable<T>(
       getPreviousOrParentTNode() as TElementNode | TContainerNode | TElementContainerNode, lView,
@@ -56,6 +56,6 @@ export function ɵɵdirectiveInject<T>(
  *
  * @codeGenApi
  */
-export function ɵɵinjectAttribute(attrNameToInject: string): string|null {
+export function ΔinjectAttribute(attrNameToInject: string): string|null {
   return injectAttributeImpl(getPreviousOrParentTNode(), attrNameToInject);
 }
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index 4a095580d2..5f8e81a8c7 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -44,7 +44,7 @@ import {getActiveDirectiveStylingIndex} from './styling';
  *
  * @codeGenApi
  */
-export function ɵɵelementStart(
+export function ΔelementStart(
     index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
   const lView = getLView();
   const tView = lView[TVIEW];
@@ -129,7 +129,7 @@ export function ɵɵelementStart(
  *
  * @codeGenApi
  */
-export function ɵɵelementEnd(): void {
+export function ΔelementEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
   if (getIsParent()) {
     setIsParent(false);
@@ -183,10 +183,10 @@ export function ɵɵelementEnd(): void {
  *
  * @codeGenApi
  */
-export function ɵɵelement(
+export function Δelement(
     index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
-  ɵɵelementStart(index, name, attrs, localRefs);
-  ɵɵelementEnd();
+  ΔelementStart(index, name, attrs, localRefs);
+  ΔelementEnd();
 }
 
 
@@ -202,7 +202,7 @@ export function ɵɵelement(
  *
  * @codeGenApi
  */
-export function ɵɵelementAttribute(
+export function ΔelementAttribute(
     index: number, name: string, value: any, sanitizer?: SanitizerFn | null,
     namespace?: string): void {
   if (value !== NO_CHANGE) {
@@ -270,7 +270,7 @@ export function ɵɵelementAttribute(
  *
  * @codeGenApi
  */
-export function ɵɵelementHostAttrs(attrs: TAttributes) {
+export function ΔelementHostAttrs(attrs: TAttributes) {
   const hostElementIndex = getSelectedIndex();
   const lView = getLView();
   const tNode = getTNode(hostElementIndex, lView);
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index 4ad34536f2..15002fc6b4 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -31,7 +31,7 @@ import {createDirectivesAndLocals, createNodeAtIndex, executeContentQueries, set
  *
  * @codeGenApi
  */
-export function ɵɵelementContainerStart(
+export function ΔelementContainerStart(
     index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void {
   const lView = getLView();
   const tView = lView[TVIEW];
@@ -72,7 +72,7 @@ export function ɵɵelementContainerStart(
  *
  * @codeGenApi
  */
-export function ɵɵelementContainerEnd(): void {
+export function ΔelementContainerEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
   const lView = getLView();
   const tView = lView[TVIEW];
diff --git a/packages/core/src/render3/instructions/embedded_view.ts b/packages/core/src/render3/instructions/embedded_view.ts
index e2e5ea31f8..63cd9dd235 100644
--- a/packages/core/src/render3/instructions/embedded_view.ts
+++ b/packages/core/src/render3/instructions/embedded_view.ts
@@ -26,8 +26,7 @@ import {assignTViewNodeToLView, createLView, createTView, refreshDescendantViews
  *
  * @codeGenApi
  */
-export function ɵɵembeddedViewStart(
-    viewBlockId: number, consts: number, vars: number): RenderFlags {
+export function ΔembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags {
   const lView = getLView();
   const previousOrParentTNode = getPreviousOrParentTNode();
   // The previous node can be a view node if we are processing an inline for loop
@@ -128,7 +127,7 @@ function scanForView(lContainer: LContainer, startIdx: number, viewBlockId: numb
  *
  * @codeGenApi
  */
-export function ɵɵembeddedViewEnd(): void {
+export function ΔembeddedViewEnd(): void {
   const lView = getLView();
   const viewHost = lView[T_HOST];
 
diff --git a/packages/core/src/render3/instructions/get_current_view.ts b/packages/core/src/render3/instructions/get_current_view.ts
index f8c75ffff3..f477a1e569 100644
--- a/packages/core/src/render3/instructions/get_current_view.ts
+++ b/packages/core/src/render3/instructions/get_current_view.ts
@@ -17,6 +17,6 @@ import {getLView} from '../state';
  *
  * @codeGenApi
  */
-export function ɵɵgetCurrentView(): OpaqueViewState {
+export function ΔgetCurrentView(): OpaqueViewState {
   return getLView() as any as OpaqueViewState;
 }
diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts
index ee61c22680..b34c35b45c 100644
--- a/packages/core/src/render3/instructions/listener.ts
+++ b/packages/core/src/render3/instructions/listener.ts
@@ -31,7 +31,7 @@ import {BindingDirection, generatePropertyAliases, getCleanup, handleError, load
  *
  * @codeGenApi
  */
-export function ɵɵlistener(
+export function Δlistener(
     eventName: string, listenerFn: (e?: any) => any, useCapture = false,
     eventTargetResolver?: GlobalTargetResolver): void {
   listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver);
@@ -58,7 +58,7 @@ export function ɵɵlistener(
  *
  * @codeGenApi
 */
-export function ɵɵcomponentHostSyntheticListener<T>(
+export function ΔcomponentHostSyntheticListener<T>(
     eventName: string, listenerFn: (e?: any) => any, useCapture = false,
     eventTargetResolver?: GlobalTargetResolver): void {
   listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver, loadComponentRenderer);
diff --git a/packages/core/src/render3/instructions/namespace.ts b/packages/core/src/render3/instructions/namespace.ts
index ae423a615a..d2ecc7dc84 100644
--- a/packages/core/src/render3/instructions/namespace.ts
+++ b/packages/core/src/render3/instructions/namespace.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {ɵɵnamespaceHTML, ɵɵnamespaceMathML, ɵɵnamespaceSVG} from '../state';
+export {ΔnamespaceHTML, ΔnamespaceMathML, ΔnamespaceSVG} from '../state';
diff --git a/packages/core/src/render3/instructions/next_context.ts b/packages/core/src/render3/instructions/next_context.ts
index 086762c3c7..3994247692 100644
--- a/packages/core/src/render3/instructions/next_context.ts
+++ b/packages/core/src/render3/instructions/next_context.ts
@@ -19,6 +19,6 @@ import {nextContextImpl} from '../state';
  *
  * @codeGenApi
  */
-export function ɵɵnextContext<T = any>(level: number = 1): T {
+export function ΔnextContext<T = any>(level: number = 1): T {
   return nextContextImpl(level);
 }
diff --git a/packages/core/src/render3/instructions/projection.ts b/packages/core/src/render3/instructions/projection.ts
index 301b43bc48..d4ce901d7f 100644
--- a/packages/core/src/render3/instructions/projection.ts
+++ b/packages/core/src/render3/instructions/projection.ts
@@ -39,7 +39,7 @@ import {createNodeAtIndex} from './shared';
  *
  * @codeGenApi
  */
-export function ɵɵprojectionDef(selectors?: CssSelectorList[]): void {
+export function ΔprojectionDef(selectors?: CssSelectorList[]): void {
   const componentNode = findComponentView(getLView())[T_HOST] as TElementNode;
 
   if (!componentNode.projection) {
@@ -78,7 +78,7 @@ export function ɵɵprojectionDef(selectors?: CssSelectorList[]): void {
  *
  * @codeGenApi
 */
-export function ɵɵprojection(
+export function Δprojection(
     nodeIndex: number, selectorIndex: number = 0, attrs?: TAttributes): void {
   const lView = getLView();
   const tProjectionNode =
diff --git a/packages/core/src/render3/instructions/property.ts b/packages/core/src/render3/instructions/property.ts
index 4a4b14ad91..e93cb7eff2 100644
--- a/packages/core/src/render3/instructions/property.ts
+++ b/packages/core/src/render3/instructions/property.ts
@@ -35,16 +35,16 @@ import {TsickleIssue1009, elementPropertyInternal, loadComponentRenderer, storeB
  *
  * @codeGenApi
  */
-export function ɵɵproperty<T>(
+export function Δproperty<T>(
     propName: string, value: T, sanitizer?: SanitizerFn | null,
     nativeOnly?: boolean): TsickleIssue1009 {
   const index = getSelectedIndex();
   ngDevMode && assertNotEqual(index, -1, 'selected index cannot be -1');
-  const bindReconciledValue = ɵɵbind(value);
+  const bindReconciledValue = Δbind(value);
   if (bindReconciledValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, bindReconciledValue, sanitizer, nativeOnly);
   }
-  return ɵɵproperty;
+  return Δproperty;
 }
 
 /**
@@ -54,7 +54,7 @@ export function ɵɵproperty<T>(
  *
  * @codeGenApi
  */
-export function ɵɵbind<T>(value: T): T|NO_CHANGE {
+export function Δbind<T>(value: T): T|NO_CHANGE {
   const lView = getLView();
   const bindingIndex = lView[BINDING_INDEX]++;
   storeBindingMetadata(lView);
@@ -79,7 +79,7 @@ export function ɵɵbind<T>(value: T): T|NO_CHANGE {
  *
  * @codeGenApi
 */
-export function ɵɵelementProperty<T>(
+export function ΔelementProperty<T>(
     index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
     nativeOnly?: boolean): void {
   if (value !== NO_CHANGE) {
@@ -110,7 +110,7 @@ export function ɵɵelementProperty<T>(
  *
  * @codeGenApi
  */
-export function ɵɵcomponentHostSyntheticProperty<T>(
+export function ΔcomponentHostSyntheticProperty<T>(
     index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
     nativeOnly?: boolean) {
   if (value !== NO_CHANGE) {
diff --git a/packages/core/src/render3/instructions/property_interpolation.ts b/packages/core/src/render3/instructions/property_interpolation.ts
index 044d7d2b18..e8d53f3562 100644
--- a/packages/core/src/render3/instructions/property_interpolation.ts
+++ b/packages/core/src/render3/instructions/property_interpolation.ts
@@ -31,7 +31,7 @@ import {TsickleIssue1009, elementPropertyInternal, storeBindingMetadata} from '.
  *
  * @codeGenApi
  */
-export function ɵɵinterpolationV(values: any[]): string|NO_CHANGE {
+export function ΔinterpolationV(values: any[]): string|NO_CHANGE {
   ngDevMode && assertLessThan(2, values.length, 'should have at least 3 values');
   ngDevMode && assertEqual(values.length % 2, 1, 'should have an odd number of values');
   let different = false;
@@ -76,7 +76,7 @@ export function ɵɵinterpolationV(values: any[]): string|NO_CHANGE {
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string|NO_CHANGE {
+export function Δinterpolation1(prefix: string, v0: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
   const different = bindingUpdated(lView, lView[BINDING_INDEX]++, v0);
   storeBindingMetadata(lView, prefix, suffix);
@@ -88,7 +88,7 @@ export function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): str
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation2(
+export function Δinterpolation2(
     prefix: string, v0: any, i0: string, v1: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
   const bindingIndex = lView[BINDING_INDEX];
@@ -109,7 +109,7 @@ export function ɵɵinterpolation2(
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation3(
+export function Δinterpolation3(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string|
     NO_CHANGE {
   const lView = getLView();
@@ -135,7 +135,7 @@ export function ɵɵinterpolation3(
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation4(
+export function Δinterpolation4(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     suffix: string): string|NO_CHANGE {
   const lView = getLView();
@@ -163,7 +163,7 @@ export function ɵɵinterpolation4(
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation5(
+export function Δinterpolation5(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
@@ -193,7 +193,7 @@ export function ɵɵinterpolation5(
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation6(
+export function Δinterpolation6(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, i4: string, v5: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
@@ -224,7 +224,7 @@ export function ɵɵinterpolation6(
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation7(
+export function Δinterpolation7(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string|
     NO_CHANGE {
@@ -258,7 +258,7 @@ export function ɵɵinterpolation7(
  *
  * @codeGenApi
  */
-export function ɵɵinterpolation8(
+export function Δinterpolation8(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string): string|NO_CHANGE {
@@ -306,7 +306,7 @@ export function ɵɵinterpolation8(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate('title', v0);
+ * ΔpropertyInterpolate('title', v0);
  * ```
  *
  * If the property name also exists as an input property on one of the element's directives,
@@ -321,10 +321,10 @@ export function ɵɵinterpolation8(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate(
+export function ΔpropertyInterpolate(
     propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009 {
-  ɵɵpropertyInterpolate1(propName, '', v0, '', sanitizer);
-  return ɵɵpropertyInterpolate;
+  ΔpropertyInterpolate1(propName, '', v0, '', sanitizer);
+  return ΔpropertyInterpolate;
 }
 
 
@@ -341,7 +341,7 @@ export function ɵɵpropertyInterpolate(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate1('title', 'prefix', v0, 'suffix');
+ * ΔpropertyInterpolate1('title', 'prefix', v0, 'suffix');
  * ```
  *
  * If the property name also exists as an input property on one of the element's directives,
@@ -356,15 +356,15 @@ export function ɵɵpropertyInterpolate(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate1(
+export function ΔpropertyInterpolate1(
     propName: string, prefix: string, v0: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation1(prefix, v0, suffix);
+  const interpolatedValue = Δinterpolation1(prefix, v0, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate1;
+  return ΔpropertyInterpolate1;
 }
 
 /**
@@ -380,7 +380,7 @@ export function ɵɵpropertyInterpolate1(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate2('title', 'prefix', v0, '-', v1, 'suffix');
+ * ΔpropertyInterpolate2('title', 'prefix', v0, '-', v1, 'suffix');
  * ```
  *
  * If the property name also exists as an input property on one of the element's directives,
@@ -397,15 +397,15 @@ export function ɵɵpropertyInterpolate1(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate2(
+export function ΔpropertyInterpolate2(
     propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
+  const interpolatedValue = Δinterpolation2(prefix, v0, i0, v1, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate2;
+  return ΔpropertyInterpolate2;
 }
 
 /**
@@ -421,7 +421,7 @@ export function ɵɵpropertyInterpolate2(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate3(
+ * ΔpropertyInterpolate3(
  * 'title', 'prefix', v0, '-', v1, '-', v2, 'suffix');
  * ```
  *
@@ -441,15 +441,15 @@ export function ɵɵpropertyInterpolate2(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate3(
+export function ΔpropertyInterpolate3(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  const interpolatedValue = Δinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate3;
+  return ΔpropertyInterpolate3;
 }
 
 /**
@@ -465,7 +465,7 @@ export function ɵɵpropertyInterpolate3(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate4(
+ * ΔpropertyInterpolate4(
  * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, 'suffix');
  * ```
  *
@@ -487,15 +487,15 @@ export function ɵɵpropertyInterpolate3(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate4(
+export function ΔpropertyInterpolate4(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  const interpolatedValue = Δinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate4;
+  return ΔpropertyInterpolate4;
 }
 
 /**
@@ -511,7 +511,7 @@ export function ɵɵpropertyInterpolate4(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate5(
+ * ΔpropertyInterpolate5(
  * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, 'suffix');
  * ```
  *
@@ -535,15 +535,15 @@ export function ɵɵpropertyInterpolate4(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate5(
+export function ΔpropertyInterpolate5(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  const interpolatedValue = Δinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate5;
+  return ΔpropertyInterpolate5;
 }
 
 /**
@@ -559,7 +559,7 @@ export function ɵɵpropertyInterpolate5(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate6(
+ * ΔpropertyInterpolate6(
  *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, 'suffix');
  * ```
  *
@@ -585,17 +585,17 @@ export function ɵɵpropertyInterpolate5(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate6(
+export function ΔpropertyInterpolate6(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
   const interpolatedValue =
-      ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+      Δinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate6;
+  return ΔpropertyInterpolate6;
 }
 
 /**
@@ -611,7 +611,7 @@ export function ɵɵpropertyInterpolate6(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate7(
+ * ΔpropertyInterpolate7(
  *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, 'suffix');
  * ```
  *
@@ -639,17 +639,17 @@ export function ɵɵpropertyInterpolate6(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate7(
+export function ΔpropertyInterpolate7(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
   const interpolatedValue =
-      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+      Δinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate7;
+  return ΔpropertyInterpolate7;
 }
 
 /**
@@ -665,7 +665,7 @@ export function ɵɵpropertyInterpolate7(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolate8(
+ * ΔpropertyInterpolate8(
  *  'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, 'suffix');
  * ```
  *
@@ -695,17 +695,17 @@ export function ɵɵpropertyInterpolate7(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolate8(
+export function ΔpropertyInterpolate8(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
   const interpolatedValue =
-      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+      Δinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolate8;
+  return ΔpropertyInterpolate8;
 }
 
 /**
@@ -721,7 +721,7 @@ export function ɵɵpropertyInterpolate8(
  * Its compiled representation is::
  *
  * ```ts
- * ɵɵpropertyInterpolateV(
+ * ΔpropertyInterpolateV(
  *  'title', ['prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, '-', v9,
  *  'suffix']);
  * ```
@@ -738,13 +738,13 @@ export function ɵɵpropertyInterpolate8(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ɵɵpropertyInterpolateV(
+export function ΔpropertyInterpolateV(
     propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
 
-  const interpolatedValue = ɵɵinterpolationV(values);
+  const interpolatedValue = ΔinterpolationV(values);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ɵɵpropertyInterpolateV;
+  return ΔpropertyInterpolateV;
 }
diff --git a/packages/core/src/render3/instructions/select.ts b/packages/core/src/render3/instructions/select.ts
index 1c77ac0176..76816b2181 100644
--- a/packages/core/src/render3/instructions/select.ts
+++ b/packages/core/src/render3/instructions/select.ts
@@ -31,7 +31,7 @@ import {getCheckNoChangesMode, getLView, setSelectedIndex} from '../state';
  *
  * @codeGenApi
  */
-export function ɵɵselect(index: number): void {
+export function Δselect(index: number): void {
   ngDevMode && assertGreaterThan(index, -1, 'Invalid index');
   ngDevMode &&
       assertLessThan(
@@ -44,6 +44,6 @@ export function ɵɵselect(index: number): void {
   // We must set the selected index *after* running the hooks, because hooks may have side-effects
   // that cause other template functions to run, thus updating the selected index, which is global
   // state. If we run `setSelectedIndex` *before* we run the hooks, in some cases the selected index
-  // will be altered by the time we leave the `ɵɵselect` instruction.
+  // will be altered by the time we leave the `Δselect` instruction.
   setSelectedIndex(index);
 }
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index ce2a8c1a29..096af66622 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -30,7 +30,7 @@ import {StylingContext} from '../interfaces/styling';
 import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_VIEW, ExpandoInstructions, FLAGS, HEADER_OFFSET, HOST, INJECTOR, InitPhaseState, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, RootContext, RootContextFlags, SANITIZER, TData, TVIEW, TView, T_HOST} from '../interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from '../node_assert';
 import {isNodeMatchingSelectorList} from '../node_selector_matcher';
-import {enterView, getBindingsEnabled, getCheckNoChangesMode, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, incrementActiveDirectiveId, isCreationMode, leaveView, resetComponentState, setActiveHostElement, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode, setSelectedIndex, ɵɵnamespaceHTML} from '../state';
+import {enterView, getBindingsEnabled, getCheckNoChangesMode, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, incrementActiveDirectiveId, isCreationMode, leaveView, resetComponentState, setActiveHostElement, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode, setSelectedIndex, ΔnamespaceHTML} from '../state';
 import {initializeStaticContext as initializeStaticStylingContext} from '../styling/class_and_style_bindings';
 import {ANIMATION_PROP_PREFIX, isAnimationProp} from '../styling/util';
 import {NO_CHANGE} from '../tokens';
@@ -484,7 +484,7 @@ function renderComponentOrTemplate<T>(
 }
 
 function executeTemplate<T>(templateFn: ComponentTemplate<T>, rf: RenderFlags, context: T) {
-  ɵɵnamespaceHTML();
+  ΔnamespaceHTML();
   const prevSelectedIndex = getSelectedIndex();
   try {
     setActiveHostElement(null);
diff --git a/packages/core/src/render3/instructions/storage.ts b/packages/core/src/render3/instructions/storage.ts
index c95db3a1e9..53c1944191 100644
--- a/packages/core/src/render3/instructions/storage.ts
+++ b/packages/core/src/render3/instructions/storage.ts
@@ -33,7 +33,7 @@ export function store<T>(index: number, value: T): void {
  *
  * @codeGenApi
  */
-export function ɵɵreference<T>(index: number) {
+export function Δreference<T>(index: number) {
   const contextLView = getContextLView();
   return loadInternal<T>(contextLView, index);
 }
@@ -43,6 +43,6 @@ export function ɵɵreference<T>(index: number) {
  *
  * @codeGenApi
  */
-export function ɵɵload<T>(index: number): T {
+export function Δload<T>(index: number): T {
   return loadInternal<T>(getLView(), index);
 }
diff --git a/packages/core/src/render3/instructions/styling.ts b/packages/core/src/render3/instructions/styling.ts
index 6735ea7b48..2d2911ba95 100644
--- a/packages/core/src/render3/instructions/styling.ts
+++ b/packages/core/src/render3/instructions/styling.ts
@@ -63,7 +63,7 @@ import {scheduleTick, setInputsForProperty} from './shared';
  *
  * @codeGenApi
  */
-export function ɵɵstyling(
+export function Δstyling(
     classBindingNames?: string[] | null, styleBindingNames?: string[] | null,
     styleSanitizer?: StyleSanitizeFn | null): void {
   const tNode = getPreviousOrParentTNode();
@@ -133,7 +133,7 @@ function initstyling(
  *
  * @codeGenApi
  */
-export function ɵɵstyleProp(
+export function ΔstyleProp(
     styleIndex: number, value: string | number | String | PlayerFactory | null,
     suffix?: string | null, forceOverride?: boolean): void {
   const index = getSelectedIndex();
@@ -190,7 +190,7 @@ function resolveStylePropValue(
  *
  * @codeGenApi
  */
-export function ɵɵclassProp(
+export function ΔclassProp(
     classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void {
   const index = getSelectedIndex();
   const input = (value instanceof BoundPlayerFactory) ?
@@ -234,7 +234,7 @@ function booleanOrNull(value: any): boolean|null {
  *
  * @codeGenApi
  */
-export function ɵɵstyleMap(styles: {[styleName: string]: any} | NO_CHANGE | null): void {
+export function ΔstyleMap(styles: {[styleName: string]: any} | NO_CHANGE | null): void {
   const index = getSelectedIndex();
   const lView = getLView();
   const stylingContext = getStylingContext(index, lView);
@@ -278,7 +278,7 @@ export function ɵɵstyleMap(styles: {[styleName: string]: any} | NO_CHANGE | nu
  *
  * @codeGenApi
  */
-export function ɵɵclassMap(classes: {[styleName: string]: any} | NO_CHANGE | string | null): void {
+export function ΔclassMap(classes: {[styleName: string]: any} | NO_CHANGE | string | null): void {
   const index = getSelectedIndex();
   const lView = getLView();
   const stylingContext = getStylingContext(index, lView);
@@ -311,7 +311,7 @@ export function ɵɵclassMap(classes: {[styleName: string]: any} | NO_CHANGE | s
  *
  * @codeGenApi
  */
-export function ɵɵstylingApply(): void {
+export function ΔstylingApply(): void {
   const index = getSelectedIndex();
   const directiveStylingIndex =
       getActiveDirectiveStylingIndex() || DEFAULT_TEMPLATE_DIRECTIVE_INDEX;
diff --git a/packages/core/src/render3/instructions/text.ts b/packages/core/src/render3/instructions/text.ts
index 13bff5d10d..1792ed6f78 100644
--- a/packages/core/src/render3/instructions/text.ts
+++ b/packages/core/src/render3/instructions/text.ts
@@ -24,7 +24,7 @@ import {createNodeAtIndex} from './shared';
  *
  * @codeGenApi
  */
-export function ɵɵtext(index: number, value?: any): void {
+export function Δtext(index: number, value?: any): void {
   const lView = getLView();
   ngDevMode && assertEqual(
                    lView[BINDING_INDEX], lView[TVIEW].bindingStartIndex,
@@ -47,7 +47,7 @@ export function ɵɵtext(index: number, value?: any): void {
  *
  * @codeGenApi
  */
-export function ɵɵtextBinding<T>(index: number, value: T | NO_CHANGE): void {
+export function ΔtextBinding<T>(index: number, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
     const lView = getLView();
     ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 55effb84bb..76c04bc0ae 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -88,7 +88,7 @@ export interface PipeType<T> extends Type<T> { ngPipeDef: never; }
 /**
  * @codeGenApi
  */
-export type ɵɵDirectiveDefWithMeta<
+export type ΔDirectiveDefWithMeta<
     T, Selector extends string, ExportAs extends string[], InputMap extends{[key: string]: string},
     OutputMap extends{[key: string]: string}, QueryFields extends string[]> = DirectiveDef<T>;
 
@@ -103,7 +103,7 @@ export type ɵɵDirectiveDefWithMeta<
  *
  * @codeGenApi
  */
-export interface ɵɵBaseDef<T> {
+export interface ΔBaseDef<T> {
   /**
    * A dictionary mapping the inputs' minified property names to their public API names, which
    * are their aliases if any, or their original unminified property names
@@ -156,7 +156,7 @@ export interface ɵɵBaseDef<T> {
  *
  * See: {@link defineDirective}
  */
-export interface DirectiveDef<T> extends ɵɵBaseDef<T> {
+export interface DirectiveDef<T> extends ΔBaseDef<T> {
   /** Token representing the directive. Used by DI. */
   type: Type<T>;
 
@@ -202,7 +202,7 @@ export interface DirectiveDef<T> extends ɵɵBaseDef<T> {
 /**
  * @codeGenApi
  */
-export type ɵɵComponentDefWithMeta<
+export type ΔComponentDefWithMeta<
     T, Selector extends String, ExportAs extends string[], InputMap extends{[key: string]: string},
     OutputMap extends{[key: string]: string}, QueryFields extends string[]> = ComponentDef<T>;
 
@@ -349,7 +349,7 @@ export interface PipeDef<T> {
 /**
  * @codeGenApi
  */
-export type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
+export type ΔPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
 
 export interface DirectiveDefFeature {
   <T>(directiveDef: DirectiveDef<T>): void;
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 781ed99f83..e4a070f611 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵɵdefineInjectable, ɵɵdefineInjector,} from '../../di/interface/defs';
-import {ɵɵinject} from '../../di/injector_compatibility';
+import {ΔdefineInjectable, ΔdefineInjector,} from '../../di/interface/defs';
+import {Δinject} from '../../di/injector_compatibility';
 import * as r3 from '../index';
 import * as sanitization from '../../sanitization/sanitization';
 
@@ -18,124 +18,124 @@ import * as sanitization from '../../sanitization/sanitization';
  * This should be kept up to date with the public exports of @angular/core.
  */
 export const angularCoreEnv: {[name: string]: Function} = {
-  'ɵɵdefineBase': r3.ɵɵdefineBase,
-  'ɵɵdefineComponent': r3.ɵɵdefineComponent,
-  'ɵɵdefineDirective': r3.ɵɵdefineDirective,
-  'ɵɵdefineInjectable': ɵɵdefineInjectable,
-  'ɵɵdefineInjector': ɵɵdefineInjector,
-  'ɵɵdefineNgModule': r3.ɵɵdefineNgModule,
-  'ɵɵdefinePipe': r3.ɵɵdefinePipe,
-  'ɵɵdirectiveInject': r3.ɵɵdirectiveInject,
-  'ɵɵgetFactoryOf': r3.ɵɵgetFactoryOf,
-  'ɵɵgetInheritedFactory': r3.ɵɵgetInheritedFactory,
-  'ɵɵinject': ɵɵinject,
-  'ɵɵinjectAttribute': r3.ɵɵinjectAttribute,
-  'ɵɵtemplateRefExtractor': r3.ɵɵtemplateRefExtractor,
-  'ɵɵNgOnChangesFeature': r3.ɵɵNgOnChangesFeature,
-  'ɵɵProvidersFeature': r3.ɵɵProvidersFeature,
-  'ɵɵInheritDefinitionFeature': r3.ɵɵInheritDefinitionFeature,
-  'ɵɵelementAttribute': r3.ɵɵelementAttribute,
-  'ɵɵbind': r3.ɵɵbind,
-  'ɵɵcontainer': r3.ɵɵcontainer,
-  'ɵɵnextContext': r3.ɵɵnextContext,
-  'ɵɵcontainerRefreshStart': r3.ɵɵcontainerRefreshStart,
-  'ɵɵcontainerRefreshEnd': r3.ɵɵcontainerRefreshEnd,
-  'ɵɵnamespaceHTML': r3.ɵɵnamespaceHTML,
-  'ɵɵnamespaceMathML': r3.ɵɵnamespaceMathML,
-  'ɵɵnamespaceSVG': r3.ɵɵnamespaceSVG,
-  'ɵɵenableBindings': r3.ɵɵenableBindings,
-  'ɵɵdisableBindings': r3.ɵɵdisableBindings,
-  'ɵɵallocHostVars': r3.ɵɵallocHostVars,
-  'ɵɵelementStart': r3.ɵɵelementStart,
-  'ɵɵelementEnd': r3.ɵɵelementEnd,
-  'ɵɵelement': r3.ɵɵelement,
-  'ɵɵelementContainerStart': r3.ɵɵelementContainerStart,
-  'ɵɵelementContainerEnd': r3.ɵɵelementContainerEnd,
-  'ɵɵpureFunction0': r3.ɵɵpureFunction0,
-  'ɵɵpureFunction1': r3.ɵɵpureFunction1,
-  'ɵɵpureFunction2': r3.ɵɵpureFunction2,
-  'ɵɵpureFunction3': r3.ɵɵpureFunction3,
-  'ɵɵpureFunction4': r3.ɵɵpureFunction4,
-  'ɵɵpureFunction5': r3.ɵɵpureFunction5,
-  'ɵɵpureFunction6': r3.ɵɵpureFunction6,
-  'ɵɵpureFunction7': r3.ɵɵpureFunction7,
-  'ɵɵpureFunction8': r3.ɵɵpureFunction8,
-  'ɵɵpureFunctionV': r3.ɵɵpureFunctionV,
-  'ɵɵgetCurrentView': r3.ɵɵgetCurrentView,
-  'ɵɵrestoreView': r3.ɵɵrestoreView,
-  'ɵɵinterpolation1': r3.ɵɵinterpolation1,
-  'ɵɵinterpolation2': r3.ɵɵinterpolation2,
-  'ɵɵinterpolation3': r3.ɵɵinterpolation3,
-  'ɵɵinterpolation4': r3.ɵɵinterpolation4,
-  'ɵɵinterpolation5': r3.ɵɵinterpolation5,
-  'ɵɵinterpolation6': r3.ɵɵinterpolation6,
-  'ɵɵinterpolation7': r3.ɵɵinterpolation7,
-  'ɵɵinterpolation8': r3.ɵɵinterpolation8,
-  'ɵɵinterpolationV': r3.ɵɵinterpolationV,
-  'ɵɵlistener': r3.ɵɵlistener,
-  'ɵɵload': r3.ɵɵload,
-  'ɵɵprojection': r3.ɵɵprojection,
-  'ɵɵelementProperty': r3.ɵɵelementProperty,
-  'ɵɵcomponentHostSyntheticProperty': r3.ɵɵcomponentHostSyntheticProperty,
-  'ɵɵcomponentHostSyntheticListener': r3.ɵɵcomponentHostSyntheticListener,
-  'ɵɵpipeBind1': r3.ɵɵpipeBind1,
-  'ɵɵpipeBind2': r3.ɵɵpipeBind2,
-  'ɵɵpipeBind3': r3.ɵɵpipeBind3,
-  'ɵɵpipeBind4': r3.ɵɵpipeBind4,
-  'ɵɵpipeBindV': r3.ɵɵpipeBindV,
-  'ɵɵprojectionDef': r3.ɵɵprojectionDef,
-  'ɵɵproperty': r3.ɵɵproperty,
-  'ɵɵpropertyInterpolate': r3.ɵɵpropertyInterpolate,
-  'ɵɵpropertyInterpolate1': r3.ɵɵpropertyInterpolate1,
-  'ɵɵpropertyInterpolate2': r3.ɵɵpropertyInterpolate2,
-  'ɵɵpropertyInterpolate3': r3.ɵɵpropertyInterpolate3,
-  'ɵɵpropertyInterpolate4': r3.ɵɵpropertyInterpolate4,
-  'ɵɵpropertyInterpolate5': r3.ɵɵpropertyInterpolate5,
-  'ɵɵpropertyInterpolate6': r3.ɵɵpropertyInterpolate6,
-  'ɵɵpropertyInterpolate7': r3.ɵɵpropertyInterpolate7,
-  'ɵɵpropertyInterpolate8': r3.ɵɵpropertyInterpolate8,
-  'ɵɵpropertyInterpolateV': r3.ɵɵpropertyInterpolateV,
-  'ɵɵpipe': r3.ɵɵpipe,
-  'ɵɵqueryRefresh': r3.ɵɵqueryRefresh,
-  'ɵɵviewQuery': r3.ɵɵviewQuery,
-  'ɵɵstaticViewQuery': r3.ɵɵstaticViewQuery,
-  'ɵɵstaticContentQuery': r3.ɵɵstaticContentQuery,
-  'ɵɵloadViewQuery': r3.ɵɵloadViewQuery,
-  'ɵɵcontentQuery': r3.ɵɵcontentQuery,
-  'ɵɵloadContentQuery': r3.ɵɵloadContentQuery,
-  'ɵɵreference': r3.ɵɵreference,
-  'ɵɵelementHostAttrs': r3.ɵɵelementHostAttrs,
-  'ɵɵclassMap': r3.ɵɵclassMap,
-  'ɵɵstyling': r3.ɵɵstyling,
-  'ɵɵstyleMap': r3.ɵɵstyleMap,
-  'ɵɵstyleProp': r3.ɵɵstyleProp,
-  'ɵɵstylingApply': r3.ɵɵstylingApply,
-  'ɵɵclassProp': r3.ɵɵclassProp,
-  'ɵɵselect': r3.ɵɵselect,
-  'ɵɵtemplate': r3.ɵɵtemplate,
-  'ɵɵtext': r3.ɵɵtext,
-  'ɵɵtextBinding': r3.ɵɵtextBinding,
-  'ɵɵembeddedViewStart': r3.ɵɵembeddedViewStart,
-  'ɵɵembeddedViewEnd': r3.ɵɵembeddedViewEnd,
-  'ɵɵi18n': r3.ɵɵi18n,
-  'ɵɵi18nAttributes': r3.ɵɵi18nAttributes,
-  'ɵɵi18nExp': r3.ɵɵi18nExp,
-  'ɵɵi18nStart': r3.ɵɵi18nStart,
-  'ɵɵi18nEnd': r3.ɵɵi18nEnd,
-  'ɵɵi18nApply': r3.ɵɵi18nApply,
-  'ɵɵi18nPostprocess': r3.ɵɵi18nPostprocess,
-  'ɵɵi18nLocalize': r3.ɵɵi18nLocalize,
-  'ɵɵresolveWindow': r3.ɵɵresolveWindow,
-  'ɵɵresolveDocument': r3.ɵɵresolveDocument,
-  'ɵɵresolveBody': r3.ɵɵresolveBody,
-  'ɵɵsetComponentScope': r3.ɵɵsetComponentScope,
-  'ɵɵsetNgModuleScope': r3.ɵɵsetNgModuleScope,
+  'ΔdefineBase': r3.ΔdefineBase,
+  'ΔdefineComponent': r3.ΔdefineComponent,
+  'ΔdefineDirective': r3.ΔdefineDirective,
+  'ΔdefineInjectable': ΔdefineInjectable,
+  'ΔdefineInjector': ΔdefineInjector,
+  'ΔdefineNgModule': r3.ΔdefineNgModule,
+  'ΔdefinePipe': r3.ΔdefinePipe,
+  'ΔdirectiveInject': r3.ΔdirectiveInject,
+  'ΔgetFactoryOf': r3.ΔgetFactoryOf,
+  'ΔgetInheritedFactory': r3.ΔgetInheritedFactory,
+  'Δinject': Δinject,
+  'ΔinjectAttribute': r3.ΔinjectAttribute,
+  'ΔtemplateRefExtractor': r3.ΔtemplateRefExtractor,
+  'ΔNgOnChangesFeature': r3.ΔNgOnChangesFeature,
+  'ΔProvidersFeature': r3.ΔProvidersFeature,
+  'ΔInheritDefinitionFeature': r3.ΔInheritDefinitionFeature,
+  'ΔelementAttribute': r3.ΔelementAttribute,
+  'Δbind': r3.Δbind,
+  'Δcontainer': r3.Δcontainer,
+  'ΔnextContext': r3.ΔnextContext,
+  'ΔcontainerRefreshStart': r3.ΔcontainerRefreshStart,
+  'ΔcontainerRefreshEnd': r3.ΔcontainerRefreshEnd,
+  'ΔnamespaceHTML': r3.ΔnamespaceHTML,
+  'ΔnamespaceMathML': r3.ΔnamespaceMathML,
+  'ΔnamespaceSVG': r3.ΔnamespaceSVG,
+  'ΔenableBindings': r3.ΔenableBindings,
+  'ΔdisableBindings': r3.ΔdisableBindings,
+  'ΔallocHostVars': r3.ΔallocHostVars,
+  'ΔelementStart': r3.ΔelementStart,
+  'ΔelementEnd': r3.ΔelementEnd,
+  'Δelement': r3.Δelement,
+  'ΔelementContainerStart': r3.ΔelementContainerStart,
+  'ΔelementContainerEnd': r3.ΔelementContainerEnd,
+  'ΔpureFunction0': r3.ΔpureFunction0,
+  'ΔpureFunction1': r3.ΔpureFunction1,
+  'ΔpureFunction2': r3.ΔpureFunction2,
+  'ΔpureFunction3': r3.ΔpureFunction3,
+  'ΔpureFunction4': r3.ΔpureFunction4,
+  'ΔpureFunction5': r3.ΔpureFunction5,
+  'ΔpureFunction6': r3.ΔpureFunction6,
+  'ΔpureFunction7': r3.ΔpureFunction7,
+  'ΔpureFunction8': r3.ΔpureFunction8,
+  'ΔpureFunctionV': r3.ΔpureFunctionV,
+  'ΔgetCurrentView': r3.ΔgetCurrentView,
+  'ΔrestoreView': r3.ΔrestoreView,
+  'Δinterpolation1': r3.Δinterpolation1,
+  'Δinterpolation2': r3.Δinterpolation2,
+  'Δinterpolation3': r3.Δinterpolation3,
+  'Δinterpolation4': r3.Δinterpolation4,
+  'Δinterpolation5': r3.Δinterpolation5,
+  'Δinterpolation6': r3.Δinterpolation6,
+  'Δinterpolation7': r3.Δinterpolation7,
+  'Δinterpolation8': r3.Δinterpolation8,
+  'ΔinterpolationV': r3.ΔinterpolationV,
+  'Δlistener': r3.Δlistener,
+  'Δload': r3.Δload,
+  'Δprojection': r3.Δprojection,
+  'ΔelementProperty': r3.ΔelementProperty,
+  'ΔcomponentHostSyntheticProperty': r3.ΔcomponentHostSyntheticProperty,
+  'ΔcomponentHostSyntheticListener': r3.ΔcomponentHostSyntheticListener,
+  'ΔpipeBind1': r3.ΔpipeBind1,
+  'ΔpipeBind2': r3.ΔpipeBind2,
+  'ΔpipeBind3': r3.ΔpipeBind3,
+  'ΔpipeBind4': r3.ΔpipeBind4,
+  'ΔpipeBindV': r3.ΔpipeBindV,
+  'ΔprojectionDef': r3.ΔprojectionDef,
+  'Δproperty': r3.Δproperty,
+  'ΔpropertyInterpolate': r3.ΔpropertyInterpolate,
+  'ΔpropertyInterpolate1': r3.ΔpropertyInterpolate1,
+  'ΔpropertyInterpolate2': r3.ΔpropertyInterpolate2,
+  'ΔpropertyInterpolate3': r3.ΔpropertyInterpolate3,
+  'ΔpropertyInterpolate4': r3.ΔpropertyInterpolate4,
+  'ΔpropertyInterpolate5': r3.ΔpropertyInterpolate5,
+  'ΔpropertyInterpolate6': r3.ΔpropertyInterpolate6,
+  'ΔpropertyInterpolate7': r3.ΔpropertyInterpolate7,
+  'ΔpropertyInterpolate8': r3.ΔpropertyInterpolate8,
+  'ΔpropertyInterpolateV': r3.ΔpropertyInterpolateV,
+  'Δpipe': r3.Δpipe,
+  'ΔqueryRefresh': r3.ΔqueryRefresh,
+  'ΔviewQuery': r3.ΔviewQuery,
+  'ΔstaticViewQuery': r3.ΔstaticViewQuery,
+  'ΔstaticContentQuery': r3.ΔstaticContentQuery,
+  'ΔloadViewQuery': r3.ΔloadViewQuery,
+  'ΔcontentQuery': r3.ΔcontentQuery,
+  'ΔloadContentQuery': r3.ΔloadContentQuery,
+  'Δreference': r3.Δreference,
+  'ΔelementHostAttrs': r3.ΔelementHostAttrs,
+  'ΔclassMap': r3.ΔclassMap,
+  'Δstyling': r3.Δstyling,
+  'ΔstyleMap': r3.ΔstyleMap,
+  'ΔstyleProp': r3.ΔstyleProp,
+  'ΔstylingApply': r3.ΔstylingApply,
+  'ΔclassProp': r3.ΔclassProp,
+  'Δselect': r3.Δselect,
+  'Δtemplate': r3.Δtemplate,
+  'Δtext': r3.Δtext,
+  'ΔtextBinding': r3.ΔtextBinding,
+  'ΔembeddedViewStart': r3.ΔembeddedViewStart,
+  'ΔembeddedViewEnd': r3.ΔembeddedViewEnd,
+  'Δi18n': r3.Δi18n,
+  'Δi18nAttributes': r3.Δi18nAttributes,
+  'Δi18nExp': r3.Δi18nExp,
+  'Δi18nStart': r3.Δi18nStart,
+  'Δi18nEnd': r3.Δi18nEnd,
+  'Δi18nApply': r3.Δi18nApply,
+  'Δi18nPostprocess': r3.Δi18nPostprocess,
+  'Δi18nLocalize': r3.Δi18nLocalize,
+  'ΔresolveWindow': r3.ΔresolveWindow,
+  'ΔresolveDocument': r3.ΔresolveDocument,
+  'ΔresolveBody': r3.ΔresolveBody,
+  'ΔsetComponentScope': r3.ΔsetComponentScope,
+  'ΔsetNgModuleScope': r3.ΔsetNgModuleScope,
 
-  'ɵɵsanitizeHtml': sanitization.ɵɵsanitizeHtml,
-  'ɵɵsanitizeStyle': sanitization.ɵɵsanitizeStyle,
-  'ɵɵdefaultStyleSanitizer': sanitization.ɵɵdefaultStyleSanitizer,
-  'ɵɵsanitizeResourceUrl': sanitization.ɵɵsanitizeResourceUrl,
-  'ɵɵsanitizeScript': sanitization.ɵɵsanitizeScript,
-  'ɵɵsanitizeUrl': sanitization.ɵɵsanitizeUrl,
-  'ɵɵsanitizeUrlOrResourceUrl': sanitization.ɵɵsanitizeUrlOrResourceUrl,
+  'ΔsanitizeHtml': sanitization.ΔsanitizeHtml,
+  'ΔsanitizeStyle': sanitization.ΔsanitizeStyle,
+  'ΔdefaultStyleSanitizer': sanitization.ΔdefaultStyleSanitizer,
+  'ΔsanitizeResourceUrl': sanitization.ΔsanitizeResourceUrl,
+  'ΔsanitizeScript': sanitization.ΔsanitizeScript,
+  'ΔsanitizeUrl': sanitization.ΔsanitizeUrl,
+  'ΔsanitizeUrlOrResourceUrl': sanitization.ΔsanitizeUrlOrResourceUrl,
 };
diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index a1168e366c..10caa79a0e 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -9,10 +9,10 @@
 import {WrappedValue} from '../change_detection/change_detection_util';
 import {PipeTransform} from '../change_detection/pipe_transform';
 
-import {store, ɵɵload} from './instructions/all';
+import {store, Δload} from './instructions/all';
 import {PipeDef, PipeDefList} from './interfaces/definition';
 import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
-import {ɵɵpureFunction1, ɵɵpureFunction2, ɵɵpureFunction3, ɵɵpureFunction4, ɵɵpureFunctionV} from './pure_function';
+import {ΔpureFunction1, ΔpureFunction2, ΔpureFunction3, ΔpureFunction4, ΔpureFunctionV} from './pure_function';
 import {getLView} from './state';
 import {NO_CHANGE} from './tokens';
 
@@ -27,7 +27,7 @@ import {NO_CHANGE} from './tokens';
  *
  * @codeGenApi
  */
-export function ɵɵpipe(index: number, pipeName: string): any {
+export function Δpipe(index: number, pipeName: string): any {
   const tView = getLView()[TVIEW];
   let pipeDef: PipeDef<any>;
   const adjustedIndex = index + HEADER_OFFSET;
@@ -81,10 +81,10 @@ function getPipeDef(name: string, registry: PipeDefList | null): PipeDef<any> {
  *
  * @codeGenApi
  */
-export function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any {
-  const pipeInstance = ɵɵload<PipeTransform>(index);
+export function ΔpipeBind1(index: number, slotOffset: number, v1: any): any {
+  const pipeInstance = Δload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ? ɵɵpureFunction1(slotOffset, pipeInstance.transform, v1, pipeInstance) :
+      isPure(index) ? ΔpureFunction1(slotOffset, pipeInstance.transform, v1, pipeInstance) :
                       pipeInstance.transform(v1));
 }
 
@@ -101,10 +101,10 @@ export function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any {
  *
  * @codeGenApi
  */
-export function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any {
-  const pipeInstance = ɵɵload<PipeTransform>(index);
+export function ΔpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any {
+  const pipeInstance = Δload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ? ɵɵpureFunction2(slotOffset, pipeInstance.transform, v1, v2, pipeInstance) :
+      isPure(index) ? ΔpureFunction2(slotOffset, pipeInstance.transform, v1, v2, pipeInstance) :
                       pipeInstance.transform(v1, v2));
 }
 
@@ -122,12 +122,11 @@ export function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: an
  *
  * @codeGenApi
  */
-export function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any {
-  const pipeInstance = ɵɵload<PipeTransform>(index);
+export function ΔpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any {
+  const pipeInstance = Δload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ?
-          ɵɵpureFunction3(slotOffset, pipeInstance.transform, v1, v2, v3, pipeInstance) :
-          pipeInstance.transform(v1, v2, v3));
+      isPure(index) ? ΔpureFunction3(slotOffset, pipeInstance.transform, v1, v2, v3, pipeInstance) :
+                      pipeInstance.transform(v1, v2, v3));
 }
 
 /**
@@ -145,12 +144,12 @@ export function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: an
  *
  * @codeGenApi
  */
-export function ɵɵpipeBind4(
+export function ΔpipeBind4(
     index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any {
-  const pipeInstance = ɵɵload<PipeTransform>(index);
+  const pipeInstance = Δload<PipeTransform>(index);
   return unwrapValue(
       isPure(index) ?
-          ɵɵpureFunction4(slotOffset, pipeInstance.transform, v1, v2, v3, v4, pipeInstance) :
+          ΔpureFunction4(slotOffset, pipeInstance.transform, v1, v2, v3, v4, pipeInstance) :
           pipeInstance.transform(v1, v2, v3, v4));
 }
 
@@ -166,10 +165,10 @@ export function ɵɵpipeBind4(
  *
  * @codeGenApi
  */
-export function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any {
-  const pipeInstance = ɵɵload<PipeTransform>(index);
+export function ΔpipeBindV(index: number, slotOffset: number, values: any[]): any {
+  const pipeInstance = Δload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ? ɵɵpureFunctionV(slotOffset, pipeInstance.transform, values, pipeInstance) :
+      isPure(index) ? ΔpureFunctionV(slotOffset, pipeInstance.transform, values, pipeInstance) :
                       pipeInstance.transform.apply(pipeInstance, values));
 }
 
diff --git a/packages/core/src/render3/pure_function.ts b/packages/core/src/render3/pure_function.ts
index d3a893ba6d..bd4f1cd255 100644
--- a/packages/core/src/render3/pure_function.ts
+++ b/packages/core/src/render3/pure_function.ts
@@ -40,7 +40,7 @@ import {getBindingRoot, getLView, isCreationMode} from './state';
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T {
+export function ΔpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
   const bindingIndex = getBindingRoot() + slotOffset;
   const lView = getLView();
@@ -61,7 +61,7 @@ export function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisAr
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction1(
+export function ΔpureFunction1(
     slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
   const lView = getLView();
@@ -84,7 +84,7 @@ export function ɵɵpureFunction1(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction2(
+export function ΔpureFunction2(
     slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any,
     thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -111,7 +111,7 @@ export function ɵɵpureFunction2(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction3(
+export function ΔpureFunction3(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any,
     thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -139,7 +139,7 @@ export function ɵɵpureFunction3(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction4(
+export function ΔpureFunction4(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any,
     exp3: any, exp4: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -168,7 +168,7 @@ export function ɵɵpureFunction4(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction5(
+export function ΔpureFunction5(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any,
     exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -199,7 +199,7 @@ export function ɵɵpureFunction5(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction6(
+export function ΔpureFunction6(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any,
     exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -232,7 +232,7 @@ export function ɵɵpureFunction6(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction7(
+export function ΔpureFunction7(
     slotOffset: number,
     pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any,
     exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any {
@@ -267,7 +267,7 @@ export function ɵɵpureFunction7(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunction8(
+export function ΔpureFunction8(
     slotOffset: number,
     pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any,
     exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any,
@@ -299,7 +299,7 @@ export function ɵɵpureFunction8(
  *
  * @codeGenApi
  */
-export function ɵɵpureFunctionV(
+export function ΔpureFunctionV(
     slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
   let bindingIndex = getBindingRoot() + slotOffset;
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 82d5572526..7f1967f5a9 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -18,7 +18,7 @@ import {assertDataInRange, assertDefined, assertEqual} from '../util/assert';
 import {assertPreviousIsParent} from './assert';
 import {getNodeInjectable, locateDirectiveOrProvider} from './di';
 import {NG_ELEMENT_ID} from './fields';
-import {store, ɵɵload} from './instructions/all';
+import {store, Δload} from './instructions/all';
 import {storeCleanupWithContext} from './instructions/shared';
 import {unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
 import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
@@ -391,7 +391,7 @@ export function query<T>(
  *
  * @codeGenApi
  */
-export function ɵɵqueryRefresh(queryList: QueryList<any>): boolean {
+export function ΔqueryRefresh(queryList: QueryList<any>): boolean {
   const queryListImpl = (queryList as any as QueryList_<any>);
   const creationMode = isCreationMode();
 
@@ -413,10 +413,10 @@ export function ɵɵqueryRefresh(queryList: QueryList<any>): boolean {
  *
  * @codeGenApi
  */
-export function ɵɵstaticViewQuery<T>(
+export function ΔstaticViewQuery<T>(
     // TODO(FW-486): "read" should be an AbstractType
     predicate: Type<any>| string[], descend: boolean, read: any): void {
-  const queryList = ɵɵviewQuery(predicate, descend, read) as QueryList_<T>;
+  const queryList = ΔviewQuery(predicate, descend, read) as QueryList_<T>;
   const tView = getLView()[TVIEW];
   queryList._static = true;
   if (!tView.staticViewQueries) {
@@ -434,7 +434,7 @@ export function ɵɵstaticViewQuery<T>(
  *
  * @codeGenApi
  */
-export function ɵɵviewQuery<T>(
+export function ΔviewQuery<T>(
     // TODO(FW-486): "read" should be an AbstractType
     predicate: Type<any>| string[], descend: boolean, read: any): QueryList<T> {
   const lView = getLView();
@@ -454,10 +454,10 @@ export function ɵɵviewQuery<T>(
  *
  * @codeGenApi
  */
-export function ɵɵloadViewQuery<T>(): T {
+export function ΔloadViewQuery<T>(): T {
   const index = getCurrentQueryIndex();
   setCurrentQueryIndex(index + 1);
-  return ɵɵload<T>(index - HEADER_OFFSET);
+  return Δload<T>(index - HEADER_OFFSET);
 }
 
 /**
@@ -472,7 +472,7 @@ export function ɵɵloadViewQuery<T>(): T {
  *
  * @codeGenApi
  */
-export function ɵɵcontentQuery<T>(
+export function ΔcontentQuery<T>(
     directiveIndex: number, predicate: Type<any>| string[], descend: boolean,
     // TODO(FW-486): "read" should be an AbstractType
     read: any): QueryList<T> {
@@ -503,11 +503,11 @@ export function ɵɵcontentQuery<T>(
  *
  * @codeGenApi
  */
-export function ɵɵstaticContentQuery<T>(
+export function ΔstaticContentQuery<T>(
     directiveIndex: number, predicate: Type<any>| string[], descend: boolean,
     // TODO(FW-486): "read" should be an AbstractType
     read: any): void {
-  const queryList = ɵɵcontentQuery(directiveIndex, predicate, descend, read) as QueryList_<T>;
+  const queryList = ΔcontentQuery(directiveIndex, predicate, descend, read) as QueryList_<T>;
   const tView = getLView()[TVIEW];
   queryList._static = true;
   if (!tView.staticContentQueries) {
@@ -519,7 +519,7 @@ export function ɵɵstaticContentQuery<T>(
  *
  * @codeGenApi
  */
-export function ɵɵloadContentQuery<T>(): QueryList<T> {
+export function ΔloadContentQuery<T>(): QueryList<T> {
   const lView = getLView();
   ngDevMode &&
       assertDefined(
diff --git a/packages/core/src/render3/state.ts b/packages/core/src/render3/state.ts
index a0ecfa2b76..7234afc2c2 100644
--- a/packages/core/src/render3/state.ts
+++ b/packages/core/src/render3/state.ts
@@ -83,17 +83,17 @@ export function getBindingsEnabled(): boolean {
  *   Should match component / directive.
  * </my-comp>
  * <div ngNonBindable>
- *   <!-- ɵɵdisableBindings() -->
+ *   <!-- ΔdisableBindings() -->
  *   <my-comp my-directive>
  *     Should not match component / directive because we are in ngNonBindable.
  *   </my-comp>
- *   <!-- ɵɵenableBindings() -->
+ *   <!-- ΔenableBindings() -->
  * </div>
  * ```
  *
  * @codeGenApi
  */
-export function ɵɵenableBindings(): void {
+export function ΔenableBindings(): void {
   bindingsEnabled = true;
 }
 
@@ -106,17 +106,17 @@ export function ɵɵenableBindings(): void {
  *   Should match component / directive.
  * </my-comp>
  * <div ngNonBindable>
- *   <!-- ɵɵdisableBindings() -->
+ *   <!-- ΔdisableBindings() -->
  *   <my-comp my-directive>
  *     Should not match component / directive because we are in ngNonBindable.
  *   </my-comp>
- *   <!-- ɵɵenableBindings() -->
+ *   <!-- ΔenableBindings() -->
  * </div>
  * ```
  *
  * @codeGenApi
  */
-export function ɵɵdisableBindings(): void {
+export function ΔdisableBindings(): void {
   bindingsEnabled = false;
 }
 
@@ -270,7 +270,7 @@ export function getActiveDirectiveSuperClassDepth() {
  *
  * @codeGenApi
  */
-export function ɵɵrestoreView(viewToRestore: OpaqueViewState) {
+export function ΔrestoreView(viewToRestore: OpaqueViewState) {
   contextLView = viewToRestore as any as LView;
 }
 
@@ -495,7 +495,7 @@ let _currentNamespace: string|null = null;
  *
  * @codeGenApi
  */
-export function ɵɵnamespaceSVG() {
+export function ΔnamespaceSVG() {
   _currentNamespace = 'http://www.w3.org/2000/svg';
 }
 
@@ -504,7 +504,7 @@ export function ɵɵnamespaceSVG() {
  *
  * @codeGenApi
  */
-export function ɵɵnamespaceMathML() {
+export function ΔnamespaceMathML() {
   _currentNamespace = 'http://www.w3.org/1998/MathML/';
 }
 
@@ -514,7 +514,7 @@ export function ɵɵnamespaceMathML() {
  *
  * @codeGenApi
  */
-export function ɵɵnamespaceHTML() {
+export function ΔnamespaceHTML() {
   _currentNamespace = null;
 }
 
diff --git a/packages/core/src/render3/util/misc_utils.ts b/packages/core/src/render3/util/misc_utils.ts
index a72006f1ed..0514f1896c 100644
--- a/packages/core/src/render3/util/misc_utils.ts
+++ b/packages/core/src/render3/util/misc_utils.ts
@@ -56,7 +56,7 @@ export const defaultScheduler =
  *
  * @codeGenApi
  */
-export function ɵɵresolveWindow(element: RElement & {ownerDocument: Document}) {
+export function ΔresolveWindow(element: RElement & {ownerDocument: Document}) {
   return {name: 'window', target: element.ownerDocument.defaultView};
 }
 
@@ -64,7 +64,7 @@ export function ɵɵresolveWindow(element: RElement & {ownerDocument: Document})
  *
  * @codeGenApi
  */
-export function ɵɵresolveDocument(element: RElement & {ownerDocument: Document}) {
+export function ΔresolveDocument(element: RElement & {ownerDocument: Document}) {
   return {name: 'document', target: element.ownerDocument};
 }
 
@@ -72,7 +72,7 @@ export function ɵɵresolveDocument(element: RElement & {ownerDocument: Document
  *
  * @codeGenApi
  */
-export function ɵɵresolveBody(element: RElement & {ownerDocument: Document}) {
+export function ΔresolveBody(element: RElement & {ownerDocument: Document}) {
   return {name: 'body', target: element.ownerDocument.body};
 }
 
diff --git a/packages/core/src/render3/view_engine_compatibility_prebound.ts b/packages/core/src/render3/view_engine_compatibility_prebound.ts
index 2c5505a831..a2cdbc706c 100644
--- a/packages/core/src/render3/view_engine_compatibility_prebound.ts
+++ b/packages/core/src/render3/view_engine_compatibility_prebound.ts
@@ -22,6 +22,6 @@ import {createTemplateRef} from './view_engine_compatibility';
  *
  * @codeGenApi
  */
-export function ɵɵtemplateRefExtractor(tNode: TNode, currentView: LView) {
+export function ΔtemplateRefExtractor(tNode: TNode, currentView: LView) {
   return createTemplateRef(ViewEngine_TemplateRef, ViewEngine_ElementRef, tNode, currentView);
 }
diff --git a/packages/core/src/sanitization/sanitization.ts b/packages/core/src/sanitization/sanitization.ts
index e28616071e..5d5b4a3a5c 100644
--- a/packages/core/src/sanitization/sanitization.ts
+++ b/packages/core/src/sanitization/sanitization.ts
@@ -33,7 +33,7 @@ import {_sanitizeUrl as _sanitizeUrl} from './url_sanitizer';
  *
  * @publicApi
  */
-export function ɵɵsanitizeHtml(unsafeHtml: any): string {
+export function ΔsanitizeHtml(unsafeHtml: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.HTML, unsafeHtml) || '';
@@ -59,7 +59,7 @@ export function ɵɵsanitizeHtml(unsafeHtml: any): string {
  *
  * @publicApi
  */
-export function ɵɵsanitizeStyle(unsafeStyle: any): string {
+export function ΔsanitizeStyle(unsafeStyle: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.STYLE, unsafeStyle) || '';
@@ -86,7 +86,7 @@ export function ɵɵsanitizeStyle(unsafeStyle: any): string {
  *
  * @publicApi
  */
-export function ɵɵsanitizeUrl(unsafeUrl: any): string {
+export function ΔsanitizeUrl(unsafeUrl: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.URL, unsafeUrl) || '';
@@ -108,7 +108,7 @@ export function ɵɵsanitizeUrl(unsafeUrl: any): string {
  *
  * @publicApi
  */
-export function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string {
+export function ΔsanitizeResourceUrl(unsafeResourceUrl: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.RESOURCE_URL, unsafeResourceUrl) || '';
@@ -131,7 +131,7 @@ export function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string {
  *
  * @publicApi
  */
-export function ɵɵsanitizeScript(unsafeScript: any): string {
+export function ΔsanitizeScript(unsafeScript: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.SCRIPT, unsafeScript) || '';
@@ -153,9 +153,9 @@ export function getUrlSanitizer(tag: string, prop: string) {
   if ((prop === 'src' && (tag === 'embed' || tag === 'frame' || tag === 'iframe' ||
                           tag === 'media' || tag === 'script')) ||
       (prop === 'href' && (tag === 'base' || tag === 'link'))) {
-    return ɵɵsanitizeResourceUrl;
+    return ΔsanitizeResourceUrl;
   }
-  return ɵɵsanitizeUrl;
+  return ΔsanitizeUrl;
 }
 
 /**
@@ -173,7 +173,7 @@ export function getUrlSanitizer(tag: string, prop: string) {
  *
  * @publicApi
  */
-export function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any {
+export function ΔsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any {
   return getUrlSanitizer(tag, prop)(unsafeUrl);
 }
 
@@ -183,13 +183,13 @@ export function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop:
  *
  * @publicApi
  */
-export const ɵɵdefaultStyleSanitizer = (function(prop: string, value?: string): string | boolean {
+export const ΔdefaultStyleSanitizer = (function(prop: string, value?: string): string | boolean {
   if (value === undefined) {
     return prop === 'background-image' || prop === 'background' || prop === 'border-image' ||
         prop === 'filter' || prop === 'list-style' || prop === 'list-style-image';
   }
 
-  return ɵɵsanitizeStyle(value);
+  return ΔsanitizeStyle(value);
 } as StyleSanitizeFn);
 
 export function validateAgainstEventProperties(name: string) {
diff --git a/packages/core/src/view/ng_module.ts b/packages/core/src/view/ng_module.ts
index 6d064e91af..5ad60881d7 100644
--- a/packages/core/src/view/ng_module.ts
+++ b/packages/core/src/view/ng_module.ts
@@ -9,7 +9,7 @@
 import {resolveForwardRef} from '../di/forward_ref';
 import {Injector} from '../di/injector';
 import {INJECTOR, setCurrentInjector} from '../di/injector_compatibility';
-import {getInjectableDef, ɵɵInjectableDef} from '../di/interface/defs';
+import {getInjectableDef, ΔInjectableDef} from '../di/interface/defs';
 import {APP_ROOT} from '../di/scope';
 import {NgModuleRef} from '../linker/ng_module_factory';
 import {stringify} from '../util/stringify';
@@ -98,7 +98,7 @@ export function resolveNgModuleDep(
         return data;
     }
     const providerDef = data._def.providersByKey[tokenKey];
-    let injectableDef: ɵɵInjectableDef<any>|null;
+    let injectableDef: ΔInjectableDef<any>|null;
     if (providerDef) {
       let providerInstance = data._providers[providerDef.index];
       if (providerInstance === undefined) {
@@ -132,7 +132,7 @@ function moduleTransitivelyPresent(ngModule: NgModuleData, scope: any): boolean
   return ngModule._def.modules.indexOf(scope) > -1;
 }
 
-function targetsModule(ngModule: NgModuleData, def: ɵɵInjectableDef<any>): boolean {
+function targetsModule(ngModule: NgModuleData, def: ΔInjectableDef<any>): boolean {
   return def.providedIn != null && (moduleTransitivelyPresent(ngModule, def.providedIn) ||
                                     def.providedIn === 'root' && ngModule._def.isRoot);
 }
diff --git a/packages/core/src/view/services.ts b/packages/core/src/view/services.ts
index 8c705f378e..55fb136989 100644
--- a/packages/core/src/view/services.ts
+++ b/packages/core/src/view/services.ts
@@ -9,7 +9,7 @@
 import {DebugElement__PRE_R3__, DebugEventListener, DebugNode__PRE_R3__, getDebugNode, indexDebugNode, removeDebugNodeFromIndex} from '../debug/debug_node';
 import {Injector} from '../di';
 import {InjectableType} from '../di/injectable';
-import {getInjectableDef, ɵɵInjectableDef} from '../di/interface/defs';
+import {getInjectableDef, ΔInjectableDef} from '../di/interface/defs';
 import {ErrorHandler} from '../error_handler';
 import {Type} from '../interface/type';
 import {ComponentFactory} from '../linker/component_factory';
@@ -170,7 +170,7 @@ const viewDefOverrides = new Map<any, ViewDefinition>();
 
 function debugOverrideProvider(override: ProviderOverride) {
   providerOverrides.set(override.token, override);
-  let injectableDef: ɵɵInjectableDef<any>|null;
+  let injectableDef: ΔInjectableDef<any>|null;
   if (typeof override.token === 'function' && (injectableDef = getInjectableDef(override.token)) &&
       typeof injectableDef.providedIn === 'function') {
     providerOverridesWithScope.set(override.token as InjectableType<any>, override);
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index 412c559d91..adb95aa96c 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -690,33 +690,33 @@
     "name": "viewAttachedToChangeDetector"
   },
   {
-    "name": "ɵɵdefineComponent"
+    "name": "ΔdefineComponent"
   },
   {
-    "name": "ɵɵdefineInjectable"
+    "name": "ΔdefineInjectable"
   },
   {
-    "name": "ɵɵdefineInjector"
+    "name": "ΔdefineInjector"
   },
   {
-    "name": "ɵɵdefineNgModule"
+    "name": "ΔdefineNgModule"
   },
   {
-    "name": "ɵɵelement"
+    "name": "Δelement"
   },
   {
-    "name": "ɵɵelementEnd"
+    "name": "ΔelementEnd"
   },
   {
-    "name": "ɵɵelementStart"
+    "name": "ΔelementStart"
   },
   {
-    "name": "ɵɵnamespaceHTML"
+    "name": "ΔnamespaceHTML"
   },
   {
-    "name": "ɵɵsetComponentScope"
+    "name": "ΔsetComponentScope"
   },
   {
-    "name": "ɵɵtext"
+    "name": "Δtext"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index d6157ce51b..7abadbcaf8 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -501,15 +501,15 @@
     "name": "viewAttachedToChangeDetector"
   },
   {
-    "name": "ɵɵdefineComponent"
+    "name": "ΔdefineComponent"
   },
   {
-    "name": "ɵɵdefineInjectable"
+    "name": "ΔdefineInjectable"
   },
   {
-    "name": "ɵɵnamespaceHTML"
+    "name": "ΔnamespaceHTML"
   },
   {
-    "name": "ɵɵtext"
+    "name": "Δtext"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json
index 057315aa95..5e59706419 100644
--- a/packages/core/test/bundling/injection/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json
@@ -195,12 +195,12 @@
     "name": "throwMixedMultiProviderError"
   },
   {
-    "name": "ɵɵdefineInjectable"
+    "name": "ΔdefineInjectable"
   },
   {
-    "name": "ɵɵdefineInjector"
+    "name": "ΔdefineInjector"
   },
   {
-    "name": "ɵɵinject"
+    "name": "Δinject"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/injection/usage.ts b/packages/core/test/bundling/injection/usage.ts
index 8f4c9a1f5b..777867de2e 100644
--- a/packages/core/test/bundling/injection/usage.ts
+++ b/packages/core/test/bundling/injection/usage.ts
@@ -6,17 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injector, ɵcreateInjector as createInjector, ɵɵdefineInjectable, ɵɵdefineInjector} from '@angular/core';
+import {Injector, ɵcreateInjector as createInjector, ΔdefineInjectable, ΔdefineInjector} from '@angular/core';
 
 export class RootService {
-  static ngInjectableDef = ɵɵdefineInjectable({
+  static ngInjectableDef = ΔdefineInjectable({
     providedIn: 'root',
     factory: () => new RootService(),
   });
 }
 
 export class ScopedService {
-  static ngInjectableDef = ɵɵdefineInjectable({
+  static ngInjectableDef = ΔdefineInjectable({
     providedIn: null,
     factory: () => new ScopedService(),
   });
@@ -28,7 +28,7 @@ export class ScopedService {
 }
 
 export class DefinedInjector {
-  static ngInjectorDef = ɵɵdefineInjector({
+  static ngInjectorDef = ΔdefineInjector({
     factory: () => new DefinedInjector(),
     providers: [ScopedService],
   });
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 96e4a1e3c1..761b3d1220 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -1362,72 +1362,72 @@
     "name": "wrapListener"
   },
   {
-    "name": "ɵɵbind"
+    "name": "Δbind"
   },
   {
-    "name": "ɵɵclassProp"
+    "name": "ΔclassProp"
   },
   {
-    "name": "ɵɵdefineComponent"
+    "name": "ΔdefineComponent"
   },
   {
-    "name": "ɵɵdefineDirective"
+    "name": "ΔdefineDirective"
   },
   {
-    "name": "ɵɵdefineInjectable"
+    "name": "ΔdefineInjectable"
   },
   {
-    "name": "ɵɵdirectiveInject"
+    "name": "ΔdirectiveInject"
   },
   {
-    "name": "ɵɵelementEnd"
+    "name": "ΔelementEnd"
   },
   {
-    "name": "ɵɵelementStart"
+    "name": "ΔelementStart"
   },
   {
-    "name": "ɵɵgetCurrentView"
+    "name": "ΔgetCurrentView"
   },
   {
-    "name": "ɵɵinject"
+    "name": "Δinject"
   },
   {
-    "name": "ɵɵinterpolation1"
+    "name": "Δinterpolation1"
   },
   {
-    "name": "ɵɵlistener"
+    "name": "Δlistener"
   },
   {
-    "name": "ɵɵnamespaceHTML"
+    "name": "ΔnamespaceHTML"
   },
   {
-    "name": "ɵɵnextContext"
+    "name": "ΔnextContext"
   },
   {
-    "name": "ɵɵproperty"
+    "name": "Δproperty"
   },
   {
-    "name": "ɵɵreference"
+    "name": "Δreference"
   },
   {
-    "name": "ɵɵrestoreView"
+    "name": "ΔrestoreView"
   },
   {
-    "name": "ɵɵselect"
+    "name": "Δselect"
   },
   {
-    "name": "ɵɵstyling"
+    "name": "Δstyling"
   },
   {
-    "name": "ɵɵstylingApply"
+    "name": "ΔstylingApply"
   },
   {
-    "name": "ɵɵtemplate"
+    "name": "Δtemplate"
   },
   {
-    "name": "ɵɵtext"
+    "name": "Δtext"
   },
   {
-    "name": "ɵɵtextBinding"
+    "name": "ΔtextBinding"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/todo_i18n/index.ts b/packages/core/test/bundling/todo_i18n/index.ts
index 49337f9395..e402eb10ae 100644
--- a/packages/core/test/bundling/todo_i18n/index.ts
+++ b/packages/core/test/bundling/todo_i18n/index.ts
@@ -16,7 +16,7 @@ import '@angular/core/test/bundling/util/src/reflect_metadata';
  */
 import './translations';
 import {CommonModule} from '@angular/common';
-import {Component, Injectable, NgModule, ViewEncapsulation, ɵmarkDirty as markDirty, ɵrenderComponent as renderComponent, ɵɵi18nLocalize as localize} from '@angular/core';
+import {Component, Injectable, NgModule, ViewEncapsulation, ɵmarkDirty as markDirty, ɵrenderComponent as renderComponent, Δi18nLocalize as localize} from '@angular/core';
 
 class Todo {
   editing: boolean;
diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts
index 75907a1aee..03f142fd38 100644
--- a/packages/core/test/di/r3_injector_spec.ts
+++ b/packages/core/test/di/r3_injector_spec.ts
@@ -6,34 +6,34 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {INJECTOR, InjectFlags, InjectionToken, Injector, Optional, ɵɵdefineInjectable, ɵɵdefineInjector, ɵɵinject} from '@angular/core';
+import {INJECTOR, InjectFlags, InjectionToken, Injector, Optional, ΔdefineInjectable, ΔdefineInjector, Δinject} from '@angular/core';
 import {R3Injector, createInjector} from '@angular/core/src/di/r3_injector';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 describe('InjectorDef-based createInjector()', () => {
   class CircularA {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
-      factory: () => ɵɵinject(CircularB),
+      factory: () => Δinject(CircularB),
     });
   }
 
   class CircularB {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
-      factory: () => ɵɵinject(CircularA),
+      factory: () => Δinject(CircularA),
     });
   }
 
   class Service {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
       factory: () => new Service(),
     });
   }
 
   class OptionalService {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
       factory: () => new OptionalService(),
     });
@@ -55,41 +55,41 @@ describe('InjectorDef-based createInjector()', () => {
   class ServiceWithDep {
     constructor(readonly service: Service) {}
 
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithDep(ɵɵinject(Service)),
+      factory: () => new ServiceWithDep(Δinject(Service)),
     });
   }
 
   class ServiceWithOptionalDep {
     constructor(@Optional() readonly service: OptionalService|null) {}
 
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithOptionalDep(ɵɵinject(OptionalService, InjectFlags.Optional)),
+      factory: () => new ServiceWithOptionalDep(Δinject(OptionalService, InjectFlags.Optional)),
     });
   }
 
   class ServiceWithMissingDep {
     constructor(readonly service: Service) {}
 
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithMissingDep(ɵɵinject(Service)),
+      factory: () => new ServiceWithMissingDep(Δinject(Service)),
     });
   }
 
   class ServiceWithMultiDep {
     constructor(readonly locale: string[]) {}
 
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithMultiDep(ɵɵinject(LOCALE)),
+      factory: () => new ServiceWithMultiDep(Δinject(LOCALE)),
     });
   }
 
   class ServiceTwo {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
       factory: () => new ServiceTwo(),
     });
@@ -97,7 +97,7 @@ describe('InjectorDef-based createInjector()', () => {
 
   let deepServiceDestroyed = false;
   class DeepService {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: null,
       factory: () => new DeepService(),
     });
@@ -107,7 +107,7 @@ describe('InjectorDef-based createInjector()', () => {
 
   let eagerServiceCreated: boolean = false;
   class EagerService {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: undefined,
       factory: () => new EagerService(),
     });
@@ -119,8 +119,8 @@ describe('InjectorDef-based createInjector()', () => {
   class DeepModule {
     constructor(eagerService: EagerService) { deepModuleCreated = true; }
 
-    static ngInjectorDef = ɵɵdefineInjector({
-      factory: () => new DeepModule(ɵɵinject(EagerService)),
+    static ngInjectorDef = ΔdefineInjector({
+      factory: () => new DeepModule(Δinject(EagerService)),
       imports: undefined,
       providers: [
         EagerService,
@@ -137,7 +137,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class IntermediateModule {
-    static ngInjectorDef = ɵɵdefineInjector({
+    static ngInjectorDef = ΔdefineInjector({
       factory: () => new IntermediateModule(),
       imports: [DeepModule.safe()],
       providers: [],
@@ -147,13 +147,13 @@ describe('InjectorDef-based createInjector()', () => {
   class InjectorWithDep {
     constructor(readonly service: Service) {}
 
-    static ngInjectorDef = ɵɵdefineInjector({
-      factory: () => new InjectorWithDep(ɵɵinject(Service)),
+    static ngInjectorDef = ΔdefineInjector({
+      factory: () => new InjectorWithDep(Δinject(Service)),
     });
   }
 
   class Module {
-    static ngInjectorDef = ɵɵdefineInjector({
+    static ngInjectorDef = ΔdefineInjector({
       factory: () => new Module(),
       imports: [IntermediateModule],
       providers: [
@@ -175,7 +175,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class OtherModule {
-    static ngInjectorDef = ɵɵdefineInjector({
+    static ngInjectorDef = ΔdefineInjector({
       factory: () => new OtherModule(),
       imports: undefined,
       providers: [],
@@ -183,7 +183,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class ModuleWithMissingDep {
-    static ngInjectorDef = ɵɵdefineInjector({
+    static ngInjectorDef = ΔdefineInjector({
       factory: () => new ModuleWithMissingDep(),
       imports: undefined,
       providers: [ServiceWithMissingDep],
@@ -193,7 +193,7 @@ describe('InjectorDef-based createInjector()', () => {
   class NotAModule {}
 
   class ImportsNotAModule {
-    static ngInjectorDef = ɵɵdefineInjector({
+    static ngInjectorDef = ΔdefineInjector({
       factory: () => new ImportsNotAModule(),
       imports: [NotAModule],
       providers: [],
@@ -202,7 +202,7 @@ describe('InjectorDef-based createInjector()', () => {
 
   let scopedServiceDestroyed = false;
   class ScopedService {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: Module,
       factory: () => new ScopedService(),
     });
@@ -211,7 +211,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class WrongScopeService {
-    static ngInjectableDef = ɵɵdefineInjectable({
+    static ngInjectableDef = ΔdefineInjectable({
       providedIn: OtherModule,
       factory: () => new WrongScopeService(),
     });
@@ -367,7 +367,7 @@ describe('InjectorDef-based createInjector()', () => {
       }
       class ErrorModule {
         static ngInjectorDef =
-            ɵɵdefineInjector({factory: () => new ErrorModule(), providers: [MissingArgumentType]});
+            ΔdefineInjector({factory: () => new ErrorModule(), providers: [MissingArgumentType]});
       }
       expect(() => createInjector(ErrorModule).get(MissingArgumentType))
           .toThrowError('Can\'t resolve all parameters for MissingArgumentType: (?).');
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index 50061efc78..f1961bd8ce 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -8,7 +8,7 @@
 
 import {ANALYZE_FOR_ENTRY_COMPONENTS, CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef, Compiler, Component, ComponentFactoryResolver, Directive, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, forwardRef, getModuleFactory, ɵivyEnabled as ivyEnabled} from '@angular/core';
 import {Console} from '@angular/core/src/console';
-import {ɵɵInjectableDef, ɵɵdefineInjectable} from '@angular/core/src/di/interface/defs';
+import {ΔInjectableDef, ΔdefineInjectable} from '@angular/core/src/di/interface/defs';
 import {getNgModuleDef} from '@angular/core/src/render3/definition';
 import {NgModuleData} from '@angular/core/src/view/types';
 import {tokenKey} from '@angular/core/src/view/util';
@@ -1374,7 +1374,7 @@ function declareTests(config?: {useJit: boolean}) {
               }
 
               class Bar {
-                static ngInjectableDef: ɵɵInjectableDef<Bar> = ɵɵdefineInjectable({
+                static ngInjectableDef: ΔInjectableDef<Bar> = ΔdefineInjectable({
                   factory: () => new Bar(),
                   providedIn: SomeModule,
                 });
@@ -1406,7 +1406,7 @@ function declareTests(config?: {useJit: boolean}) {
               }
 
               class Bar {
-                static ngInjectableDef: ɵɵInjectableDef<Bar> = ɵɵdefineInjectable({
+                static ngInjectableDef: ΔInjectableDef<Bar> = ΔdefineInjectable({
                   factory: () => new Bar(),
                   providedIn: SomeModule,
                 });
diff --git a/packages/core/test/render3/basic_perf.ts b/packages/core/test/render3/basic_perf.ts
index b0595447dc..7fc6aa6d75 100644
--- a/packages/core/test/render3/basic_perf.ts
+++ b/packages/core/test/render3/basic_perf.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵɵdefineComponent} from '../../src/render3/index';
-import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtext} from '../../src/render3/instructions/all';
+import {ΔdefineComponent} from '../../src/render3/index';
+import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {document, renderComponent} from './render_util';
@@ -33,31 +33,31 @@ describe('iv perf test', () => {
 
       it(`${iteration}. create ${count} divs in Render3`, () => {
         class Component {
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: Component,
             selectors: [['div']],
             consts: 1,
             vars: 0,
             template: function Template(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵcontainer(0);
+                Δcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
+                ΔcontainerRefreshStart(0);
                 {
                   for (let i = 0; i < count; i++) {
-                    let rf0 = ɵɵembeddedViewStart(0, 2, 0);
+                    let rf0 = ΔembeddedViewStart(0, 2, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        ɵɵelementStart(0, 'div');
-                        ɵɵtext(1, '-');
-                        ɵɵelementEnd();
+                        ΔelementStart(0, 'div');
+                        Δtext(1, '-');
+                        ΔelementEnd();
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             },
             factory: () => new Component
diff --git a/packages/core/test/render3/change_detection_spec.ts b/packages/core/test/render3/change_detection_spec.ts
index 52629da45b..9660061dfc 100644
--- a/packages/core/test/render3/change_detection_spec.ts
+++ b/packages/core/test/render3/change_detection_spec.ts
@@ -10,8 +10,8 @@ import {withBody} from '@angular/private/testing';
 
 import {ChangeDetectionStrategy, DoCheck} from '../../src/core';
 import {whenRendered} from '../../src/render3/component';
-import {LifecycleHooksFeature, getRenderedText, ɵɵdefineComponent, ɵɵgetCurrentView} from '../../src/render3/index';
-import {detectChanges, markDirty, tick, ɵɵbind, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵinterpolation1, ɵɵinterpolation2, ɵɵlistener, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {LifecycleHooksFeature, getRenderedText, ΔdefineComponent, ΔgetCurrentView} from '../../src/render3/index';
+import {detectChanges, markDirty, tick, Δbind, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, Δinterpolation1, Δinterpolation2, Δlistener, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {Renderer3, RendererFactory3} from '../../src/render3/interfaces/renderer';
 import {FLAGS, LViewFlags} from '../../src/render3/interfaces/view';
@@ -25,7 +25,7 @@ describe('change detection', () => {
       doCheckCount = 0;
       ngDoCheck(): void { this.doCheckCount++; }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         factory: () => new MyComponent(),
@@ -33,12 +33,12 @@ describe('change detection', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'span');
-            ɵɵtext(1);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'span');
+            Δtext(1);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(1, ɵɵbind(ctx.value));
+            ΔtextBinding(1, Δbind(ctx.value));
           }
         }
       });
@@ -100,7 +100,7 @@ describe('change detection', () => {
 
       onClick() {}
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         factory: () => comp = new MyComponent(),
@@ -112,15 +112,15 @@ describe('change detection', () => {
          */
         template: (rf: RenderFlags, ctx: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0);
-            ɵɵelementStart(1, 'button');
+            Δtext(0);
+            ΔelementStart(1, 'button');
             {
-              ɵɵlistener('click', () => { ctx.onClick(); });
+              Δlistener('click', () => { ctx.onClick(); });
             }
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(0, ɵɵinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
+            ΔtextBinding(0, Δinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
           }
         },
         changeDetection: ChangeDetectionStrategy.OnPush,
@@ -138,7 +138,7 @@ describe('change detection', () => {
 
         onClick() {}
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ManualComponent,
           selectors: [['manual-comp']],
           factory: () => comp = new ManualComponent(),
@@ -152,18 +152,18 @@ describe('change detection', () => {
             if (rf & RenderFlags.Create) {
               // This is temporarily the only way to turn on manual change detection
               // because public API has not yet been added.
-              const view = ɵɵgetCurrentView() as any;
+              const view = ΔgetCurrentView() as any;
               view[FLAGS] |= LViewFlags.ManualOnPush;
 
-              ɵɵtext(0);
-              ɵɵelementStart(1, 'button');
+              Δtext(0);
+              ΔelementStart(1, 'button');
               {
-                ɵɵlistener('click', () => { ctx.onClick(); });
+                Δlistener('click', () => { ctx.onClick(); });
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
+              ΔtextBinding(0, Δinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
             }
           },
           changeDetection: ChangeDetectionStrategy.OnPush,
@@ -174,7 +174,7 @@ describe('change detection', () => {
       class ManualApp {
         name: string = 'Nancy';
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ManualApp,
           selectors: [['manual-app']],
           factory: () => new ManualApp(),
@@ -183,10 +183,10 @@ describe('change detection', () => {
           /** <manual-comp [name]="name"></manual-comp> */
           template: (rf: RenderFlags, ctx: ManualApp) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'manual-comp');
+              Δelement(0, 'manual-comp');
             }
             if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'name', ɵɵbind(ctx.name));
+              ΔelementProperty(0, 'name', Δbind(ctx.name));
             }
 
           },
@@ -229,7 +229,7 @@ describe('change detection', () => {
              doCheckCount = 0;
              ngDoCheck(): void { this.doCheckCount++; }
 
-             static ngComponentDef = ɵɵdefineComponent({
+             static ngComponentDef = ΔdefineComponent({
                type: ButtonParent,
                selectors: [['button-parent']],
                factory: () => parent = new ButtonParent(),
@@ -238,11 +238,11 @@ describe('change detection', () => {
                /** {{ doCheckCount }} - <manual-comp></manual-comp> */
                template: (rf: RenderFlags, ctx: ButtonParent) => {
                  if (rf & RenderFlags.Create) {
-                   ɵɵtext(0);
-                   ɵɵelement(1, 'manual-comp');
+                   Δtext(0);
+                   Δelement(1, 'manual-comp');
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵtextBinding(0, ɵɵinterpolation1('', ctx.doCheckCount, ' - '));
+                   ΔtextBinding(0, Δinterpolation1('', ctx.doCheckCount, ' - '));
                  }
                },
                directives: () => [ManualComponent],
@@ -252,7 +252,7 @@ describe('change detection', () => {
 
            const MyButtonApp = createComponent('my-button-app', function(rf: RenderFlags) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'button-parent');
+               Δelement(0, 'button-parent');
              }
            }, 1, 0, [ButtonParent]);
 
@@ -306,7 +306,7 @@ describe('change detection', () => {
         return 'works';
       }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         factory: () => new MyComponent(),
@@ -314,10 +314,10 @@ describe('change detection', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0);
+            Δtext(0);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(0, ɵɵbind(ctx.value));
+            ΔtextBinding(0, Δbind(ctx.value));
           }
         }
       });
diff --git a/packages/core/test/render3/common_with_def.ts b/packages/core/test/render3/common_with_def.ts
index 6e08c7ef43..c3cd705134 100644
--- a/packages/core/test/render3/common_with_def.ts
+++ b/packages/core/test/render3/common_with_def.ts
@@ -9,18 +9,18 @@
 import {NgForOf as NgForOfDef, NgIf as NgIfDef, NgTemplateOutlet as NgTemplateOutletDef} from '@angular/common';
 import {IterableDiffers, TemplateRef, ViewContainerRef} from '@angular/core';
 
-import {DirectiveType, ɵɵNgOnChangesFeature, ɵɵdefineDirective, ɵɵdirectiveInject} from '../../src/render3/index';
+import {DirectiveType, ΔNgOnChangesFeature, ΔdefineDirective, ΔdirectiveInject} from '../../src/render3/index';
 
 export const NgForOf: DirectiveType<NgForOfDef<any>> = NgForOfDef as any;
 export const NgIf: DirectiveType<NgIfDef> = NgIfDef as any;
 export const NgTemplateOutlet: DirectiveType<NgTemplateOutletDef> = NgTemplateOutletDef as any;
 
-NgForOf.ngDirectiveDef = ɵɵdefineDirective({
+NgForOf.ngDirectiveDef = ΔdefineDirective({
   type: NgForOfDef,
   selectors: [['', 'ngForOf', '']],
   factory: () => new NgForOfDef(
-               ɵɵdirectiveInject(ViewContainerRef as any), ɵɵdirectiveInject(TemplateRef as any),
-               ɵɵdirectiveInject(IterableDiffers)),
+               ΔdirectiveInject(ViewContainerRef as any), ΔdirectiveInject(TemplateRef as any),
+               ΔdirectiveInject(IterableDiffers)),
   inputs: {
     ngForOf: 'ngForOf',
     ngForTrackBy: 'ngForTrackBy',
@@ -28,19 +28,19 @@ NgForOf.ngDirectiveDef = ɵɵdefineDirective({
   }
 });
 
-(NgIf as any).ngDirectiveDef = ɵɵdefineDirective({
+(NgIf as any).ngDirectiveDef = ΔdefineDirective({
   type: NgIfDef,
   selectors: [['', 'ngIf', '']],
   factory: () => new NgIfDef(
-               ɵɵdirectiveInject(ViewContainerRef as any), ɵɵdirectiveInject(TemplateRef as any)),
+               ΔdirectiveInject(ViewContainerRef as any), ΔdirectiveInject(TemplateRef as any)),
   inputs: {ngIf: 'ngIf', ngIfThen: 'ngIfThen', ngIfElse: 'ngIfElse'}
 });
 
-(NgTemplateOutlet as any).ngDirectiveDef = ɵɵdefineDirective({
+(NgTemplateOutlet as any).ngDirectiveDef = ΔdefineDirective({
   type: NgTemplateOutletDef,
   selectors: [['', 'ngTemplateOutlet', '']],
-  factory: () => new NgTemplateOutletDef(ɵɵdirectiveInject(ViewContainerRef as any)),
-  features: [ɵɵNgOnChangesFeature()],
+  factory: () => new NgTemplateOutletDef(ΔdirectiveInject(ViewContainerRef as any)),
+  features: [ΔNgOnChangesFeature()],
   inputs:
       {ngTemplateOutlet: 'ngTemplateOutlet', ngTemplateOutletContext: 'ngTemplateOutletContext'}
 });
diff --git a/packages/core/test/render3/component_ref_spec.ts b/packages/core/test/render3/component_ref_spec.ts
index 9af77d2d46..bb414547ca 100644
--- a/packages/core/test/render3/component_ref_spec.ts
+++ b/packages/core/test/render3/component_ref_spec.ts
@@ -10,7 +10,7 @@ import {Injector, NgModuleRef, ViewEncapsulation} from '../../src/core';
 import {ComponentFactory} from '../../src/linker/component_factory';
 import {RendererFactory2} from '../../src/render/api';
 import {injectComponentFactoryResolver} from '../../src/render3/component_ref';
-import {ɵɵdefineComponent} from '../../src/render3/index';
+import {ΔdefineComponent} from '../../src/render3/index';
 import {domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {Sanitizer} from '../../src/sanitization/security';
 
@@ -20,7 +20,7 @@ describe('ComponentFactory', () => {
   describe('constructor()', () => {
     it('should correctly populate default properties', () => {
       class TestComponent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: TestComponent,
           selectors: [['test', 'foo'], ['bar']],
           consts: 0,
@@ -41,7 +41,7 @@ describe('ComponentFactory', () => {
 
     it('should correctly populate defined properties', () => {
       class TestComponent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: TestComponent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['test', 'foo'], ['bar']],
@@ -89,7 +89,7 @@ describe('ComponentFactory', () => {
       createRenderer3Spy = spyOn(domRendererFactory3, 'createRenderer').and.callThrough();
 
       class TestComponent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: TestComponent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['test']],
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index fbd43b429e..f173155635 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ViewEncapsulation, ɵɵdefineInjectable, ɵɵdefineInjector} from '../../src/core';
+import {ViewEncapsulation, ΔdefineInjectable, ΔdefineInjector} from '../../src/core';
 import {createInjector} from '../../src/di/r3_injector';
-import {AttributeMarker, ComponentFactory, LifecycleHooksFeature, getRenderedText, markDirty, ɵɵdefineComponent, ɵɵdirectiveInject, ɵɵtemplate} from '../../src/render3/index';
-import {tick, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵnextContext, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {AttributeMarker, ComponentFactory, LifecycleHooksFeature, getRenderedText, markDirty, ΔdefineComponent, ΔdirectiveInject, Δtemplate} from '../../src/render3/index';
+import {tick, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, ΔnextContext, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
 import {ComponentDef, RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {NgIf} from './common_with_def';
@@ -21,7 +21,7 @@ describe('component', () => {
 
     increment() { this.count++; }
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: CounterComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['counter']],
@@ -29,10 +29,10 @@ describe('component', () => {
       vars: 1,
       template: function(rf: RenderFlags, ctx: CounterComponent) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0);
+          Δtext(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(0, ɵɵbind(ctx.count));
+          ΔtextBinding(0, Δbind(ctx.count));
         }
       },
       factory: () => new CounterComponent,
@@ -64,30 +64,30 @@ describe('component', () => {
     class MyService {
       constructor(public value: string) {}
       static ngInjectableDef =
-          ɵɵdefineInjectable({providedIn: 'root', factory: () => new MyService('no-injector')});
+          ΔdefineInjectable({providedIn: 'root', factory: () => new MyService('no-injector')});
     }
     class MyComponent {
       constructor(public myService: MyService) {}
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComponent,
         encapsulation: ViewEncapsulation.None,
         selectors: [['my-component']],
-        factory: () => new MyComponent(ɵɵdirectiveInject(MyService)),
+        factory: () => new MyComponent(ΔdirectiveInject(MyService)),
         consts: 1,
         vars: 1,
         template: function(fs: RenderFlags, ctx: MyComponent) {
           if (fs & RenderFlags.Create) {
-            ɵɵtext(0);
+            Δtext(0);
           }
           if (fs & RenderFlags.Update) {
-            ɵɵtextBinding(0, ɵɵbind(ctx.myService.value));
+            ΔtextBinding(0, Δbind(ctx.myService.value));
           }
         }
       });
     }
 
     class MyModule {
-      static ngInjectorDef = ɵɵdefineInjector({
+      static ngInjectorDef = ΔdefineInjector({
         factory: () => new MyModule(),
         providers: [{provide: MyService, useValue: new MyService('injector')}]
       });
@@ -112,7 +112,7 @@ describe('component', () => {
       // @Input
       name = '';
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: Comp,
         selectors: [['comp']],
         factory: () => new Comp(),
@@ -120,10 +120,10 @@ describe('component', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: Comp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0);
+            Δtext(0);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(0, ɵɵbind(ctx.name));
+            ΔtextBinding(0, Δbind(ctx.name));
           }
         },
         inputs: {name: 'name'}
@@ -134,10 +134,10 @@ describe('component', () => {
     // with a very large view
     const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(4097, 'comp');
+        Δelement(4097, 'comp');
       }
       if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(4097, 'name', ɵɵbind(ctx.name));
+        ΔelementProperty(4097, 'name', Δbind(ctx.name));
       }
     }, 4098, 1, [Comp]);
 
@@ -156,16 +156,16 @@ it('should not invoke renderer destroy method for embedded views', () => {
 
   function MyComponent_div_Template_2(rf: any, ctx: any) {
     if (rf & RenderFlags.Create) {
-      ɵɵelementStart(0, 'div');
-      ɵɵtext(1, 'Child view');
-      ɵɵelementEnd();
+      ΔelementStart(0, 'div');
+      Δtext(1, 'Child view');
+      ΔelementEnd();
     }
   }
 
   class Comp {
     visible = true;
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: Comp,
       selectors: [['comp']],
       consts: 3,
@@ -181,14 +181,13 @@ it('should not invoke renderer destroy method for embedded views', () => {
        */
       template: function(rf: RenderFlags, ctx: Comp) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          ɵɵtext(1, 'Root view');
-          ɵɵelementEnd();
-          ɵɵtemplate(
-              2, MyComponent_div_Template_2, 2, 0, 'div', [AttributeMarker.Template, 'ngIf']);
+          ΔelementStart(0, 'div');
+          Δtext(1, 'Root view');
+          ΔelementEnd();
+          Δtemplate(2, MyComponent_div_Template_2, 2, 0, 'div', [AttributeMarker.Template, 'ngIf']);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(2, 'ngIf', ɵɵbind(ctx.visible));
+          ΔelementProperty(2, 'ngIf', Δbind(ctx.visible));
         }
       }
     });
@@ -214,32 +213,32 @@ it('should not invoke renderer destroy method for embedded views', () => {
 describe('component with a container', () => {
   function showItems(rf: RenderFlags, ctx: {items: string[]}) {
     if (rf & RenderFlags.Create) {
-      ɵɵcontainer(0);
+      Δcontainer(0);
     }
     if (rf & RenderFlags.Update) {
-      ɵɵcontainerRefreshStart(0);
+      ΔcontainerRefreshStart(0);
       {
         for (const item of ctx.items) {
-          const rf0 = ɵɵembeddedViewStart(0, 1, 1);
+          const rf0 = ΔembeddedViewStart(0, 1, 1);
           {
             if (rf0 & RenderFlags.Create) {
-              ɵɵtext(0);
+              Δtext(0);
             }
             if (rf0 & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(item));
+              ΔtextBinding(0, Δbind(item));
             }
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
       }
-      ɵɵcontainerRefreshEnd();
+      ΔcontainerRefreshEnd();
     }
   }
 
   class WrapperComponent {
     // TODO(issue/24571): remove '!'.
     items !: string[];
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: WrapperComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['wrapper']],
@@ -247,16 +246,16 @@ describe('component with a container', () => {
       vars: 0,
       template: function ChildComponentTemplate(rf: RenderFlags, ctx: {items: string[]}) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
-            const rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            const rf0 = ΔembeddedViewStart(0, 1, 0);
             { showItems(rf0, {items: ctx.items}); }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       },
       factory: () => new WrapperComponent,
@@ -266,10 +265,10 @@ describe('component with a container', () => {
 
   function template(rf: RenderFlags, ctx: {items: string[]}) {
     if (rf & RenderFlags.Create) {
-      ɵɵelement(0, 'wrapper');
+      Δelement(0, 'wrapper');
     }
     if (rf & RenderFlags.Update) {
-      ɵɵelementProperty(0, 'items', ɵɵbind(ctx.items));
+      ΔelementProperty(0, 'items', Δbind(ctx.items));
     }
   }
 
@@ -316,7 +315,7 @@ describe('recursive components', () => {
 
     ngOnDestroy() { events.push('destroy' + this.data.value); }
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: TreeComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['tree-comp']],
@@ -325,40 +324,40 @@ describe('recursive components', () => {
       vars: 1,
       template: (rf: RenderFlags, ctx: TreeComponent) => {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0);
-          ɵɵcontainer(1);
-          ɵɵcontainer(2);
+          Δtext(0);
+          Δcontainer(1);
+          Δcontainer(2);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(0, ɵɵbind(ctx.data.value));
-          ɵɵcontainerRefreshStart(1);
+          ΔtextBinding(0, Δbind(ctx.data.value));
+          ΔcontainerRefreshStart(1);
           {
             if (ctx.data.left != null) {
-              let rf0 = ɵɵembeddedViewStart(0, 1, 1);
+              let rf0 = ΔembeddedViewStart(0, 1, 1);
               if (rf0 & RenderFlags.Create) {
-                ɵɵelement(0, 'tree-comp');
+                Δelement(0, 'tree-comp');
               }
               if (rf0 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'data', ɵɵbind(ctx.data.left));
+                ΔelementProperty(0, 'data', Δbind(ctx.data.left));
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
-          ɵɵcontainerRefreshStart(2);
+          ΔcontainerRefreshEnd();
+          ΔcontainerRefreshStart(2);
           {
             if (ctx.data.right != null) {
-              let rf0 = ɵɵembeddedViewStart(0, 1, 1);
+              let rf0 = ΔembeddedViewStart(0, 1, 1);
               if (rf0 & RenderFlags.Create) {
-                ɵɵelement(0, 'tree-comp');
+                Δelement(0, 'tree-comp');
               }
               if (rf0 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'data', ɵɵbind(ctx.data.right));
+                ΔelementProperty(0, 'data', Δbind(ctx.data.right));
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       },
       inputs: {data: 'data'}
@@ -380,7 +379,7 @@ describe('recursive components', () => {
 
     ngOnDestroy() { events.push('destroy' + this.data.value); }
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: NgIfTree,
       encapsulation: ViewEncapsulation.None,
       selectors: [['ng-if-tree']],
@@ -390,18 +389,18 @@ describe('recursive components', () => {
       template: (rf: RenderFlags, ctx: NgIfTree) => {
 
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0);
-          ɵɵtemplate(
+          Δtext(0);
+          Δtemplate(
               1, IfTemplate, 1, 1, 'ng-if-tree',
               [AttributeMarker.Bindings, 'data', AttributeMarker.Template, 'ngIf']);
-          ɵɵtemplate(
+          Δtemplate(
               2, IfTemplate2, 1, 1, 'ng-if-tree',
               [AttributeMarker.Bindings, 'data', AttributeMarker.Template, 'ngIf']);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(0, ɵɵbind(ctx.data.value));
-          ɵɵelementProperty(1, 'ngIf', ɵɵbind(ctx.data.left));
-          ɵɵelementProperty(2, 'ngIf', ɵɵbind(ctx.data.right));
+          ΔtextBinding(0, Δbind(ctx.data.value));
+          ΔelementProperty(1, 'ngIf', Δbind(ctx.data.left));
+          ΔelementProperty(2, 'ngIf', Δbind(ctx.data.right));
         }
 
       },
@@ -411,23 +410,23 @@ describe('recursive components', () => {
 
   function IfTemplate(rf: RenderFlags, left: any) {
     if (rf & RenderFlags.Create) {
-      ɵɵelementStart(0, 'ng-if-tree');
-      ɵɵelementEnd();
+      ΔelementStart(0, 'ng-if-tree');
+      ΔelementEnd();
     }
     if (rf & RenderFlags.Update) {
-      const parent = ɵɵnextContext();
-      ɵɵelementProperty(0, 'data', ɵɵbind(parent.data.left));
+      const parent = ΔnextContext();
+      ΔelementProperty(0, 'data', Δbind(parent.data.left));
     }
   }
 
   function IfTemplate2(rf: RenderFlags, right: any) {
     if (rf & RenderFlags.Create) {
-      ɵɵelementStart(0, 'ng-if-tree');
-      ɵɵelementEnd();
+      ΔelementStart(0, 'ng-if-tree');
+      ΔelementEnd();
     }
     if (rf & RenderFlags.Update) {
-      const parent = ɵɵnextContext();
-      ɵɵelementProperty(0, 'data', ɵɵbind(parent.data.right));
+      const parent = ΔnextContext();
+      ΔelementProperty(0, 'data', Δbind(parent.data.right));
     }
   }
 
@@ -460,19 +459,19 @@ describe('recursive components', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         if (!ctx.skipContent) {
-          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
+          const rf0 = ΔembeddedViewStart(0, 1, 0);
           if (rf0 & RenderFlags.Create) {
-            ɵɵelementStart(0, 'tree-comp');
-            ɵɵelementEnd();
+            ΔelementStart(0, 'tree-comp');
+            ΔelementEnd();
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 1, 0, [TreeComponent]);
 
@@ -494,19 +493,19 @@ describe('recursive components', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         if (!ctx.skipContent) {
-          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
+          const rf0 = ΔembeddedViewStart(0, 1, 0);
           if (rf0 & RenderFlags.Create) {
-            ɵɵelementStart(0, 'ng-if-tree');
-            ɵɵelementEnd();
+            ΔelementStart(0, 'ng-if-tree');
+            ΔelementEnd();
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 1, 0, [NgIfTree]);
 
@@ -525,7 +524,7 @@ describe('recursive components', () => {
     class TestInputsComponent {
       // TODO(issue/24571): remove '!'.
       minifiedName !: string;
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: TestInputsComponent,
         encapsulation: ViewEncapsulation.None,
         selectors: [['test-inputs']],
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 49aa362f8f..f241610077 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -9,7 +9,7 @@
 import {SelectorFlags} from '@angular/core/src/render3/interfaces/projection';
 
 import {AttributeMarker, detectChanges} from '../../src/render3/index';
-import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵprojection, ɵɵprojectionDef, ɵɵtext} from '../../src/render3/instructions/all';
+import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δprojection, ΔprojectionDef, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {ComponentFixture, createComponent, getDirectiveOnNode, renderComponent, toHtml} from './render_util';
 
@@ -18,10 +18,10 @@ describe('content projection', () => {
     /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δprojection(1); }
+        ΔelementEnd();
       }
     }, 2);
 
@@ -36,26 +36,26 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
+        ΔelementStart(0, 'child');
         {
-          ɵɵtext(1, '(');
-          ɵɵcontainer(2);
-          ɵɵtext(3, ')');
+          Δtext(1, '(');
+          Δcontainer(2);
+          Δtext(3, ')');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (ctx.value) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵtext(0, 'content');
+              Δtext(0, 'content');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -75,8 +75,8 @@ describe('content projection', () => {
     /** <ng-content></ng-content> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵprojection(0);
+        ΔprojectionDef();
+        Δprojection(0);
       }
     }, 1);
 
@@ -89,22 +89,22 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'child');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           if (ctx.value) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵtext(0, 'content');
+              Δtext(0, 'content');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2, 0, [Child]);
 
@@ -124,10 +124,10 @@ describe('content projection', () => {
     /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δprojection(1); }
+        ΔelementEnd();
       }
     }, 2);
 
@@ -144,31 +144,31 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
+        ΔelementStart(0, 'child');
         {
-          ɵɵtext(1, '(');
-          ɵɵcontainer(2);
-          ɵɵtext(3, ')');
+          Δtext(1, '(');
+          Δcontainer(2);
+          Δtext(3, ')');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (ctx.value) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵtext(0, 'content');
+              Δtext(0, 'content');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           } else {
-            if (ɵɵembeddedViewStart(1, 1, 0)) {
-              ɵɵtext(0, 'else');
+            if (ΔembeddedViewStart(1, 1, 0)) {
+              Δtext(0, 'else');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -196,25 +196,25 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           if (!ctx.skipContent) {
-            let rf0 = ɵɵembeddedViewStart(0, 2, 0);
+            let rf0 = ΔembeddedViewStart(0, 2, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵelementStart(0, 'span');
-              ɵɵprojection(1);
-              ɵɵelementEnd();
+              ΔelementStart(0, 'span');
+              Δprojection(1);
+              ΔelementEnd();
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2, 0);
 
@@ -226,14 +226,14 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
+        ΔelementStart(0, 'child');
         {
-          ɵɵelementStart(1, 'div');
-          { ɵɵtext(2, 'text'); }
-          ɵɵelementEnd();
-          ɵɵtext(3, 'content');
+          ΔelementStart(1, 'div');
+          { Δtext(2, 'text'); }
+          ΔelementEnd();
+          Δtext(3, 'content');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
 
         // testing
         childCmptInstance = getDirectiveOnNode(0);
@@ -261,31 +261,31 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           if (!ctx.skipContent) {
-            let rf0 = ɵɵembeddedViewStart(0, 2, 0);
+            let rf0 = ΔembeddedViewStart(0, 2, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵprojection(0);
-              ɵɵtext(1, 'text');
+              Δprojection(0);
+              Δtext(1, 'text');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
     /** <child></child> */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'child');
+        Δelement(0, 'child');
 
         // testing
         childCmptInstance = getDirectiveOnNode(0);
@@ -313,23 +313,23 @@ describe('content projection', () => {
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ɵɵprojectionDef();
-           ɵɵelementStart(0, 'div');
-           { ɵɵcontainer(1); }
-           ɵɵelementEnd();
+           ΔprojectionDef();
+           ΔelementStart(0, 'div');
+           { Δcontainer(1); }
+           ΔelementEnd();
          }
          if (rf & RenderFlags.Update) {
-           ɵɵcontainerRefreshStart(1);
+           ΔcontainerRefreshStart(1);
            {
              if (!ctx.skipContent) {
-               let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+               let rf0 = ΔembeddedViewStart(0, 1, 0);
                if (rf0 & RenderFlags.Create) {
-                 ɵɵprojection(0);
+                 Δprojection(0);
                }
-               ɵɵembeddedViewEnd();
+               ΔembeddedViewEnd();
              }
            }
-           ɵɵcontainerRefreshEnd();
+           ΔcontainerRefreshEnd();
          }
        }, 2);
 
@@ -338,12 +338,12 @@ describe('content projection', () => {
         */
        const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ɵɵelementStart(0, 'child');
+           ΔelementStart(0, 'child');
            {
              childCmptInstance = getDirectiveOnNode(0);
-             ɵɵtext(1, 'content');
+             Δtext(1, 'content');
            }
-           ɵɵelementEnd();
+           ΔelementEnd();
          }
        }, 2, 0, [Child]);
 
@@ -367,27 +367,27 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
         {
-          ɵɵtext(1, 'Before (inside)-');
-          ɵɵcontainer(2);
-          ɵɵtext(3, '-After (inside)');
+          Δtext(1, 'Before (inside)-');
+          Δcontainer(2);
+          Δtext(3, '-After (inside)');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (!ctx.skipContent) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵprojection(0);
+              Δprojection(0);
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 4);
 
@@ -402,26 +402,26 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
+        ΔelementStart(0, 'child');
         {
-          ɵɵtext(1, 'Before text-');
-          ɵɵcontainer(2);
-          ɵɵtext(3, '-After text');
+          Δtext(1, 'Before text-');
+          Δcontainer(2);
+          Δtext(3, '-After text');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (!ctx.skipContent) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵtext(0, 'content');
+              Δtext(0, 'content');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -447,23 +447,23 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           if (!ctx.skipContent) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵprojection(0);
+              Δprojection(0);
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
@@ -478,27 +478,27 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'child');
+        ΔprojectionDef();
+        ΔelementStart(0, 'child');
         {
-          ɵɵtext(1, 'Before text');
-          ɵɵcontainer(2);
-          ɵɵtext(3, '-After text');
+          Δtext(1, 'Before text');
+          Δcontainer(2);
+          Δtext(3, '-After text');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (!ctx.skipContent) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵprojection(0);
+              Δprojection(0);
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -506,13 +506,13 @@ describe('content projection', () => {
     /** <parent><p>text</p></parent> */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'parent');
+        ΔelementStart(0, 'parent');
         {
-          ɵɵelementStart(1, 'p');
-          { ɵɵtext(2, 'text'); }
-          ɵɵelementEnd();
+          ΔelementStart(1, 'p');
+          { Δtext(2, 'text'); }
+          ΔelementEnd();
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
         // testing
         parent = getDirectiveOnNode(0);
       }
@@ -541,25 +541,25 @@ describe('content projection', () => {
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ɵɵprojectionDef();
-           ɵɵelementStart(0, 'div');
-           { ɵɵcontainer(1); }
-           ɵɵelementEnd();
+           ΔprojectionDef();
+           ΔelementStart(0, 'div');
+           { Δcontainer(1); }
+           ΔelementEnd();
          }
          if (rf & RenderFlags.Update) {
-           ɵɵcontainerRefreshStart(1);
+           ΔcontainerRefreshStart(1);
            {
              if (!ctx.skipContent) {
-               let rf0 = ɵɵembeddedViewStart(0, 3, 0);
+               let rf0 = ΔembeddedViewStart(0, 3, 0);
                if (rf0 & RenderFlags.Create) {
-                 ɵɵtext(0, 'before-');
-                 ɵɵprojection(1);
-                 ɵɵtext(2, '-after');
+                 Δtext(0, 'before-');
+                 Δprojection(1);
+                 Δtext(2, '-after');
                }
-               ɵɵembeddedViewEnd();
+               ΔembeddedViewEnd();
              }
            }
-           ɵɵcontainerRefreshEnd();
+           ΔcontainerRefreshEnd();
          }
        }, 2);
 
@@ -568,12 +568,12 @@ describe('content projection', () => {
         */
        const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ɵɵelementStart(0, 'child');
+           ΔelementStart(0, 'child');
            {
              childCmptInstance = getDirectiveOnNode(0);
-             ɵɵtext(1, 'content');
+             Δtext(1, 'content');
            }
-           ɵɵelementEnd();
+           ΔelementEnd();
          }
        }, 2, 0, [Child]);
 
@@ -592,13 +592,13 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
-        ɵɵelementStart(2, 'span');
-        { ɵɵprojection(3); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δprojection(1); }
+        ΔelementEnd();
+        ΔelementStart(2, 'span');
+        { Δprojection(3); }
+        ΔelementEnd();
       }
     }, 4);
 
@@ -607,9 +607,9 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
-        { ɵɵtext(1, 'content'); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'child');
+        { Δtext(1, 'content'); }
+        ΔelementEnd();
       }
     }, 2, 0, [Child]);
 
@@ -638,24 +638,24 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵprojection(0);
-        ɵɵelementStart(1, 'div');
-        { ɵɵcontainer(2); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        Δprojection(0);
+        ΔelementStart(1, 'div');
+        { Δcontainer(2); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (ctx.show) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              ɵɵprojection(0);
+              Δprojection(0);
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 3);
 
@@ -664,12 +664,12 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
+        ΔelementStart(0, 'child');
         {
           childCmptInstance = getDirectiveOnNode(0);
-          ɵɵtext(1, 'content');
+          Δtext(1, 'content');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }, 2, 0, [Child]);
 
@@ -684,10 +684,10 @@ describe('content projection', () => {
   it('should project with multiple instances of a component with projection', () => {
     const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵtext(0, 'Before');
-        ɵɵprojection(1);
-        ɵɵtext(2, 'After');
+        ΔprojectionDef();
+        Δtext(0, 'Before');
+        Δprojection(1);
+        Δtext(2, 'After');
       }
     }, 3);
 
@@ -703,26 +703,26 @@ describe('content projection', () => {
      */
     const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'projection-comp');
+        ΔelementStart(0, 'projection-comp');
         {
-          ɵɵelementStart(1, 'div');
-          { ɵɵtext(2, 'A'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(3, 'p');
-          { ɵɵtext(4, '123'); }
-          ɵɵelementEnd();
+          ΔelementStart(1, 'div');
+          { Δtext(2, 'A'); }
+          ΔelementEnd();
+          ΔelementStart(3, 'p');
+          { Δtext(4, '123'); }
+          ΔelementEnd();
         }
-        ɵɵelementEnd();
-        ɵɵelementStart(5, 'projection-comp');
+        ΔelementEnd();
+        ΔelementStart(5, 'projection-comp');
         {
-          ɵɵelementStart(6, 'div');
-          { ɵɵtext(7, 'B'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(8, 'p');
-          { ɵɵtext(9, '456'); }
-          ɵɵelementEnd();
+          ΔelementStart(6, 'div');
+          { Δtext(7, 'B'); }
+          ΔelementEnd();
+          ΔelementStart(8, 'p');
+          { Δtext(9, '456'); }
+          ΔelementEnd();
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }, 10, 0, [ProjectionComp]);
 
@@ -742,10 +742,10 @@ describe('content projection', () => {
      */
     const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵtext(0, 'Before');
-        ɵɵprojection(1);
-        ɵɵtext(2, 'After');
+        ΔprojectionDef();
+        Δtext(0, 'Before');
+        Δprojection(1);
+        Δtext(2, 'After');
       }
     }, 3);
 
@@ -762,28 +762,28 @@ describe('content projection', () => {
      */
     const ProjectionParent = createComponent('parent-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'projection-comp');
+        ΔprojectionDef();
+        ΔelementStart(0, 'projection-comp');
         {
-          ɵɵelementStart(1, 'div');
-          { ɵɵtext(2, 'A'); }
-          ɵɵelementEnd();
-          ɵɵprojection(3, 0);
-          ɵɵelementStart(4, 'p');
-          { ɵɵtext(5, '123'); }
-          ɵɵelementEnd();
+          ΔelementStart(1, 'div');
+          { Δtext(2, 'A'); }
+          ΔelementEnd();
+          Δprojection(3, 0);
+          ΔelementStart(4, 'p');
+          { Δtext(5, '123'); }
+          ΔelementEnd();
         }
-        ɵɵelementEnd();
-        ɵɵelementStart(6, 'projection-comp');
+        ΔelementEnd();
+        ΔelementStart(6, 'projection-comp');
         {
-          ɵɵelementStart(7, 'div');
-          { ɵɵtext(8, 'B'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(9, 'p');
-          { ɵɵtext(10, '456'); }
-          ɵɵelementEnd();
+          ΔelementStart(7, 'div');
+          { Δtext(8, 'B'); }
+          ΔelementEnd();
+          ΔelementStart(9, 'p');
+          { Δtext(10, '456'); }
+          ΔelementEnd();
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }, 11, 0, [ProjectionComp]);
 
@@ -797,12 +797,12 @@ describe('content projection', () => {
      */
     const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'parent-comp');
-        { ɵɵtext(1, '**ABC**'); }
-        ɵɵelementEnd();
-        ɵɵelementStart(2, 'parent-comp');
-        { ɵɵtext(3, '**DEF**'); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'parent-comp');
+        { Δtext(1, '**ABC**'); }
+        ΔelementEnd();
+        ΔelementStart(2, 'parent-comp');
+        { Δtext(3, '**DEF**'); }
+        ΔelementEnd();
       }
     }, 4, 0, [ProjectionParent]);
 
@@ -823,8 +823,8 @@ describe('content projection', () => {
     `<ng-content></ng-content>`;
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵprojection(0);
+        ΔprojectionDef();
+        Δprojection(0);
       }
     }, 1);
 
@@ -837,17 +837,17 @@ describe('content projection', () => {
     </child>`;
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
+        ΔelementStart(0, 'child');
         {
-          ɵɵelementContainerStart(1);
+          ΔelementContainerStart(1);
           {
-            ɵɵelementContainerStart(2);
-            { ɵɵtext(3, 'content'); }
-            ɵɵelementContainerEnd();
+            ΔelementContainerStart(2);
+            { Δtext(3, 'content'); }
+            ΔelementContainerEnd();
           }
-          ɵɵelementContainerEnd();
+          ΔelementContainerEnd();
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }, 4, 0, [Child]);
 
@@ -860,8 +860,8 @@ describe('content projection', () => {
     `<ng-content></ng-content>`;
     const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵprojection(0);
+        ΔprojectionDef();
+        Δprojection(0);
       }
     }, 1);
 
@@ -870,10 +870,10 @@ describe('content projection', () => {
     </grand-child>`;
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'grand-child');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'grand-child');
+        { Δprojection(1); }
+        ΔelementEnd();
       }
     }, 2, 0, [GrandChild]);
 
@@ -886,17 +886,17 @@ describe('content projection', () => {
     </child>`;
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
+        ΔelementStart(0, 'child');
         {
-          ɵɵelementContainerStart(1);
+          ΔelementContainerStart(1);
           {
-            ɵɵelementContainerStart(2);
-            { ɵɵtext(3, 'content'); }
-            ɵɵelementContainerEnd();
+            ΔelementContainerStart(2);
+            { Δtext(3, 'content'); }
+            ΔelementContainerEnd();
           }
-          ɵɵelementContainerEnd();
+          ΔelementContainerEnd();
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }, 4, 0, [Child]);
 
@@ -913,13 +913,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]]);
-          ɵɵelementStart(0, 'div', ['id', 'first']);
-          { ɵɵprojection(1, 1); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'div', ['id', 'second']);
-          { ɵɵprojection(3, 2); }
-          ɵɵelementEnd();
+          ΔprojectionDef([[['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]]);
+          ΔelementStart(0, 'div', ['id', 'first']);
+          { Δprojection(1, 1); }
+          ΔelementEnd();
+          ΔelementStart(2, 'div', ['id', 'second']);
+          { Δprojection(3, 2); }
+          ΔelementEnd();
         }
       }, 4);
 
@@ -931,16 +931,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'span', ['title', 'toFirst']);
-            { ɵɵtext(2, '1'); }
-            ɵɵelementEnd();
-            ɵɵelementStart(3, 'span', ['title', 'toSecond']);
-            { ɵɵtext(4, '2'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'span', ['title', 'toFirst']);
+            { Δtext(2, '1'); }
+            ΔelementEnd();
+            ΔelementStart(3, 'span', ['title', 'toSecond']);
+            { Δtext(4, '2'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -957,16 +957,16 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([
+          ΔprojectionDef([
             [['span', SelectorFlags.CLASS, 'toFirst']],
             [['span', SelectorFlags.CLASS, 'toSecond']]
           ]);
-          ɵɵelementStart(0, 'div', ['id', 'first']);
-          { ɵɵprojection(1, 1); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'div', ['id', 'second']);
-          { ɵɵprojection(3, 2); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'div', ['id', 'first']);
+          { Δprojection(1, 1); }
+          ΔelementEnd();
+          ΔelementStart(2, 'div', ['id', 'second']);
+          { Δprojection(3, 2); }
+          ΔelementEnd();
         }
       }, 4);
 
@@ -978,16 +978,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'span', ['class', 'toFirst']);
-            { ɵɵtext(2, '1'); }
-            ɵɵelementEnd();
-            ɵɵelementStart(3, 'span', ['class', 'toSecond']);
-            { ɵɵtext(4, '2'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'span', ['class', 'toFirst']);
+            { Δtext(2, '1'); }
+            ΔelementEnd();
+            ΔelementStart(3, 'span', ['class', 'toSecond']);
+            { Δtext(4, '2'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -1004,16 +1004,16 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([
+          ΔprojectionDef([
             [['span', SelectorFlags.CLASS, 'toFirst']],
             [['span', SelectorFlags.CLASS, 'toSecond']]
           ]);
-          ɵɵelementStart(0, 'div', ['id', 'first']);
-          { ɵɵprojection(1, 1); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'div', ['id', 'second']);
-          { ɵɵprojection(3, 2); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'div', ['id', 'first']);
+          { Δprojection(1, 1); }
+          ΔelementEnd();
+          ΔelementStart(2, 'div', ['id', 'second']);
+          { Δprojection(3, 2); }
+          ΔelementEnd();
         }
       }, 4);
 
@@ -1025,16 +1025,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'span', ['class', 'other toFirst']);
-            { ɵɵtext(2, '1'); }
-            ɵɵelementEnd();
-            ɵɵelementStart(3, 'span', ['class', 'toSecond noise']);
-            { ɵɵtext(4, '2'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'span', ['class', 'other toFirst']);
+            { Δtext(2, '1'); }
+            ΔelementEnd();
+            ΔelementStart(3, 'span', ['class', 'toSecond noise']);
+            { Δtext(4, '2'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -1051,13 +1051,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span']], [['span', SelectorFlags.CLASS, 'toSecond']]]);
-          ɵɵelementStart(0, 'div', ['id', 'first']);
-          { ɵɵprojection(1, 1); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'div', ['id', 'second']);
-          { ɵɵprojection(3, 2); }
-          ɵɵelementEnd();
+          ΔprojectionDef([[['span']], [['span', SelectorFlags.CLASS, 'toSecond']]]);
+          ΔelementStart(0, 'div', ['id', 'first']);
+          { Δprojection(1, 1); }
+          ΔelementEnd();
+          ΔelementStart(2, 'div', ['id', 'second']);
+          { Δprojection(3, 2); }
+          ΔelementEnd();
         }
       }, 4);
 
@@ -1069,16 +1069,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'span', ['class', 'toFirst']);
-            { ɵɵtext(2, '1'); }
-            ɵɵelementEnd();
-            ɵɵelementStart(3, 'span', ['class', 'toSecond']);
-            { ɵɵtext(4, '2'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'span', ['class', 'toFirst']);
+            { Δtext(2, '1'); }
+            ΔelementEnd();
+            ΔelementStart(3, 'span', ['class', 'toSecond']);
+            { Δtext(4, '2'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -1095,13 +1095,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span', SelectorFlags.CLASS, 'toFirst']]]);
-          ɵɵelementStart(0, 'div', ['id', 'first']);
-          { ɵɵprojection(1, 1); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'div', ['id', 'second']);
-          { ɵɵprojection(3); }
-          ɵɵelementEnd();
+          ΔprojectionDef([[['span', SelectorFlags.CLASS, 'toFirst']]]);
+          ΔelementStart(0, 'div', ['id', 'first']);
+          { Δprojection(1, 1); }
+          ΔelementEnd();
+          ΔelementStart(2, 'div', ['id', 'second']);
+          { Δprojection(3); }
+          ΔelementEnd();
         }
       }, 4);
 
@@ -1113,17 +1113,17 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'span', ['class', 'toFirst']);
-            { ɵɵtext(2, '1'); }
-            ɵɵelementEnd();
-            ɵɵelementStart(3, 'span');
-            { ɵɵtext(4, 'remaining'); }
-            ɵɵelementEnd();
-            ɵɵtext(5, 'more remaining');
+            ΔelementStart(1, 'span', ['class', 'toFirst']);
+            { Δtext(2, '1'); }
+            ΔelementEnd();
+            ΔelementStart(3, 'span');
+            { Δtext(4, 'remaining'); }
+            ΔelementEnd();
+            Δtext(5, 'more remaining');
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 6, 0, [Child]);
 
@@ -1140,13 +1140,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span', SelectorFlags.CLASS, 'toSecond']]]);
-          ɵɵelementStart(0, 'div', ['id', 'first']);
-          { ɵɵprojection(1); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'div', ['id', 'second']);
-          { ɵɵprojection(3, 1); }
-          ɵɵelementEnd();
+          ΔprojectionDef([[['span', SelectorFlags.CLASS, 'toSecond']]]);
+          ΔelementStart(0, 'div', ['id', 'first']);
+          { Δprojection(1); }
+          ΔelementEnd();
+          ΔelementStart(2, 'div', ['id', 'second']);
+          { Δprojection(3, 1); }
+          ΔelementEnd();
         }
       }, 4);
 
@@ -1159,17 +1159,17 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'span');
-            { ɵɵtext(2, '1'); }
-            ɵɵelementEnd();
-            ɵɵelementStart(3, 'span', ['class', 'toSecond']);
-            { ɵɵtext(4, '2'); }
-            ɵɵelementEnd();
-            ɵɵtext(5, 'remaining');
+            ΔelementStart(1, 'span');
+            { Δtext(2, '1'); }
+            ΔelementEnd();
+            ΔelementStart(3, 'span', ['class', 'toSecond']);
+            { Δtext(4, '2'); }
+            ΔelementEnd();
+            Δtext(5, 'remaining');
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 6, 0, [Child]);
 
@@ -1192,10 +1192,10 @@ describe('content projection', () => {
        */
       const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span']]]);
-          ɵɵprojection(0, 1);
-          ɵɵelement(1, 'hr');
-          ɵɵprojection(2);
+          ΔprojectionDef([[['span']]]);
+          Δprojection(0, 1);
+          Δelement(1, 'hr');
+          Δprojection(2);
         }
       }, 3);
 
@@ -1207,15 +1207,15 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef();
-          ɵɵelementStart(0, 'grand-child');
+          ΔprojectionDef();
+          ΔelementStart(0, 'grand-child');
           {
-            ɵɵprojection(1);
-            ɵɵelementStart(2, 'span');
-            { ɵɵtext(3, 'in child template'); }
-            ɵɵelementEnd();
+            Δprojection(1);
+            ΔelementStart(2, 'span');
+            { Δtext(3, 'in child template'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 4, 0, [GrandChild]);
 
@@ -1228,13 +1228,13 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'span');
-            { ɵɵtext(2, 'parent content'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'span');
+            { Δtext(2, 'parent content'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 3, 0, [Child]);
 
@@ -1253,10 +1253,10 @@ describe('content projection', () => {
        */
       const Card = createComponent('card', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['', 'card-title', '']], [['', 'card-content', '']]]);
-          ɵɵprojection(0, 1);
-          ɵɵelement(1, 'hr');
-          ɵɵprojection(2, 2);
+          ΔprojectionDef([[['', 'card-title', '']], [['', 'card-content', '']]]);
+          Δprojection(0, 1);
+          Δelement(1, 'hr');
+          Δprojection(2, 2);
         }
       }, 3);
 
@@ -1268,15 +1268,15 @@ describe('content projection', () => {
        */
       const CardWithTitle = createComponent('card-with-title', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef();
-          ɵɵelementStart(0, 'card');
+          ΔprojectionDef();
+          ΔelementStart(0, 'card');
           {
-            ɵɵelementStart(1, 'h1', ['card-title', '']);
-            { ɵɵtext(2, 'Title'); }
-            ɵɵelementEnd();
-            ɵɵprojection(3, 0, ['card-content', '']);
+            ΔelementStart(1, 'h1', ['card-title', '']);
+            { Δtext(2, 'Title'); }
+            ΔelementEnd();
+            Δprojection(3, 0, ['card-content', '']);
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 4, 0, [Card]);
 
@@ -1287,9 +1287,9 @@ describe('content projection', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'card-with-title');
-          { ɵɵtext(1, 'content'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'card-with-title');
+          { Δtext(1, 'content'); }
+          ΔelementEnd();
         }
       }, 2, 0, [CardWithTitle]);
 
@@ -1306,8 +1306,8 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['div']]]);
-          ɵɵprojection(0, 1);
+          ΔprojectionDef([[['div']]]);
+          Δprojection(0, 1);
         }
       }, 1);
 
@@ -1319,16 +1319,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'child');
+          ΔelementStart(0, 'child');
           {
-            ɵɵelementStart(1, 'div', [AttributeMarker.ProjectAs, ['span']]);
-            { ɵɵtext(2, 'should not project'); }
-            ɵɵelementEnd();
-            ɵɵelementStart(3, 'div');
-            { ɵɵtext(4, 'should project'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'div', [AttributeMarker.ProjectAs, ['span']]);
+            { Δtext(2, 'should not project'); }
+            ΔelementEnd();
+            ΔelementStart(3, 'div');
+            { Δtext(4, 'should project'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 5, 0, [Child]);
 
diff --git a/packages/core/test/render3/control_flow_spec.ts b/packages/core/test/render3/control_flow_spec.ts
index 3de917fcd0..8a9f3eb094 100644
--- a/packages/core/test/render3/control_flow_spec.ts
+++ b/packages/core/test/render3/control_flow_spec.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵɵdefineComponent} from '../../src/render3/definition';
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {ΔdefineComponent} from '../../src/render3/definition';
+import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {ComponentFixture, TemplateFixture, createComponent} from './render_util';
@@ -16,29 +16,29 @@ describe('JS control flow', () => {
   it('should work with if block', () => {
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           if (ctx.condition) {
-            let rf1 = ɵɵembeddedViewStart(1, 2, 1);
+            let rf1 = ΔembeddedViewStart(1, 2, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'span');
-                { ɵɵtext(1); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'span');
+                { Δtext(1); }
+                ΔelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵtextBinding(1, ɵɵbind(ctx.message));
+                ΔtextBinding(1, Δbind(ctx.message));
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
@@ -72,41 +72,41 @@ describe('JS control flow', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           if (ctx.condition) {
-            let rf1 = ɵɵembeddedViewStart(1, 2, 0);
+            let rf1 = ΔembeddedViewStart(1, 2, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'span');
-                { ɵɵcontainer(1); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'span');
+                { Δcontainer(1); }
+                ΔelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(1);
+                ΔcontainerRefreshStart(1);
                 {
                   if (ctx.condition2) {
-                    let rf2 = ɵɵembeddedViewStart(2, 1, 0);
+                    let rf2 = ΔembeddedViewStart(2, 1, 0);
                     {
                       if (rf2 & RenderFlags.Create) {
-                        ɵɵtext(0, 'Hello');
+                        Δtext(0, 'Hello');
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
@@ -164,51 +164,51 @@ describe('JS control flow', () => {
      *   % }
      * % }
      */
-    function createTemplate() { ɵɵcontainer(0); }
+    function createTemplate() { Δcontainer(0); }
 
     function updateTemplate() {
-      ɵɵcontainerRefreshStart(0);
+      ΔcontainerRefreshStart(0);
       {
         if (ctx.condition) {
-          let rf1 = ɵɵembeddedViewStart(1, 2, 0);
+          let rf1 = ΔembeddedViewStart(1, 2, 0);
           {
             if (rf1 & RenderFlags.Create) {
-              { ɵɵcontainer(0); }
-              { ɵɵcontainer(1); }
+              { Δcontainer(0); }
+              { Δcontainer(1); }
             }
             if (rf1 & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(0);
+              ΔcontainerRefreshStart(0);
               {
                 if (ctx.condition2) {
-                  let rf2 = ɵɵembeddedViewStart(2, 1, 0);
+                  let rf2 = ΔembeddedViewStart(2, 1, 0);
                   {
                     if (rf2 & RenderFlags.Create) {
-                      ɵɵtext(0, 'Hello');
+                      Δtext(0, 'Hello');
                     }
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
-              ɵɵcontainerRefreshStart(1);
+              ΔcontainerRefreshEnd();
+              ΔcontainerRefreshStart(1);
               {
                 if (ctx.condition3) {
-                  let rf2 = ɵɵembeddedViewStart(2, 1, 0);
+                  let rf2 = ΔembeddedViewStart(2, 1, 0);
                   {
                     if (rf2 & RenderFlags.Create) {
-                      ɵɵtext(0, 'World');
+                      Δtext(0, 'World');
                     }
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
       }
-      ɵɵcontainerRefreshEnd();
+      ΔcontainerRefreshEnd();
     }
 
     const fixture = new TemplateFixture(createTemplate, updateTemplate, 1);
@@ -231,32 +231,32 @@ describe('JS control flow', () => {
     */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         if (ctx.condition1) {
-          const rf1 = ɵɵembeddedViewStart(1, 1, 0);
+          const rf1 = ΔembeddedViewStart(1, 1, 0);
           if (rf1 & RenderFlags.Create) {
-            ɵɵtext(0, '1');
+            Δtext(0, '1');
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }  // can't have ; here due linting rules
         if (ctx.condition2) {
-          const rf2 = ɵɵembeddedViewStart(2, 1, 0);
+          const rf2 = ΔembeddedViewStart(2, 1, 0);
           if (rf2 & RenderFlags.Create) {
-            ɵɵtext(0, '2');
+            Δtext(0, '2');
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }  // can't have ; here due linting rules
         if (ctx.condition3) {
-          const rf3 = ɵɵembeddedViewStart(3, 1, 0);
+          const rf3 = ΔembeddedViewStart(3, 1, 0);
           if (rf3 & RenderFlags.Create) {
-            ɵɵtext(0, '3');
+            Δtext(0, '3');
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 1);
 
@@ -275,40 +275,40 @@ describe('JS control flow', () => {
   it('should work with containers with views as parents', () => {
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        { ɵɵtext(1, 'hello'); }
-        ɵɵelementEnd();
-        ɵɵcontainer(2);
+        ΔelementStart(0, 'div');
+        { Δtext(1, 'hello'); }
+        ΔelementEnd();
+        Δcontainer(2);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (ctx.condition1) {
-            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf0 = ΔembeddedViewStart(0, 1, 0);
             {
               if (rf0 & RenderFlags.Create) {
-                ɵɵcontainer(0);
+                Δcontainer(0);
               }
               if (rf0 & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
+                ΔcontainerRefreshStart(0);
                 {
                   if (ctx.condition2) {
-                    let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+                    let rf0 = ΔembeddedViewStart(0, 1, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        ɵɵtext(0, 'world');
+                        Δtext(0, 'world');
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 3);
 
@@ -328,29 +328,29 @@ describe('JS control flow', () => {
     let data: string[] = ['a', 'b', 'c'];
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'ul');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'ul');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           for (let i = 0; i < data.length; i++) {
-            let rf1 = ɵɵembeddedViewStart(1, 2, 1);
+            let rf1 = ΔembeddedViewStart(1, 2, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'li');
-                { ɵɵtext(1); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'li');
+                { Δtext(1); }
+                ΔelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵtextBinding(1, ɵɵbind(data[i]));
+                ΔtextBinding(1, Δbind(data[i]));
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
@@ -384,42 +384,42 @@ describe('JS control flow', () => {
 
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'ul');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'ul');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           for (let i = 0; i < data[0].length; i++) {
-            let rf1 = ɵɵembeddedViewStart(1, 2, 0);
+            let rf1 = ΔembeddedViewStart(1, 2, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'li');
-                { ɵɵcontainer(1); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'li');
+                { Δcontainer(1); }
+                ΔelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(1);
+                ΔcontainerRefreshStart(1);
                 {
                   data[1].forEach((value: string, ind: number) => {
-                    let rf2 = ɵɵembeddedViewStart(2, 1, 1);
+                    let rf2 = ΔembeddedViewStart(2, 1, 1);
                     if (rf2 & RenderFlags.Create) {
-                      ɵɵtext(0);
+                      Δtext(0);
                     }
                     if (rf2 & RenderFlags.Update) {
-                      ɵɵtextBinding(0, ɵɵbind(data[0][i] + value));
+                      ΔtextBinding(0, Δbind(data[0][i] + value));
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   });
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
@@ -453,49 +453,49 @@ describe('JS control flow', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
+        ΔelementStart(0, 'div');
         {
-          ɵɵtext(1, 'Before');
-          ɵɵcontainer(2);
-          ɵɵtext(3, 'After');
+          Δtext(1, 'Before');
+          Δcontainer(2);
+          Δtext(3, 'After');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           for (let i = 0; i < cafes.length; i++) {
-            let rf1 = ɵɵembeddedViewStart(1, 4, 1);
+            let rf1 = ΔembeddedViewStart(1, 4, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'h2');
-                { ɵɵtext(1); }
-                ɵɵelementEnd();
-                ɵɵcontainer(2);
-                ɵɵtext(3, '-');
+                ΔelementStart(0, 'h2');
+                { Δtext(1); }
+                ΔelementEnd();
+                Δcontainer(2);
+                Δtext(3, '-');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵtextBinding(1, ɵɵbind(cafes[i].name));
-                ɵɵcontainerRefreshStart(2);
+                ΔtextBinding(1, Δbind(cafes[i].name));
+                ΔcontainerRefreshStart(2);
                 {
                   for (let j = 0; j < cafes[i].entrees.length; j++) {
-                    let rf2 = ɵɵembeddedViewStart(2, 1, 1);
+                    let rf2 = ΔembeddedViewStart(2, 1, 1);
                     if (rf2 & RenderFlags.Create) {
-                      ɵɵtext(0);
+                      Δtext(0);
                     }
                     if (rf2 & RenderFlags.Update) {
-                      ɵɵtextBinding(0, ɵɵbind(cafes[i].entrees[j]));
+                      ΔtextBinding(0, Δbind(cafes[i].entrees[j]));
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 4);
 
@@ -548,68 +548,68 @@ describe('JS control flow', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
+        ΔelementStart(0, 'div');
         {
-          ɵɵtext(1, 'Before');
-          ɵɵcontainer(2);
-          ɵɵtext(3, 'After');
+          Δtext(1, 'Before');
+          Δcontainer(2);
+          Δtext(3, 'After');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           for (let i = 0; i < cafes.length; i++) {
-            let rf1 = ɵɵembeddedViewStart(1, 4, 1);
+            let rf1 = ΔembeddedViewStart(1, 4, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'h2');
-                { ɵɵtext(1); }
-                ɵɵelementEnd();
-                ɵɵcontainer(2);
-                ɵɵtext(3, '-');
+                ΔelementStart(0, 'h2');
+                { Δtext(1); }
+                ΔelementEnd();
+                Δcontainer(2);
+                Δtext(3, '-');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵtextBinding(1, ɵɵbind(cafes[i].name));
-                ɵɵcontainerRefreshStart(2);
+                ΔtextBinding(1, Δbind(cafes[i].name));
+                ΔcontainerRefreshStart(2);
                 {
                   for (let j = 0; j < cafes[i].entrees.length; j++) {
-                    let rf1 = ɵɵembeddedViewStart(1, 3, 1);
+                    let rf1 = ΔembeddedViewStart(1, 3, 1);
                     {
                       if (rf1 & RenderFlags.Create) {
-                        ɵɵelementStart(0, 'h3');
-                        { ɵɵtext(1); }
-                        ɵɵelementEnd();
-                        ɵɵcontainer(2);
+                        ΔelementStart(0, 'h3');
+                        { Δtext(1); }
+                        ΔelementEnd();
+                        Δcontainer(2);
                       }
                       if (rf1 & RenderFlags.Update) {
-                        ɵɵtextBinding(1, ɵɵbind(cafes[i].entrees[j].name));
-                        ɵɵcontainerRefreshStart(2);
+                        ΔtextBinding(1, Δbind(cafes[i].entrees[j].name));
+                        ΔcontainerRefreshStart(2);
                         {
                           for (let k = 0; k < cafes[i].entrees[j].foods.length; k++) {
-                            let rf2 = ɵɵembeddedViewStart(1, 1, 1);
+                            let rf2 = ΔembeddedViewStart(1, 1, 1);
                             if (rf2 & RenderFlags.Create) {
-                              ɵɵtext(0);
+                              Δtext(0);
                             }
                             if (rf2 & RenderFlags.Update) {
-                              ɵɵtextBinding(0, ɵɵbind(cafes[i].entrees[j].foods[k]));
+                              ΔtextBinding(0, Δbind(cafes[i].entrees[j].foods[k]));
                             }
-                            ɵɵembeddedViewEnd();
+                            ΔembeddedViewEnd();
                           }
                         }
-                        ɵɵcontainerRefreshEnd();
+                        ΔcontainerRefreshEnd();
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 4);
 
@@ -632,36 +632,36 @@ describe('JS control flow', () => {
   it('should work with if/else blocks', () => {
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           if (ctx.condition) {
-            let rf1 = ɵɵembeddedViewStart(1, 2, 0);
+            let rf1 = ΔembeddedViewStart(1, 2, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'span');
-                { ɵɵtext(1, 'Hello'); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'span');
+                { Δtext(1, 'Hello'); }
+                ΔelementEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           } else {
-            let rf2 = ɵɵembeddedViewStart(2, 2, 0);
+            let rf2 = ΔembeddedViewStart(2, 2, 0);
             {
               if (rf2) {
-                ɵɵelementStart(0, 'div');
-                { ɵɵtext(1, 'Goodbye'); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'div');
+                { Δtext(1, 'Goodbye'); }
+                ΔelementEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
@@ -685,7 +685,7 @@ describe('JS control flow', () => {
     // Intentionally duplicating the templates in test below so we are
     // testing the behavior on firstTemplatePass for each of these tests
     class Comp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: Comp,
         selectors: [['comp']],
         consts: 0,
@@ -702,7 +702,7 @@ describe('JS control flow', () => {
       condition = true;
       condition2 = true;
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: App,
         selectors: [['app']],
         factory: () => new App(),
@@ -710,33 +710,33 @@ describe('JS control flow', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div');
-            ɵɵcontainer(1);
-            ɵɵcontainer(2);
+            Δelement(0, 'div');
+            Δcontainer(1);
+            Δcontainer(2);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵcontainerRefreshStart(1);
+            ΔcontainerRefreshStart(1);
             {
               if (ctx.condition) {
-                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                let rf1 = ΔembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  ɵɵelement(0, 'comp');
+                  Δelement(0, 'comp');
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
-            ɵɵcontainerRefreshStart(2);
+            ΔcontainerRefreshEnd();
+            ΔcontainerRefreshStart(2);
             {
               if (ctx.condition2) {
-                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                let rf1 = ΔembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  ɵɵelement(0, 'comp');
+                  Δelement(0, 'comp');
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         },
         directives: () => [Comp]
@@ -753,7 +753,7 @@ describe('JS control flow', () => {
     // Intentionally duplicating the templates from above so we are
     // testing the behavior on firstTemplatePass for each of these tests
     class Comp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: Comp,
         selectors: [['comp']],
         consts: 0,
@@ -770,7 +770,7 @@ describe('JS control flow', () => {
       condition = false;
       condition2 = true;
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: App,
         selectors: [['app']],
         factory: () => new App(),
@@ -778,33 +778,33 @@ describe('JS control flow', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div');
-            ɵɵcontainer(1);
-            ɵɵcontainer(2);
+            Δelement(0, 'div');
+            Δcontainer(1);
+            Δcontainer(2);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵcontainerRefreshStart(1);
+            ΔcontainerRefreshStart(1);
             {
               if (ctx.condition) {
-                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                let rf1 = ΔembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  ɵɵelement(0, 'comp');
+                  Δelement(0, 'comp');
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
-            ɵɵcontainerRefreshStart(2);
+            ΔcontainerRefreshEnd();
+            ΔcontainerRefreshStart(2);
             {
               if (ctx.condition2) {
-                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                let rf1 = ΔembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  ɵɵelement(0, 'comp');
+                  Δelement(0, 'comp');
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         },
         directives: () => [Comp]
@@ -835,35 +835,35 @@ describe('JS for loop', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshStart(1);
         {
           for (let i = 0; i < config.data1.length; i++) {
-            let rf2 = ɵɵembeddedViewStart(1, 1, 1);
+            let rf2 = ΔembeddedViewStart(1, 1, 1);
             if (rf2 & RenderFlags.Create) {
-              ɵɵtext(0);
+              Δtext(0);
             }
             if (rf2 & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(config.data1[i]));
+              ΔtextBinding(0, Δbind(config.data1[i]));
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
           for (let j = 0; j < config.data2.length; j++) {
-            let rf2 = ɵɵembeddedViewStart(1, 1, 1);
+            let rf2 = ΔembeddedViewStart(1, 1, 1);
             if (rf2 & RenderFlags.Create) {
-              ɵɵtext(0);
+              Δtext(0);
             }
             if (rf2 & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(config.data2[j]));
+              ΔtextBinding(0, Δbind(config.data2[j]));
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 2);
 
@@ -891,41 +891,41 @@ describe('function calls', () => {
     function spanify(rf: RenderFlags, ctx: {message: string | null}) {
       const message = ctx.message;
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'span');
-        { ɵɵtext(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'span');
+        { Δtext(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵtextBinding(1, ɵɵbind(message));
+        ΔtextBinding(1, Δbind(message));
       }
     }
 
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
+        ΔelementStart(0, 'div');
         {
-          ɵɵtext(1, 'Before');
-          ɵɵcontainer(2);
-          ɵɵcontainer(3);
-          ɵɵtext(4, 'After');
+          Δtext(1, 'Before');
+          Δcontainer(2);
+          Δcontainer(3);
+          Δtext(4, 'After');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
-          let rf0 = ɵɵembeddedViewStart(0, 2, 1);
+          let rf0 = ΔembeddedViewStart(0, 2, 1);
           { spanify(rf0, {message: data[0]}); }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
-        ɵɵcontainerRefreshStart(3);
+        ΔcontainerRefreshEnd();
+        ΔcontainerRefreshStart(3);
         {
-          let rf0 = ɵɵembeddedViewStart(0, 2, 1);
+          let rf0 = ΔembeddedViewStart(0, 2, 1);
           { spanify(rf0, {message: data[1]}); }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }, 5);
 
diff --git a/packages/core/test/render3/debug_spec.ts b/packages/core/test/render3/debug_spec.ts
index 794dfb9d56..e1c15ab002 100644
--- a/packages/core/test/render3/debug_spec.ts
+++ b/packages/core/test/render3/debug_spec.ts
@@ -8,14 +8,14 @@
 
 import {getLContext} from '../../src/render3/context_discovery';
 import {LViewDebug, toDebug} from '../../src/render3/debug';
-import {RenderFlags, ɵɵdefineComponent, ɵɵelementEnd, ɵɵelementStart, ɵɵtext} from '../../src/render3/index';
+import {RenderFlags, ΔdefineComponent, ΔelementEnd, ΔelementStart, Δtext} from '../../src/render3/index';
 
 import {ComponentFixture} from './render_util';
 
 describe('Debug Representation', () => {
   it('should generate a human readable version', () => {
     class MyComponent {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         vars: 0,
@@ -23,9 +23,9 @@ describe('Debug Representation', () => {
         factory: () => new MyComponent(),
         template: function(rf: RenderFlags, ctx: MyComponent) {
           if (rf == RenderFlags.Create) {
-            ɵɵelementStart(0, 'div', ['id', '123']);
-            ɵɵtext(1, 'Hello World');
-            ɵɵelementEnd();
+            ΔelementStart(0, 'div', ['id', '123']);
+            Δtext(1, 'Hello World');
+            ΔelementEnd();
           }
         }
       });
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 7ad45750f1..6d10532cc8 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -10,9 +10,9 @@ import {ChangeDetectorRef, Host, InjectFlags, Injector, Optional, Renderer2, Sel
 import {createLView, createNodeAtIndex, createTView} from '@angular/core/src/render3/instructions/shared';
 import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
 
-import {ɵɵdefineComponent} from '../../src/render3/definition';
+import {ΔdefineComponent} from '../../src/render3/definition';
 import {bloomAdd, bloomHasToken, bloomHashBitOrFactory as bloomHash, getOrCreateNodeInjectorForNode} from '../../src/render3/di';
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation2, ɵɵprojection, ɵɵprojectionDef, ɵɵreference, ɵɵtext, ɵɵtextBinding} from '../../src/render3/index';
+import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdefineDirective, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation2, Δprojection, ΔprojectionDef, Δreference, Δtext, ΔtextBinding} from '../../src/render3/index';
 import {TNODE} from '../../src/render3/interfaces/injector';
 import {TNodeType} from '../../src/render3/interfaces/node';
 import {isProceduralRenderer} from '../../src/render3/interfaces/renderer';
@@ -31,7 +31,7 @@ describe('di', () => {
       value = 'DirB';
       constructor() { log.push(this.value); }
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         selectors: [['', 'dirB', '']],
         type: DirB,
         factory: () => new DirB(),
@@ -49,10 +49,10 @@ describe('di', () => {
       class DirA {
         constructor(dir: DirB) { log.push(`DirA (dep: ${dir.value})`); }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           selectors: [['', 'dirA', '']],
           type: DirA,
-          factory: () => new DirA(ɵɵdirectiveInject(DirB))
+          factory: () => new DirA(ΔdirectiveInject(DirB))
         });
       }
 
@@ -63,19 +63,19 @@ describe('di', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             for (let i = 0; i < 3; i++) {
-              if (ɵɵembeddedViewStart(0, 1, 0)) {
-                ɵɵelement(0, 'div', ['dirA', '', 'dirB', '']);
+              if (ΔembeddedViewStart(0, 1, 0)) {
+                Δelement(0, 'div', ['dirA', '', 'dirB', '']);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, [DirA, DirB]);
 
@@ -92,11 +92,11 @@ describe('di', () => {
           this.injector = vcr.injector;
         }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: DirA,
           selectors: [['', 'dirA', '']],
-          factory:
-              () => new DirA(ɵɵdirectiveInject(DirB), ɵɵdirectiveInject(ViewContainerRef as any)),
+          factory: () =>
+                       new DirA(ΔdirectiveInject(DirB), ΔdirectiveInject(ViewContainerRef as any)),
           exportAs: ['dirA']
         });
       }
@@ -117,45 +117,45 @@ describe('di', () => {
          */
         const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'div', ['dirB', '']);
-            { ɵɵcontainer(1); }
-            ɵɵelementEnd();
+            ΔelementStart(0, 'div', ['dirB', '']);
+            { Δcontainer(1); }
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵcontainerRefreshStart(1);
+            ΔcontainerRefreshStart(1);
             {
               if (!ctx.skipContent) {
-                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                let rf1 = ΔembeddedViewStart(0, 1, 0);
                 {
                   if (rf1 & RenderFlags.Create) {
-                    ɵɵcontainer(0);
+                    Δcontainer(0);
                   }
                   if (rf1 & RenderFlags.Update) {
-                    ɵɵcontainerRefreshStart(0);
+                    ΔcontainerRefreshStart(0);
                     {
                       if (!ctx.skipContent2) {
-                        let rf2 = ɵɵembeddedViewStart(0, 3, 1);
+                        let rf2 = ΔembeddedViewStart(0, 3, 1);
                         {
                           if (rf2 & RenderFlags.Create) {
-                            ɵɵelementStart(0, 'div', ['dirA', ''], ['dir', 'dirA']);
-                            { ɵɵtext(2); }
-                            ɵɵelementEnd();
+                            ΔelementStart(0, 'div', ['dirA', ''], ['dir', 'dirA']);
+                            { Δtext(2); }
+                            ΔelementEnd();
                           }
                           if (rf2 & RenderFlags.Update) {
-                            const dir = ɵɵreference(1) as DirA;
-                            ɵɵtextBinding(2, ɵɵbind(dir.dirB.value));
+                            const dir = Δreference(1) as DirA;
+                            ΔtextBinding(2, Δbind(dir.dirB.value));
                           }
                         }
-                        ɵɵembeddedViewEnd();
+                        ΔembeddedViewEnd();
                       }
                     }
-                    ɵɵcontainerRefreshEnd();
+                    ΔcontainerRefreshEnd();
                   }
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         }, 2, 0, [DirA, DirB]);
 
@@ -170,7 +170,7 @@ describe('di', () => {
         // TODO(issue/24571): remove '!'.
         value !: string;
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: DirB,
           selectors: [['', 'dirB', '']],
           factory: () => new DirB(),
@@ -184,10 +184,10 @@ describe('di', () => {
         class DirA {
           constructor(@Optional() public dirB: DirB|null) {}
 
-          static ngDirectiveDef = ɵɵdefineDirective({
+          static ngDirectiveDef = ΔdefineDirective({
             type: DirA,
             selectors: [['', 'dirA', '']],
-            factory: () => dirA = new DirA(ɵɵdirectiveInject(DirB, InjectFlags.Optional))
+            factory: () => dirA = new DirA(ΔdirectiveInject(DirB, InjectFlags.Optional))
           });
         }
 
@@ -198,7 +198,7 @@ describe('di', () => {
           /** <div dirA></div> */
           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'div', ['dirA', '']);
+              Δelement(0, 'div', ['dirA', '']);
             }
           }, 1, 0, [DirA, DirB]);
 
@@ -213,10 +213,10 @@ describe('di', () => {
         class DirA {
           constructor(@Self() public dirB: DirB) {}
 
-          static ngDirectiveDef = ɵɵdefineDirective({
+          static ngDirectiveDef = ΔdefineDirective({
             type: DirA,
             selectors: [['', 'dirA', '']],
-            factory: () => dirA = new DirA(ɵɵdirectiveInject(DirB, InjectFlags.Self))
+            factory: () => dirA = new DirA(ΔdirectiveInject(DirB, InjectFlags.Self))
           });
         }
 
@@ -229,9 +229,9 @@ describe('di', () => {
          */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'div', ['dirB', '']);
-            ɵɵelement(1, 'div', ['dirA', '', 'dirC', '']);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'div', ['dirB', '']);
+            Δelement(1, 'div', ['dirA', '', 'dirC', '']);
+            ΔelementEnd();
           }
         }, 2, 0, [DirA, DirB, DirC]);
 
@@ -250,10 +250,10 @@ describe('di', () => {
         class DirA {
           constructor(@Host() public dirB: DirB) {}
 
-          static ngDirectiveDef = ɵɵdefineDirective({
+          static ngDirectiveDef = ΔdefineDirective({
             type: DirA,
             selectors: [['', 'dirA', '']],
-            factory: () => dirA = new DirA(ɵɵdirectiveInject(DirB, InjectFlags.Host))
+            factory: () => dirA = new DirA(ΔdirectiveInject(DirB, InjectFlags.Host))
           });
         }
 
@@ -271,27 +271,27 @@ describe('di', () => {
            */
           const Comp = createComponent('comp', function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵcontainer(0);
+              Δcontainer(0);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(0);
+              ΔcontainerRefreshStart(0);
               {
                 if (ctx.showing) {
-                  let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                  let rf1 = ΔembeddedViewStart(0, 1, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ɵɵelement(0, 'div', ['dirA', '']);
+                    Δelement(0, 'div', ['dirA', '']);
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
           }, 1, 0, [DirA, DirB]);
 
           /* <comp dirB></comp> */
           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'comp', ['dirB', '']);
+              Δelement(0, 'comp', ['dirB', '']);
             }
             if (rf & RenderFlags.Update) {
               comp = getDirectiveOnNode(0);
@@ -318,16 +318,16 @@ describe('di', () => {
       class MyComp {
         constructor(public cdr: ChangeDetectorRef) {}
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: MyComp,
           selectors: [['my-comp']],
-          factory: () => comp = new MyComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
+          factory: () => comp = new MyComp(ΔdirectiveInject(ChangeDetectorRef as any)),
           consts: 1,
           vars: 0,
           template: function(rf: RenderFlags, ctx: MyComp) {
             if (rf & RenderFlags.Create) {
-              ɵɵprojectionDef();
-              ɵɵprojection(0);
+              ΔprojectionDef();
+              Δprojection(0);
             }
           }
         });
@@ -338,10 +338,10 @@ describe('di', () => {
 
         constructor(public cdr: ChangeDetectorRef) { this.value = (cdr.constructor as any).name; }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: Directive,
           selectors: [['', 'dir', '']],
-          factory: () => dir = new Directive(ɵɵdirectiveInject(ChangeDetectorRef as any)),
+          factory: () => dir = new Directive(ΔdirectiveInject(ChangeDetectorRef as any)),
           exportAs: ['dir']
         });
       }
@@ -349,11 +349,11 @@ describe('di', () => {
       class DirectiveSameInstance {
         constructor(public cdr: ChangeDetectorRef) {}
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: DirectiveSameInstance,
           selectors: [['', 'dirSame', '']],
           factory: () => dirSameInstance =
-                       new DirectiveSameInstance(ɵɵdirectiveInject(ChangeDetectorRef as any))
+                       new DirectiveSameInstance(ΔdirectiveInject(ChangeDetectorRef as any))
         });
       }
 
@@ -370,10 +370,10 @@ describe('di', () => {
 
           constructor(public cdr: ChangeDetectorRef) {}
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: MyApp,
             selectors: [['my-app']],
-            factory: () => new MyApp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
+            factory: () => new MyApp(ΔdirectiveInject(ChangeDetectorRef as any)),
             consts: 1,
             vars: 0,
             /**
@@ -383,26 +383,26 @@ describe('di', () => {
              */
             template: function(rf: RenderFlags, ctx: MyApp) {
               if (rf & RenderFlags.Create) {
-                ɵɵcontainer(0);
+                Δcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
+                ΔcontainerRefreshStart(0);
                 {
                   if (ctx.showing) {
-                    let rf1 = ɵɵembeddedViewStart(0, 3, 1);
+                    let rf1 = ΔembeddedViewStart(0, 3, 1);
                     if (rf1 & RenderFlags.Create) {
-                      ɵɵelementStart(0, 'div', ['dir', '', 'dirSame', ''], ['dir', 'dir']);
-                      { ɵɵtext(2); }
-                      ɵɵelementEnd();
+                      ΔelementStart(0, 'div', ['dir', '', 'dirSame', ''], ['dir', 'dir']);
+                      { Δtext(2); }
+                      ΔelementEnd();
                     }
                     if (rf1 & RenderFlags.Update) {
-                      const tmp = ɵɵreference(1) as any;
-                      ɵɵtextBinding(2, ɵɵbind(tmp.value));
+                      const tmp = Δreference(1) as any;
+                      ΔtextBinding(2, Δbind(tmp.value));
                     }
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             },
             directives: directives
@@ -424,15 +424,15 @@ describe('di', () => {
     class MyComp {
       constructor(public renderer: Renderer2) {}
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComp,
         selectors: [['my-comp']],
-        factory: () => new MyComp(ɵɵdirectiveInject(Renderer2 as any)),
+        factory: () => new MyComp(ΔdirectiveInject(Renderer2 as any)),
         consts: 1,
         vars: 0,
         template: function(rf: RenderFlags, ctx: MyComp) {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0, 'Foo');
+            Δtext(0, 'Foo');
           }
         }
       });
@@ -448,7 +448,7 @@ describe('di', () => {
        () => { expect(() => new ComponentFixture(MyComp)).toThrow(); });
   });
 
-  describe('ɵɵinject', () => {
+  describe('Δinject', () => {
     describe('bloom filter', () => {
       let mockTView: any;
       beforeEach(() => {
@@ -535,10 +535,10 @@ describe('di', () => {
       class ChildDirective {
         value: string;
         constructor(public parent: any) { this.value = (parent.constructor as any).name; }
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: ChildDirective,
           selectors: [['', 'childDir', '']],
-          factory: () => new ChildDirective(ɵɵdirectiveInject(ParentDirective)),
+          factory: () => new ChildDirective(ΔdirectiveInject(ParentDirective)),
           exportAs: ['childDir']
         });
       }
@@ -546,11 +546,11 @@ describe('di', () => {
       class Child2Directive {
         value: boolean;
         constructor(parent: any, child: ChildDirective) { this.value = parent === child.parent; }
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           selectors: [['', 'child2Dir', '']],
           type: Child2Directive,
           factory: () => new Child2Directive(
-                       ɵɵdirectiveInject(ParentDirective), ɵɵdirectiveInject(ChildDirective)),
+                       ΔdirectiveInject(ParentDirective), ΔdirectiveInject(ChildDirective)),
           exportAs: ['child2Dir']
         });
       }
@@ -566,29 +566,29 @@ describe('di', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div', ['parentDir', '']);
-          { ɵɵcontainer(1); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'div', ['parentDir', '']);
+          { Δcontainer(1); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(1);
+          ΔcontainerRefreshStart(1);
           {
-            let rf1 = ɵɵembeddedViewStart(0, 4, 2);
+            let rf1 = ΔembeddedViewStart(0, 4, 2);
             if (rf1 & RenderFlags.Create) {
-              ɵɵelementStart(
+              ΔelementStart(
                   0, 'span', ['childDir', '', 'child2Dir', ''],
                   ['child1', 'childDir', 'child2', 'child2Dir']);
-              { ɵɵtext(3); }
-              ɵɵelementEnd();
+              { Δtext(3); }
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              const tmp1 = ɵɵreference(1) as any;
-              const tmp2 = ɵɵreference(2) as any;
-              ɵɵtextBinding(3, ɵɵinterpolation2('', tmp1.value, '-', tmp2.value, ''));
+              const tmp1 = Δreference(1) as any;
+              const tmp2 = Δreference(2) as any;
+              ΔtextBinding(3, Δinterpolation2('', tmp1.value, '-', tmp2.value, ''));
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 2, 0, [ChildDirective, Child2Directive, ParentDirective]);
 
diff --git a/packages/core/test/render3/exports_spec.ts b/packages/core/test/render3/exports_spec.ts
index 4a1fd89b1d..461eb685d2 100644
--- a/packages/core/test/render3/exports_spec.ts
+++ b/packages/core/test/render3/exports_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵreference, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δreference, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {ComponentFixture, createComponent} from './render_util';
@@ -23,29 +23,29 @@ describe('exports', () => {
     it('should work inside a view container', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵcontainer(1); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'div');
+          { Δcontainer(1); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(1);
+          ΔcontainerRefreshStart(1);
           {
             if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(1, 2, 1);
+              let rf1 = ΔembeddedViewStart(1, 2, 1);
               {
                 if (rf1 & RenderFlags.Create) {
-                  ɵɵtext(0);
-                  ɵɵelement(1, 'input', ['value', 'one'], ['myInput', '']);
+                  Δtext(0);
+                  Δelement(1, 'input', ['value', 'one'], ['myInput', '']);
                 }
                 if (rf1 & RenderFlags.Update) {
-                  const tmp = ɵɵreference(2) as any;
-                  ɵɵtextBinding(0, ɵɵbind(tmp.value));
+                  const tmp = Δreference(2) as any;
+                  ΔtextBinding(0, Δbind(tmp.value));
                 }
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 2);
 
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index 10df144f31..1f21500068 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {noop} from '../../../compiler/src/render3/view/util';
-import {getTranslationForTemplate, ɵɵi18nAttributes, ɵɵi18nPostprocess, ɵɵi18nStart} from '../../src/render3/i18n';
-import {ɵɵelementEnd, ɵɵelementStart} from '../../src/render3/instructions/all';
+import {getTranslationForTemplate, Δi18nAttributes, Δi18nPostprocess, Δi18nStart} from '../../src/render3/i18n';
+import {ΔelementEnd, ΔelementStart} from '../../src/render3/instructions/all';
 import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nUpdateOpCode, I18nUpdateOpCodes, TI18n} from '../../src/render3/interfaces/i18n';
 import {HEADER_OFFSET, LView, TVIEW} from '../../src/render3/interfaces/view';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
@@ -68,7 +68,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV = `simple text`;
       const nbConsts = 1;
       const index = 0;
-      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       // Check debug
       const debugOps = (opCodes as any).create.debug !.operations;
@@ -99,7 +99,7 @@ describe('Runtime i18n', () => {
       const index = 1;
       const elementIndex = 2;
       const elementIndex2 = 3;
-      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 5,
@@ -135,7 +135,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV = `Hello �0�!`;
       const nbConsts = 2;
       const index = 1;
-      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect((opCodes as any).update.debug.operations).toEqual([
         {__raw_opCode: 8, checkBit: 1, type: 'Text', nodeIndex: 2, text: 'Hello �0�!'}
@@ -160,7 +160,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV = `Hello �0� and �1�, again �0�!`;
       const nbConsts = 2;
       const index = 1;
-      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 1,
@@ -193,7 +193,7 @@ describe('Runtime i18n', () => {
       let nbConsts = 3;
       let index = 1;
       const firstTextNode = 3;
-      let opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      let opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 2,
@@ -223,7 +223,7 @@ describe('Runtime i18n', () => {
       index = 0;
       const spanElement = 1;
       const bElementSubTemplate = 2;
-      opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV, 1); }, null, nbConsts, index);
+      opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV, 1); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 2,
@@ -250,7 +250,7 @@ describe('Runtime i18n', () => {
       nbConsts = 2;
       index = 0;
       const bElement = 1;
-      opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV, 2); }, null, nbConsts, index);
+      opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV, 2); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 1,
@@ -275,7 +275,7 @@ describe('Runtime i18n', () => {
       }`;
       const nbConsts = 1;
       const index = 0;
-      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
       const tIcuIndex = 0;
       const icuCommentNodeIndex = index + 1;
       const firstTextNodeIndex = index + 2;
@@ -463,7 +463,7 @@ describe('Runtime i18n', () => {
       }`;
       const nbConsts = 1;
       const index = 0;
-      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
       const icuCommentNodeIndex = index + 1;
       const firstTextNodeIndex = index + 2;
       const nestedIcuCommentNodeIndex = index + 3;
@@ -579,9 +579,9 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18nAttributes(index, MSG_div_attr);
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        Δi18nAttributes(index, MSG_div_attr);
+        ΔelementEnd();
       }, null, nbConsts, index);
       const tView = fixture.hostView[TVIEW];
       const opCodes = tView.data[index + HEADER_OFFSET] as I18nUpdateOpCodes;
@@ -598,7 +598,7 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const opCodes =
-          getOpCodes(() => { ɵɵi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
+          getOpCodes(() => { Δi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
 
       expect(opCodes).toEqual([
         0b1,  // bindings mask
@@ -615,7 +615,7 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const opCodes =
-          getOpCodes(() => { ɵɵi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
+          getOpCodes(() => { Δi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
 
       expect(opCodes).toEqual([
         0b11,  // bindings mask
@@ -631,7 +631,7 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const opCodes =
-          getOpCodes(() => { ɵɵi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
+          getOpCodes(() => { Δi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
 
       expect(opCodes).toEqual([
         0b1,  // bindings mask
@@ -724,7 +724,7 @@ describe('Runtime i18n', () => {
         ],
       ];
       cases.forEach(([input, replacements, output]) => {
-        expect(ɵɵi18nPostprocess(input as string, replacements as any)).toEqual(output as string);
+        expect(Δi18nPostprocess(input as string, replacements as any)).toEqual(output as string);
       });
     });
 
@@ -776,7 +776,7 @@ describe('Runtime i18n', () => {
         �/*3:1�
         �#4� Bonjour - 5 �/#4�
       `;
-      expect(ɵɵi18nPostprocess(generated.replace(/\s+/g, ''))).toEqual(final.replace(/\s+/g, ''));
+      expect(Δi18nPostprocess(generated.replace(/\s+/g, ''))).toEqual(final.replace(/\s+/g, ''));
     });
 
     it('should throw in case we have invalid string', () => {
@@ -794,7 +794,7 @@ describe('Runtime i18n', () => {
         ['My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�', {ICU: ['ICU_VALUE_1']}]
       ];
       cases.forEach(([input, replacements, output]) => {
-        expect(() => ɵɵi18nPostprocess(input as string, replacements as any)).toThrowError();
+        expect(() => Δi18nPostprocess(input as string, replacements as any)).toThrowError();
       });
     });
   });
diff --git a/packages/core/test/render3/inherit_definition_feature_spec.ts b/packages/core/test/render3/inherit_definition_feature_spec.ts
index b9155bea2d..4d78e7eb7e 100644
--- a/packages/core/test/render3/inherit_definition_feature_spec.ts
+++ b/packages/core/test/render3/inherit_definition_feature_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {ElementRef, Inject, InjectionToken, QueryList, ɵAttributeMarker as AttributeMarker} from '../../src/core';
-import {ɵɵallocHostVars, ɵɵbind, ComponentDef, ɵɵcontentQuery, ɵɵdefineBase, ɵɵdefineComponent, ɵɵdefineDirective, DirectiveDef, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵInheritDefinitionFeature, ɵɵload, ɵɵloadContentQuery, ɵɵloadViewQuery, ɵɵNgOnChangesFeature, ɵɵProvidersFeature, ɵɵqueryRefresh, RenderFlags, ɵɵviewQuery,} from '../../src/render3/index';
+import {ΔallocHostVars, Δbind, ComponentDef, ΔcontentQuery, ΔdefineBase, ΔdefineComponent, ΔdefineDirective, DirectiveDef, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔInheritDefinitionFeature, Δload, ΔloadContentQuery, ΔloadViewQuery, ΔNgOnChangesFeature, ΔProvidersFeature, ΔqueryRefresh, RenderFlags, ΔviewQuery,} from '../../src/render3/index';
 
 import {ComponentFixture, createComponent, getDirectiveOnNode} from './render_util';
 
@@ -28,11 +28,11 @@ describe('InheritDefinitionFeature', () => {
       ngAfterViewChecked() {}
       ngDoCheck() {}
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SubDirective,
         selectors: [['', 'subDir', '']],
         factory: () => new SubDirective(),
-        features: [ɵɵInheritDefinitionFeature]
+        features: [ΔInheritDefinitionFeature]
       });
     }
 
@@ -50,7 +50,7 @@ describe('InheritDefinitionFeature', () => {
 
   it('should inherit inputs', () => {
     class SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         inputs: {
           superFoo: ['foo', 'declaredFoo'],
           superBar: 'bar',
@@ -63,7 +63,7 @@ describe('InheritDefinitionFeature', () => {
     }
 
     class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SubDirective,
         inputs: {
           subBaz: 'baz',
@@ -71,7 +71,7 @@ describe('InheritDefinitionFeature', () => {
         },
         selectors: [['', 'subDir', '']],
         factory: () => new SubDirective(),
-        features: [ɵɵInheritDefinitionFeature]
+        features: [ΔInheritDefinitionFeature]
       });
     }
 
@@ -93,7 +93,7 @@ describe('InheritDefinitionFeature', () => {
 
   it('should inherit outputs', () => {
     class SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         outputs: {
           superFoo: 'foo',
           superBar: 'bar',
@@ -106,7 +106,7 @@ describe('InheritDefinitionFeature', () => {
     }
 
     class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SubDirective,
         outputs: {
           subBaz: 'baz',
@@ -114,7 +114,7 @@ describe('InheritDefinitionFeature', () => {
         },
         selectors: [['', 'subDir', '']],
         factory: () => new SubDirective(),
-        features: [ɵɵInheritDefinitionFeature]
+        features: [ΔInheritDefinitionFeature]
       });
     }
 
@@ -130,7 +130,7 @@ describe('InheritDefinitionFeature', () => {
 
   it('should detect EMPTY inputs and outputs', () => {
     class SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         inputs: {
           testIn: 'testIn',
         },
@@ -144,11 +144,11 @@ describe('InheritDefinitionFeature', () => {
     }
 
     class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SubDirective,
         selectors: [['', 'subDir', '']],
         factory: () => new SubDirective(),
-        features: [ɵɵInheritDefinitionFeature]
+        features: [ΔInheritDefinitionFeature]
       });
     }
 
@@ -167,7 +167,7 @@ describe('InheritDefinitionFeature', () => {
     class Class5 {
       input5 = 'data, so data';
 
-      static ngBaseDef = ɵɵdefineBase({
+      static ngBaseDef = ΔdefineBase({
         inputs: {
           input5: 'input5',
         },
@@ -177,14 +177,14 @@ describe('InheritDefinitionFeature', () => {
     class Class4 extends Class5 {
       input4 = 'hehe';
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         inputs: {
           input4: 'input4',
         },
         type: Class4,
         selectors: [['', 'superDir', '']],
         factory: () => new Class4(),
-        features: [ɵɵInheritDefinitionFeature],
+        features: [ΔInheritDefinitionFeature],
       });
     }
 
@@ -193,7 +193,7 @@ describe('InheritDefinitionFeature', () => {
     class Class2 extends Class3 {
       input3 = 'wee';
 
-      static ngBaseDef = ɵɵdefineBase({
+      static ngBaseDef = ΔdefineBase({
         inputs: {
           input3: ['alias3', 'input3'],
         }
@@ -204,7 +204,7 @@ describe('InheritDefinitionFeature', () => {
       input1 = 'test';
       input2 = 'whatever';
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: Class1,
         inputs: {
           input1: 'input1',
@@ -212,7 +212,7 @@ describe('InheritDefinitionFeature', () => {
         },
         selectors: [['', 'subDir', '']],
         factory: () => new Class1(),
-        features: [ɵɵInheritDefinitionFeature],
+        features: [ΔInheritDefinitionFeature],
       });
     }
 
@@ -239,7 +239,7 @@ describe('InheritDefinitionFeature', () => {
     class Class5 {
       output5 = 'data, so data';
 
-      static ngBaseDef = ɵɵdefineBase({
+      static ngBaseDef = ΔdefineBase({
         outputs: {
           output5: 'alias5',
         },
@@ -249,14 +249,14 @@ describe('InheritDefinitionFeature', () => {
     class Class4 extends Class5 {
       output4 = 'hehe';
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         outputs: {
           output4: 'alias4',
         },
         type: Class4,
         selectors: [['', 'superDir', '']],
         factory: () => new Class4(),
-        features: [ɵɵInheritDefinitionFeature],
+        features: [ΔInheritDefinitionFeature],
       });
     }
 
@@ -265,7 +265,7 @@ describe('InheritDefinitionFeature', () => {
     class Class2 extends Class3 {
       output3 = 'wee';
 
-      static ngBaseDef = ɵɵdefineBase({
+      static ngBaseDef = ΔdefineBase({
         outputs: {
           output3: 'alias3',
         }
@@ -276,7 +276,7 @@ describe('InheritDefinitionFeature', () => {
       output1 = 'test';
       output2 = 'whatever';
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: Class1,
         outputs: {
           output1: 'alias1',
@@ -284,7 +284,7 @@ describe('InheritDefinitionFeature', () => {
         },
         selectors: [['', 'subDir', '']],
         factory: () => new Class1(),
-        features: [ɵɵInheritDefinitionFeature],
+        features: [ΔInheritDefinitionFeature],
       });
     }
 
@@ -305,15 +305,15 @@ describe('InheritDefinitionFeature', () => {
     class SuperDirective {
       id = 'my-id';
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SuperDirective,
         selectors: [['', 'superDir', '']],
         hostBindings: (rf: RenderFlags, ctx: SuperDirective, elementIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ɵɵallocHostVars(1);
+            ΔallocHostVars(1);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(elementIndex, 'id', ɵɵbind(ctx.id));
+            ΔelementProperty(elementIndex, 'id', Δbind(ctx.id));
           }
         },
         factory: () => new SuperDirective(),
@@ -323,26 +323,26 @@ describe('InheritDefinitionFeature', () => {
     class SubDirective extends SuperDirective {
       title = 'my-title';
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SubDirective,
         selectors: [['', 'subDir', '']],
         hostBindings: (rf: RenderFlags, ctx: SubDirective, elementIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ɵɵallocHostVars(1);
+            ΔallocHostVars(1);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(elementIndex, 'title', ɵɵbind(ctx.title));
+            ΔelementProperty(elementIndex, 'title', Δbind(ctx.title));
           }
         },
         factory: () => subDir = new SubDirective(),
-        features: [ɵɵInheritDefinitionFeature]
+        features: [ΔInheritDefinitionFeature]
       });
     }
 
 
     const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'div', ['subDir', '']);
+        Δelement(0, 'div', ['subDir', '']);
       }
     }, 1, 0, [SubDirective]);
 
@@ -374,7 +374,7 @@ describe('InheritDefinitionFeature', () => {
      */
     class SuperComponent {
       superQuery?: QueryList<any>;
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: SuperComponent,
         template: () => {},
         consts: 0,
@@ -382,11 +382,11 @@ describe('InheritDefinitionFeature', () => {
         selectors: [['super-comp']],
         viewQuery: <T>(rf: RenderFlags, ctx: any) => {
           if (rf & RenderFlags.Create) {
-            ɵɵviewQuery(['super'], false, null);
+            ΔviewQuery(['super'], false, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                 (ctx.superQuery = tmp as QueryList<any>);
           }
         },
@@ -404,13 +404,13 @@ describe('InheritDefinitionFeature', () => {
      */
     class SubComponent extends SuperComponent {
       subQuery?: QueryList<any>;
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: SubComponent,
         template: (rf: RenderFlags, ctx: any) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div', ['id', 'sub'], ['sub', '']);
-            ɵɵelement(2, 'div', ['id', 'super'], ['super', '']);
-            ɵɵelement(4, 'some-comp');
+            Δelement(0, 'div', ['id', 'sub'], ['sub', '']);
+            Δelement(2, 'div', ['id', 'super'], ['super', '']);
+            Δelement(4, 'some-comp');
           }
         },
         consts: 5,
@@ -418,16 +418,16 @@ describe('InheritDefinitionFeature', () => {
         selectors: [['sub-comp']],
         viewQuery: (rf: RenderFlags, ctx: any) => {
           if (rf & RenderFlags.Create) {
-            ɵɵviewQuery(['sub'], false, null);
+            ΔviewQuery(['sub'], false, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                 (ctx.subQuery = tmp as QueryList<any>);
           }
         },
         factory: () => new SubComponent(),
-        features: [ɵɵInheritDefinitionFeature],
+        features: [ΔInheritDefinitionFeature],
         directives: [SomeComp]
       });
     }
@@ -437,7 +437,7 @@ describe('InheritDefinitionFeature', () => {
       const log: Array<[string, RenderFlags, any]> = [];
 
       class SuperComponent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: SuperComponent,
           template: () => {},
           consts: 0,
@@ -451,7 +451,7 @@ describe('InheritDefinitionFeature', () => {
       }
 
       class SubComponent extends SuperComponent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: SubComponent,
           template: () => {},
           consts: 0,
@@ -461,7 +461,7 @@ describe('InheritDefinitionFeature', () => {
             log.push(['sub', rf, ctx]);
           },
           factory: () => new SubComponent(),
-          features: [ɵɵInheritDefinitionFeature]
+          features: [ΔInheritDefinitionFeature]
         });
       }
 
@@ -497,8 +497,8 @@ describe('InheritDefinitionFeature', () => {
 
       const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'sub-comp');
-          ɵɵelement(1, 'sub-comp');
+          Δelement(0, 'sub-comp');
+          Δelement(1, 'sub-comp');
         }
         subCompOne = getDirectiveOnNode(0);
         subCompTwo = getDirectiveOnNode(1);
@@ -524,7 +524,7 @@ describe('InheritDefinitionFeature', () => {
     const log: string[] = [];
 
     class SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SuperDirective,
         selectors: [['', 'superDir', '']],
         contentQueries: () => { log.push('super'); },
@@ -533,12 +533,12 @@ describe('InheritDefinitionFeature', () => {
     }
 
     class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SubDirective,
         selectors: [['', 'subDir', '']],
         contentQueries: () => { log.push('sub'); },
         factory: () => new SubDirective(),
-        features: [ɵɵInheritDefinitionFeature]
+        features: [ΔInheritDefinitionFeature]
       });
     }
 
@@ -555,17 +555,17 @@ describe('InheritDefinitionFeature', () => {
       // @ContentChildren('foo')
       foos !: QueryList<ElementRef>;
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SuperDirective,
         selectors: [['', 'super-dir', '']],
         factory: () => new SuperDirective(),
         contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ɵɵcontentQuery(dirIndex, ['foo'], true, null);
+            ΔcontentQuery(dirIndex, ['foo'], true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
           }
         }
       });
@@ -575,20 +575,20 @@ describe('InheritDefinitionFeature', () => {
       // @ContentChildren('bar')
       bars !: QueryList<ElementRef>;
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SubDirective,
         selectors: [['', 'sub-dir', '']],
         factory: () => dirInstance = new SubDirective(),
         contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ɵɵcontentQuery(dirIndex, ['bar'], true, null);
+            ΔcontentQuery(dirIndex, ['bar'], true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.bars = tmp);
+            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.bars = tmp);
           }
         },
-        features: [ɵɵInheritDefinitionFeature]
+        features: [ΔInheritDefinitionFeature]
       });
     }
 
@@ -600,12 +600,12 @@ describe('InheritDefinitionFeature', () => {
      */
     const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'sub-dir']);
+        ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'sub-dir']);
         {
-          ɵɵelement(1, 'span', null, ['foo', '']);
-          ɵɵelement(3, 'span', null, ['bar', '']);
+          Δelement(1, 'span', null, ['foo', '']);
+          Δelement(3, 'span', null, ['bar', '']);
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }, 5, 0, [SubDirective]);
 
@@ -616,7 +616,7 @@ describe('InheritDefinitionFeature', () => {
 
   it('should throw if inheriting a component from a directive', () => {
     class SuperComponent {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: SuperComponent,
         template: () => {},
         selectors: [['', 'superDir', '']],
@@ -627,11 +627,11 @@ describe('InheritDefinitionFeature', () => {
     }
 
     expect(() => {
-      class SubDirective extends SuperComponent{static ngDirectiveDef = ɵɵdefineDirective({
+      class SubDirective extends SuperComponent{static ngDirectiveDef = ΔdefineDirective({
                                                   type: SubDirective,
                                                   selectors: [['', 'subDir', '']],
                                                   factory: () => new SubDirective(),
-                                                  features: [ɵɵInheritDefinitionFeature]
+                                                  features: [ΔInheritDefinitionFeature]
                                                 });}
     }).toThrowError('Directives cannot inherit Components');
   });
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index cc75beec31..90ec5eb979 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -8,11 +8,11 @@
 
 import {NgForOfContext} from '@angular/common';
 
-import {ɵɵdefineComponent} from '../../src/render3/definition';
-import {RenderFlags, ɵɵbind, ɵɵclassMap, ɵɵelement, ɵɵelementAttribute, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵinterpolation1, ɵɵproperty, ɵɵselect, ɵɵstyleMap, ɵɵstyleProp, ɵɵstyling, ɵɵstylingApply, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/index';
+import {ΔdefineComponent} from '../../src/render3/definition';
+import {RenderFlags, Δbind, ΔclassMap, Δelement, ΔelementAttribute, ΔelementEnd, ΔelementProperty, ΔelementStart, Δinterpolation1, Δproperty, Δselect, ΔstyleMap, ΔstyleProp, Δstyling, ΔstylingApply, Δtemplate, Δtext, ΔtextBinding} from '../../src/render3/index';
 import {AttributeMarker} from '../../src/render3/interfaces/node';
 import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl} from '../../src/sanitization/bypass';
-import {ɵɵdefaultStyleSanitizer, ɵɵsanitizeHtml, ɵɵsanitizeResourceUrl, ɵɵsanitizeScript, ɵɵsanitizeStyle, ɵɵsanitizeUrl} from '../../src/sanitization/sanitization';
+import {ΔdefaultStyleSanitizer, ΔsanitizeHtml, ΔsanitizeResourceUrl, ΔsanitizeScript, ΔsanitizeStyle, ΔsanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 import {StyleSanitizeFn} from '../../src/sanitization/style_sanitizer';
 
@@ -21,9 +21,9 @@ import {ComponentFixture, TemplateFixture} from './render_util';
 
 describe('instructions', () => {
   function createAnchor() {
-    ɵɵelementStart(0, 'a');
-    ɵɵstyling();
-    ɵɵelementEnd();
+    ΔelementStart(0, 'a');
+    Δstyling();
+    ΔelementEnd();
   }
 
   function createDiv(
@@ -37,20 +37,20 @@ describe('instructions', () => {
     if (initialStyles) {
       attrs.push(AttributeMarker.Styles, ...initialStyles);
     }
-    ɵɵelementStart(0, 'div', attrs);
-    ɵɵstyling(classBindingNames || null, styleBindingNames || null, styleSanitizer);
-    ɵɵelementEnd();
+    ΔelementStart(0, 'div', attrs);
+    Δstyling(classBindingNames || null, styleBindingNames || null, styleSanitizer);
+    ΔelementEnd();
   }
 
-  function createScript() { ɵɵelement(0, 'script'); }
+  function createScript() { Δelement(0, 'script'); }
 
-  describe('ɵɵselect', () => {
+  describe('Δselect', () => {
     it('should error in DevMode if index is out of range', () => {
       // Only one constant added, meaning only index `0` is valid.
       const t = new TemplateFixture(createDiv, () => {}, 1, 0);
-      expect(() => { t.update(() => { ɵɵselect(-1); }); }).toThrow();
-      expect(() => { t.update(() => { ɵɵselect(1); }); }).toThrow();
-      expect(() => { t.update(() => { ɵɵselect(0); }); }).not.toThrow();
+      expect(() => { t.update(() => { Δselect(-1); }); }).toThrow();
+      expect(() => { t.update(() => { Δselect(1); }); }).toThrow();
+      expect(() => { t.update(() => { Δselect(0); }); }).not.toThrow();
     });
   });
 
@@ -58,10 +58,10 @@ describe('instructions', () => {
     it('should update bindings when value changes with the correct perf counters', () => {
       const t = new TemplateFixture(createAnchor, () => {}, 1, 1);
 
-      t.update(() => ɵɵelementProperty(0, 'title', ɵɵbind('Hello')));
+      t.update(() => ΔelementProperty(0, 'title', Δbind('Hello')));
       expect(t.html).toEqual('<a title="Hello"></a>');
 
-      t.update(() => ɵɵelementProperty(0, 'title', ɵɵbind('World')));
+      t.update(() => ΔelementProperty(0, 'title', Δbind('World')));
       expect(t.html).toEqual('<a title="World"></a>');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
@@ -74,7 +74,7 @@ describe('instructions', () => {
 
     it('should not update bindings when value does not change, with the correct perf counters',
        () => {
-         const idempotentUpdate = () => ɵɵelementProperty(0, 'title', ɵɵbind('Hello'));
+         const idempotentUpdate = () => ΔelementProperty(0, 'title', Δbind('Hello'));
          const t = new TemplateFixture(createAnchor, idempotentUpdate, 1, 1);
 
          t.update();
@@ -95,7 +95,7 @@ describe('instructions', () => {
   describe('element', () => {
     it('should create an element with the correct perf counters', () => {
       const t = new TemplateFixture(() => {
-        ɵɵelement(0, 'div', ['id', 'test', 'title', 'Hello']);
+        Δelement(0, 'div', ['id', 'test', 'title', 'Hello']);
       }, () => {}, 1);
 
       const div = (t.hostElement as HTMLElement).querySelector('div') !;
@@ -114,12 +114,12 @@ describe('instructions', () => {
     it('should use sanitizer function', () => {
       const t = new TemplateFixture(createDiv, () => {}, 1);
 
-      t.update(() => ɵɵelementAttribute(0, 'title', 'javascript:true', ɵɵsanitizeUrl));
+      t.update(() => ΔelementAttribute(0, 'title', 'javascript:true', ΔsanitizeUrl));
       expect(t.html).toEqual('<div title="unsafe:javascript:true"></div>');
 
       t.update(
-          () => ɵɵelementAttribute(
-              0, 'title', bypassSanitizationTrustUrl('javascript:true'), ɵɵsanitizeUrl));
+          () => ΔelementAttribute(
+              0, 'title', bypassSanitizationTrustUrl('javascript:true'), ΔsanitizeUrl));
       expect(t.html).toEqual('<div title="javascript:true"></div>');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
@@ -141,13 +141,13 @@ describe('instructions', () => {
       // <div [title]="title" [accesskey]="key"></div>
       const t = new TemplateFixture(createDiv, () => {}, 1, 2);
       t.update(() => {
-        ɵɵselect(0);
-        ɵɵproperty('title', 'one')('accessKey', 'A');
+        Δselect(0);
+        Δproperty('title', 'one')('accessKey', 'A');
       });
       expect(t.html).toEqual('<div accesskey="A" title="one"></div>');
       t.update(() => {
-        ɵɵselect(0);
-        ɵɵproperty('title', 'two')('accessKey', 'B');
+        Δselect(0);
+        Δproperty('title', 'two')('accessKey', 'B');
       });
       expect(t.html).toEqual('<div accesskey="B" title="two"></div>');
       expect(ngDevMode).toHaveProperties({
@@ -159,13 +159,13 @@ describe('instructions', () => {
       });
     });
 
-    it('should error in dev mode if ɵɵselect was not called prior', () => {
+    it('should error in dev mode if Δselect was not called prior', () => {
       const t = new TemplateFixture(createDiv, () => {}, 1, 1);
-      expect(() => { t.update(() => { ɵɵproperty('title', 'test'); }); }).toThrow();
+      expect(() => { t.update(() => { Δproperty('title', 'test'); }); }).toThrow();
       expect(() => {
         t.update(() => {
-          ɵɵselect(0);
-          ɵɵproperty('title', 'test');
+          Δselect(0);
+          Δproperty('title', 'test');
         });
       }).not.toThrow();
     });
@@ -174,20 +174,20 @@ describe('instructions', () => {
   describe('styleProp', () => {
     it('should automatically sanitize unless a bypass operation is applied', () => {
       const t = new TemplateFixture(() => {
-        return createDiv(null, null, null, ['background-image'], ɵɵdefaultStyleSanitizer);
+        return createDiv(null, null, null, ['background-image'], ΔdefaultStyleSanitizer);
       }, () => {}, 1);
       t.update(() => {
-        ɵɵselect(0);
-        ɵɵstyleProp(0, 'url("http://server")');
-        ɵɵstylingApply();
+        Δselect(0);
+        ΔstyleProp(0, 'url("http://server")');
+        ΔstylingApply();
       });
       // nothing is set because sanitizer suppresses it.
       expect(t.html).toEqual('<div></div>');
 
       t.update(() => {
-        ɵɵselect(0);
-        ɵɵstyleProp(0, bypassSanitizationTrustStyle('url("http://server2")'));
-        ɵɵstylingApply();
+        Δselect(0);
+        ΔstyleProp(0, bypassSanitizationTrustStyle('url("http://server2")'));
+        ΔstylingApply();
       });
       expect((t.hostElement.firstChild as HTMLElement).style.getPropertyValue('background-image'))
           .toEqual('url("http://server2")');
@@ -201,18 +201,18 @@ describe('instructions', () => {
           1, sanitizerInterceptor);
 
       t.update(() => {
-        ɵɵselect(0);
-        ɵɵstyleProp(0, bypassSanitizationTrustStyle('apple'));
-        ɵɵstylingApply();
+        Δselect(0);
+        ΔstyleProp(0, bypassSanitizationTrustStyle('apple'));
+        ΔstylingApply();
       });
 
       expect(sanitizerInterceptor.lastValue !).toEqual('apple');
       sanitizerInterceptor.lastValue = null;
 
       t.update(() => {
-        ɵɵselect(0);
-        ɵɵstyleProp(0, bypassSanitizationTrustStyle('apple'));
-        ɵɵstylingApply();
+        Δselect(0);
+        ΔstyleProp(0, bypassSanitizationTrustStyle('apple'));
+        ΔstylingApply();
       });
       expect(sanitizerInterceptor.lastValue).toEqual(null);
     });
@@ -220,17 +220,17 @@ describe('instructions', () => {
 
   describe('styleMap', () => {
     function createDivWithStyle() {
-      ɵɵelementStart(0, 'div', [AttributeMarker.Styles, 'height', '10px']);
-      ɵɵstyling([], ['height']);
-      ɵɵelementEnd();
+      ΔelementStart(0, 'div', [AttributeMarker.Styles, 'height', '10px']);
+      Δstyling([], ['height']);
+      ΔelementEnd();
     }
 
     it('should add style', () => {
       const fixture = new TemplateFixture(createDivWithStyle, () => {}, 1);
       fixture.update(() => {
-        ɵɵselect(0);
-        ɵɵstyleMap({'background-color': 'red'});
-        ɵɵstylingApply();
+        Δselect(0);
+        ΔstyleMap({'background-color': 'red'});
+        ΔstylingApply();
       });
       expect(fixture.html).toEqual('<div style="background-color: red; height: 10px;"></div>');
     });
@@ -244,8 +244,8 @@ describe('instructions', () => {
           sanitizerInterceptor);
 
       fixture.update(() => {
-        ɵɵselect(0);
-        ɵɵstyleMap({
+        Δselect(0);
+        ΔstyleMap({
           'background-image': 'background-image',
           'background': 'background',
           'border-image': 'border-image',
@@ -254,7 +254,7 @@ describe('instructions', () => {
           'filter': 'filter',
           'width': 'width'
         });
-        ɵɵstylingApply();
+        ΔstylingApply();
       });
 
       const props = detectedValues.sort();
@@ -266,17 +266,17 @@ describe('instructions', () => {
 
   describe('elementClass', () => {
     function createDivWithStyling() {
-      ɵɵelementStart(0, 'div');
-      ɵɵstyling();
-      ɵɵelementEnd();
+      ΔelementStart(0, 'div');
+      Δstyling();
+      ΔelementEnd();
     }
 
     it('should add class', () => {
       const fixture = new TemplateFixture(createDivWithStyling, () => {}, 1);
       fixture.update(() => {
-        ɵɵselect(0);
-        ɵɵclassMap('multiple classes');
-        ɵɵstylingApply();
+        Δselect(0);
+        ΔclassMap('multiple classes');
+        ΔstylingApply();
       });
       expect(fixture.html).toEqual('<div class="multiple classes"></div>');
     });
@@ -289,26 +289,26 @@ describe('instructions', () => {
 
       function ToDoAppComponent_NgForOf_Template_0(rf: RenderFlags, ctx0: NgForOfContext<any>) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'ul');
-          ɵɵtemplate(1, ToDoAppComponent_NgForOf_NgForOf_Template_1, 2, 1, 'li', _c1);
-          ɵɵelementEnd();
+          ΔelementStart(0, 'ul');
+          Δtemplate(1, ToDoAppComponent_NgForOf_NgForOf_Template_1, 2, 1, 'li', _c1);
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
           const row_r2 = ctx0.$implicit;
-          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(row_r2));
+          ΔelementProperty(1, 'ngForOf', Δbind(row_r2));
         }
       }
 
       function ToDoAppComponent_NgForOf_NgForOf_Template_1(
           rf: RenderFlags, ctx1: NgForOfContext<any>) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'li');
-          ɵɵtext(1);
-          ɵɵelementEnd();
+          ΔelementStart(0, 'li');
+          Δtext(1);
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
           const col_r3 = ctx1.$implicit;
-          ɵɵtextBinding(1, ɵɵinterpolation1('', col_r3, ''));
+          ΔtextBinding(1, Δinterpolation1('', col_r3, ''));
         }
       }
 
@@ -320,7 +320,7 @@ describe('instructions', () => {
       class NestedLoops {
         rows = [['a', 'b'], ['A', 'B'], ['a', 'b'], ['A', 'B']];
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: NestedLoops,
           selectors: [['nested-loops']],
           factory: function ToDoAppComponent_Factory() { return new NestedLoops(); },
@@ -328,10 +328,10 @@ describe('instructions', () => {
           vars: 1,
           template: function ToDoAppComponent_Template(rf: RenderFlags, ctx: NestedLoops) {
             if (rf & RenderFlags.Create) {
-              ɵɵtemplate(0, ToDoAppComponent_NgForOf_Template_0, 2, 1, 'ul', _c0);
+              Δtemplate(0, ToDoAppComponent_NgForOf_Template_0, 2, 1, 'ul', _c0);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.rows));
+              ΔelementProperty(0, 'ngForOf', Δbind(ctx.rows));
             }
           },
           directives: [NgForOf]
@@ -353,7 +353,7 @@ describe('instructions', () => {
       const inputValue = 'http://foo';
       const outputValue = 'http://foo-sanitized';
 
-      t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
+      t.update(() => ΔelementAttribute(0, 'href', inputValue, ΔsanitizeUrl));
       expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -364,7 +364,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustUrl('http://foo');
       const outputValue = 'http://foo';
 
-      t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
+      t.update(() => ΔelementAttribute(0, 'href', inputValue, ΔsanitizeUrl));
       expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -375,7 +375,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustUrl('http://foo');
       const outputValue = 'http://foo-ivy';
 
-      t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
+      t.update(() => ΔelementAttribute(0, 'href', inputValue, ΔsanitizeUrl));
       expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -386,7 +386,7 @@ describe('instructions', () => {
       const inputValue = 'color:red';
       const outputValue = 'color:blue';
 
-      t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
+      t.update(() => ΔelementAttribute(0, 'style', inputValue, ΔsanitizeStyle));
       expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -397,7 +397,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustStyle('color:maroon');
       const outputValue = 'color:maroon';
 
-      t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
+      t.update(() => ΔelementAttribute(0, 'style', inputValue, ΔsanitizeStyle));
       expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -408,7 +408,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustStyle('font-family:foo');
       const outputValue = 'font-family:foo-ivy';
 
-      t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
+      t.update(() => ΔelementAttribute(0, 'style', inputValue, ΔsanitizeStyle));
       expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -419,7 +419,7 @@ describe('instructions', () => {
       const inputValue = 'http://resource';
       const outputValue = 'http://resource-sanitized';
 
-      t.update(() => ɵɵelementAttribute(0, 'src', inputValue, ɵɵsanitizeResourceUrl));
+      t.update(() => ΔelementAttribute(0, 'src', inputValue, ΔsanitizeResourceUrl));
       expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -430,7 +430,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustResourceUrl('file://all-my-secrets.pdf');
       const outputValue = 'file://all-my-secrets.pdf';
 
-      t.update(() => ɵɵelementAttribute(0, 'src', inputValue, ɵɵsanitizeResourceUrl));
+      t.update(() => ΔelementAttribute(0, 'src', inputValue, ΔsanitizeResourceUrl));
       expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -441,7 +441,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustResourceUrl('file://all-my-secrets.pdf');
       const outputValue = 'file://all-my-secrets.pdf-ivy';
 
-      t.update(() => ɵɵelementAttribute(0, 'src', inputValue, ɵɵsanitizeResourceUrl));
+      t.update(() => ΔelementAttribute(0, 'src', inputValue, ΔsanitizeResourceUrl));
       expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -452,7 +452,7 @@ describe('instructions', () => {
       const inputValue = 'fn();';
       const outputValue = 'fn(); //sanitized';
 
-      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
+      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeScript));
       expect(t.html).toEqual(`<script>${outputValue}</script>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -463,7 +463,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustScript('alert("bar")');
       const outputValue = 'alert("bar")';
 
-      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
+      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeScript));
       expect(t.html).toEqual(`<script>${outputValue}</script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -474,7 +474,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustScript('alert("bar")');
       const outputValue = 'alert("bar")-ivy';
 
-      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
+      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeScript));
       expect(t.html).toEqual(`<script>${outputValue}</script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -485,7 +485,7 @@ describe('instructions', () => {
       const inputValue = '<header></header>';
       const outputValue = '<header></header> <!--sanitized-->';
 
-      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
+      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeHtml));
       expect(t.html).toEqual(`<div>${outputValue}</div>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -496,7 +496,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustHtml('<div onclick="alert(123)"></div>');
       const outputValue = '<div onclick="alert(123)"></div>';
 
-      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
+      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeHtml));
       expect(t.html).toEqual(`<div>${outputValue}</div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -507,7 +507,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustHtml('<div onclick="alert(123)"></div>');
       const outputValue = '<div onclick="alert(123)"></div>-ivy';
 
-      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
+      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeHtml));
       expect(t.html).toEqual(`<div>${outputValue}</div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -552,7 +552,7 @@ class LocalMockSanitizer implements Sanitizer {
 class MockSanitizerInterceptor {
   public lastValue: string|null = null;
   constructor(private _interceptorFn?: ((value: any) => any)|null) {}
-  getStyleSanitizer() { return ɵɵdefaultStyleSanitizer; }
+  getStyleSanitizer() { return ΔdefaultStyleSanitizer; }
   sanitize(context: SecurityContext, value: LocalSanitizedValue|string|null|any): string|null {
     if (this._interceptorFn) {
       this._interceptorFn(value);
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 55090eb9f9..9c0118f69d 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -10,15 +10,15 @@ import {ElementRef, TemplateRef, ViewContainerRef} from '@angular/core';
 
 import {RendererType2} from '../../src/render/api';
 import {getLContext} from '../../src/render3/context_discovery';
-import {AttributeMarker, ɵɵclassMap, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵstyleMap, ɵɵtemplateRefExtractor} from '../../src/render3/index';
-import {ɵɵallocHostVars, ɵɵbind, ɵɵclassProp, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementAttribute, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementHostAttrs, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV, ɵɵprojection, ɵɵprojectionDef, ɵɵreference, ɵɵselect, ɵɵstyleProp, ɵɵstyling, ɵɵstylingApply, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {AttributeMarker, ΔclassMap, ΔdefineComponent, ΔdefineDirective, ΔstyleMap, ΔtemplateRefExtractor} from '../../src/render3/index';
+import {ΔallocHostVars, Δbind, ΔclassProp, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementAttribute, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementHostAttrs, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δinterpolation2, Δinterpolation3, Δinterpolation4, Δinterpolation5, Δinterpolation6, Δinterpolation7, Δinterpolation8, ΔinterpolationV, Δprojection, ΔprojectionDef, Δreference, Δselect, ΔstyleProp, Δstyling, ΔstylingApply, Δtemplate, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
 import {MONKEY_PATCH_KEY_NAME} from '../../src/render3/interfaces/context';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {RElement, Renderer3, RendererFactory3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {StylingIndex} from '../../src/render3/interfaces/styling';
 import {CONTEXT, HEADER_OFFSET} from '../../src/render3/interfaces/view';
-import {ɵɵdisableBindings, ɵɵenableBindings} from '../../src/render3/state';
-import {ɵɵsanitizeUrl} from '../../src/sanitization/sanitization';
+import {ΔdisableBindings, ΔenableBindings} from '../../src/render3/state';
+import {ΔsanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
 import {NgIf} from './common_with_def';
@@ -33,9 +33,9 @@ describe('render3 integration test', () => {
 
       function Template(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'span', ['title', 'Hello']);
-          { ɵɵtext(1, 'Greetings'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'span', ['title', 'Hello']);
+          { Δtext(1, 'Greetings'); }
+          ΔelementEnd();
         }
       }
       expect(ngDevMode).toHaveProperties({
@@ -49,12 +49,12 @@ describe('render3 integration test', () => {
     it('should render and update basic "Hello, World" template', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'h1');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'h1');
+          { Δtext(1); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(1, ɵɵinterpolation1('Hello, ', ctx.name, '!'));
+          ΔtextBinding(1, Δinterpolation1('Hello, ', ctx.name, '!'));
         }
       }, 2, 1);
 
@@ -73,10 +73,10 @@ describe('render3 integration test', () => {
     it('should render "undefined" as "" when used with `bind()`', () => {
       function Template(rf: RenderFlags, name: string) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0);
+          Δtext(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(0, ɵɵbind(name));
+          ΔtextBinding(0, Δbind(name));
         }
       }
 
@@ -93,10 +93,10 @@ describe('render3 integration test', () => {
     it('should render "null" as "" when used with `bind()`', () => {
       function Template(rf: RenderFlags, name: string) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0);
+          Δtext(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(0, ɵɵbind(name));
+          ΔtextBinding(0, Δbind(name));
         }
       }
 
@@ -113,8 +113,8 @@ describe('render3 integration test', () => {
     it('should support creation-time values in text nodes', () => {
       function Template(rf: RenderFlags, value: string) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0);
-          ɵɵtextBinding(0, value);
+          Δtext(0);
+          ΔtextBinding(0, value);
         }
       }
       expect(renderToHtml(Template, 'once', 1, 1)).toEqual('once');
@@ -140,18 +140,18 @@ describe('render3 integration test', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'b', ['id', 'my-id'], ['myRef', '']);
-          ɵɵdisableBindings();
-          ɵɵelementStart(2, 'i');
-          ɵɵtext(3, 'Hello {{ name }}!');
-          ɵɵelementEnd();
-          ɵɵenableBindings();
-          ɵɵelementEnd();
-          ɵɵtext(4);
+          ΔelementStart(0, 'b', ['id', 'my-id'], ['myRef', '']);
+          ΔdisableBindings();
+          ΔelementStart(2, 'i');
+          Δtext(3, 'Hello {{ name }}!');
+          ΔelementEnd();
+          ΔenableBindings();
+          ΔelementEnd();
+          Δtext(4);
         }
         if (rf & RenderFlags.Update) {
-          const ref = ɵɵreference(1) as any;
-          ɵɵtextBinding(4, ɵɵinterpolation1(' ', ref.id, ' '));
+          const ref = Δreference(1) as any;
+          ΔtextBinding(4, Δinterpolation1(' ', ref.id, ' '));
         }
       }, 5, 1);
 
@@ -165,7 +165,7 @@ describe('render3 integration test', () => {
       class TestDirective {
         ngOnInit() { directiveInvoked = true; }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: TestDirective,
           selectors: [['', 'directive', '']],
           factory: () => new TestDirective()
@@ -179,13 +179,13 @@ describe('render3 integration test', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'b', ['directive', '']);
-          ɵɵdisableBindings();
-          ɵɵelementStart(1, 'i');
-          ɵɵtext(2, 'Hello {{ name }}!');
-          ɵɵelementEnd();
-          ɵɵenableBindings();
-          ɵɵelementEnd();
+          ΔelementStart(0, 'b', ['directive', '']);
+          ΔdisableBindings();
+          ΔelementStart(1, 'i');
+          Δtext(2, 'Hello {{ name }}!');
+          ΔelementEnd();
+          ΔenableBindings();
+          ΔelementEnd();
         }
       }, 3, 0, [TestDirective]);
 
@@ -200,7 +200,7 @@ describe('render3 integration test', () => {
       class TestDirective {
         ngOnInit() { directiveInvoked = true; }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: TestDirective,
           selectors: [['', 'directive', '']],
           factory: () => new TestDirective()
@@ -214,13 +214,13 @@ describe('render3 integration test', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'b');
-          ɵɵdisableBindings();
-          ɵɵelementStart(1, 'i', ['directive', '']);
-          ɵɵtext(2, 'Hello {{ name }}!');
-          ɵɵelementEnd();
-          ɵɵenableBindings();
-          ɵɵelementEnd();
+          ΔelementStart(0, 'b');
+          ΔdisableBindings();
+          ΔelementStart(1, 'i', ['directive', '']);
+          Δtext(2, 'Hello {{ name }}!');
+          ΔelementEnd();
+          ΔenableBindings();
+          ΔelementEnd();
         }
       }, 3, 0, [TestDirective]);
 
@@ -234,12 +234,12 @@ describe('render3 integration test', () => {
     it('should handle a flat list of static/bound text nodes', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0, 'Hello ');
-          ɵɵtext(1);
-          ɵɵtext(2, '!');
+          Δtext(0, 'Hello ');
+          Δtext(1);
+          Δtext(2, '!');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(1, ɵɵbind(ctx.name));
+          ΔtextBinding(1, Δbind(ctx.name));
         }
       }, 3, 1);
 
@@ -256,16 +256,16 @@ describe('render3 integration test', () => {
     it('should handle a list of static/bound text nodes as element children', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'b');
+          ΔelementStart(0, 'b');
           {
-            ɵɵtext(1, 'Hello ');
-            ɵɵtext(2);
-            ɵɵtext(3, '!');
+            Δtext(1, 'Hello ');
+            Δtext(2);
+            Δtext(3, '!');
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(2, ɵɵbind(ctx.name));
+          ΔtextBinding(2, Δbind(ctx.name));
         }
       }, 4, 1);
 
@@ -282,24 +282,24 @@ describe('render3 integration test', () => {
     it('should render/update text node as a child of a deep list of elements', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'b');
+          ΔelementStart(0, 'b');
           {
-            ɵɵelementStart(1, 'b');
+            ΔelementStart(1, 'b');
             {
-              ɵɵelementStart(2, 'b');
+              ΔelementStart(2, 'b');
               {
-                ɵɵelementStart(3, 'b');
-                { ɵɵtext(4); }
-                ɵɵelementEnd();
+                ΔelementStart(3, 'b');
+                { Δtext(4); }
+                ΔelementEnd();
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(4, ɵɵinterpolation1('Hello ', ctx.name, '!'));
+          ΔtextBinding(4, Δinterpolation1('Hello ', ctx.name, '!'));
         }
       }, 5, 1);
 
@@ -316,17 +316,17 @@ describe('render3 integration test', () => {
     it('should update 2 sibling elements', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'b');
+          ΔelementStart(0, 'b');
           {
-            ɵɵelement(1, 'span');
-            ɵɵelementStart(2, 'span', ['class', 'foo']);
+            Δelement(1, 'span');
+            ΔelementStart(2, 'span', ['class', 'foo']);
             {}
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementAttribute(2, 'id', ɵɵbind(ctx.id));
+          ΔelementAttribute(2, 'id', Δbind(ctx.id));
         }
       }, 3, 1);
 
@@ -343,10 +343,10 @@ describe('render3 integration test', () => {
     it('should handle sibling text node after element with child text node', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'p');
-          { ɵɵtext(1, 'hello'); }
-          ɵɵelementEnd();
-          ɵɵtext(2, 'world');
+          ΔelementStart(0, 'p');
+          { Δtext(1, 'hello'); }
+          ΔelementEnd();
+          Δtext(2, 'world');
         }
       }, 3);
 
@@ -360,22 +360,22 @@ describe('render3 integration test', () => {
     class TodoComponent {
       value = ' one';
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: TodoComponent,
         selectors: [['todo']],
         consts: 3,
         vars: 1,
         template: function TodoTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'p');
+            ΔelementStart(0, 'p');
             {
-              ɵɵtext(1, 'Todo');
-              ɵɵtext(2);
+              Δtext(1, 'Todo');
+              Δtext(2);
             }
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(2, ɵɵbind(ctx.value));
+            ΔtextBinding(2, Δbind(ctx.value));
           }
         },
         factory: () => new TodoComponent
@@ -387,7 +387,7 @@ describe('render3 integration test', () => {
     it('should support a basic component template', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'todo');
+          Δelement(0, 'todo');
         }
       }, 1, 0, defs);
 
@@ -398,8 +398,8 @@ describe('render3 integration test', () => {
     it('should support a component template with sibling', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'todo');
-          ɵɵtext(1, 'two');
+          Δelement(0, 'todo');
+          Δtext(1, 'two');
         }
       }, 2, 0, defs);
 
@@ -414,8 +414,8 @@ describe('render3 integration test', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'todo');
-          ɵɵelement(1, 'todo');
+          Δelement(0, 'todo');
+          Δelement(1, 'todo');
         }
       }, 2, 0, defs);
 
@@ -428,7 +428,7 @@ describe('render3 integration test', () => {
 
       class TodoComponentHostBinding {
         title = 'one';
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: TodoComponentHostBinding,
           selectors: [['todo']],
           consts: 1,
@@ -436,20 +436,20 @@ describe('render3 integration test', () => {
           template: function TodoComponentHostBindingTemplate(
               rf: RenderFlags, ctx: TodoComponentHostBinding) {
             if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
+              Δtext(0);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.title));
+              ΔtextBinding(0, Δbind(ctx.title));
             }
           },
           factory: () => cmptInstance = new TodoComponentHostBinding,
           hostBindings: function(rf: RenderFlags, ctx: any, elementIndex: number): void {
             if (rf & RenderFlags.Create) {
-              ɵɵallocHostVars(1);
+              ΔallocHostVars(1);
             }
             if (rf & RenderFlags.Update) {
               // host bindings
-              ɵɵelementProperty(elementIndex, 'title', ɵɵbind(ctx.title));
+              ΔelementProperty(elementIndex, 'title', Δbind(ctx.title));
             }
           }
         });
@@ -457,7 +457,7 @@ describe('render3 integration test', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'todo');
+          Δelement(0, 'todo');
         }
       }, 1, 0, [TodoComponentHostBinding]);
 
@@ -471,7 +471,7 @@ describe('render3 integration test', () => {
 
     it('should support root component with host attribute', () => {
       class HostAttributeComp {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: HostAttributeComp,
           selectors: [['host-attr-comp']],
           factory: () => new HostAttributeComp(),
@@ -479,7 +479,7 @@ describe('render3 integration test', () => {
           vars: 0,
           hostBindings: function(rf, ctx, elIndex) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementHostAttrs(['role', 'button']);
+              ΔelementHostAttrs(['role', 'button']);
             }
           },
           template: (rf: RenderFlags, ctx: HostAttributeComp) => {},
@@ -494,19 +494,19 @@ describe('render3 integration test', () => {
       /** <p> {{ name }} </p>*/
       class MyComp {
         name = 'Bess';
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: MyComp,
           selectors: [['comp']],
           consts: 2,
           vars: 1,
           template: function MyCompTemplate(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'p');
-              { ɵɵtext(1); }
-              ɵɵelementEnd();
+              ΔelementStart(0, 'p');
+              { Δtext(1); }
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(1, ɵɵbind(ctx.name));
+              ΔtextBinding(1, Δbind(ctx.name));
             }
           },
           factory: () => new MyComp
@@ -515,7 +515,7 @@ describe('render3 integration test', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
       }, 1, 0, [MyComp]);
 
@@ -532,29 +532,29 @@ describe('render3 integration test', () => {
       class MyComp {
         // TODO(issue/24571): remove '!'.
         condition !: boolean;
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: MyComp,
           selectors: [['comp']],
           consts: 1,
           vars: 0,
           template: function MyCompTemplate(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵcontainer(0);
+              Δcontainer(0);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(0);
+              ΔcontainerRefreshStart(0);
               {
                 if (ctx.condition) {
-                  let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+                  let rf1 = ΔembeddedViewStart(0, 2, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ɵɵelementStart(0, 'div');
-                    { ɵɵtext(1, 'text'); }
-                    ɵɵelementEnd();
+                    ΔelementStart(0, 'div');
+                    { Δtext(1, 'text'); }
+                    ΔelementEnd();
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
           },
           factory: () => new MyComp,
@@ -565,10 +565,10 @@ describe('render3 integration test', () => {
       /** <comp [condition]="condition"></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'condition', ɵɵbind(ctx.condition));
+          ΔelementProperty(0, 'condition', Δbind(ctx.condition));
         }
       }, 1, 1, [MyComp]);
 
@@ -591,18 +591,18 @@ describe('render3 integration test', () => {
        * <div>before|<ng-container>Greetings<span></span></ng-container>|after</div>
        */
       function Template() {
-        ɵɵelementStart(0, 'div');
+        ΔelementStart(0, 'div');
         {
-          ɵɵtext(1, 'before|');
-          ɵɵelementContainerStart(2);
+          Δtext(1, 'before|');
+          ΔelementContainerStart(2);
           {
-            ɵɵtext(3, 'Greetings');
-            ɵɵelement(4, 'span');
+            Δtext(3, 'Greetings');
+            Δelement(4, 'span');
           }
-          ɵɵelementContainerEnd();
-          ɵɵtext(5, '|after');
+          ΔelementContainerEnd();
+          Δtext(5, '|after');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
 
       const fixture = new TemplateFixture(Template, () => {}, 6);
@@ -619,26 +619,26 @@ describe('render3 integration test', () => {
        */
       const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags, ctx: {value: any}) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           if (ctx.value) {
-            let rf1 = ɵɵembeddedViewStart(0, 3, 0);
+            let rf1 = ΔembeddedViewStart(0, 3, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'div');
+                ΔelementStart(0, 'div');
                 {
-                  ɵɵelementContainerStart(1);
-                  { ɵɵtext(2, 'content'); }
-                  ɵɵelementContainerEnd();
+                  ΔelementContainerStart(1);
+                  { Δtext(2, 'content'); }
+                  ΔelementContainerEnd();
                 }
-                ɵɵelementEnd();
+                ΔelementEnd();
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1);
 
@@ -664,22 +664,22 @@ describe('render3 integration test', () => {
          const TestCmpt =
              createComponent('test-cmpt', function(rf: RenderFlags, ctx: {value: any}) {
                if (rf & RenderFlags.Create) {
-                 ɵɵcontainer(0);
+                 Δcontainer(0);
                }
                if (rf & RenderFlags.Update) {
-                 ɵɵcontainerRefreshStart(0);
+                 ΔcontainerRefreshStart(0);
                  if (ctx.value) {
-                   let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+                   let rf1 = ΔembeddedViewStart(0, 2, 0);
                    {
                      if (rf1 & RenderFlags.Create) {
-                       ɵɵelementContainerStart(0);
-                       { ɵɵtext(1, 'content'); }
-                       ɵɵelementContainerEnd();
+                       ΔelementContainerStart(0);
+                       { Δtext(1, 'content'); }
+                       ΔelementContainerEnd();
                      }
                    }
-                   ɵɵembeddedViewEnd();
+                   ΔembeddedViewEnd();
                  }
-                 ɵɵcontainerRefreshEnd();
+                 ΔcontainerRefreshEnd();
                }
              }, 1);
 
@@ -700,9 +700,9 @@ describe('render3 integration test', () => {
 
          function ngIfTemplate(rf: RenderFlags, ctx: any) {
            if (rf & RenderFlags.Create) {
-             ɵɵelementContainerStart(0);
-             { ɵɵtext(1, 'content'); }
-             ɵɵelementContainerEnd();
+             ΔelementContainerStart(0);
+             { Δtext(1, 'content'); }
+             ΔelementContainerEnd();
            }
          }
 
@@ -720,11 +720,11 @@ describe('render3 integration test', () => {
          const TestCmpt =
              createComponent('test-cmpt', function(rf: RenderFlags, ctx: {value: any}) {
                if (rf & RenderFlags.Create) {
-                 ɵɵtemplate(
+                 Δtemplate(
                      0, ngIfTemplate, 2, 0, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
                }
                if (rf & RenderFlags.Update) {
-                 ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.value));
+                 ΔelementProperty(0, 'ngIf', Δbind(ctx.value));
                }
              }, 1, 1, [NgIf]);
 
@@ -751,21 +751,21 @@ describe('render3 integration test', () => {
 
            clear() { this._vcRef.clear(); }
 
-           static ngDirectiveDef = ɵɵdefineDirective({
+           static ngDirectiveDef = ΔdefineDirective({
              type: TestDirective,
              selectors: [['', 'testDirective', '']],
              factory: () => testDirective = new TestDirective(
-                          ɵɵdirectiveInject(TemplateRef as any),
-                          ɵɵdirectiveInject(ViewContainerRef as any)),
+                          ΔdirectiveInject(TemplateRef as any),
+                          ΔdirectiveInject(ViewContainerRef as any)),
            });
          }
 
 
          function embeddedTemplate(rf: RenderFlags, ctx: any) {
            if (rf & RenderFlags.Create) {
-             ɵɵelementContainerStart(0);
-             { ɵɵtext(1, 'content'); }
-             ɵɵelementContainerEnd();
+             ΔelementContainerStart(0);
+             { Δtext(1, 'content'); }
+             ΔelementContainerEnd();
            }
          }
 
@@ -779,7 +779,7 @@ describe('render3 integration test', () => {
           </ng-template>`;
          const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
            if (rf & RenderFlags.Create) {
-             ɵɵtemplate(
+             Δtemplate(
                  0, embeddedTemplate, 2, 0, 'ng-template',
                  [AttributeMarker.Bindings, 'testDirective']);
            }
@@ -803,13 +803,13 @@ describe('render3 integration test', () => {
        */
       const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0);
-          { ɵɵtext(1, 'component template'); }
-          ɵɵelementContainerEnd();
+          ΔelementContainerStart(0);
+          { Δtext(1, 'component template'); }
+          ΔelementContainerEnd();
         }
       }, 2);
 
-      function App() { ɵɵelement(0, 'test-cmpt'); }
+      function App() { Δelement(0, 'test-cmpt'); }
 
       const fixture = new TemplateFixture(App, () => {}, 1, 0, [TestCmpt]);
       expect(fixture.html).toEqual('<test-cmpt>component template</test-cmpt>');
@@ -827,21 +827,21 @@ describe('render3 integration test', () => {
        */
       const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0);
+          ΔelementContainerStart(0);
           {
-            ɵɵelementContainerStart(1);
+            ΔelementContainerStart(1);
             {
-              ɵɵelementContainerStart(2);
-              { ɵɵtext(3, 'content'); }
-              ɵɵelementContainerEnd();
+              ΔelementContainerStart(2);
+              { Δtext(3, 'content'); }
+              ΔelementContainerEnd();
             }
-            ɵɵelementContainerEnd();
+            ΔelementContainerEnd();
           }
-          ɵɵelementContainerEnd();
+          ΔelementContainerEnd();
         }
       }, 4);
 
-      function App() { ɵɵelement(0, 'test-cmpt'); }
+      function App() { Δelement(0, 'test-cmpt'); }
 
       const fixture = new TemplateFixture(App, () => {}, 1, 0, [TestCmpt]);
       expect(fixture.html).toEqual('<test-cmpt>content</test-cmpt>');
@@ -857,29 +857,29 @@ describe('render3 integration test', () => {
 
         clear() { this._vcRef.clear(); }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: TestDirective,
           selectors: [['', 'testDirective', '']],
-          factory: () => testDirective = new TestDirective(
-                       ɵɵdirectiveInject(TemplateRef as any),
-                       ɵɵdirectiveInject(ViewContainerRef as any)),
+          factory:
+              () => testDirective = new TestDirective(
+                  ΔdirectiveInject(TemplateRef as any), ΔdirectiveInject(ViewContainerRef as any)),
         });
       }
 
 
       function embeddedTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0);
+          ΔelementContainerStart(0);
           {
-            ɵɵelementContainerStart(1);
+            ΔelementContainerStart(1);
             {
-              ɵɵelementContainerStart(2);
-              { ɵɵtext(3, 'content'); }
-              ɵɵelementContainerEnd();
+              ΔelementContainerStart(2);
+              { Δtext(3, 'content'); }
+              ΔelementContainerEnd();
             }
-            ɵɵelementContainerEnd();
+            ΔelementContainerEnd();
           }
-          ɵɵelementContainerEnd();
+          ΔelementContainerEnd();
         }
       }
 
@@ -896,13 +896,13 @@ describe('render3 integration test', () => {
        */
       const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(
+          Δtemplate(
               0, embeddedTemplate, 4, 0, 'ng-template',
               [AttributeMarker.Bindings, 'testDirective']);
         }
       }, 1, 0, [TestDirective]);
 
-      function App() { ɵɵelement(0, 'test-cmpt'); }
+      function App() { Δelement(0, 'test-cmpt'); }
 
       const fixture = new ComponentFixture(TestCmpt);
       expect(fixture.html).toEqual('');
@@ -925,10 +925,10 @@ describe('render3 integration test', () => {
       class Directive {
         constructor(public elRef: ElementRef) {}
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: Directive,
           selectors: [['', 'dir', '']],
-          factory: () => directive = new Directive(ɵɵdirectiveInject(ElementRef)),
+          factory: () => directive = new Directive(ΔdirectiveInject(ElementRef)),
         });
       }
 
@@ -938,12 +938,12 @@ describe('render3 integration test', () => {
        * <div><ng-container dir></ng-container></div>
        */
       function Template() {
-        ɵɵelementStart(0, 'div');
+        ΔelementStart(0, 'div');
         {
-          ɵɵelementContainerStart(1, [AttributeMarker.Bindings, 'dir']);
-          ɵɵelementContainerEnd();
+          ΔelementContainerStart(1, [AttributeMarker.Bindings, 'dir']);
+          ΔelementContainerEnd();
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
 
       const fixture = new TemplateFixture(Template, () => {}, 2, 0, [Directive]);
@@ -955,7 +955,7 @@ describe('render3 integration test', () => {
 
       function ContentTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0, 'Content');
+          Δtext(0, 'Content');
         }
       }
 
@@ -968,10 +968,10 @@ describe('render3 integration test', () => {
 
         clear() { this._vcRef.clear(); }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: Directive,
           selectors: [['', 'dir', '']],
-          factory: () => directive = new Directive(ɵɵdirectiveInject(ViewContainerRef as any)),
+          factory: () => directive = new Directive(ΔdirectiveInject(ViewContainerRef as any)),
           inputs: {contentTpl: 'contentTpl'},
         });
       }
@@ -985,15 +985,15 @@ describe('render3 integration test', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0, [AttributeMarker.Bindings, 'dir']);
-          ɵɵtemplate(
+          ΔelementContainerStart(0, [AttributeMarker.Bindings, 'dir']);
+          Δtemplate(
               1, ContentTemplate, 1, 0, 'ng-template', null, ['content', ''],
-              ɵɵtemplateRefExtractor);
-          ɵɵelementContainerEnd();
+              ΔtemplateRefExtractor);
+          ΔelementContainerEnd();
         }
         if (rf & RenderFlags.Update) {
-          const content = ɵɵreference(2) as any;
-          ɵɵelementProperty(0, 'contentTpl', ɵɵbind(content));
+          const content = Δreference(2) as any;
+          ΔelementProperty(0, 'contentTpl', Δbind(content));
         }
       }, 3, 1, [Directive]);
 
@@ -1013,7 +1013,7 @@ describe('render3 integration test', () => {
     it('should support ViewContainerRef on <ng-template> inside <ng-container>', () => {
       function ContentTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0, 'Content');
+          Δtext(0, 'Content');
         }
       }
 
@@ -1024,12 +1024,12 @@ describe('render3 integration test', () => {
 
         clear() { this._vcRef.clear(); }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: Directive,
           selectors: [['', 'dir', '']],
-          factory: () => directive = new Directive(
-                       ɵɵdirectiveInject(TemplateRef as any),
-                       ɵɵdirectiveInject(ViewContainerRef as any)),
+          factory:
+              () => directive = new Directive(
+                  ΔdirectiveInject(TemplateRef as any), ΔdirectiveInject(ViewContainerRef as any)),
         });
       }
 
@@ -1042,11 +1042,11 @@ describe('render3 integration test', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0);
-          ɵɵtemplate(
+          ΔelementContainerStart(0);
+          Δtemplate(
               1, ContentTemplate, 1, 0, 'ng-template', [AttributeMarker.Bindings, 'dir'], [],
-              ɵɵtemplateRefExtractor);
-          ɵɵelementContainerEnd();
+              ΔtemplateRefExtractor);
+          ΔelementContainerEnd();
         }
       }, 2, 0, [Directive]);
 
@@ -1068,12 +1068,12 @@ describe('render3 integration test', () => {
        * <div><ng-container id="foo"></ng-container></div>
        */
       function Template() {
-        ɵɵelementStart(0, 'div');
+        ΔelementStart(0, 'div');
         {
-          ɵɵelementContainerStart(1, ['id', 'foo']);
-          ɵɵelementContainerEnd();
+          ΔelementContainerStart(1, ['id', 'foo']);
+          ΔelementContainerEnd();
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
 
       const fixture = new TemplateFixture(Template, () => {}, 2);
@@ -1097,56 +1097,56 @@ describe('render3 integration test', () => {
 
     function showLabel(rf: RenderFlags, ctx: {label: string | undefined}) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           if (ctx.label != null) {
-            let rf1 = ɵɵembeddedViewStart(0, 1, 1);
+            let rf1 = ΔembeddedViewStart(0, 1, 1);
             if (rf1 & RenderFlags.Create) {
-              ɵɵtext(0);
+              Δtext(0);
             }
             if (rf1 & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.label));
+              ΔtextBinding(0, Δbind(ctx.label));
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
     function showTree(rf: RenderFlags, ctx: {tree: Tree}) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
-        ɵɵcontainer(1);
-        ɵɵcontainer(2);
+        Δcontainer(0);
+        Δcontainer(1);
+        Δcontainer(2);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
-          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
+          const rf0 = ΔembeddedViewStart(0, 1, 0);
           { showLabel(rf0, {label: ctx.tree.beforeLabel}); }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
-        ɵɵcontainerRefreshStart(1);
+        ΔcontainerRefreshEnd();
+        ΔcontainerRefreshStart(1);
         {
           for (let subTree of ctx.tree.subTrees || []) {
-            const rf0 = ɵɵembeddedViewStart(0, 3, 0);
+            const rf0 = ΔembeddedViewStart(0, 3, 0);
             { showTree(rf0, {tree: subTree}); }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshEnd();
+        ΔcontainerRefreshStart(2);
         {
-          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
+          const rf0 = ΔembeddedViewStart(0, 1, 0);
           { showLabel(rf0, {label: ctx.tree.afterLabel}); }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -1155,7 +1155,7 @@ describe('render3 integration test', () => {
       beforeTree !: Tree;
       // TODO(issue/24571): remove '!'.
       afterTree !: Tree;
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         selectors: [['child']],
         type: ChildComponent,
         consts: 3,
@@ -1163,26 +1163,26 @@ describe('render3 integration test', () => {
         template: function ChildComponentTemplate(
             rf: RenderFlags, ctx: {beforeTree: Tree, afterTree: Tree}) {
           if (rf & RenderFlags.Create) {
-            ɵɵprojectionDef();
-            ɵɵcontainer(0);
-            ɵɵprojection(1);
-            ɵɵcontainer(2);
+            ΔprojectionDef();
+            Δcontainer(0);
+            Δprojection(1);
+            Δcontainer(2);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵcontainerRefreshStart(0);
+            ΔcontainerRefreshStart(0);
             {
-              const rf0 = ɵɵembeddedViewStart(0, 3, 0);
+              const rf0 = ΔembeddedViewStart(0, 3, 0);
               { showTree(rf0, {tree: ctx.beforeTree}); }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
-            ɵɵcontainerRefreshEnd();
-            ɵɵcontainerRefreshStart(2);
+            ΔcontainerRefreshEnd();
+            ΔcontainerRefreshStart(2);
             {
-              const rf0 = ɵɵembeddedViewStart(0, 3, 0);
+              const rf0 = ΔembeddedViewStart(0, 3, 0);
               { showTree(rf0, {tree: ctx.afterTree}); }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         },
         factory: () => new ChildComponent,
@@ -1192,20 +1192,20 @@ describe('render3 integration test', () => {
 
     function parentTemplate(rf: RenderFlags, ctx: ParentCtx) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'child');
-        { ɵɵcontainer(1); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'child');
+        { Δcontainer(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'beforeTree', ɵɵbind(ctx.beforeTree));
-        ɵɵelementProperty(0, 'afterTree', ɵɵbind(ctx.afterTree));
-        ɵɵcontainerRefreshStart(1);
+        ΔelementProperty(0, 'beforeTree', Δbind(ctx.beforeTree));
+        ΔelementProperty(0, 'afterTree', Δbind(ctx.afterTree));
+        ΔcontainerRefreshStart(1);
         {
-          const rf0 = ɵɵembeddedViewStart(0, 3, 0);
+          const rf0 = ΔembeddedViewStart(0, 3, 0);
           { showTree(rf0, {tree: ctx.projectedTree}); }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -1238,10 +1238,10 @@ describe('render3 integration test', () => {
       it('should support attribute bindings', () => {
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'span');
+            Δelement(0, 'span');
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementAttribute(0, 'title', ɵɵbind(ctx.title));
+            ΔelementAttribute(0, 'title', Δbind(ctx.title));
           }
         }, 1, 1);
 
@@ -1265,10 +1265,10 @@ describe('render3 integration test', () => {
       it('should stringify values used attribute bindings', () => {
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'span');
+            Δelement(0, 'span');
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementAttribute(0, 'title', ɵɵbind(ctx.title));
+            ΔelementAttribute(0, 'title', Δbind(ctx.title));
           }
         }, 1, 1);
 
@@ -1285,30 +1285,29 @@ describe('render3 integration test', () => {
       it('should update bindings', () => {
         function Template(rf: RenderFlags, c: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'b');
+            Δelement(0, 'b');
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementAttribute(0, 'a', ɵɵinterpolationV(c));
-            ɵɵelementAttribute(0, 'a0', ɵɵbind(c[1]));
-            ɵɵelementAttribute(0, 'a1', ɵɵinterpolation1(c[0], c[1], c[16]));
-            ɵɵelementAttribute(0, 'a2', ɵɵinterpolation2(c[0], c[1], c[2], c[3], c[16]));
-            ɵɵelementAttribute(
-                0, 'a3', ɵɵinterpolation3(c[0], c[1], c[2], c[3], c[4], c[5], c[16]));
-            ɵɵelementAttribute(
-                0, 'a4', ɵɵinterpolation4(c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[16]));
-            ɵɵelementAttribute(
-                0, 'a5', ɵɵinterpolation5(
-                             c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[16]));
-            ɵɵelementAttribute(
-                0, 'a6', ɵɵinterpolation6(
+            ΔelementAttribute(0, 'a', ΔinterpolationV(c));
+            ΔelementAttribute(0, 'a0', Δbind(c[1]));
+            ΔelementAttribute(0, 'a1', Δinterpolation1(c[0], c[1], c[16]));
+            ΔelementAttribute(0, 'a2', Δinterpolation2(c[0], c[1], c[2], c[3], c[16]));
+            ΔelementAttribute(0, 'a3', Δinterpolation3(c[0], c[1], c[2], c[3], c[4], c[5], c[16]));
+            ΔelementAttribute(
+                0, 'a4', Δinterpolation4(c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[16]));
+            ΔelementAttribute(
+                0, 'a5',
+                Δinterpolation5(c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[16]));
+            ΔelementAttribute(
+                0, 'a6', Δinterpolation6(
                              c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[10],
                              c[11], c[16]));
-            ɵɵelementAttribute(
-                0, 'a7', ɵɵinterpolation7(
+            ΔelementAttribute(
+                0, 'a7', Δinterpolation7(
                              c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[10],
                              c[11], c[12], c[13], c[16]));
-            ɵɵelementAttribute(
-                0, 'a8', ɵɵinterpolation8(
+            ΔelementAttribute(
+                0, 'a8', Δinterpolation8(
                              c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[10],
                              c[11], c[12], c[13], c[14], c[15], c[16]));
           }
@@ -1332,30 +1331,30 @@ describe('render3 integration test', () => {
 
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'span');
-            ɵɵcontainer(1);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'span');
+            Δcontainer(1);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementAttribute(0, 'title', ɵɵbind(ctx.title));
-            ɵɵcontainerRefreshStart(1);
+            ΔelementAttribute(0, 'title', Δbind(ctx.title));
+            ΔcontainerRefreshStart(1);
             {
               if (true) {
-                let rf1 = ɵɵembeddedViewStart(1, 1, 1);
+                let rf1 = ΔembeddedViewStart(1, 1, 1);
                 {
                   if (rf1 & RenderFlags.Create) {
-                    ɵɵelementStart(0, 'b');
+                    ΔelementStart(0, 'b');
                     {}
-                    ɵɵelementEnd();
+                    ΔelementEnd();
                   }
                   if (rf1 & RenderFlags.Update) {
-                    ɵɵelementAttribute(0, 'title', ɵɵbind(ctx.title));
+                    ΔelementAttribute(0, 'title', Δbind(ctx.title));
                   }
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         }, 2, 1);
 
@@ -1383,7 +1382,7 @@ describe('render3 integration test', () => {
           /* @HostBinding('attr.aria-label') */
           label = 'some label';
 
-          static ngDirectiveDef = ɵɵdefineDirective({
+          static ngDirectiveDef = ΔdefineDirective({
             type: HostBindingDir,
             selectors: [['', 'hostBindingDir', '']],
             factory: function HostBindingDir_Factory() {
@@ -1392,10 +1391,10 @@ describe('render3 integration test', () => {
             hostBindings: function HostBindingDir_HostBindings(
                 rf: RenderFlags, ctx: any, elIndex: number) {
               if (rf & RenderFlags.Create) {
-                ɵɵallocHostVars(1);
+                ΔallocHostVars(1);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵelementAttribute(elIndex, 'aria-label', ɵɵbind(ctx.label));
+                ΔelementAttribute(elIndex, 'aria-label', Δbind(ctx.label));
               }
             }
           });
@@ -1403,7 +1402,7 @@ describe('render3 integration test', () => {
 
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div', ['hostBindingDir', '']);
+            Δelement(0, 'div', ['hostBindingDir', '']);
           }
         }, 1, 0, [HostBindingDir]);
 
@@ -1420,14 +1419,14 @@ describe('render3 integration test', () => {
       it('should support binding to styles', () => {
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'span');
-            ɵɵstyling(null, ['border-color']);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'span');
+            Δstyling(null, ['border-color']);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵselect(0);
-            ɵɵstyleProp(0, ctx.color);
-            ɵɵstylingApply();
+            Δselect(0);
+            ΔstyleProp(0, ctx.color);
+            ΔstylingApply();
           }
         }, 1);
 
@@ -1448,14 +1447,14 @@ describe('render3 integration test', () => {
       it('should support binding to styles with suffix', () => {
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'span');
-            ɵɵstyling(null, ['font-size']);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'span');
+            Δstyling(null, ['font-size']);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵselect(0);
-            ɵɵstyleProp(0, ctx.time, 'px');
-            ɵɵstylingApply();
+            Δselect(0);
+            ΔstyleProp(0, ctx.time, 'px');
+            ΔstylingApply();
           }
         }, 1);
 
@@ -1483,14 +1482,14 @@ describe('render3 integration test', () => {
         /** <span [class.active]="class"></span> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'span');
-            ɵɵstyling(['active']);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'span');
+            Δstyling(['active']);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵselect(0);
-            ɵɵclassProp(0, ctx.class);
-            ɵɵstylingApply();
+            Δselect(0);
+            ΔclassProp(0, ctx.class);
+            ΔstylingApply();
           }
         }, 1);
 
@@ -1525,14 +1524,14 @@ describe('render3 integration test', () => {
       it('should work correctly with existing static classes', () => {
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'span', [AttributeMarker.Classes, 'existing']);
-            ɵɵstyling(['existing', 'active']);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'span', [AttributeMarker.Classes, 'existing']);
+            Δstyling(['existing', 'active']);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵselect(0);
-            ɵɵclassProp(1, ctx.class);
-            ɵɵstylingApply();
+            Δselect(0);
+            ΔclassProp(1, ctx.class);
+            ΔstylingApply();
           }
         }, 1);
 
@@ -1549,7 +1548,7 @@ describe('render3 integration test', () => {
       it('should apply classes properly when nodes are components', () => {
         const MyComp = createComponent('my-comp', (rf: RenderFlags, ctx: any) => {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0, 'Comp Content');
+            Δtext(0, 'Comp Content');
           }
         }, 1, 0, []);
 
@@ -1558,14 +1557,14 @@ describe('render3 integration test', () => {
          */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'my-comp');
-            ɵɵstyling(['active']);
-            ɵɵelementEnd();
+            ΔelementStart(0, 'my-comp');
+            Δstyling(['active']);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵselect(0);
-            ɵɵclassProp(0, ctx.class);
-            ɵɵstylingApply();
+            Δselect(0);
+            ΔclassProp(0, ctx.class);
+            ΔstylingApply();
           }
         }, 1, 0, [MyComp]);
 
@@ -1589,17 +1588,17 @@ describe('render3 integration test', () => {
 
           create() { this.vcr.createEmbeddedView(this.tmp); }
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: StructuralComp,
             selectors: [['structural-comp']],
             factory: () => structuralComp =
-                         new StructuralComp(ɵɵdirectiveInject(ViewContainerRef as any)),
+                         new StructuralComp(ΔdirectiveInject(ViewContainerRef as any)),
             inputs: {tmp: 'tmp'},
             consts: 1,
             vars: 0,
             template: (rf: RenderFlags, ctx: StructuralComp) => {
               if (rf & RenderFlags.Create) {
-                ɵɵtext(0, 'Comp Content');
+                Δtext(0, 'Comp Content');
               }
             }
           });
@@ -1607,7 +1606,7 @@ describe('render3 integration test', () => {
 
         function FooTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0, 'Temp Content');
+            Δtext(0, 'Temp Content');
           }
         }
 
@@ -1619,18 +1618,18 @@ describe('render3 integration test', () => {
          */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵtemplate(
-                0, FooTemplate, 1, 0, 'ng-template', null, ['foo', ''], ɵɵtemplateRefExtractor);
-            ɵɵelementStart(2, 'structural-comp');
-            ɵɵstyling(['active']);
-            ɵɵelementEnd();
+            Δtemplate(
+                0, FooTemplate, 1, 0, 'ng-template', null, ['foo', ''], ΔtemplateRefExtractor);
+            ΔelementStart(2, 'structural-comp');
+            Δstyling(['active']);
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            const foo = ɵɵreference(1) as any;
-            ɵɵselect(2);
-            ɵɵclassProp(0, ctx.class);
-            ɵɵstylingApply();
-            ɵɵelementProperty(2, 'tmp', ɵɵbind(foo));
+            const foo = Δreference(1) as any;
+            Δselect(2);
+            ΔclassProp(0, ctx.class);
+            ΔstylingApply();
+            ΔelementProperty(2, 'tmp', Δbind(foo));
           }
         }, 3, 1, [StructuralComp]);
 
@@ -1653,7 +1652,7 @@ describe('render3 integration test', () => {
 
       let mockClassDirective: DirWithClassDirective;
       class DirWithClassDirective {
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: DirWithClassDirective,
           selectors: [['', 'DirWithClass', '']],
           factory: () => mockClassDirective = new DirWithClassDirective(),
@@ -1666,7 +1665,7 @@ describe('render3 integration test', () => {
 
       let mockStyleDirective: DirWithStyleDirective;
       class DirWithStyleDirective {
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: DirWithStyleDirective,
           selectors: [['', 'DirWithStyle', '']],
           factory: () => mockStyleDirective = new DirWithStyleDirective(),
@@ -1684,15 +1683,15 @@ describe('render3 integration test', () => {
             */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(
+               ΔelementStart(
                    0, 'div',
                    ['DirWithClass', '', AttributeMarker.Classes, 'apple', 'orange', 'banana']);
-               ɵɵstyling();
-               ɵɵelementEnd();
+               Δstyling();
+               ΔelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔstylingApply();
              }
            }, 1, 0, [DirWithClassDirective]);
 
@@ -1707,15 +1706,15 @@ describe('render3 integration test', () => {
             */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'div', [
+               ΔelementStart(0, 'div', [
                  'DirWithStyle', '', AttributeMarker.Styles, 'width', '100px', 'height', '200px'
                ]);
-               ɵɵstyling();
-               ɵɵelementEnd();
+               Δstyling();
+               ΔelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔstylingApply();
              }
            }, 1, 0, [DirWithStyleDirective]);
 
@@ -1730,14 +1729,14 @@ describe('render3 integration test', () => {
            */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'div', ['DirWithClass']);
-               ɵɵstyling();
-               ɵɵelementEnd();
+               ΔelementStart(0, 'div', ['DirWithClass']);
+               Δstyling();
+               ΔelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵclassMap('cucumber grape');
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔclassMap('cucumber grape');
+               ΔstylingApply();
              }
            }, 1, 0, [DirWithClassDirective]);
 
@@ -1752,14 +1751,14 @@ describe('render3 integration test', () => {
            */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'div', ['DirWithStyle']);
-               ɵɵstyling();
-               ɵɵelementEnd();
+               ΔelementStart(0, 'div', ['DirWithStyle']);
+               Δstyling();
+               ΔelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵstyleMap({width: '200px', height: '500px'});
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔstyleMap({width: '200px', height: '500px'});
+               ΔstylingApply();
              }
            }, 1, 0, [DirWithStyleDirective]);
 
@@ -1770,14 +1769,14 @@ describe('render3 integration test', () => {
       it('should apply initial styling to the element that contains the directive with host styling',
          () => {
            class DirWithInitialStyling {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: DirWithInitialStyling,
                selectors: [['', 'DirWithInitialStyling', '']],
                factory: () => new DirWithInitialStyling(),
                hostBindings: function(
                    rf: RenderFlags, ctx: DirWithInitialStyling, elementIndex: number) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelementHostAttrs([
+                   ΔelementHostAttrs([
                      'title', 'foo', AttributeMarker.Classes, 'heavy', 'golden',
                      AttributeMarker.Styles, 'color', 'purple', 'font-weight', 'bold'
                    ]);
@@ -1795,7 +1794,7 @@ describe('render3 integration test', () => {
            */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', [
+               Δelement(0, 'div', [
                  'DirWithInitialStyling', '', AttributeMarker.Classes, 'big',
                  AttributeMarker.Styles, 'color', 'black', 'font-size', '200px'
                ]);
@@ -1821,22 +1820,22 @@ describe('render3 integration test', () => {
             * [style.height]></my-comp>
            */
            class DirWithSingleStylingBindings {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: DirWithSingleStylingBindings,
                selectors: [['', 'DirWithSingleStylingBindings', '']],
                factory: () => dirInstance = new DirWithSingleStylingBindings(),
                hostBindings: function(
                    rf: RenderFlags, ctx: DirWithSingleStylingBindings, elementIndex: number) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelementHostAttrs(
+                   ΔelementHostAttrs(
                        [AttributeMarker.Classes, 'def', AttributeMarker.Styles, 'width', '555px']);
-                   ɵɵstyling(['xyz'], ['width', 'height']);
+                   Δstyling(['xyz'], ['width', 'height']);
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵstyleProp(0, ctx.width);
-                   ɵɵstyleProp(1, ctx.height);
-                   ɵɵclassProp(0, ctx.activateXYZClass);
-                   ɵɵstylingApply();
+                   ΔstyleProp(0, ctx.width);
+                   ΔstyleProp(1, ctx.height);
+                   ΔclassProp(0, ctx.activateXYZClass);
+                   ΔstylingApply();
                  }
                }
              });
@@ -1852,7 +1851,7 @@ describe('render3 integration test', () => {
            */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', [
+               Δelement(0, 'div', [
                  'DirWithSingleStylingBindings', '', AttributeMarker.Classes, 'abc',
                  AttributeMarker.Styles, 'width', '100px', 'height', '200px'
                ]);
@@ -1897,17 +1896,17 @@ describe('render3 integration test', () => {
             *   [style.width]
            */
            class Dir1WithStyle {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: Dir1WithStyle,
                selectors: [['', 'Dir1WithStyle', '']],
                factory: () => dir1Instance = new Dir1WithStyle(),
                hostBindings: function(rf: RenderFlags, ctx: Dir1WithStyle, elementIndex: number) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵstyling(null, ['width']);
+                   Δstyling(null, ['width']);
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵstyleProp(0, ctx.width);
-                   ɵɵstylingApply();
+                   ΔstyleProp(0, ctx.width);
+                   ΔstylingApply();
                  }
                }
              });
@@ -1921,18 +1920,18 @@ describe('render3 integration test', () => {
             *   style="width:111px"
            */
            class Dir2WithStyle {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: Dir2WithStyle,
                selectors: [['', 'Dir2WithStyle', '']],
                factory: () => dir2Instance = new Dir2WithStyle(),
                hostBindings: function(rf: RenderFlags, ctx: Dir2WithStyle, elementIndex: number) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelementHostAttrs([AttributeMarker.Styles, 'width', '111px']);
-                   ɵɵstyling(null, ['width']);
+                   ΔelementHostAttrs([AttributeMarker.Styles, 'width', '111px']);
+                   Δstyling(null, ['width']);
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵstyleProp(0, ctx.width);
-                   ɵɵstylingApply();
+                   ΔstyleProp(0, ctx.width);
+                   ΔstylingApply();
                  }
                }
              });
@@ -1945,13 +1944,13 @@ describe('render3 integration test', () => {
            */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', ['Dir1WithStyle', '', 'Dir2WithStyle', '']);
-               ɵɵstyling(null, ['width']);
+               Δelement(0, 'div', ['Dir1WithStyle', '', 'Dir2WithStyle', '']);
+               Δstyling(null, ['width']);
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵstyleProp(0, ctx.width);
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔstyleProp(0, ctx.width);
+               ΔstylingApply();
              }
            }, 1, 0, [Dir1WithStyle, Dir2WithStyle]);
 
@@ -1995,18 +1994,18 @@ describe('render3 integration test', () => {
             *   [class]
            */
            class Dir1WithStyling {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: Dir1WithStyling,
                selectors: [['', 'Dir1WithStyling', '']],
                factory: () => dir1Instance = new Dir1WithStyling(),
                hostBindings: function(rf: RenderFlags, ctx: Dir1WithStyling, elementIndex: number) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵstyling();
+                   Δstyling();
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵstyleMap(ctx.stylesExp);
-                   ɵɵclassMap(ctx.classesExp);
-                   ɵɵstylingApply();
+                   ΔstyleMap(ctx.stylesExp);
+                   ΔclassMap(ctx.classesExp);
+                   ΔstylingApply();
                  }
                }
              });
@@ -2022,18 +2021,18 @@ describe('render3 integration test', () => {
             *   style="width:111px"
            */
            class Dir2WithStyling {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: Dir2WithStyling,
                selectors: [['', 'Dir2WithStyling', '']],
                factory: () => dir2Instance = new Dir2WithStyling(),
                hostBindings: function(rf: RenderFlags, ctx: Dir2WithStyling, elementIndex: number) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelementHostAttrs([AttributeMarker.Styles, 'width', '111px']);
-                   ɵɵstyling();
+                   ΔelementHostAttrs([AttributeMarker.Styles, 'width', '111px']);
+                   Δstyling();
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵstyleMap(ctx.stylesExp);
-                   ɵɵstylingApply();
+                   ΔstyleMap(ctx.stylesExp);
+                   ΔstylingApply();
                  }
                }
              });
@@ -2047,14 +2046,14 @@ describe('render3 integration test', () => {
            */
            const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', ['Dir1WithStyling', '', 'Dir2WithStyling', '']);
-               ɵɵstyling();
+               Δelement(0, 'div', ['Dir1WithStyling', '', 'Dir2WithStyling', '']);
+               Δstyling();
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵstyleMap(ctx.stylesExp);
-               ɵɵclassMap(ctx.classesExp);
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔstyleMap(ctx.stylesExp);
+               ΔclassMap(ctx.classesExp);
+               ΔstylingApply();
              }
            }, 1, 0, [Dir1WithStyling, Dir2WithStyling]);
 
@@ -2125,14 +2124,14 @@ describe('render3 integration test', () => {
     it('should properly handle and render interpolation for class attribute bindings', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          ɵɵstyling();
-          ɵɵelementEnd();
+          ΔelementStart(0, 'div');
+          Δstyling();
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵselect(0);
-          ɵɵclassMap(ɵɵinterpolation2('-', ctx.name, '-', ctx.age, '-'));
-          ɵɵstylingApply();
+          Δselect(0);
+          ΔclassMap(Δinterpolation2('-', ctx.name, '-', ctx.age, '-'));
+          ΔstylingApply();
         }
       }, 1, 2);
 
@@ -2159,20 +2158,20 @@ describe('template data', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           if (ctx.condition) {
-            let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf1 = ΔembeddedViewStart(0, 1, 0);
             if (rf1 & RenderFlags.Create) {
-              ɵɵelement(0, 'div');
+              Δelement(0, 'div');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -2202,7 +2201,7 @@ describe('template data', () => {
 describe('component styles', () => {
   it('should pass in the component styles directly into the underlying renderer', () => {
     class StyledComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: StyledComp,
         styles: ['div { color: red; }'],
         consts: 1,
@@ -2212,7 +2211,7 @@ describe('component styles', () => {
         factory: () => new StyledComp(),
         template: (rf: RenderFlags, ctx: StyledComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div');
+            Δelement(0, 'div');
           }
         }
       });
@@ -2230,7 +2229,7 @@ describe('component animations', () => {
     const animB = {name: 'b'};
 
     class AnimComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AnimComp,
         consts: 0,
         vars: 0,
@@ -2257,7 +2256,7 @@ describe('component animations', () => {
 
   it('should include animations in the renderType data array even if the array is empty', () => {
     class AnimComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AnimComp,
         consts: 0,
         vars: 0,
@@ -2277,7 +2276,7 @@ describe('component animations', () => {
 
   it('should allow [@trigger] bindings to be picked up by the underlying renderer', () => {
     class AnimComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AnimComp,
         consts: 1,
         vars: 1,
@@ -2285,10 +2284,10 @@ describe('component animations', () => {
         factory: () => new AnimComp(),
         template: (rf: RenderFlags, ctx: AnimComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div', [AttributeMarker.Bindings, '@fooAnimation']);
+            Δelement(0, 'div', [AttributeMarker.Bindings, '@fooAnimation']);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementAttribute(0, '@fooAnimation', ɵɵbind(ctx.animationValue));
+            ΔelementAttribute(0, '@fooAnimation', Δbind(ctx.animationValue));
           }
         }
       });
@@ -2313,7 +2312,7 @@ describe('component animations', () => {
   it('should allow creation-level [@trigger] properties to be picked up by the underlying renderer',
      () => {
        class AnimComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: AnimComp,
            consts: 1,
            vars: 1,
@@ -2321,7 +2320,7 @@ describe('component animations', () => {
            factory: () => new AnimComp(),
            template: (rf: RenderFlags, ctx: AnimComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', ['@fooAnimation', '']);
+               Δelement(0, 'div', ['@fooAnimation', '']);
              }
            }
          });
@@ -2340,13 +2339,13 @@ describe('component animations', () => {
 
   it('should allow host binding animations to be picked up and rendered', () => {
     class ChildCompWithAnim {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: ChildCompWithAnim,
         factory: () => new ChildCompWithAnim(),
         selectors: [['child-comp-with-anim']],
         hostBindings: function(rf: RenderFlags, ctx: any, elementIndex: number): void {
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(0, '@fooAnim', ctx.exp);
+            ΔelementProperty(0, '@fooAnim', ctx.exp);
           }
         },
       });
@@ -2355,7 +2354,7 @@ describe('component animations', () => {
     }
 
     class ParentComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: ParentComp,
         consts: 1,
         vars: 1,
@@ -2363,7 +2362,7 @@ describe('component animations', () => {
         factory: () => new ParentComp(),
         template: (rf: RenderFlags, ctx: ParentComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'child-comp-with-anim');
+            Δelement(0, 'child-comp-with-anim');
           }
         },
         directives: [ChildCompWithAnim]
@@ -2385,7 +2384,7 @@ describe('component animations', () => {
 describe('element discovery', () => {
   it('should only monkey-patch immediate child nodes in a component', () => {
     class StructuredComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         factory: () => new StructuredComp(),
@@ -2393,10 +2392,10 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'div');
-            ɵɵelementStart(1, 'p');
-            ɵɵelementEnd();
-            ɵɵelementEnd();
+            ΔelementStart(0, 'div');
+            ΔelementStart(1, 'p');
+            ΔelementEnd();
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
           }
@@ -2417,7 +2416,7 @@ describe('element discovery', () => {
 
   it('should only monkey-patch immediate child nodes in a sub component', () => {
     class ChildComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: ChildComp,
         selectors: [['child-comp']],
         factory: () => new ChildComp(),
@@ -2425,16 +2424,16 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: ChildComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div');
-            ɵɵelement(1, 'div');
-            ɵɵelement(2, 'div');
+            Δelement(0, 'div');
+            Δelement(1, 'div');
+            Δelement(2, 'div');
           }
         }
       });
     }
 
     class ParentComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: ParentComp,
         selectors: [['parent-comp']],
         directives: [ChildComp],
@@ -2443,10 +2442,10 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: ParentComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'section');
-            ɵɵelementStart(1, 'child-comp');
-            ɵɵelementEnd();
-            ɵɵelementEnd();
+            ΔelementStart(0, 'section');
+            ΔelementStart(1, 'child-comp');
+            ΔelementEnd();
+            ΔelementEnd();
           }
         }
       });
@@ -2467,7 +2466,7 @@ describe('element discovery', () => {
 
   it('should only monkey-patch immediate child nodes in an embedded template container', () => {
     class StructuredComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         directives: [NgIf],
@@ -2476,19 +2475,19 @@ describe('element discovery', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'section');
-            ɵɵtemplate(1, (rf, ctx) => {
+            ΔelementStart(0, 'section');
+            Δtemplate(1, (rf, ctx) => {
               if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'div');
-                ɵɵelement(1, 'p');
-                ɵɵelementEnd();
-                ɵɵelement(2, 'div');
+                ΔelementStart(0, 'div');
+                Δelement(1, 'p');
+                ΔelementEnd();
+                Δelement(2, 'div');
               }
             }, 3, 0, 'ng-template', ['ngIf', '']);
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(1, 'ngIf', true);
+            ΔelementProperty(1, 'ngIf', true);
           }
         }
       });
@@ -2515,7 +2514,7 @@ describe('element discovery', () => {
 
   it('should return a context object from a given dom node', () => {
     class StructuredComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         directives: [NgIf],
@@ -2524,8 +2523,8 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'section');
-            ɵɵelement(1, 'div');
+            Δelement(0, 'section');
+            Δelement(1, 'div');
           }
         }
       });
@@ -2553,7 +2552,7 @@ describe('element discovery', () => {
 
   it('should cache the element context on a element was pre-emptively monkey-patched', () => {
     class StructuredComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         factory: () => new StructuredComp(),
@@ -2561,7 +2560,7 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'section');
+            Δelement(0, 'section');
           }
         }
       });
@@ -2585,7 +2584,7 @@ describe('element discovery', () => {
   it('should cache the element context on an intermediate element that isn\'t pre-emptively monkey-patched',
      () => {
        class StructuredComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            factory: () => new StructuredComp(),
@@ -2593,9 +2592,9 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'section');
-               ɵɵelement(1, 'p');
-               ɵɵelementEnd();
+               ΔelementStart(0, 'section');
+               Δelement(1, 'p');
+               ΔelementEnd();
              }
            }
          });
@@ -2618,7 +2617,7 @@ describe('element discovery', () => {
   it('should be able to pull in element context data even if the element is decorated using styling',
      () => {
        class StructuredComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            factory: () => new StructuredComp(),
@@ -2626,13 +2625,13 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'section');
-               ɵɵstyling(['class-foo']);
-               ɵɵelementEnd();
+               ΔelementStart(0, 'section');
+               Δstyling(['class-foo']);
+               ΔelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔstylingApply();
              }
            }
          });
@@ -2673,7 +2672,7 @@ describe('element discovery', () => {
          </section>
        */
        class ProjectorComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: ProjectorComp,
            selectors: [['projector-comp']],
            factory: () => new ProjectorComp(),
@@ -2681,13 +2680,13 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ProjectorComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵprojectionDef();
-               ɵɵtext(0, 'welcome');
-               ɵɵelementStart(1, 'header');
-               ɵɵelementStart(2, 'h1');
-               ɵɵprojection(3);
-               ɵɵelementEnd();
-               ɵɵelementEnd();
+               ΔprojectionDef();
+               Δtext(0, 'welcome');
+               ΔelementStart(1, 'header');
+               ΔelementStart(2, 'h1');
+               Δprojection(3);
+               ΔelementEnd();
+               ΔelementEnd();
              }
              if (rf & RenderFlags.Update) {
              }
@@ -2696,7 +2695,7 @@ describe('element discovery', () => {
        }
 
        class ParentComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: ParentComp,
            selectors: [['parent-comp']],
            directives: [ProjectorComp],
@@ -2705,14 +2704,14 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ParentComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'section');
-               ɵɵelementStart(1, 'projector-comp');
-               ɵɵelementStart(2, 'p');
-               ɵɵtext(3, 'this content is projected');
-               ɵɵelementEnd();
-               ɵɵtext(4, 'this content is projected also');
-               ɵɵelementEnd();
-               ɵɵelementEnd();
+               ΔelementStart(0, 'section');
+               ΔelementStart(1, 'projector-comp');
+               ΔelementStart(2, 'p');
+               Δtext(3, 'this content is projected');
+               ΔelementEnd();
+               Δtext(4, 'this content is projected also');
+               ΔelementEnd();
+               ΔelementEnd();
              }
            }
          });
@@ -2770,7 +2769,7 @@ describe('element discovery', () => {
   it('should return `null` when an element context is retrieved that is a DOM node that was not created by Angular',
      () => {
        class StructuredComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            factory: () => new StructuredComp(),
@@ -2778,7 +2777,7 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'section');
+               Δelement(0, 'section');
              }
            }
          });
@@ -2797,7 +2796,7 @@ describe('element discovery', () => {
 
   it('should by default monkey-patch the bootstrap component with context details', () => {
     class StructuredComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         factory: () => new StructuredComp(),
@@ -2836,7 +2835,7 @@ describe('element discovery', () => {
        let myDir3Instance: MyDir2|null = null;
 
        class MyDir1 {
-         static ngDirectiveDef = ɵɵdefineDirective({
+         static ngDirectiveDef = ΔdefineDirective({
            type: MyDir1,
            selectors: [['', 'my-dir-1', '']],
            factory: () => myDir1Instance = new MyDir1()
@@ -2844,7 +2843,7 @@ describe('element discovery', () => {
        }
 
        class MyDir2 {
-         static ngDirectiveDef = ɵɵdefineDirective({
+         static ngDirectiveDef = ΔdefineDirective({
            type: MyDir2,
            selectors: [['', 'my-dir-2', '']],
            factory: () => myDir2Instance = new MyDir2()
@@ -2852,7 +2851,7 @@ describe('element discovery', () => {
        }
 
        class MyDir3 {
-         static ngDirectiveDef = ɵɵdefineDirective({
+         static ngDirectiveDef = ΔdefineDirective({
            type: MyDir3,
            selectors: [['', 'my-dir-3', '']],
            factory: () => myDir3Instance = new MyDir2()
@@ -2860,7 +2859,7 @@ describe('element discovery', () => {
        }
 
        class StructuredComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            directives: [MyDir1, MyDir2, MyDir3],
@@ -2869,8 +2868,8 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', ['my-dir-1', '', 'my-dir-2', '']);
-               ɵɵelement(1, 'div', ['my-dir-3']);
+               Δelement(0, 'div', ['my-dir-1', '', 'my-dir-2', '']);
+               Δelement(1, 'div', ['my-dir-3']);
              }
            }
          });
@@ -2925,7 +2924,7 @@ describe('element discovery', () => {
        let childComponentInstance: ChildComp|null = null;
 
        class MyDir1 {
-         static ngDirectiveDef = ɵɵdefineDirective({
+         static ngDirectiveDef = ΔdefineDirective({
            type: MyDir1,
            selectors: [['', 'my-dir-1', '']],
            factory: () => myDir1Instance = new MyDir1()
@@ -2933,7 +2932,7 @@ describe('element discovery', () => {
        }
 
        class MyDir2 {
-         static ngDirectiveDef = ɵɵdefineDirective({
+         static ngDirectiveDef = ΔdefineDirective({
            type: MyDir2,
            selectors: [['', 'my-dir-2', '']],
            factory: () => myDir2Instance = new MyDir2()
@@ -2941,7 +2940,7 @@ describe('element discovery', () => {
        }
 
        class ChildComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: ChildComp,
            selectors: [['child-comp']],
            factory: () => childComponentInstance = new ChildComp(),
@@ -2949,14 +2948,14 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ChildComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div');
+               Δelement(0, 'div');
              }
            }
          });
        }
 
        class ParentComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: ParentComp,
            selectors: [['parent-comp']],
            directives: [ChildComp, MyDir1, MyDir2],
@@ -2965,7 +2964,7 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ParentComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'child-comp', ['my-dir-1', '', 'my-dir-2', '']);
+               Δelement(0, 'child-comp', ['my-dir-1', '', 'my-dir-2', '']);
              }
            }
          });
@@ -3018,7 +3017,7 @@ describe('element discovery', () => {
   it('should monkey-patch sub components with the view data and then replace them with the context result once a lookup occurs',
      () => {
        class ChildComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: ChildComp,
            selectors: [['child-comp']],
            factory: () => new ChildComp(),
@@ -3026,16 +3025,16 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ChildComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div');
-               ɵɵelement(1, 'div');
-               ɵɵelement(2, 'div');
+               Δelement(0, 'div');
+               Δelement(1, 'div');
+               Δelement(2, 'div');
              }
            }
          });
        }
 
        class ParentComp {
-         static ngComponentDef = ɵɵdefineComponent({
+         static ngComponentDef = ΔdefineComponent({
            type: ParentComp,
            selectors: [['parent-comp']],
            directives: [ChildComp],
@@ -3044,10 +3043,10 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ParentComp) => {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'section');
-               ɵɵelementStart(1, 'child-comp');
-               ɵɵelementEnd();
-               ɵɵelementEnd();
+               ΔelementStart(0, 'section');
+               ΔelementStart(1, 'child-comp');
+               ΔelementEnd();
+               ΔelementEnd();
              }
            }
          });
@@ -3079,7 +3078,7 @@ describe('element discovery', () => {
 describe('sanitization', () => {
   it('should sanitize data using the provided sanitization interface', () => {
     class SanitizationComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: SanitizationComp,
         selectors: [['sanitize-this']],
         factory: () => new SanitizationComp(),
@@ -3087,10 +3086,10 @@ describe('sanitization', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: SanitizationComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'a');
+            Δelement(0, 'a');
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(0, 'href', ɵɵbind(ctx.href), ɵɵsanitizeUrl);
+            ΔelementProperty(0, 'href', Δbind(ctx.href), ΔsanitizeUrl);
           }
         }
       });
@@ -3121,23 +3120,23 @@ describe('sanitization', () => {
       // @HostBinding()
       cite: any = 'http://cite-dir-value';
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: UnsafeUrlHostBindingDir,
         selectors: [['', 'unsafeUrlHostBindingDir', '']],
         factory: () => hostBindingDir = new UnsafeUrlHostBindingDir(),
         hostBindings: (rf: RenderFlags, ctx: any, elementIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ɵɵallocHostVars(1);
+            ΔallocHostVars(1);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(elementIndex, 'cite', ɵɵbind(ctx.cite), ɵɵsanitizeUrl, true);
+            ΔelementProperty(elementIndex, 'cite', Δbind(ctx.cite), ΔsanitizeUrl, true);
           }
         }
       });
     }
 
     class SimpleComp {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: SimpleComp,
         selectors: [['sanitize-this']],
         factory: () => new SimpleComp(),
@@ -3145,7 +3144,7 @@ describe('sanitization', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: SimpleComp) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'blockquote', ['unsafeUrlHostBindingDir', '']);
+            Δelement(0, 'blockquote', ['unsafeUrlHostBindingDir', '']);
           }
         },
         directives: [UnsafeUrlHostBindingDir]
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
index 6fb5771030..c58d0fa88d 100644
--- a/packages/core/test/render3/ivy/jit_spec.ts
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -7,10 +7,10 @@
  */
 import 'reflect-metadata';
 
-import {ElementRef, QueryList, ɵɵsetComponentScope as setComponentScope} from '@angular/core';
+import {ElementRef, QueryList, ΔsetComponentScope as setComponentScope} from '@angular/core';
 import {Injectable} from '@angular/core/src/di/injectable';
-import {setCurrentInjector, ɵɵinject} from '@angular/core/src/di/injector_compatibility';
-import {ɵɵInjectorDef, ɵɵdefineInjectable} from '@angular/core/src/di/interface/defs';
+import {setCurrentInjector, Δinject} from '@angular/core/src/di/injector_compatibility';
+import {ΔInjectorDef, ΔdefineInjectable} from '@angular/core/src/di/interface/defs';
 import {ivyEnabled} from '@angular/core/src/ivy_switch';
 import {ContentChild, ContentChildren, ViewChild, ViewChildren} from '@angular/core/src/metadata/di';
 import {Component, Directive, HostBinding, HostListener, Input, Output, Pipe} from '@angular/core/src/metadata/directives';
@@ -45,7 +45,7 @@ ivyEnabled && describe('render3 jit', () => {
 
     expect(ServiceAny.ngInjectableDef).toBeDefined();
     expect(ServiceAny.ngInjectableDef.providedIn).toBe('root');
-    expect(ɵɵinject(Service) instanceof Service).toBe(true);
+    expect(Δinject(Service) instanceof Service).toBe(true);
   });
 
   it('compiles an injectable with a useValue provider', () => {
@@ -53,7 +53,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(ɵɵinject(Service)).toBe('test');
+    expect(Δinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useExisting provider', () => {
@@ -65,7 +65,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(ɵɵinject(Service)).toBe('test');
+    expect(Δinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useFactory provider, without deps', () => {
@@ -74,7 +74,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(ɵɵinject(Service)).toBe('test');
+    expect(Δinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useFactory provider, with deps', () => {
@@ -86,7 +86,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(ɵɵinject(Service)).toBe('test');
+    expect(Δinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useClass provider, with deps', () => {
@@ -104,7 +104,7 @@ ivyEnabled && describe('render3 jit', () => {
     }
     const ServiceAny = Service as any;
 
-    expect(ɵɵinject(Service).value).toBe('test');
+    expect(Δinject(Service).value).toBe('test');
   });
 
   it('compiles an injectable with a useClass provider, without deps', () => {
@@ -119,8 +119,8 @@ ivyEnabled && describe('render3 jit', () => {
       get value(): number { return 0; }
     }
 
-    expect(ɵɵinject(Existing).value).toBe(1);
-    const injected = ɵɵinject(Service);
+    expect(Δinject(Existing).value).toBe(1);
+    const injected = Δinject(Service);
     expect(injected instanceof Existing).toBe(true);
     expect(injected.value).toBe(2);
   });
@@ -139,7 +139,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Child extends Base {
     }
 
-    expect(ɵɵinject(Child).dep instanceof Dep).toBe(true);
+    expect(Δinject(Child).dep instanceof Dep).toBe(true);
   });
 
   it('compiles a module to a definition', () => {
@@ -167,7 +167,7 @@ ivyEnabled && describe('render3 jit', () => {
 
   it('compiles a module to an ngInjectorDef with the providers', () => {
     class Token {
-      static ngInjectableDef = ɵɵdefineInjectable({
+      static ngInjectableDef = ΔdefineInjectable({
         providedIn: 'root',
         factory: () => 'default',
       });
@@ -180,7 +180,7 @@ ivyEnabled && describe('render3 jit', () => {
       constructor(public token: Token) {}
     }
 
-    const injectorDef: ɵɵInjectorDef<Module> = (Module as any).ngInjectorDef;
+    const injectorDef: ΔInjectorDef<Module> = (Module as any).ngInjectorDef;
     const instance = injectorDef.factory();
 
     // Since the instance was created outside of an injector using the module, the
diff --git a/packages/core/test/render3/jit_environment_spec.ts b/packages/core/test/render3/jit_environment_spec.ts
index 659066d30f..e256047c21 100644
--- a/packages/core/test/render3/jit_environment_spec.ts
+++ b/packages/core/test/render3/jit_environment_spec.ts
@@ -12,12 +12,12 @@ import {Identifiers} from '@angular/compiler/src/render3/r3_identifiers';
 import {angularCoreEnv} from '../../src/render3/jit/environment';
 
 const INTERFACE_EXCEPTIONS = new Set<string>([
-  'ɵɵBaseDef',
-  'ɵɵComponentDefWithMeta',
-  'ɵɵDirectiveDefWithMeta',
-  'ɵɵInjectorDef',
-  'ɵɵNgModuleDefWithMeta',
-  'ɵɵPipeDefWithMeta',
+  'ΔBaseDef',
+  'ΔComponentDefWithMeta',
+  'ΔDirectiveDefWithMeta',
+  'ΔInjectorDef',
+  'ΔNgModuleDefWithMeta',
+  'ΔPipeDefWithMeta',
 ]);
 
 describe('r3 jit environment', () => {
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index b0780aee98..c7c9c465c4 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {ComponentFactoryResolver, OnDestroy, SimpleChange, SimpleChanges, ViewContainerRef} from '../../src/core';
-import {AttributeMarker, ComponentTemplate, LifecycleHooksFeature, injectComponentFactoryResolver, ɵɵNgOnChangesFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
-import {markDirty, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵlistener, ɵɵprojection, ɵɵprojectionDef, ɵɵselect, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
+import {AttributeMarker, ComponentTemplate, LifecycleHooksFeature, injectComponentFactoryResolver, ΔNgOnChangesFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
+import {markDirty, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δlistener, Δprojection, ΔprojectionDef, Δselect, Δtemplate, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {NgIf} from './common_with_def';
@@ -19,10 +19,10 @@ describe('lifecycles', () => {
   function getParentTemplate(name: string) {
     return (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, name);
+        Δelement(0, name);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'val', ɵɵbind(ctx.val));
+        ΔelementProperty(0, 'val', Δbind(ctx.val));
       }
     };
   }
@@ -34,16 +34,16 @@ describe('lifecycles', () => {
 
     let Comp = createOnInitComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δprojection(1); }
+        ΔelementEnd();
       }
     }, 2);
     let Parent = createOnInitComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
     let ProjectedComp = createOnInitComponent('projected', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵtext(0, 'content');
+        Δtext(0, 'content');
       }
     }, 1);
 
@@ -57,7 +57,7 @@ describe('lifecycles', () => {
           events.push(`${name}${this.val}`);
         }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Component,
           selectors: [[name]],
           consts: consts,
@@ -72,7 +72,7 @@ describe('lifecycles', () => {
     class Directive {
       ngOnInit() { events.push('dir'); }
 
-      static ngDirectiveDef = ɵɵdefineDirective(
+      static ngDirectiveDef = ΔdefineDirective(
           {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
     }
 
@@ -83,10 +83,10 @@ describe('lifecycles', () => {
          /** <comp [val]="val"></comp> */
          const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
            if (rf & RenderFlags.Create) {
-             ɵɵelement(0, 'comp');
+             Δelement(0, 'comp');
            }
            if (rf & RenderFlags.Update) {
-             ɵɵelementProperty(0, 'val', ɵɵbind(ctx.val));
+             ΔelementProperty(0, 'val', Δbind(ctx.val));
            }
          }, 1, 1, directives);
 
@@ -115,7 +115,7 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
+          Δelement(0, 'parent');
         }
       }, 1, 0, directives);
 
@@ -132,13 +132,13 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵelement(1, 'parent');
+          Δelement(0, 'parent');
+          Δelement(1, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 2);
         }
       }, 2, 0, directives);
 
@@ -155,20 +155,20 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, directives);
 
@@ -189,17 +189,17 @@ describe('lifecycles', () => {
 
       function IfTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
       }
 
       /** <comp *ngIf="showing"></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, IfTemplate, 1, 0, 'comp', [AttributeMarker.Template, 'ngIf']);
+          Δtemplate(0, IfTemplate, 1, 0, 'comp', [AttributeMarker.Template, 'ngIf']);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.showing));
+          ΔelementProperty(0, 'ngIf', Δbind(ctx.showing));
         }
       }, 1, 0, directives);
 
@@ -224,12 +224,11 @@ describe('lifecycles', () => {
       class ViewContainerComp {
         constructor(public vcr: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ViewContainerComp,
           selectors: [['view-container-comp']],
-          factory:
-              () => viewContainerComp = new ViewContainerComp(
-                  ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+          factory: () => viewContainerComp = new ViewContainerComp(
+                       ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
           consts: 0,
           vars: 0,
           template: (rf: RenderFlags, ctx: ViewContainerComp) => {}
@@ -238,7 +237,7 @@ describe('lifecycles', () => {
 
       const DynamicComp = createComponent('dynamic-comp', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
       }, 1, 0, [Comp]);
 
@@ -259,9 +258,9 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵelementStart(1, 'projected'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { ΔelementStart(1, 'projected'); }
+          ΔelementEnd();
         }
       }, 2, 0, directives);
 
@@ -280,21 +279,21 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵelementStart(1, 'projected'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'comp');
-          { ɵɵelementStart(3, 'projected'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { ΔelementStart(1, 'projected'); }
+          ΔelementEnd();
+          ΔelementStart(2, 'comp');
+          { ΔelementStart(3, 'projected'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 1);
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', 2);
-          ɵɵselect(3);
-          ɵɵelementProperty(3, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 1);
+          Δselect(2);
+          ΔelementProperty(2, 'val', 2);
+          Δselect(3);
+          ΔelementProperty(3, 'val', 2);
         }
       }, 4, 0, directives);
 
@@ -306,7 +305,7 @@ describe('lifecycles', () => {
       /** <comp directive></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp', ['dir', '']);
+          Δelement(0, 'comp', ['dir', '']);
         }
       }, 1, 0, directives);
 
@@ -321,7 +320,7 @@ describe('lifecycles', () => {
       /** <div directive></div> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['dir', '']);
+          Δelement(0, 'div', ['dir', '']);
         }
       }, 1, 0, directives);
 
@@ -342,28 +341,28 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
-          ɵɵcontainer(1);
-          ɵɵelement(2, 'comp');
+          Δelement(0, 'comp');
+          Δcontainer(1);
+          Δelement(2, 'comp');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', 5);
-          ɵɵcontainerRefreshStart(1);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(2);
+          ΔelementProperty(2, 'val', 5);
+          ΔcontainerRefreshStart(1);
           {
             for (let j = 2; j < 5; j++) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', j);
+                ΔelementProperty(0, 'val', j);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 3, 0, directives);
 
@@ -383,28 +382,28 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵcontainer(1);
-          ɵɵelement(2, 'parent');
+          Δelement(0, 'parent');
+          Δcontainer(1);
+          Δelement(2, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', 5);
-          ɵɵcontainerRefreshStart(1);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(2);
+          ΔelementProperty(2, 'val', 5);
+          ΔcontainerRefreshStart(1);
           {
             for (let j = 2; j < 5; j++) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'parent');
+                Δelement(0, 'parent');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', j);
+                ΔelementProperty(0, 'val', j);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 3, 0, directives);
 
@@ -442,7 +441,7 @@ describe('lifecycles', () => {
 
         ngOnInit() { allEvents.push('init ' + name); }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Component,
           selectors: [[name]],
           factory: () => new Component(), template,
@@ -457,7 +456,7 @@ describe('lifecycles', () => {
     class Directive {
       ngDoCheck() { events.push('dir'); }
 
-      static ngDirectiveDef = ɵɵdefineDirective(
+      static ngDirectiveDef = ΔdefineDirective(
           {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
     }
 
@@ -467,7 +466,7 @@ describe('lifecycles', () => {
       /** <comp></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
       }, 1, 0, directives);
 
@@ -494,7 +493,7 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
+          Δelement(0, 'parent');
         }
       }, 1, 0, directives);
 
@@ -506,7 +505,7 @@ describe('lifecycles', () => {
       /** <comp></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
       }, 1, 0, directives);
 
@@ -521,7 +520,7 @@ describe('lifecycles', () => {
       /** <comp directive></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp', ['dir', '']);
+          Δelement(0, 'comp', ['dir', '']);
         }
       }, 1, 0, directives);
 
@@ -536,7 +535,7 @@ describe('lifecycles', () => {
       /** <div directive></div> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['dir', '']);
+          Δelement(0, 'div', ['dir', '']);
         }
       }, 1, 0, directives);
 
@@ -560,27 +559,27 @@ describe('lifecycles', () => {
 
     let Comp = createAfterContentInitComp('comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵprojection(0);
+        ΔprojectionDef();
+        Δprojection(0);
       }
     }, 1);
 
     let Parent = createAfterContentInitComp('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'comp');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'comp');
+        { Δprojection(1); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'val', ɵɵbind(ctx.val));
+        ΔelementProperty(0, 'val', Δbind(ctx.val));
       }
     }, 2, 1, [Comp]);
 
     let ProjectedComp = createAfterContentInitComp('projected', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵprojection(0);
+        ΔprojectionDef();
+        Δprojection(0);
       }
     }, 1);
 
@@ -595,7 +594,7 @@ describe('lifecycles', () => {
         }
         ngAfterContentChecked() { allEvents.push(`${name}${this.val} check`); }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Component,
           selectors: [[name]],
           factory: () => new Component(),
@@ -612,40 +611,40 @@ describe('lifecycles', () => {
       ngAfterContentInit() { events.push('init'); }
       ngAfterContentChecked() { events.push('check'); }
 
-      static ngDirectiveDef = ɵɵdefineDirective(
+      static ngDirectiveDef = ΔdefineDirective(
           {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
     }
 
     function ForLoopWithChildrenTemplate(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'parent');
-        { ɵɵtext(1, 'content'); }
-        ɵɵelementEnd();
-        ɵɵcontainer(2);
-        ɵɵelementStart(3, 'parent');
-        { ɵɵtext(4, 'content'); }
-        ɵɵelementEnd();
+        ΔelementStart(0, 'parent');
+        { Δtext(1, 'content'); }
+        ΔelementEnd();
+        Δcontainer(2);
+        ΔelementStart(3, 'parent');
+        { Δtext(4, 'content'); }
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'val', 1);
-        ɵɵselect(3);
-        ɵɵelementProperty(3, 'val', 4);
-        ɵɵcontainerRefreshStart(2);
+        ΔelementProperty(0, 'val', 1);
+        Δselect(3);
+        ΔelementProperty(3, 'val', 4);
+        ΔcontainerRefreshStart(2);
         {
           for (let i = 2; i < 4; i++) {
-            let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+            let rf1 = ΔembeddedViewStart(0, 2, 0);
             if (rf1 & RenderFlags.Create) {
-              ɵɵelementStart(0, 'parent');
-              { ɵɵtext(1, 'content'); }
-              ɵɵelementEnd();
+              ΔelementStart(0, 'parent');
+              { Δtext(1, 'content'); }
+              ΔelementEnd();
             }
             if (rf1 & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'val', i);
+              ΔelementProperty(0, 'val', i);
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -655,9 +654,9 @@ describe('lifecycles', () => {
       /** <comp>content</comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵtext(1, 'content'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { Δtext(1, 'content'); }
+          ΔelementEnd();
         }
       }, 2, 0, directives);
 
@@ -685,22 +684,22 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+              let rf1 = ΔembeddedViewStart(0, 2, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'comp');
-                { ɵɵtext(1, 'content'); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'comp');
+                { Δtext(1, 'content'); }
+                ΔelementEnd();
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, directives);
 
@@ -724,9 +723,9 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'parent');
-          { ɵɵtext(1, 'content'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'parent');
+          { Δtext(1, 'content'); }
+          ΔelementEnd();
         }
       }, 2, 0, directives);
 
@@ -743,17 +742,17 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'parent');
-          { ɵɵtext(1, 'content'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'parent');
-          { ɵɵtext(3, 'content'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'parent');
+          { Δtext(1, 'content'); }
+          ΔelementEnd();
+          ΔelementStart(2, 'parent');
+          { Δtext(3, 'content'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(2);
+          ΔelementProperty(2, 'val', 2);
         }
       }, 4, 0, directives);
 
@@ -774,13 +773,13 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'parent');
+          ΔelementStart(0, 'parent');
           {
-            ɵɵelementStart(1, 'projected');
-            { ɵɵtext(2, 'content'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'projected');
+            { Δtext(2, 'content'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }, 3, 0, directives);
 
@@ -804,29 +803,29 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'parent');
+          ΔelementStart(0, 'parent');
           {
-            ɵɵelementStart(1, 'projected');
-            { ɵɵtext(2, 'content'); }
-            ɵɵelementEnd();
+            ΔelementStart(1, 'projected');
+            { Δtext(2, 'content'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
-          ɵɵelementStart(3, 'parent');
+          ΔelementEnd();
+          ΔelementStart(3, 'parent');
           {
-            ɵɵelementStart(4, 'projected');
-            { ɵɵtext(5, 'content'); }
-            ɵɵelementEnd();
+            ΔelementStart(4, 'projected');
+            { Δtext(5, 'content'); }
+            ΔelementEnd();
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 1);
-          ɵɵselect(3);
-          ɵɵelementProperty(3, 'val', 2);
-          ɵɵselect(4);
-          ɵɵelementProperty(4, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 1);
+          Δselect(3);
+          ΔelementProperty(3, 'val', 2);
+          Δselect(4);
+          ΔelementProperty(4, 'val', 2);
         }
       }, 6, 0, directives);
 
@@ -844,34 +843,34 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵtext(1, 'content'); }
-          ɵɵelementEnd();
-          ɵɵcontainer(2);
-          ɵɵelementStart(3, 'comp');
-          { ɵɵtext(4, 'content'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { Δtext(1, 'content'); }
+          ΔelementEnd();
+          Δcontainer(2);
+          ΔelementStart(3, 'comp');
+          { Δtext(4, 'content'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(3);
-          ɵɵelementProperty(3, 'val', 4);
-          ɵɵcontainerRefreshStart(2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(3);
+          ΔelementProperty(3, 'val', 4);
+          ΔcontainerRefreshStart(2);
           {
             for (let i = 2; i < 4; i++) {
-              let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+              let rf1 = ΔembeddedViewStart(0, 2, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'comp');
-                { ɵɵtext(1, 'content'); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'comp');
+                { Δtext(1, 'content'); }
+                ΔelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', i);
+                ΔelementProperty(0, 'val', i);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 5, 0, directives);
 
@@ -899,9 +898,9 @@ describe('lifecycles', () => {
         /** <comp>content</comp> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'comp');
-            { ɵɵtext(1, 'content'); }
-            ɵɵelementEnd();
+            ΔelementStart(0, 'comp');
+            { Δtext(1, 'content'); }
+            ΔelementEnd();
           }
         }, 2, 0, directives);
 
@@ -928,7 +927,7 @@ describe('lifecycles', () => {
         /** <comp directive></comp> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'comp', ['dir', '']);
+            Δelement(0, 'comp', ['dir', '']);
           }
         }, 1, 0, directives);
 
@@ -940,7 +939,7 @@ describe('lifecycles', () => {
         /** <div directive></div> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div', ['dir', '']);
+            Δelement(0, 'div', ['dir', '']);
           }
         }, 1, 0, directives);
 
@@ -961,17 +960,17 @@ describe('lifecycles', () => {
 
     let Comp = createAfterViewInitComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δprojection(1); }
+        ΔelementEnd();
       }
     }, 2);
     let Parent = createAfterViewInitComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
 
     let ProjectedComp = createAfterViewInitComponent('projected', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵtext(0, 'content');
+        Δtext(0, 'content');
       }
     }, 1);
 
@@ -987,7 +986,7 @@ describe('lifecycles', () => {
         }
         ngAfterViewChecked() { allEvents.push(`${name}${this.val} check`); }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Component,
           selectors: [[name]],
           consts: consts,
@@ -1004,7 +1003,7 @@ describe('lifecycles', () => {
       ngAfterViewInit() { events.push('init'); }
       ngAfterViewChecked() { events.push('check'); }
 
-      static ngDirectiveDef = ɵɵdefineDirective(
+      static ngDirectiveDef = ΔdefineDirective(
           {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
     }
 
@@ -1014,7 +1013,7 @@ describe('lifecycles', () => {
       /** <comp></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
       }, 1, 0, defs);
 
@@ -1042,20 +1041,20 @@ describe('lifecycles', () => {
       */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1080,7 +1079,7 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
+          Δelement(0, 'parent');
         }
       }, 1, 0, defs);
 
@@ -1097,13 +1096,13 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵelement(1, 'parent');
+          Δelement(0, 'parent');
+          Δelement(1, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 2);
         }
       }, 2, 0, defs);
 
@@ -1120,9 +1119,9 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵelement(1, 'projected'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { Δelement(1, 'projected'); }
+          ΔelementEnd();
         }
       }, 2, 0, defs);
 
@@ -1141,21 +1140,21 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵelement(1, 'projected'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'comp');
-          { ɵɵelement(3, 'projected'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { Δelement(1, 'projected'); }
+          ΔelementEnd();
+          ΔelementStart(2, 'comp');
+          { Δelement(3, 'projected'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 1);
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', 2);
-          ɵɵselect(3);
-          ɵɵelementProperty(3, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 1);
+          Δselect(2);
+          ΔelementProperty(2, 'val', 2);
+          Δselect(3);
+          ΔelementProperty(3, 'val', 2);
         }
       }, 4, 0, defs);
 
@@ -1171,14 +1170,14 @@ describe('lifecycles', () => {
        */
       const ParentComp = createAfterViewInitComponent('parent', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵelement(1, 'projected'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { Δelement(1, 'projected'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', ɵɵbind(ctx.val));
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', ɵɵbind(ctx.val));
+          ΔelementProperty(0, 'val', Δbind(ctx.val));
+          Δselect(1);
+          ΔelementProperty(1, 'val', Δbind(ctx.val));
         }
       }, 2, 2, [Comp, ProjectedComp]);
 
@@ -1188,13 +1187,13 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵelement(1, 'parent');
+          Δelement(0, 'parent');
+          Δelement(1, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 2);
         }
       }, 2, 0, [ParentComp]);
 
@@ -1212,28 +1211,28 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
-          ɵɵcontainer(1);
-          ɵɵelement(2, 'comp');
+          Δelement(0, 'comp');
+          Δcontainer(1);
+          Δelement(2, 'comp');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', 4);
-          ɵɵcontainerRefreshStart(1);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(2);
+          ΔelementProperty(2, 'val', 4);
+          ΔcontainerRefreshStart(1);
           {
             for (let i = 2; i < 4; i++) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', i);
+                ΔelementProperty(0, 'val', i);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 3, 0, defs);
 
@@ -1252,28 +1251,28 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵcontainer(1);
-          ɵɵelement(2, 'parent');
+          Δelement(0, 'parent');
+          Δcontainer(1);
+          Δelement(2, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', 4);
-          ɵɵcontainerRefreshStart(1);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(2);
+          ΔelementProperty(2, 'val', 4);
+          ΔcontainerRefreshStart(1);
           {
             for (let i = 2; i < 4; i++) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'parent');
+                Δelement(0, 'parent');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', i);
+                ΔelementProperty(0, 'val', i);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 3, 0, defs);
 
@@ -1289,7 +1288,7 @@ describe('lifecycles', () => {
         /** <comp></comp> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'comp');
+            Δelement(0, 'comp');
           }
         }, 1, 0, defs);
 
@@ -1313,10 +1312,10 @@ describe('lifecycles', () => {
         /** <comp [val]="myVal"></comp> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'comp');
+            Δelement(0, 'comp');
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(0, 'val', ɵɵbind(ctx.myVal));
+            ΔelementProperty(0, 'val', Δbind(ctx.myVal));
           }
         }, 1, 1, defs);
 
@@ -1338,28 +1337,28 @@ describe('lifecycles', () => {
          */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'parent');
-            ɵɵcontainer(1);
-            ɵɵelement(2, 'parent');
+            Δelement(0, 'parent');
+            Δcontainer(1);
+            Δelement(2, 'parent');
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(0, 'val', 1);
-            ɵɵselect(2);
-            ɵɵelementProperty(2, 'val', 4);
-            ɵɵcontainerRefreshStart(1);
+            ΔelementProperty(0, 'val', 1);
+            Δselect(2);
+            ΔelementProperty(2, 'val', 4);
+            ΔcontainerRefreshStart(1);
             {
               for (let i = 2; i < 4; i++) {
-                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                let rf1 = ΔembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  ɵɵelement(0, 'parent');
+                  Δelement(0, 'parent');
                 }
                 if (rf1 & RenderFlags.Update) {
-                  ɵɵelementProperty(0, 'val', i);
+                  ΔelementProperty(0, 'val', i);
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         }, 3, 0, defs);
 
@@ -1379,7 +1378,7 @@ describe('lifecycles', () => {
         /** <comp directive></comp> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'comp', ['dir', '']);
+            Δelement(0, 'comp', ['dir', '']);
           }
         }, 1, 0, defs);
 
@@ -1391,7 +1390,7 @@ describe('lifecycles', () => {
         /** <div directive></div> */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div', ['dir', '']);
+            Δelement(0, 'div', ['dir', '']);
           }
         }, 1, 0, defs);
 
@@ -1408,8 +1407,8 @@ describe('lifecycles', () => {
 
     let Comp = createOnDestroyComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵprojection(0);
+        ΔprojectionDef();
+        Δprojection(0);
       }
     }, 1);
     let Parent = createOnDestroyComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
@@ -1421,7 +1420,7 @@ describe('lifecycles', () => {
         val: string = '';
         ngOnDestroy() { events.push(`${name}${this.val}`); }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Component,
           selectors: [[name]],
           factory: () => new Component(),
@@ -1436,7 +1435,7 @@ describe('lifecycles', () => {
 
     let Grandparent = createOnDestroyComponent('grandparent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'parent');
+        Δelement(0, 'parent');
       }
     }, 1, 0, [Parent]);
 
@@ -1445,7 +1444,7 @@ describe('lifecycles', () => {
     class Directive {
       ngOnDestroy() { events.push('dir'); }
 
-      static ngDirectiveDef = ɵɵdefineDirective(
+      static ngDirectiveDef = ΔdefineDirective(
           {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
     }
 
@@ -1460,20 +1459,20 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1493,26 +1492,26 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 2, 2);
+              let rf1 = ΔembeddedViewStart(0, 2, 2);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
-                ɵɵelement(1, 'comp');
+                Δelement(0, 'comp');
+                Δelement(1, 'comp');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', ɵɵbind('1'));
-                ɵɵselect(1);
-                ɵɵelementProperty(1, 'val', ɵɵbind('2'));
+                ΔelementProperty(0, 'val', Δbind('1'));
+                Δselect(1);
+                ΔelementProperty(1, 'val', Δbind('2'));
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1534,20 +1533,20 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'parent');
+                Δelement(0, 'parent');
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1569,20 +1568,20 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'grandparent');
+                Δelement(0, 'grandparent');
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1606,34 +1605,34 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ɵɵembeddedViewStart(0, 4, 0);
+              let rf1 = ΔembeddedViewStart(0, 4, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'comp');
-                { ɵɵelement(1, 'projected'); }
-                ɵɵelementEnd();
-                ɵɵelementStart(2, 'comp');
-                { ɵɵelement(3, 'projected'); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'comp');
+                { Δelement(1, 'projected'); }
+                ΔelementEnd();
+                ΔelementStart(2, 'comp');
+                { Δelement(3, 'projected'); }
+                ΔelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', 1);
-                ɵɵselect(1);
-                ɵɵelementProperty(1, 'val', 1);
-                ɵɵselect(2);
-                ɵɵelementProperty(2, 'val', 2);
-                ɵɵselect(3);
-                ɵɵelementProperty(3, 'val', 2);
+                ΔelementProperty(0, 'val', 1);
+                Δselect(1);
+                ΔelementProperty(1, 'val', 1);
+                Δselect(2);
+                ΔelementProperty(2, 'val', 2);
+                Δselect(3);
+                ΔelementProperty(3, 'val', 2);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1658,41 +1657,41 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(0, 3, 2);
+              let rf1 = ΔembeddedViewStart(0, 3, 2);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
-                ɵɵcontainer(1);
-                ɵɵelement(2, 'comp');
+                Δelement(0, 'comp');
+                Δcontainer(1);
+                Δelement(2, 'comp');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', ɵɵbind('1'));
-                ɵɵselect(2);
-                ɵɵelementProperty(2, 'val', ɵɵbind('3'));
-                ɵɵcontainerRefreshStart(1);
+                ΔelementProperty(0, 'val', Δbind('1'));
+                Δselect(2);
+                ΔelementProperty(2, 'val', Δbind('3'));
+                ΔcontainerRefreshStart(1);
                 {
                   if (ctx.condition2) {
-                    let rf2 = ɵɵembeddedViewStart(0, 1, 1);
+                    let rf2 = ΔembeddedViewStart(0, 1, 1);
                     if (rf2 & RenderFlags.Create) {
-                      ɵɵelement(0, 'comp');
+                      Δelement(0, 'comp');
                     }
                     if (rf2 & RenderFlags.Update) {
-                      ɵɵelementProperty(0, 'val', ɵɵbind('2'));
+                      ΔelementProperty(0, 'val', Δbind('2'));
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1752,41 +1751,41 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(0, 3, 2);
+              let rf1 = ΔembeddedViewStart(0, 3, 2);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
-                ɵɵcontainer(1);
-                ɵɵelement(2, 'comp');
+                Δelement(0, 'comp');
+                Δcontainer(1);
+                Δelement(2, 'comp');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val', ɵɵbind('1'));
-                ɵɵselect(2);
-                ɵɵelementProperty(2, 'val', ɵɵbind('5'));
-                ɵɵcontainerRefreshStart(1);
+                ΔelementProperty(0, 'val', Δbind('1'));
+                Δselect(2);
+                ΔelementProperty(2, 'val', Δbind('5'));
+                ΔcontainerRefreshStart(1);
                 {
                   for (let j = 2; j < ctx.len; j++) {
-                    let rf2 = ɵɵembeddedViewStart(0, 1, 1);
+                    let rf2 = ΔembeddedViewStart(0, 1, 1);
                     if (rf2 & RenderFlags.Create) {
-                      ɵɵelement(0, 'comp');
+                      Δelement(0, 'comp');
                     }
                     if (rf2 & RenderFlags.Update) {
-                      ɵɵelementProperty(0, 'val', ɵɵbind(j));
+                      ΔelementProperty(0, 'val', Δbind(j));
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1843,32 +1842,32 @@ describe('lifecycles', () => {
        */
       function Template(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(0, 5, 0);
+              let rf1 = ΔembeddedViewStart(0, 5, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelementStart(0, 'button');
+                ΔelementStart(0, 'button');
                 {
-                  ɵɵlistener('click', ctx.onClick.bind(ctx));
-                  ɵɵtext(1, 'Click me');
+                  Δlistener('click', ctx.onClick.bind(ctx));
+                  Δtext(1, 'Click me');
                 }
-                ɵɵelementEnd();
-                ɵɵelement(2, 'comp');
-                ɵɵelementStart(3, 'button');
+                ΔelementEnd();
+                Δelement(2, 'comp');
+                ΔelementStart(3, 'button');
                 {
-                  ɵɵlistener('click', ctx.onClick.bind(ctx));
-                  ɵɵtext(4, 'Click me');
+                  Δlistener('click', ctx.onClick.bind(ctx));
+                  Δtext(4, 'Click me');
                 }
-                ɵɵelementEnd();
+                ΔelementEnd();
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }
 
@@ -1903,20 +1902,20 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp', ['dir', '']);
+                Δelement(0, 'comp', ['dir', '']);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1939,20 +1938,20 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['dir', '']);
+                Δelement(0, 'div', ['dir', '']);
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -1980,10 +1979,10 @@ describe('lifecycles', () => {
      */
     const Comp = createOnChangesComponent('comp', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵprojectionDef();
-        ɵɵelementStart(0, 'div');
-        { ɵɵprojection(1); }
-        ɵɵelementEnd();
+        ΔprojectionDef();
+        ΔelementStart(0, 'div');
+        { Δprojection(1); }
+        ΔelementEnd();
       }
     }, 2);
 
@@ -1992,17 +1991,17 @@ describe('lifecycles', () => {
      */
     const Parent = createOnChangesComponent('parent', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'comp');
+        Δelement(0, 'comp');
       }
       if (rf & RenderFlags.Update) {
-        ɵɵelementProperty(0, 'val1', ɵɵbind(ctx.a));
-        ɵɵelementProperty(0, 'publicVal2', ɵɵbind(ctx.b));
+        ΔelementProperty(0, 'val1', Δbind(ctx.a));
+        ΔelementProperty(0, 'publicVal2', Δbind(ctx.b));
       }
     }, 1, 2, [Comp]);
 
     const ProjectedComp = createOnChangesComponent('projected', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        ɵɵtext(0, 'content');
+        Δtext(0, 'content');
       }
     }, 1);
 
@@ -2027,7 +2026,7 @@ describe('lifecycles', () => {
           events.push({type: 'onChanges', name: 'comp - ' + name, changes});
         }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Component,
           selectors: [[name]],
           factory: () => new Component(),
@@ -2035,7 +2034,7 @@ describe('lifecycles', () => {
           vars: vars,
           inputs: {a: 'val1', b: ['publicVal2', 'val2']}, template,
           directives: directives,
-          features: [ɵɵNgOnChangesFeature()],
+          features: [ΔNgOnChangesFeature()],
         });
       };
     }
@@ -2049,12 +2048,12 @@ describe('lifecycles', () => {
         events.push({type: 'onChanges', name: 'dir - dir', changes});
       }
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: Directive,
         selectors: [['', 'dir', '']],
         factory: () => new Directive(),
         inputs: {a: 'val1', b: ['publicVal2', 'val2']},
-        features: [ɵɵNgOnChangesFeature()],
+        features: [ΔNgOnChangesFeature()],
       });
     }
 
@@ -2064,11 +2063,11 @@ describe('lifecycles', () => {
       /** <comp [val1]="val1" [publicVal2]="val2"></comp> */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(ctx.val1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(ctx.val2));
+          ΔelementProperty(0, 'val1', Δbind(ctx.val1));
+          ΔelementProperty(0, 'publicVal2', Δbind(ctx.val2));
         }
       }, 1, 2, defs);
 
@@ -2110,11 +2109,11 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
+          Δelement(0, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(ctx.val1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(ctx.val2));
+          ΔelementProperty(0, 'val1', Δbind(ctx.val1));
+          ΔelementProperty(0, 'publicVal2', Δbind(ctx.val2));
         }
       }, 1, 2, defs);
 
@@ -2154,15 +2153,15 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵelement(1, 'parent');
+          Δelement(0, 'parent');
+          Δelement(1, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val1', ɵɵbind(2));
-          ɵɵelementProperty(1, 'publicVal2', ɵɵbind(2));
+          ΔelementProperty(0, 'val1', Δbind(1));
+          ΔelementProperty(0, 'publicVal2', Δbind(1));
+          Δselect(1);
+          ΔelementProperty(1, 'val1', Δbind(2));
+          ΔelementProperty(1, 'publicVal2', Δbind(2));
         }
       }, 2, 4, defs);
 
@@ -2213,24 +2212,24 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (ctx.condition) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 2);
+              let rf1 = ΔembeddedViewStart(0, 1, 2);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-                ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
+                ΔelementProperty(0, 'val1', Δbind(1));
+                ΔelementProperty(0, 'publicVal2', Δbind(1));
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, defs);
 
@@ -2291,16 +2290,16 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵelementStart(1, 'projected'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { ΔelementStart(1, 'projected'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val1', ɵɵbind(2));
-          ɵɵelementProperty(1, 'publicVal2', ɵɵbind(2));
+          ΔelementProperty(0, 'val1', Δbind(1));
+          ΔelementProperty(0, 'publicVal2', Δbind(1));
+          Δselect(1);
+          ΔelementProperty(1, 'val1', Δbind(2));
+          ΔelementProperty(1, 'publicVal2', Δbind(2));
         }
       }, 2, 4, defs);
 
@@ -2336,25 +2335,25 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'comp');
-          { ɵɵelementStart(1, 'projected'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'comp');
-          { ɵɵelementStart(3, 'projected'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'comp');
+          { ΔelementStart(1, 'projected'); }
+          ΔelementEnd();
+          ΔelementStart(2, 'comp');
+          { ΔelementStart(3, 'projected'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val1', ɵɵbind(2));
-          ɵɵelementProperty(1, 'publicVal2', ɵɵbind(2));
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val1', ɵɵbind(3));
-          ɵɵelementProperty(2, 'publicVal2', ɵɵbind(3));
-          ɵɵselect(3);
-          ɵɵelementProperty(3, 'val1', ɵɵbind(4));
-          ɵɵelementProperty(3, 'publicVal2', ɵɵbind(4));
+          ΔelementProperty(0, 'val1', Δbind(1));
+          ΔelementProperty(0, 'publicVal2', Δbind(1));
+          Δselect(1);
+          ΔelementProperty(1, 'val1', Δbind(2));
+          ΔelementProperty(1, 'publicVal2', Δbind(2));
+          Δselect(2);
+          ΔelementProperty(2, 'val1', Δbind(3));
+          ΔelementProperty(2, 'publicVal2', Δbind(3));
+          Δselect(3);
+          ΔelementProperty(3, 'val1', Δbind(4));
+          ΔelementProperty(3, 'publicVal2', Δbind(4));
         }
       }, 4, 8, defs);
 
@@ -2401,11 +2400,11 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp', ['dir', '']);
+          Δelement(0, 'comp', ['dir', '']);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
+          ΔelementProperty(0, 'val1', Δbind(1));
+          ΔelementProperty(0, 'publicVal2', Δbind(1));
         }
       }, 1, 2, defs);
 
@@ -2442,11 +2441,11 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['dir', '']);
+          Δelement(0, 'div', ['dir', '']);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
+          ΔelementProperty(0, 'val1', Δbind(1));
+          ΔelementProperty(0, 'publicVal2', Δbind(1));
         }
       }, 1, 2, defs);
 
@@ -2476,31 +2475,31 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
-          ɵɵcontainer(1);
-          ɵɵelement(2, 'comp');
+          Δelement(0, 'comp');
+          Δcontainer(1);
+          Δelement(2, 'comp');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val1', ɵɵbind(5));
-          ɵɵelementProperty(2, 'publicVal2', ɵɵbind(5));
-          ɵɵcontainerRefreshStart(1);
+          ΔelementProperty(0, 'val1', Δbind(1));
+          ΔelementProperty(0, 'publicVal2', Δbind(1));
+          Δselect(2);
+          ΔelementProperty(2, 'val1', Δbind(5));
+          ΔelementProperty(2, 'publicVal2', Δbind(5));
+          ΔcontainerRefreshStart(1);
           {
             for (let j = 2; j < 5; j++) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 2);
+              let rf1 = ΔembeddedViewStart(0, 1, 2);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val1', ɵɵbind(j));
-                ɵɵelementProperty(0, 'publicVal2', ɵɵbind(j));
+                ΔelementProperty(0, 'val1', Δbind(j));
+                ΔelementProperty(0, 'publicVal2', Δbind(j));
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 3, 4, defs);
 
@@ -2563,31 +2562,31 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵcontainer(1);
-          ɵɵelement(2, 'parent');
+          Δelement(0, 'parent');
+          Δcontainer(1);
+          Δelement(2, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val1', ɵɵbind(1));
-          ɵɵelementProperty(0, 'publicVal2', ɵɵbind(1));
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val1', ɵɵbind(5));
-          ɵɵelementProperty(2, 'publicVal2', ɵɵbind(5));
-          ɵɵcontainerRefreshStart(1);
+          ΔelementProperty(0, 'val1', Δbind(1));
+          ΔelementProperty(0, 'publicVal2', Δbind(1));
+          Δselect(2);
+          ΔelementProperty(2, 'val1', Δbind(5));
+          ΔelementProperty(2, 'publicVal2', Δbind(5));
+          ΔcontainerRefreshStart(1);
           {
             for (let j = 2; j < 5; j++) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 2);
+              let rf1 = ΔembeddedViewStart(0, 1, 2);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'parent');
+                Δelement(0, 'parent');
               }
               if (rf1 & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'val1', ɵɵbind(j));
-                ɵɵelementProperty(0, 'publicVal2', ɵɵbind(j));
+                ΔelementProperty(0, 'val1', Δbind(j));
+                ΔelementProperty(0, 'publicVal2', Δbind(j));
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 3, 4, defs);
 
@@ -2687,7 +2686,7 @@ describe('lifecycles', () => {
 
         ngOnChanges(changes: SimpleChanges) { events.push(changes); }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: MyComp,
           factory: () => {
             // Capture the instance so we can test setting the property directly
@@ -2696,10 +2695,10 @@ describe('lifecycles', () => {
           },
           template: (rf: RenderFlags, ctx: any) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'div');
+              Δelement(0, 'div');
             }
             if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'id', ɵɵbind(ctx.a));
+              ΔelementProperty(0, 'id', Δbind(ctx.a));
             }
           },
           selectors: [['my-comp']],
@@ -2717,10 +2716,10 @@ describe('lifecycles', () => {
 
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'my-comp');
+          Δelement(0, 'my-comp');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'value', ɵɵbind(1));
+          ΔelementProperty(0, 'value', Δbind(1));
         }
       }, 1, 1, [MyComp]);
 
@@ -2758,7 +2757,7 @@ describe('lifecycles', () => {
         ngAfterViewInit() { events.push(`viewInit ${name}${this.val}`); }
         ngAfterViewChecked() { events.push(`viewCheck ${name}${this.val}`); }
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Component,
           selectors: [[name]],
           factory: () => new Component(),
@@ -2766,7 +2765,7 @@ describe('lifecycles', () => {
           vars: vars,
           inputs: {val: 'val'}, template,
           directives: directives,
-          features: [ɵɵNgOnChangesFeature()],
+          features: [ΔNgOnChangesFeature()],
         });
       };
     }
@@ -2780,8 +2779,8 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
-          ɵɵelement(1, 'comp');
+          Δelement(0, 'comp');
+          Δelement(1, 'comp');
         }
         // This template function is a little weird in that the `elementProperty` calls
         // below are directly setting values `1` and `2`, where normally there would be
@@ -2789,9 +2788,9 @@ describe('lifecycles', () => {
         // This means when `fixture.update()` is called below, ngOnChanges should fire,
         // even though the *value* itself never changed.
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 2);
         }
       }, 2, 0, [Comp]);
 
@@ -2816,10 +2815,10 @@ describe('lifecycles', () => {
       /** <comp [val]="val"></comp> */
       const Parent = createAllHooksComponent('parent', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp');
+          Δelement(0, 'comp');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', ɵɵbind(ctx.val));
+          ΔelementProperty(0, 'val', Δbind(ctx.val));
         }
       }, 1, 1, [Comp]);
 
@@ -2829,13 +2828,13 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'parent');
-          ɵɵelement(1, 'parent');
+          Δelement(0, 'parent');
+          Δelement(1, 'parent');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', 1);
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', 2);
+          ΔelementProperty(0, 'val', 1);
+          Δselect(1);
+          ΔelementProperty(1, 'val', 2);
         }
       }, 2, 0, [Parent]);
 
@@ -2873,13 +2872,13 @@ describe('lifecycles', () => {
       /** <ng-content></ng-content><view [val]="val"></view> */
       const Parent = createAllHooksComponent('parent', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef();
-          ɵɵprojection(0);
-          ɵɵelement(1, 'view');
+          ΔprojectionDef();
+          Δprojection(0);
+          Δelement(1, 'view');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', ɵɵbind(ctx.val));
+          Δselect(1);
+          ΔelementProperty(1, 'val', Δbind(ctx.val));
         }
       }, 2, 1, [View]);
 
@@ -2893,21 +2892,21 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'parent');
-          { ɵɵelement(1, 'content'); }
-          ɵɵelementEnd();
-          ɵɵelementStart(2, 'parent');
-          { ɵɵelement(3, 'content'); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'parent');
+          { Δelement(1, 'content'); }
+          ΔelementEnd();
+          ΔelementStart(2, 'parent');
+          { Δelement(3, 'content'); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'val', ɵɵbind(1));
-          ɵɵselect(1);
-          ɵɵelementProperty(1, 'val', ɵɵbind(1));
-          ɵɵselect(2);
-          ɵɵelementProperty(2, 'val', ɵɵbind(2));
-          ɵɵselect(3);
-          ɵɵelementProperty(3, 'val', ɵɵbind(2));
+          ΔelementProperty(0, 'val', Δbind(1));
+          Δselect(1);
+          ΔelementProperty(1, 'val', Δbind(1));
+          Δselect(2);
+          ΔelementProperty(2, 'val', Δbind(2));
+          Δselect(3);
+          ΔelementProperty(3, 'val', Δbind(2));
         }
       }, 4, 4, [Parent, Content]);
 
@@ -2958,7 +2957,7 @@ describe('lifecycles', () => {
       class OnDestroyDirective implements OnDestroy {
         ngOnDestroy() { destroyed = true; }
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: OnDestroyDirective,
           selectors: [['', 'onDestroyDirective', '']],
           factory: () => new OnDestroyDirective()
@@ -2968,8 +2967,7 @@ describe('lifecycles', () => {
 
       function conditionTpl(rf: RenderFlags, ctx: Cmpt) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(
-              0, null, 0, 1, 'ng-template', [AttributeMarker.Bindings, 'onDestroyDirective']);
+          Δtemplate(0, null, 0, 1, 'ng-template', [AttributeMarker.Bindings, 'onDestroyDirective']);
         }
       }
 
@@ -2980,16 +2978,16 @@ describe('lifecycles', () => {
        */
       function cmptTpl(rf: RenderFlags, cmpt: Cmpt) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, conditionTpl, 1, 1, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
+          Δtemplate(0, conditionTpl, 1, 1, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'ngIf', ɵɵbind(cmpt.showing));
+          ΔelementProperty(0, 'ngIf', Δbind(cmpt.showing));
         }
       }
 
       class Cmpt {
         showing = true;
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Cmpt,
           factory: () => new Cmpt(),
           selectors: [['cmpt']],
diff --git a/packages/core/test/render3/listeners_spec.ts b/packages/core/test/render3/listeners_spec.ts
index 546c1155e3..b37695351e 100644
--- a/packages/core/test/render3/listeners_spec.ts
+++ b/packages/core/test/render3/listeners_spec.ts
@@ -8,11 +8,11 @@
 
 import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
 
-import {markDirty, ɵɵbind, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵreference, ɵɵresolveBody, ɵɵresolveDocument, ɵɵtextBinding} from '../../src/render3/index';
-import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵgetCurrentView, ɵɵlistener, ɵɵtext} from '../../src/render3/instructions/all';
+import {markDirty, Δbind, ΔdefineComponent, ΔdefineDirective, Δreference, ΔresolveBody, ΔresolveDocument, ΔtextBinding} from '../../src/render3/index';
+import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, ΔgetCurrentView, Δlistener, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {GlobalTargetResolver} from '../../src/render3/interfaces/renderer';
-import {ɵɵrestoreView} from '../../src/render3/state';
+import {ΔrestoreView} from '../../src/render3/state';
 
 import {getRendererFactory2} from './imported_renderer2';
 import {ComponentFixture, TemplateFixture, containerEl, createComponent, getDirectiveOnNode, renderToHtml, requestAnimationFrame} from './render_util';
@@ -28,7 +28,7 @@ describe('event listeners', () => {
 
     onClick() { this.counter++; }
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: MyComp,
       selectors: [['comp']],
       consts: 2,
@@ -36,12 +36,12 @@ describe('event listeners', () => {
       /** <button (click)="onClick()"> Click me </button> */
       template: function CompTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'button');
+          ΔelementStart(0, 'button');
           {
-            ɵɵlistener('click', function() { return ctx.onClick(); });
-            ɵɵtext(1, 'Click me');
+            Δlistener('click', function() { return ctx.onClick(); });
+            Δtext(1, 'Click me');
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       },
       factory: () => {
@@ -59,14 +59,14 @@ describe('event listeners', () => {
     /* @HostListener('body:click') */
     onBodyClick() { events.push('component - body:click'); }
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: MyCompWithGlobalListeners,
       selectors: [['comp']],
       consts: 1,
       vars: 0,
       template: function CompTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0, 'Some text');
+          Δtext(0, 'Some text');
         }
       },
       factory: () => {
@@ -77,12 +77,12 @@ describe('event listeners', () => {
       hostBindings: function HostListenerDir_HostBindings(
           rf: RenderFlags, ctx: any, elIndex: number) {
         if (rf & RenderFlags.Create) {
-          ɵɵlistener('custom', function() {
+          Δlistener('custom', function() {
             return ctx.onDocumentCustomEvent();
-          }, false, ɵɵresolveDocument as GlobalTargetResolver);
-          ɵɵlistener('click', function() {
+          }, false, ΔresolveDocument as GlobalTargetResolver);
+          Δlistener('click', function() {
             return ctx.onBodyClick();
-          }, false, ɵɵresolveBody as GlobalTargetResolver);
+          }, false, ΔresolveBody as GlobalTargetResolver);
         }
       }
     });
@@ -95,19 +95,19 @@ describe('event listeners', () => {
     /* @HostListener('body:click') */
     onBodyClick() { events.push('directive - body:click'); }
 
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: GlobalHostListenerDir,
       selectors: [['', 'hostListenerDir', '']],
       factory: function HostListenerDir_Factory() { return new GlobalHostListenerDir(); },
       hostBindings: function HostListenerDir_HostBindings(
           rf: RenderFlags, ctx: any, elIndex: number) {
         if (rf & RenderFlags.Create) {
-          ɵɵlistener('custom', function() {
+          Δlistener('custom', function() {
             return ctx.onDocumentCustomEvent();
-          }, false, ɵɵresolveDocument as GlobalTargetResolver);
-          ɵɵlistener('click', function() {
+          }, false, ΔresolveDocument as GlobalTargetResolver);
+          Δlistener('click', function() {
             return ctx.onBodyClick();
-          }, false, ɵɵresolveBody as GlobalTargetResolver);
+          }, false, ΔresolveBody as GlobalTargetResolver);
         }
       }
     });
@@ -129,7 +129,7 @@ describe('event listeners', () => {
       return this.handlerReturnValue;
     }
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: PreventDefaultComp,
       selectors: [['prevent-default-comp']],
       factory: () => new PreventDefaultComp(),
@@ -138,12 +138,12 @@ describe('event listeners', () => {
       /** <button (click)="onClick($event)">Click</button> */
       template: (rf: RenderFlags, ctx: PreventDefaultComp) => {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'button');
+          ΔelementStart(0, 'button');
           {
-            ɵɵlistener('click', function($event: any) { return ctx.onClick($event); });
-            ɵɵtext(1, 'Click');
+            Δlistener('click', function($event: any) { return ctx.onClick($event); });
+            Δtext(1, 'Click');
           }
-          ɵɵelementEnd();
+          ΔelementEnd();
         }
       }
     });
@@ -205,15 +205,15 @@ describe('event listeners', () => {
     /** <button (click)="onClick(); onClick2(); "> Click me </button> */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'button');
+        ΔelementStart(0, 'button');
         {
-          ɵɵlistener('click', function() {
+          Δlistener('click', function() {
             ctx.onClick();
             return ctx.onClick2();
           });
-          ɵɵtext(1, 'Click me');
+          Δtext(1, 'Click me');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }
 
@@ -240,12 +240,12 @@ describe('event listeners', () => {
     /** <button (click)="showing=!showing"> Click me </button> */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'button');
+        ΔelementStart(0, 'button');
         {
-          ɵɵlistener('click', function() { return ctx.showing = !ctx.showing; });
-          ɵɵtext(1, 'Click me');
+          Δlistener('click', function() { return ctx.showing = !ctx.showing; });
+          Δtext(1, 'Click me');
         }
-        ɵɵelementEnd();
+        ΔelementEnd();
       }
     }
 
@@ -269,24 +269,24 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           if (ctx.showing) {
-            if (ɵɵembeddedViewStart(1, 2, 0)) {
-              ɵɵelementStart(0, 'button');
+            if (ΔembeddedViewStart(1, 2, 0)) {
+              ΔelementStart(0, 'button');
               {
-                ɵɵlistener('click', function() { return ctx.onClick(); });
-                ɵɵtext(1, 'Click me');
+                Δlistener('click', function() { return ctx.onClick(); });
+                Δtext(1, 'Click me');
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -320,7 +320,7 @@ describe('event listeners', () => {
 
       onClick() { this.counter++; }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AppComp,
         selectors: [['app-comp']],
         factory: () => new AppComp(),
@@ -328,24 +328,24 @@ describe('event listeners', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵcontainer(0);
+            Δcontainer(0);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵcontainerRefreshStart(0);
+            ΔcontainerRefreshStart(0);
             {
               if (ctx.showing) {
-                if (ɵɵembeddedViewStart(0, 2, 0)) {
-                  ɵɵelementStart(0, 'button');
+                if (ΔembeddedViewStart(0, 2, 0)) {
+                  ΔelementStart(0, 'button');
                   {
-                    ɵɵlistener('click', function() { return ctx.onClick(); });
-                    ɵɵtext(1, 'Click me');
+                    Δlistener('click', function() { return ctx.onClick(); });
+                    Δtext(1, 'Click me');
                   }
-                  ɵɵelementEnd();
+                  ΔelementEnd();
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         }
       });
@@ -381,7 +381,7 @@ describe('event listeners', () => {
 
       onClick(index: number) { this.counters[index]++; }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AppComp,
         selectors: [['app-comp']],
         factory: () => new AppComp(),
@@ -389,24 +389,24 @@ describe('event listeners', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵcontainer(0);
+            Δcontainer(0);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵcontainerRefreshStart(0);
+            ΔcontainerRefreshStart(0);
             {
               for (let i = 0; i < ctx.buttons; i++) {
-                if (ɵɵembeddedViewStart(0, 2, 0)) {
-                  ɵɵelementStart(0, 'button');
+                if (ΔembeddedViewStart(0, 2, 0)) {
+                  ΔelementStart(0, 'button');
                   {
-                    ɵɵlistener('click', function() { return ctx.onClick(i); });
-                    ɵɵtext(1, 'Click me');
+                    Δlistener('click', function() { return ctx.onClick(i); });
+                    Δtext(1, 'Click me');
                   }
-                  ɵɵelementEnd();
+                  ΔelementEnd();
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         }
       });
@@ -445,7 +445,7 @@ describe('event listeners', () => {
 
       onClick(index: number) { this.counters[index]++; }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AppComp,
         selectors: [['app-comp']],
         factory: () => new AppComp(),
@@ -453,31 +453,31 @@ describe('event listeners', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵcontainer(0);
+            Δcontainer(0);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵcontainerRefreshStart(0);
+            ΔcontainerRefreshStart(0);
             {
               for (let i = 0; i < ctx.buttons; i++) {
-                const rf1 = ɵɵembeddedViewStart(1, 4, 1);
+                const rf1 = ΔembeddedViewStart(1, 4, 1);
                 if (rf1 & RenderFlags.Create) {
-                  ɵɵelementStart(0, 'button');
+                  ΔelementStart(0, 'button');
                   {
-                    ɵɵlistener('click', function() { return ctx.onClick(i); });
-                    ɵɵtext(1, 'Click me');
+                    Δlistener('click', function() { return ctx.onClick(i); });
+                    Δtext(1, 'Click me');
                   }
-                  ɵɵelementEnd();
-                  ɵɵelementStart(2, 'div');
-                  { ɵɵtext(3); }
-                  ɵɵelementEnd();
+                  ΔelementEnd();
+                  ΔelementStart(2, 'div');
+                  { Δtext(3); }
+                  ΔelementEnd();
                 }
                 if (rf1 & RenderFlags.Update) {
-                  ɵɵtextBinding(3, ɵɵbind(ctx.counters[i]));
+                  ΔtextBinding(3, Δbind(ctx.counters[i]));
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
             }
-            ɵɵcontainerRefreshEnd();
+            ΔcontainerRefreshEnd();
           }
         }
       });
@@ -523,21 +523,21 @@ describe('event listeners', () => {
       /* @HostListener('click') */
       onClick() { events.push('click!'); }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComp,
         selectors: [['comp']],
         consts: 1,
         vars: 0,
         template: function CompTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0, 'Some text');
+            Δtext(0, 'Some text');
           }
         },
         factory: () => { return new MyComp(); },
         hostBindings: function HostListenerDir_HostBindings(
             rf: RenderFlags, ctx: any, elIndex: number) {
           if (rf & RenderFlags.Create) {
-            ɵɵlistener('click', function() { return ctx.onClick(); });
+            Δlistener('click', function() { return ctx.onClick(); });
           }
         }
       });
@@ -574,23 +574,23 @@ describe('event listeners', () => {
       /* @HostListener('click') */
       onClick() { events.push('click!'); }
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: HostListenerDir,
         selectors: [['', 'hostListenerDir', '']],
         factory: function HostListenerDir_Factory() { return new HostListenerDir(); },
         hostBindings: function HostListenerDir_HostBindings(
             rf: RenderFlags, ctx: any, elIndex: number) {
           if (rf & RenderFlags.Create) {
-            ɵɵlistener('click', function() { return ctx.onClick(); });
+            Δlistener('click', function() { return ctx.onClick(); });
           }
         }
       });
     }
 
     const fixture = new TemplateFixture(() => {
-      ɵɵelementStart(0, 'button', ['hostListenerDir', '']);
-      ɵɵtext(1, 'Click');
-      ɵɵelementEnd();
+      ΔelementStart(0, 'button', ['hostListenerDir', '']);
+      Δtext(1, 'Click');
+      ΔelementEnd();
     }, () => {}, 2, 0, [HostListenerDir]);
 
     const button = fixture.hostElement.querySelector('button') !;
@@ -604,7 +604,7 @@ describe('event listeners', () => {
 
   it('should support global host listeners on directives', () => {
     const fixture = new TemplateFixture(() => {
-      ɵɵelement(0, 'div', ['hostListenerDir', '']);
+      Δelement(0, 'div', ['hostListenerDir', '']);
     }, () => {}, 1, 0, [GlobalHostListenerDir]);
 
     const doc = fixture.hostElement.ownerDocument !;
@@ -626,7 +626,7 @@ describe('event listeners', () => {
 
       onClick(a: any, b: any) { this.counter += a + b; }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComp,
         selectors: [['comp']],
         consts: 2,
@@ -634,12 +634,12 @@ describe('event listeners', () => {
         /** <button (click)="onClick(data.a, data.b)"> Click me </button> */
         template: function CompTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'button');
+            ΔelementStart(0, 'button');
             {
-              ɵɵlistener('click', function() { return ctx.onClick(ctx.data.a, ctx.data.b); });
-              ɵɵtext(1, 'Click me');
+              Δlistener('click', function() { return ctx.onClick(ctx.data.a, ctx.data.b); });
+              Δtext(1, 'Click me');
             }
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
         },
         factory: () => new MyComp()
@@ -669,39 +669,39 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           if (ctx.showing) {
-            let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+            let rf1 = ΔembeddedViewStart(0, 2, 0);
             if (rf1 & RenderFlags.Create) {
-              ɵɵtext(0, 'Hello');
-              ɵɵcontainer(1);
+              Δtext(0, 'Hello');
+              Δcontainer(1);
             }
             if (rf1 & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(1);
+              ΔcontainerRefreshStart(1);
               {
                 if (ctx.button) {
-                  let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+                  let rf1 = ΔembeddedViewStart(0, 2, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ɵɵelementStart(0, 'button');
+                    ΔelementStart(0, 'button');
                     {
-                      ɵɵlistener('click', function() { return ctx.onClick(); });
-                      ɵɵtext(1, 'Click');
+                      Δlistener('click', function() { return ctx.onClick(); });
+                      Δtext(1, 'Click');
                     }
-                    ɵɵelementEnd();
+                    ΔelementEnd();
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -733,22 +733,22 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           if (ctx.showing) {
-            let rf1 = ɵɵembeddedViewStart(0, 3, 0);
+            let rf1 = ΔembeddedViewStart(0, 3, 0);
             if (rf1 & RenderFlags.Create) {
-              ɵɵtext(0, 'Hello');
-              ɵɵelement(1, 'comp');
-              ɵɵelement(2, 'comp');
+              Δtext(0, 'Hello');
+              Δelement(1, 'comp');
+              Δelement(2, 'comp');
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -775,19 +775,19 @@ describe('event listeners', () => {
     const ctx = {showing: true};
 
     const fixture = new TemplateFixture(
-        () => { ɵɵcontainer(0); },
+        () => { Δcontainer(0); },
         () => {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             if (ctx.showing) {
-              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+              let rf1 = ΔembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'comp');
+                Δelement(0, 'comp');
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         },
         1, 0, [MyCompWithGlobalListeners]);
 
@@ -820,56 +820,56 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           if (ctx.condition) {
-            let rf1 = ɵɵembeddedViewStart(0, 3, 0);
+            let rf1 = ΔembeddedViewStart(0, 3, 0);
             if (rf1 & RenderFlags.Create) {
-              ɵɵtext(0, 'Hello');
-              ɵɵcontainer(1);
-              ɵɵcontainer(2);
+              Δtext(0, 'Hello');
+              Δcontainer(1);
+              Δcontainer(2);
             }
             if (rf1 & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(1);
+              ΔcontainerRefreshStart(1);
               {
                 if (ctx.sub1) {
-                  let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+                  let rf1 = ΔembeddedViewStart(0, 2, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ɵɵelementStart(0, 'button');
+                    ΔelementStart(0, 'button');
                     {
-                      ɵɵlistener('click', function() { return ctx.counter1++; });
-                      ɵɵtext(1, 'Click');
+                      Δlistener('click', function() { return ctx.counter1++; });
+                      Δtext(1, 'Click');
                     }
-                    ɵɵelementEnd();
+                    ΔelementEnd();
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
-              ɵɵcontainerRefreshStart(2);
+              ΔcontainerRefreshEnd();
+              ΔcontainerRefreshStart(2);
               {
                 if (ctx.sub2) {
-                  let rf1 = ɵɵembeddedViewStart(0, 2, 0);
+                  let rf1 = ΔembeddedViewStart(0, 2, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ɵɵelementStart(0, 'button');
+                    ΔelementStart(0, 'button');
                     {
-                      ɵɵlistener('click', function() { return ctx.counter2++; });
-                      ɵɵtext(1, 'Click');
+                      Δlistener('click', function() { return ctx.counter2++; });
+                      Δtext(1, 'Click');
                     }
-                    ɵɵelementEnd();
+                    ΔelementEnd();
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
@@ -907,7 +907,7 @@ describe('event listeners', () => {
 
       onClick(comp: any) { this.comp = comp; }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: App,
         selectors: [['app']],
         factory: () => new App(),
@@ -915,17 +915,17 @@ describe('event listeners', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: App) => {
           if (rf & RenderFlags.Create) {
-            const state = ɵɵgetCurrentView();
-            ɵɵelement(0, 'comp', null, ['comp', '']);
-            ɵɵelementStart(2, 'button');
+            const state = ΔgetCurrentView();
+            Δelement(0, 'comp', null, ['comp', '']);
+            ΔelementStart(2, 'button');
             {
-              ɵɵlistener('click', function() {
-                ɵɵrestoreView(state);
-                const comp = ɵɵreference(1);
+              Δlistener('click', function() {
+                ΔrestoreView(state);
+                const comp = Δreference(1);
                 return ctx.onClick(comp);
               });
             }
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
 
           // testing only
diff --git a/packages/core/test/render3/outputs_spec.ts b/packages/core/test/render3/outputs_spec.ts
index 58607ea713..efc1c8605f 100644
--- a/packages/core/test/render3/outputs_spec.ts
+++ b/packages/core/test/render3/outputs_spec.ts
@@ -8,8 +8,8 @@
 
 import {EventEmitter} from '@angular/core';
 
-import {ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
-import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵlistener, ɵɵtext} from '../../src/render3/instructions/all';
+import {ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
+import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δlistener, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {renderToHtml} from './render_util';
@@ -21,7 +21,7 @@ describe('outputs', () => {
     change = new EventEmitter();
     resetStream = new EventEmitter();
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: ButtonToggle,
       selectors: [['button-toggle']],
       template: function(rf: RenderFlags, ctx: any) {},
@@ -37,7 +37,7 @@ describe('outputs', () => {
   class OtherDir {
     changeStream = new EventEmitter();
 
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: OtherDir,
       selectors: [['', 'otherDir', '']],
       factory: () => otherDir = new OtherDir,
@@ -60,39 +60,39 @@ describe('outputs', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'button');
+        ΔelementStart(0, 'button');
         {
-          ɵɵlistener('click', function() { return ctx.onClick(); });
-          ɵɵtext(1, 'Click me');
+          Δlistener('click', function() { return ctx.onClick(); });
+          Δtext(1, 'Click me');
         }
-        ɵɵelementEnd();
-        ɵɵcontainer(2);
+        ΔelementEnd();
+        Δcontainer(2);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(2);
+        ΔcontainerRefreshStart(2);
         {
           if (ctx.condition) {
-            let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+            let rf1 = ΔembeddedViewStart(0, 1, 0);
             if (rf1 & RenderFlags.Create) {
-              ɵɵelementStart(0, 'button-toggle');
+              ΔelementStart(0, 'button-toggle');
               {
-                ɵɵlistener('change', function() { return ctx.onChange(); });
+                Δlistener('change', function() { return ctx.onChange(); });
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           } else {
-            if (ɵɵembeddedViewStart(1, 1, 0)) {
-              ɵɵelementStart(0, 'div', ['otherDir', '']);
+            if (ΔembeddedViewStart(1, 1, 0)) {
+              ΔelementStart(0, 'div', ['otherDir', '']);
               {
-                ɵɵlistener('change', function() { return ctx.onChange(); });
+                Δlistener('change', function() { return ctx.onChange(); });
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
diff --git a/packages/core/test/render3/pipe_spec.ts b/packages/core/test/render3/pipe_spec.ts
index e91dadd74a..44f0464af3 100644
--- a/packages/core/test/render3/pipe_spec.ts
+++ b/packages/core/test/render3/pipe_spec.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive as _Directive, Pipe as _Pipe, PipeTransform, WrappedValue, ɵɵdefinePipe} from '@angular/core';
+import {Directive as _Directive, Pipe as _Pipe, PipeTransform, WrappedValue, ΔdefinePipe} from '@angular/core';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
-import {ɵɵinterpolation1, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
-import {ɵɵpipe, ɵɵpipeBind1} from '../../src/render3/pipe';
+import {Δinterpolation1, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {Δpipe, ΔpipeBind1} from '../../src/render3/pipe';
 
 import {TemplateFixture} from './render_util';
 
@@ -29,7 +29,7 @@ describe('pipe', () => {
     class WrappingPipe implements PipeTransform {
       transform(value: any) { return new WrappedValue('Bar'); }
 
-      static ngPipeDef = ɵɵdefinePipe({
+      static ngPipeDef = ΔdefinePipe({
         name: 'wrappingPipe',
         type: WrappingPipe,
         factory: function WrappingPipe_Factory() { return new WrappingPipe(); },
@@ -38,13 +38,11 @@ describe('pipe', () => {
     }
 
     function createTemplate() {
-      ɵɵtext(0);
-      ɵɵpipe(1, 'wrappingPipe');
+      Δtext(0);
+      Δpipe(1, 'wrappingPipe');
     }
 
-    function updateTemplate() {
-      ɵɵtextBinding(0, ɵɵinterpolation1('', ɵɵpipeBind1(1, 1, null), ''));
-    }
+    function updateTemplate() { ΔtextBinding(0, Δinterpolation1('', ΔpipeBind1(1, 1, null), '')); }
 
     it('should unwrap', () => {
       const fixture =
diff --git a/packages/core/test/render3/providers_spec.ts b/packages/core/test/render3/providers_spec.ts
index 0e64029c90..021b7a18db 100644
--- a/packages/core/test/render3/providers_spec.ts
+++ b/packages/core/test/render3/providers_spec.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component as _Component, ComponentFactoryResolver, ElementRef, InjectFlags, Injectable as _Injectable, InjectionToken, InjectorType, Provider, RendererFactory2, ViewContainerRef, ɵNgModuleDef as NgModuleDef, ɵɵdefineInjectable, ɵɵdefineInjector, ɵɵinject} from '../../src/core';
+import {Component as _Component, ComponentFactoryResolver, ElementRef, InjectFlags, Injectable as _Injectable, InjectionToken, InjectorType, Provider, RendererFactory2, ViewContainerRef, ɵNgModuleDef as NgModuleDef, ΔdefineInjectable, ΔdefineInjector, Δinject} from '../../src/core';
 import {forwardRef} from '../../src/di/forward_ref';
 import {createInjector} from '../../src/di/r3_injector';
-import {injectComponentFactoryResolver, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdirectiveInject} from '../../src/render3/index';
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {injectComponentFactoryResolver, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective, ΔdirectiveInject} from '../../src/render3/index';
+import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {NgModuleFactory} from '../../src/render3/ng_module_ref';
 import {getInjector} from '../../src/render3/util/discovery_utils';
@@ -59,7 +59,7 @@ describe('providers', () => {
       constructor(private provider: GreeterProvider) { this.greet = this.provider.provide(); }
 
       static ngInjectableDef =
-          ɵɵdefineInjectable({factory: () => new GreeterInj(ɵɵinject(GreeterProvider as any))});
+          ΔdefineInjectable({factory: () => new GreeterInj(Δinject(GreeterProvider as any))});
     }
 
     it('TypeProvider', () => {
@@ -67,7 +67,7 @@ describe('providers', () => {
         parent: {
           providers: [GreeterClass],
           componentAssertion:
-              () => { expect(ɵɵdirectiveInject(GreeterClass).greet).toEqual('Class'); }
+              () => { expect(ΔdirectiveInject(GreeterClass).greet).toEqual('Class'); }
         }
       });
     });
@@ -76,7 +76,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [{provide: GREETER, useValue: {greet: 'Value'}}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Value'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Value'); }
         }
       });
     });
@@ -85,7 +85,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [{provide: GREETER, useClass: GreeterClass}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
         }
       });
     });
@@ -94,7 +94,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [GreeterClass, {provide: GREETER, useExisting: GreeterClass}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
         }
       });
     });
@@ -103,7 +103,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [GreeterClass, {provide: GREETER, useFactory: () => new GreeterClass()}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
         }
       });
     });
@@ -117,7 +117,7 @@ describe('providers', () => {
             {provide: MESSAGE, useValue: 'Message'},
             {provide: GREETER, useClass: GreeterDeps, deps: [MESSAGE]}
           ],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message'); }
         }
       });
     });
@@ -130,7 +130,7 @@ describe('providers', () => {
             {provide: GREETER, useClass: GreeterBuiltInDeps, deps: [MESSAGE, ElementRef]}
           ],
           componentAssertion:
-              () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
+              () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
         }
       });
     });
@@ -142,7 +142,7 @@ describe('providers', () => {
             {provide: MESSAGE, useValue: 'Message'},
             {provide: GREETER, useFactory: (msg: string) => new GreeterDeps(msg), deps: [MESSAGE]}
           ],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message'); }
         }
       });
     });
@@ -159,7 +159,7 @@ describe('providers', () => {
             }
           ],
           componentAssertion:
-              () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
+              () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
         }
       });
     });
@@ -168,8 +168,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [GreeterProvider, {provide: GREETER, useClass: GreeterInj}],
-          componentAssertion:
-              () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Provided'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Provided'); }
         }
       });
     });
@@ -181,7 +180,7 @@ describe('providers', () => {
             parent: {
               providers: [forwardRef(() => ForLater)],
               componentAssertion:
-                  () => { expect(ɵɵdirectiveInject(ForLater) instanceof ForLater).toBeTruthy(); }
+                  () => { expect(ΔdirectiveInject(ForLater) instanceof ForLater).toBeTruthy(); }
             }
           });
           done();
@@ -196,7 +195,7 @@ describe('providers', () => {
           parent: {
             providers:
                 [{provide: GREETER, useValue: forwardRef(() => { return {greet: 'Value'}; })}],
-            componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Value'); }
+            componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Value'); }
           }
         });
       });
@@ -205,7 +204,7 @@ describe('providers', () => {
         expectProvidersScenario({
           parent: {
             providers: [{provide: GREETER, useClass: forwardRef(() => GreeterClass)}],
-            componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
+            componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
           }
         });
       });
@@ -215,7 +214,7 @@ describe('providers', () => {
           parent: {
             providers:
                 [GreeterClass, {provide: GREETER, useExisting: forwardRef(() => GreeterClass)}],
-            componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
+            componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
           }
         });
       });
@@ -226,7 +225,7 @@ describe('providers', () => {
           parent: {
             providers: [{provide: GREETER, useValue: {greet: 'Value'}}],
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(forwardRef(() => GREETER)).greet).toEqual('Value');
+              expect(ΔdirectiveInject(forwardRef(() => GREETER)).greet).toEqual('Value');
             }
           }
         });
@@ -256,7 +255,7 @@ describe('providers', () => {
         parent: {
           providers: [{provide: String, useValue: 'Message 1'}],
           directiveProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -266,7 +265,7 @@ describe('providers', () => {
         parent: {
           providers: [{provide: String, useValue: 'Message 1'}],
           viewProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -276,7 +275,7 @@ describe('providers', () => {
         parent: {
           directiveProviders: [{provide: String, useValue: 'Message 1'}],
           viewProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -286,7 +285,7 @@ describe('providers', () => {
         parent: {
           directive2Providers: [{provide: String, useValue: 'Message 1'}],
           directiveProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -296,7 +295,7 @@ describe('providers', () => {
         parent: {
           providers:
               [{provide: String, useValue: 'Message 1'}, {provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -306,7 +305,7 @@ describe('providers', () => {
         parent: {
           viewProviders:
               [{provide: String, useValue: 'Message 1'}, {provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -316,7 +315,7 @@ describe('providers', () => {
         parent: {
           directiveProviders:
               [{provide: String, useValue: 'Message 1'}, {provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -324,7 +323,7 @@ describe('providers', () => {
 
   describe('single', () => {
     class MyModule {
-      static ngInjectorDef = ɵɵdefineInjector(
+      static ngInjectorDef = ΔdefineInjector(
           {factory: () => new MyModule(), providers: [{provide: String, useValue: 'From module'}]});
     }
 
@@ -332,16 +331,16 @@ describe('providers', () => {
       it('should work without providers nor viewProviders in component', () => {
         expectProvidersScenario({
           parent: {
-            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
           },
           viewChild: {
-            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
           },
           contentChild: {
-            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
           },
           ngModule: MyModule
         });
@@ -352,21 +351,21 @@ describe('providers', () => {
           parent: {
             providers: [{provide: String, useValue: 'From providers'}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
           },
           ngModule: MyModule
         });
@@ -377,18 +376,18 @@ describe('providers', () => {
           parent: {
             viewProviders: [{provide: String, useValue: 'From viewProviders'}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
-            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
-            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
           },
           ngModule: MyModule
         });
@@ -400,21 +399,21 @@ describe('providers', () => {
             providers: [{provide: String, useValue: 'From providers'}],
             viewProviders: [{provide: String, useValue: 'From viewProviders'}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
           },
           ngModule: MyModule
         });
@@ -428,21 +427,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -455,21 +454,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -482,21 +481,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -510,21 +509,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -534,7 +533,7 @@ describe('providers', () => {
 
   describe('multi', () => {
     class MyModule {
-      static ngInjectorDef = ɵɵdefineInjector({
+      static ngInjectorDef = ΔdefineInjector({
         factory: () => new MyModule(),
         providers: [{provide: String, useValue: 'From module', multi: true}]
       });
@@ -545,21 +544,18 @@ describe('providers', () => {
         expectProvidersScenario({
           parent: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
           },
           ngModule: MyModule
         });
@@ -570,21 +566,21 @@ describe('providers', () => {
           parent: {
             providers: [{provide: String, useValue: 'From providers', multi: true}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
           },
           ngModule: MyModule
         });
@@ -595,21 +591,19 @@ describe('providers', () => {
           parent: {
             viewProviders: [{provide: String, useValue: 'From viewProviders', multi: true}],
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From viewProviders']); },
-            directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From viewProviders']); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From viewProviders']); },
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From viewProviders']); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From viewProviders']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From viewProviders']); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
           },
           ngModule: MyModule
         });
@@ -621,24 +615,24 @@ describe('providers', () => {
             providers: [{provide: String, useValue: 'From providers', multi: true}],
             viewProviders: [{provide: String, useValue: 'From viewProviders', multi: true}],
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
+              expect(ΔdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
             },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
+              expect(ΔdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
+              expect(ΔdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
             }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
           },
           ngModule: MyModule
         });
@@ -652,26 +646,26 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           ngModule: MyModule
@@ -685,36 +679,36 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
@@ -730,32 +724,32 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           ngModule: MyModule
@@ -770,36 +764,36 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ɵɵdirectiveInject(String)).toEqual([
+              expect(ΔdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
@@ -815,20 +809,20 @@ describe('providers', () => {
       @Injectable({providedIn: 'root'})
       class FooForRoot {
         static ngInjectableDef =
-            ɵɵdefineInjectable({factory: () => new FooForRoot(), providedIn: 'root'});
+            ΔdefineInjectable({factory: () => new FooForRoot(), providedIn: 'root'});
       }
 
       expectProvidersScenario({
         parent: {
           componentAssertion:
-              () => { expect(ɵɵdirectiveInject(FooForRoot) instanceof FooForRoot).toBeTruthy(); }
+              () => { expect(ΔdirectiveInject(FooForRoot) instanceof FooForRoot).toBeTruthy(); }
         }
       });
     });
 
     it('should work with a module', () => {
       class MyModule {
-        static ngInjectorDef = ɵɵdefineInjector({
+        static ngInjectorDef = ΔdefineInjector({
           factory: () => new MyModule(),
           providers: [{provide: String, useValue: 'From module'}]
         });
@@ -837,14 +831,13 @@ describe('providers', () => {
       @Injectable({providedIn: MyModule})
       class FooForModule {
         static ngInjectableDef =
-            ɵɵdefineInjectable({factory: () => new FooForModule(), providedIn: MyModule});
+            ΔdefineInjectable({factory: () => new FooForModule(), providedIn: MyModule});
       }
 
       expectProvidersScenario({
         parent: {
-          componentAssertion: () => {
-            expect(ɵɵdirectiveInject(FooForModule) instanceof FooForModule).toBeTruthy();
-          }
+          componentAssertion:
+              () => { expect(ΔdirectiveInject(FooForModule) instanceof FooForModule).toBeTruthy(); }
         },
         ngModule: MyModule
       });
@@ -859,20 +852,20 @@ describe('providers', () => {
       class Repeated {
         constructor(private s: String, private n: Number) {}
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Repeated,
           selectors: [['repeated']],
-          factory: () => new Repeated(ɵɵdirectiveInject(String), ɵɵdirectiveInject(Number)),
+          factory: () => new Repeated(ΔdirectiveInject(String), ΔdirectiveInject(Number)),
           consts: 2,
           vars: 2,
           template: function(fs: RenderFlags, ctx: Repeated) {
             if (fs & RenderFlags.Create) {
-              ɵɵtext(0);
-              ɵɵtext(1);
+              Δtext(0);
+              Δtext(1);
             }
             if (fs & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.s));
-              ɵɵtextBinding(1, ɵɵbind(ctx.n));
+              ΔtextBinding(0, Δbind(ctx.s));
+              ΔtextBinding(1, Δbind(ctx.n));
             }
           }
         });
@@ -889,7 +882,7 @@ describe('providers', () => {
             [{provide: String, useValue: 'foo'}, {provide: Number, useValue: 2, multi: true}],
       })
       class ComponentWithProviders {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ComponentWithProviders,
           selectors: [['component-with-providers']],
           factory: () => new ComponentWithProviders(),
@@ -897,28 +890,28 @@ describe('providers', () => {
           vars: 0,
           template: function(fs: RenderFlags, ctx: ComponentWithProviders) {
             if (fs & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              { ɵɵcontainer(1); }
-              ɵɵelementEnd();
+              ΔelementStart(0, 'div');
+              { Δcontainer(1); }
+              ΔelementEnd();
             }
             if (fs & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(1);
+              ΔcontainerRefreshStart(1);
               {
                 for (let i = 0; i < 3; i++) {
-                  let rf1 = ɵɵembeddedViewStart(1, 1, 0);
+                  let rf1 = ΔembeddedViewStart(1, 1, 0);
                   {
                     if (rf1 & RenderFlags.Create) {
-                      ɵɵelement(0, 'repeated');
+                      Δelement(0, 'repeated');
                     }
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
           },
           features: [
-            ɵɵProvidersFeature(
+            ΔProvidersFeature(
                 [{provide: Number, useValue: 1, multi: true}],
                 [{provide: String, useValue: 'foo'}, {provide: Number, useValue: 2, multi: true}]),
           ],
@@ -942,24 +935,24 @@ describe('providers', () => {
       class Repeated {
         constructor(private s: String, private n: Number) {}
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Repeated,
           selectors: [['repeated']],
-          factory: () => new Repeated(ɵɵdirectiveInject(String), ɵɵdirectiveInject(Number)),
+          factory: () => new Repeated(ΔdirectiveInject(String), ΔdirectiveInject(Number)),
           consts: 2,
           vars: 2,
           template: function(fs: RenderFlags, ctx: Repeated) {
             if (fs & RenderFlags.Create) {
-              ɵɵtext(0);
-              ɵɵtext(1);
+              Δtext(0);
+              Δtext(1);
             }
             if (fs & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵbind(ctx.s));
-              ɵɵtextBinding(1, ɵɵbind(ctx.n));
+              ΔtextBinding(0, Δbind(ctx.s));
+              ΔtextBinding(1, Δbind(ctx.n));
             }
           },
           features: [
-            ɵɵProvidersFeature(
+            ΔProvidersFeature(
                 [{provide: Number, useValue: 1, multi: true}],
                 [{provide: String, useValue: 'bar'}, {provide: Number, useValue: 2, multi: true}]),
           ],
@@ -975,7 +968,7 @@ describe('providers', () => {
         viewProviders: [{provide: toString, useValue: 'foo'}],
       })
       class ComponentWithProviders {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ComponentWithProviders,
           selectors: [['component-with-providers']],
           factory: () => new ComponentWithProviders(),
@@ -983,27 +976,27 @@ describe('providers', () => {
           vars: 0,
           template: function(fs: RenderFlags, ctx: ComponentWithProviders) {
             if (fs & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              { ɵɵcontainer(1); }
-              ɵɵelementEnd();
+              ΔelementStart(0, 'div');
+              { Δcontainer(1); }
+              ΔelementEnd();
             }
             if (fs & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(1);
+              ΔcontainerRefreshStart(1);
               {
                 for (let i = 0; i < 3; i++) {
-                  let rf1 = ɵɵembeddedViewStart(1, 1, 0);
+                  let rf1 = ΔembeddedViewStart(1, 1, 0);
                   {
                     if (rf1 & RenderFlags.Create) {
-                      ɵɵelement(0, 'repeated');
+                      Δelement(0, 'repeated');
                     }
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
           },
-          features: [ɵɵProvidersFeature([], [{provide: String, useValue: 'foo'}])],
+          features: [ΔProvidersFeature([], [{provide: String, useValue: 'foo'}])],
           directives: [Repeated]
         });
       }
@@ -1024,18 +1017,18 @@ describe('providers', () => {
     class EmbeddedComponent {
       constructor(private s: String) {}
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: EmbeddedComponent,
         selectors: [['embedded-cmp']],
-        factory: () => new EmbeddedComponent(ɵɵdirectiveInject(String)),
+        factory: () => new EmbeddedComponent(ΔdirectiveInject(String)),
         consts: 1,
         vars: 1,
         template: (rf: RenderFlags, cmp: EmbeddedComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0);
+            Δtext(0);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(0, ɵɵinterpolation1('', cmp.s, ''));
+            ΔtextBinding(0, Δinterpolation1('', cmp.s, ''));
           }
         }
       });
@@ -1045,20 +1038,20 @@ describe('providers', () => {
     class HostComponent {
       constructor(public vcref: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: HostComponent,
         selectors: [['host-cmp']],
         factory: () => hostComponent = new HostComponent(
-                     ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                     ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
         consts: 1,
         vars: 0,
         template: (rf: RenderFlags, cmp: HostComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0, 'foo');
+            Δtext(0, 'foo');
           }
         },
         features: [
-          ɵɵProvidersFeature([{provide: String, useValue: 'From host component'}]),
+          ΔProvidersFeature([{provide: String, useValue: 'From host component'}]),
         ],
       });
     }
@@ -1070,7 +1063,7 @@ describe('providers', () => {
     class AppComponent {
       constructor() {}
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AppComponent,
         selectors: [['app-cmp']],
         factory: () => new AppComponent(),
@@ -1078,11 +1071,11 @@ describe('providers', () => {
         vars: 0,
         template: (rf: RenderFlags, cmp: AppComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'host-cmp');
+            Δelement(0, 'host-cmp');
           }
         },
         features: [
-          ɵɵProvidersFeature([{provide: String, useValue: 'From app component'}]),
+          ΔProvidersFeature([{provide: String, useValue: 'From app component'}]),
         ],
         directives: [HostComponent]
       });
@@ -1111,7 +1104,7 @@ describe('providers', () => {
          expect(fixture.html).toEqual('<host-cmp>foo</host-cmp>');
 
          class MyAppModule {
-           static ngInjectorDef = ɵɵdefineInjector({
+           static ngInjectorDef = ΔdefineInjector({
              factory: () => new MyAppModule(),
              imports: [],
              providers: [
@@ -1154,7 +1147,7 @@ describe('providers', () => {
            constructor(public value: String) {}
 
            static ngInjectableDef =
-               ɵɵdefineInjectable({factory: () => new MyService(ɵɵinject(String))});
+               ΔdefineInjectable({factory: () => new MyService(Δinject(String))});
          }
 
          expectProvidersScenario({
@@ -1162,8 +1155,8 @@ describe('providers', () => {
              providers: [MyService, {provide: String, useValue: 'providers'}],
              viewProviders: [{provide: String, useValue: 'viewProviders'}],
              componentAssertion: () => {
-               expect(ɵɵdirectiveInject(String)).toEqual('viewProviders');
-               expect(ɵɵdirectiveInject(MyService).value).toEqual('providers');
+               expect(ΔdirectiveInject(String)).toEqual('viewProviders');
+               expect(ΔdirectiveInject(MyService).value).toEqual('providers');
              }
            }
          });
@@ -1171,7 +1164,7 @@ describe('providers', () => {
 
     it('should make sure that parent service does not see overrides in child directives', () => {
       class Greeter {
-        static ngInjectableDef = ɵɵdefineInjectable({factory: () => new Greeter(ɵɵinject(String))});
+        static ngInjectableDef = ΔdefineInjectable({factory: () => new Greeter(Δinject(String))});
         constructor(public greeting: String) {}
       }
 
@@ -1182,7 +1175,7 @@ describe('providers', () => {
         viewChild: {
           providers: [{provide: String, useValue: 'view'}],
           componentAssertion:
-              () => { expect(ɵɵdirectiveInject(Greeter).greeting).toEqual('parent'); },
+              () => { expect(ΔdirectiveInject(Greeter).greeting).toEqual('parent'); },
         },
       });
     });
@@ -1190,7 +1183,7 @@ describe('providers', () => {
 
   describe('injection flags', () => {
     class MyModule {
-      static ngInjectorDef = ɵɵdefineInjector(
+      static ngInjectorDef = ΔdefineInjector(
           {factory: () => new MyModule(), providers: [{provide: String, useValue: 'Module'}]});
     }
     it('should not fall through to ModuleInjector if flags limit the scope', () => {
@@ -1198,9 +1191,9 @@ describe('providers', () => {
         ngModule: MyModule,
         parent: {
           componentAssertion: () => {
-            expect(ɵɵdirectiveInject(String)).toEqual('Module');
-            expect(ɵɵdirectiveInject(String, InjectFlags.Optional | InjectFlags.Self)).toBeNull();
-            expect(ɵɵdirectiveInject(String, InjectFlags.Optional | InjectFlags.Host)).toBeNull();
+            expect(ΔdirectiveInject(String)).toEqual('Module');
+            expect(ΔdirectiveInject(String, InjectFlags.Optional | InjectFlags.Self)).toBeNull();
+            expect(ΔdirectiveInject(String, InjectFlags.Optional | InjectFlags.Host)).toBeNull();
           }
         }
       });
@@ -1213,7 +1206,7 @@ describe('providers', () => {
     class SomeInj implements Some {
       constructor(public location: String) {}
 
-      static ngInjectableDef = ɵɵdefineInjectable({factory: () => new SomeInj(ɵɵinject(String))});
+      static ngInjectableDef = ΔdefineInjectable({factory: () => new SomeInj(Δinject(String))});
     }
 
     @Component({
@@ -1224,7 +1217,7 @@ describe('providers', () => {
     class MyComponent {
       constructor() {}
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: MyComponent,
         selectors: [['my-cmp']],
         factory: () => new MyComponent(),
@@ -1232,11 +1225,11 @@ describe('providers', () => {
         vars: 0,
         template: (rf: RenderFlags, cmp: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'p');
+            Δelement(0, 'p');
           }
         },
         features: [
-          ɵɵProvidersFeature(
+          ΔProvidersFeature(
               [{provide: String, useValue: 'From my component'}],
               [{provide: Number, useValue: 123}]),
         ],
@@ -1251,7 +1244,7 @@ describe('providers', () => {
     class AppComponent {
       constructor() {}
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AppComponent,
         selectors: [['app-cmp']],
         factory: () => new AppComponent(),
@@ -1259,11 +1252,11 @@ describe('providers', () => {
         vars: 0,
         template: (rf: RenderFlags, cmp: AppComponent) => {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'my-cmp');
+            Δelement(0, 'my-cmp');
           }
         },
         features: [
-          ɵɵProvidersFeature([
+          ΔProvidersFeature([
             {provide: String, useValue: 'From app component'}, {provide: Some, useClass: SomeInj}
           ]),
         ],
@@ -1314,18 +1307,18 @@ describe('providers', () => {
       class MyComponent {
         constructor(foo: InjectableWithLifeCycleHooks) {}
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: MyComponent,
           selectors: [['my-comp']],
-          factory: () => new MyComponent(ɵɵdirectiveInject(InjectableWithLifeCycleHooks)),
+          factory: () => new MyComponent(ΔdirectiveInject(InjectableWithLifeCycleHooks)),
           consts: 1,
           vars: 0,
           template: (rf: RenderFlags, ctx: MyComponent) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'span');
+              Δelement(0, 'span');
             }
           },
-          features: [ɵɵProvidersFeature([InjectableWithLifeCycleHooks])]
+          features: [ΔProvidersFeature([InjectableWithLifeCycleHooks])]
         });
       }
 
@@ -1341,7 +1334,7 @@ describe('providers', () => {
       class App {
         public condition = true;
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: App,
           selectors: [['app-cmp']],
           factory: () => new App(),
@@ -1349,24 +1342,24 @@ describe('providers', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: App) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              { ɵɵcontainer(1); }
-              ɵɵelementEnd();
+              ΔelementStart(0, 'div');
+              { Δcontainer(1); }
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(1);
+              ΔcontainerRefreshStart(1);
               {
                 if (ctx.condition) {
-                  let rf1 = ɵɵembeddedViewStart(1, 2, 1);
+                  let rf1 = ΔembeddedViewStart(1, 2, 1);
                   {
                     if (rf1 & RenderFlags.Create) {
-                      ɵɵelement(0, 'my-comp');
+                      Δelement(0, 'my-comp');
                     }
                   }
-                  ɵɵembeddedViewEnd();
+                  ΔembeddedViewEnd();
                 }
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
           },
           directives: [MyComponent]
@@ -1416,7 +1409,7 @@ function expectProvidersScenario(defs: {
   }
 
   class ViewChildComponent {
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: ViewChildComponent,
       selectors: [['view-child']],
       consts: 1,
@@ -1424,27 +1417,27 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.viewChild, new ViewChildComponent()),
       template: function(fs: RenderFlags, ctx: ViewChildComponent) {
         if (fs & RenderFlags.Create) {
-          ɵɵtext(0, 'view-child');
+          Δtext(0, 'view-child');
         }
       },
       features: defs.viewChild &&
           [
-            ɵɵProvidersFeature(defs.viewChild.providers || [], defs.viewChild.viewProviders || []),
+            ΔProvidersFeature(defs.viewChild.providers || [], defs.viewChild.viewProviders || []),
           ],
     });
   }
 
   class ViewChildDirective {
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: ViewChildDirective,
       selectors: [['view-child']],
       factory: () => testDirectiveInjection(defs.viewChild, new ViewChildDirective()),
-      features: defs.viewChild && [ɵɵProvidersFeature(defs.viewChild.directiveProviders || [])],
+      features: defs.viewChild && [ΔProvidersFeature(defs.viewChild.directiveProviders || [])],
     });
   }
 
   class ContentChildComponent {
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: ContentChildComponent,
       selectors: [['content-child']],
       consts: 1,
@@ -1452,28 +1445,28 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.contentChild, new ContentChildComponent()),
       template: function(fs: RenderFlags, ctx: ParentComponent) {
         if (fs & RenderFlags.Create) {
-          ɵɵtext(0, 'content-child');
+          Δtext(0, 'content-child');
         }
       },
       features: defs.contentChild &&
-          [ɵɵProvidersFeature(
+          [ΔProvidersFeature(
               defs.contentChild.providers || [], defs.contentChild.viewProviders || [])],
     });
   }
 
   class ContentChildDirective {
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: ContentChildDirective,
       selectors: [['content-child']],
       factory: () => testDirectiveInjection(defs.contentChild, new ContentChildDirective()),
       features:
-          defs.contentChild && [ɵɵProvidersFeature(defs.contentChild.directiveProviders || [])],
+          defs.contentChild && [ΔProvidersFeature(defs.contentChild.directiveProviders || [])],
     });
   }
 
 
   class ParentComponent {
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: ParentComponent,
       selectors: [['parent']],
       consts: 1,
@@ -1481,36 +1474,36 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.parent, new ParentComponent()),
       template: function(fs: RenderFlags, ctx: ParentComponent) {
         if (fs & RenderFlags.Create) {
-          ɵɵelement(0, 'view-child');
+          Δelement(0, 'view-child');
         }
       },
       features: defs.parent &&
-          [ɵɵProvidersFeature(defs.parent.providers || [], defs.parent.viewProviders || [])],
+          [ΔProvidersFeature(defs.parent.providers || [], defs.parent.viewProviders || [])],
       directives: [ViewChildComponent, ViewChildDirective]
     });
   }
 
   class ParentDirective {
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: ParentDirective,
       selectors: [['parent']],
       factory: () => testDirectiveInjection(defs.parent, new ParentDirective()),
-      features: defs.parent && [ɵɵProvidersFeature(defs.parent.directiveProviders || [])],
+      features: defs.parent && [ΔProvidersFeature(defs.parent.directiveProviders || [])],
     });
   }
 
   class ParentDirective2 {
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: ParentDirective2,
       selectors: [['parent']],
       factory: () => testDirectiveInjection(defs.parent, new ParentDirective2()),
-      features: defs.parent && [ɵɵProvidersFeature(defs.parent.directive2Providers || [])],
+      features: defs.parent && [ΔProvidersFeature(defs.parent.directive2Providers || [])],
     });
   }
 
 
   class App {
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: App,
       selectors: [['app']],
       consts: 2,
@@ -1518,13 +1511,13 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.app, new App()),
       template: function(fs: RenderFlags, ctx: App) {
         if (fs & RenderFlags.Create) {
-          ɵɵelementStart(0, 'parent');
-          ɵɵelement(1, 'content-child');
-          ɵɵelementEnd();
+          ΔelementStart(0, 'parent');
+          Δelement(1, 'content-child');
+          ΔelementEnd();
         }
       },
       features:
-          defs.app && [ɵɵProvidersFeature(defs.app.providers || [], defs.app.viewProviders || [])],
+          defs.app && [ΔProvidersFeature(defs.app.providers || [], defs.app.viewProviders || [])],
       directives: [
         ParentComponent, ParentDirective2, ParentDirective, ContentChildComponent,
         ContentChildDirective
diff --git a/packages/core/test/render3/pure_function_spec.ts b/packages/core/test/render3/pure_function_spec.ts
index 42f7a17476..f8a99c225a 100644
--- a/packages/core/test/render3/pure_function_spec.ts
+++ b/packages/core/test/render3/pure_function_spec.ts
@@ -5,10 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {ɵɵdefineComponent} from '../../src/render3/index';
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart} from '../../src/render3/instructions/all';
+import {ΔdefineComponent} from '../../src/render3/index';
+import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {ɵɵpureFunction2} from '../../src/render3/pure_function';
+import {ΔpureFunction2} from '../../src/render3/pure_function';
 import {getDirectiveOnNode, renderToHtml} from '../../test/render3/render_util';
 
 
@@ -19,7 +19,7 @@ describe('object literals', () => {
     // TODO(issue/24571): remove '!'.
     config !: {[key: string]: any};
 
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: ObjectComp,
       selectors: [['object-comp']],
       factory: function ObjectComp_Factory() { return objectComp = new ObjectComp(); },
@@ -45,27 +45,27 @@ describe('object literals', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵcontainer(0);
+        Δcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           for (let i = 0; i < 2; i++) {
-            let rf1 = ɵɵembeddedViewStart(0, 1, 4);
+            let rf1 = ΔembeddedViewStart(0, 1, 4);
             if (rf1 & RenderFlags.Create) {
-              ɵɵelementStart(0, 'object-comp');
+              ΔelementStart(0, 'object-comp');
               objectComps.push(getDirectiveOnNode(0));
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
             if (rf1 & RenderFlags.Update) {
-              ɵɵelementProperty(
-                  0, 'config', ɵɵbind(ɵɵpureFunction2(
-                                   1, e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration)));
+              ΔelementProperty(
+                  0, 'config',
+                  Δbind(ΔpureFunction2(1, e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration)));
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
     }
 
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 7d730c8e3a..033fc2ea72 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -10,13 +10,13 @@ import {NgForOfContext} from '@angular/common';
 import {ElementRef, QueryList, TemplateRef, ViewContainerRef} from '@angular/core';
 
 import {EventEmitter} from '../..';
-import {AttributeMarker, detectChanges, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
-import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵload, ɵɵreference, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
+import {AttributeMarker, detectChanges, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
+import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δload, Δreference, Δtemplate, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {query, ɵɵcontentQuery, ɵɵloadContentQuery, ɵɵloadViewQuery, ɵɵqueryRefresh, ɵɵviewQuery} from '../../src/render3/query';
+import {query, ΔcontentQuery, ΔloadContentQuery, ΔloadViewQuery, ΔqueryRefresh, ΔviewQuery} from '../../src/render3/query';
 import {getLView} from '../../src/render3/state';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
-import {ɵɵtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
+import {ΔtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
 
 import {NgForOf, NgIf, NgTemplateOutlet} from './common_with_def';
 import {ComponentFixture, TemplateFixture, createComponent, createDirective, getDirectiveOnNode, renderComponent} from './render_util';
@@ -70,9 +70,9 @@ describe('query', () => {
            * }
            */
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'child');
-            { ɵɵelement(1, 'child'); }
-            ɵɵelementEnd();
+            ΔelementStart(0, 'child');
+            { Δelement(1, 'child'); }
+            ΔelementEnd();
           }
           if (rf & RenderFlags.Update) {
             child1 = getDirectiveOnNode(0);
@@ -82,14 +82,14 @@ describe('query', () => {
         2, 0, [Child], [],
         function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵviewQuery(Child, false, null);
-            ɵɵviewQuery(Child, true, null);
+            ΔviewQuery(Child, false, null);
+            ΔviewQuery(Child, true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                 (ctx.query0 = tmp as QueryList<any>);
-            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                 (ctx.query1 = tmp as QueryList<any>);
           }
         });
@@ -115,18 +115,18 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', '']);
+                Δelement(0, 'div', ['child', '']);
                 elToQuery = getNativeByIndex(0, getLView());
               }
             },
             1, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(Child, false, ElementRef);
+                ΔviewQuery(Child, false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -152,19 +152,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'div', ['child', '', 'otherChild', '']);
+                ΔelementStart(0, 'div', ['child', '', 'otherChild', '']);
                 { otherChildInstance = getDirectiveOnNode(0, 1); }
-                ɵɵelementEnd();
+                ΔelementEnd();
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(Child, false, OtherChild);
+                ΔviewQuery(Child, false, OtherChild);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -188,17 +188,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', '']);
+                Δelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(Child, false, OtherChild);
+                ΔviewQuery(Child, false, OtherChild);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -219,13 +219,13 @@ describe('query', () => {
       class MyDirective {
         constructor(public service: Service) {}
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: MyDirective,
           selectors: [['', 'myDir', '']],
           factory: function MyDirective_Factory() {
-            return directive = new MyDirective(ɵɵdirectiveInject(Service));
+            return directive = new MyDirective(ΔdirectiveInject(Service));
           },
-          features: [ɵɵProvidersFeature([Service, {provide: Alias, useExisting: Service}])],
+          features: [ΔProvidersFeature([Service, {provide: Alias, useExisting: Service}])],
         });
       }
 
@@ -247,7 +247,7 @@ describe('query', () => {
           service?: Service;
           alias?: Alias;
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: App,
             selectors: [['app']],
             consts: 1,
@@ -255,22 +255,21 @@ describe('query', () => {
             factory: function App_Factory() { return new App(); },
             template: function App_Template(rf: RenderFlags, ctx: App) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['myDir']);
+                Δelement(0, 'div', ['myDir']);
               }
             },
             viewQuery: function(rf: RenderFlags, ctx: App) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(MyDirective, false, null);
-                ɵɵviewQuery(Service, false, null);
-                ɵɵviewQuery(Alias, false, null);
+                ΔviewQuery(MyDirective, false, null);
+                ΔviewQuery(Service, false, null);
+                ΔviewQuery(Alias, false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.directive = tmp.first);
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
-                    (ctx.service = tmp.first);
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && (ctx.alias = tmp.first);
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) && (ctx.service = tmp.first);
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) && (ctx.alias = tmp.first);
               }
             },
             directives: [MyDirective]
@@ -294,7 +293,7 @@ describe('query', () => {
         class App {
           service?: Service;
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: App,
             selectors: [['app']],
             consts: 1,
@@ -302,17 +301,16 @@ describe('query', () => {
             factory: function App_Factory() { return new App(); },
             template: function App_Template(rf: RenderFlags, ctx: App) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['myDir']);
+                Δelement(0, 'div', ['myDir']);
               }
             },
             viewQuery: function(rf: RenderFlags, ctx: App) {
               let tmp: any;
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(MyDirective, false, Alias);
+                ΔviewQuery(MyDirective, false, Alias);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
-                    (ctx.service = tmp.first);
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) && (ctx.service = tmp.first);
               }
             },
             directives: [MyDirective]
@@ -341,19 +339,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', null, ['foo', '']);
+                Δelement(0, 'div', null, ['foo', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                ɵɵelement(2, 'div');
+                Δelement(2, 'div');
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, null);
+                ΔviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -379,22 +377,22 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', null, ['foo', '', 'bar', '']);
+                Δelement(0, 'div', null, ['foo', '', 'bar', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                ɵɵelement(3, 'div');
+                Δelement(3, 'div');
               }
             },
             4, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, null);
-                ɵɵviewQuery(['bar'], false, null);
+                ΔviewQuery(['foo'], false, null);
+                ΔviewQuery(['bar'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.fooQuery = tmp as QueryList<any>);
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.barQuery = tmp as QueryList<any>);
               }
             });
@@ -426,21 +424,21 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', null, ['foo', '']);
+                Δelement(0, 'div', null, ['foo', '']);
                 el1ToQuery = getNativeByIndex(0, getLView());
-                ɵɵelement(2, 'div');
-                ɵɵelement(3, 'div', null, ['bar', '']);
+                Δelement(2, 'div');
+                Δelement(3, 'div', null, ['bar', '']);
                 el2ToQuery = getNativeByIndex(3, getLView());
               }
             },
             5, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo', 'bar'], false, null);
+                ΔviewQuery(['foo', 'bar'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -466,19 +464,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', null, ['foo', '']);
+                Δelement(0, 'div', null, ['foo', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                ɵɵelement(2, 'div');
+                Δelement(2, 'div');
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, null);
+                ΔviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -503,19 +501,19 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelementContainerStart(0, null, ['foo', '']);
+                   ΔelementContainerStart(0, null, ['foo', '']);
                    elToQuery = getNativeByIndex(0, getLView());
-                   ɵɵelementContainerEnd();
+                   ΔelementContainerEnd();
                  }
                },
                2, 0, [], [],
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵviewQuery(['foo'], false, ElementRef);
+                   ΔviewQuery(['foo'], false, ElementRef);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -539,19 +537,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelementContainerStart(0, null, ['foo', '']);
+                ΔelementContainerStart(0, null, ['foo', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                ɵɵelementContainerEnd();
+                ΔelementContainerEnd();
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -601,25 +599,25 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelementContainerStart(0);
+                ΔelementContainerStart(0);
                 {
-                  ɵɵelement(1, 'div', null, ['foo', '']);
+                  Δelement(1, 'div', null, ['foo', '']);
                   elToQuery = getNativeByIndex(3, getLView());
                 }
-                ɵɵelementContainerEnd();
+                ΔelementContainerEnd();
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, ElementRef);
-                ɵɵviewQuery(['foo'], false, ElementRef);
+                ΔviewQuery(['foo'], true, ElementRef);
+                ΔviewQuery(['foo'], false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.deep = tmp as QueryList<any>);
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.shallow = tmp as QueryList<any>);
               }
             });
@@ -642,17 +640,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', null, ['foo', '']);
+                Δelement(0, 'div', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, ViewContainerRef);
+                ΔviewQuery(['foo'], false, ViewContainerRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -674,17 +672,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, ViewContainerRef);
+                ΔviewQuery(['foo'], false, ViewContainerRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -707,18 +705,18 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                   Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
                  }
                },
                2, 0, [], [],
                function(rf: RenderFlags, ctx: any) {
 
                  if (rf & RenderFlags.Create) {
-                   ɵɵviewQuery(['foo'], false, ElementRef);
+                   ΔviewQuery(['foo'], false, ElementRef);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -742,17 +740,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, null);
+                ΔviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -775,17 +773,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, TemplateRef);
+                ΔviewQuery(['foo'], false, TemplateRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -810,7 +808,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'child', null, ['foo', '']);
+                Δelement(0, 'child', null, ['foo', '']);
               }
               if (rf & RenderFlags.Update) {
                 childInstance = getDirectiveOnNode(0);
@@ -819,11 +817,11 @@ describe('query', () => {
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -838,7 +836,7 @@ describe('query', () => {
         let childInstance: Child;
 
         class Child {
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: Child,
             selectors: [['child']],
             factory: () => childInstance = new Child(),
@@ -859,17 +857,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'child', null, ['foo', 'child']);
+                Δelement(0, 'child', null, ['foo', 'child']);
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -895,7 +893,7 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelement(0, 'div', ['child', ''], ['foo', 'child']);
+                   Δelement(0, 'div', ['child', ''], ['foo', 'child']);
                  }
                  if (rf & RenderFlags.Update) {
                    childInstance = getDirectiveOnNode(0);
@@ -904,11 +902,11 @@ describe('query', () => {
                2, 0, [Child], [],
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵviewQuery(['foo'], true, null);
+                   ΔviewQuery(['foo'], true, null);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -934,7 +932,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(
+                Δelement(
                     0, 'div', ['child1', '', 'child2', ''], ['foo', 'child1', 'bar', 'child2']);
               }
               if (rf & RenderFlags.Update) {
@@ -945,11 +943,11 @@ describe('query', () => {
             3, 0, [Child1, Child2], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo', 'bar'], true, null);
+                ΔviewQuery(['foo', 'bar'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -976,7 +974,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', ''], ['foo', 'child', 'bar', 'child']);
+                Δelement(0, 'div', ['child', ''], ['foo', 'child', 'bar', 'child']);
               }
               if (rf & RenderFlags.Update) {
                 childInstance = getDirectiveOnNode(0);
@@ -985,14 +983,14 @@ describe('query', () => {
             3, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
-                ɵɵviewQuery(['bar'], true, null);
+                ΔviewQuery(['foo'], true, null);
+                ΔviewQuery(['bar'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.fooQuery = tmp as QueryList<any>);
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.barQuery = tmp as QueryList<any>);
               }
             });
@@ -1022,18 +1020,18 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', ''], ['foo', 'child']);
+                Δelement(0, 'div', ['child', ''], ['foo', 'child']);
                 div = getNativeByIndex(0, getLView());
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, ElementRef);
+                ΔviewQuery(['foo'], false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1058,7 +1056,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', ''], ['foo', '', 'bar', 'child']);
+                Δelement(0, 'div', ['child', ''], ['foo', '', 'bar', 'child']);
                 div = getNativeByIndex(0, getLView());
               }
               if (rf & RenderFlags.Update) {
@@ -1068,11 +1066,11 @@ describe('query', () => {
             3, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo', 'bar'], false, null);
+                ΔviewQuery(['foo', 'bar'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1097,17 +1095,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['foo', '']);
+                Δelement(0, 'div', ['foo', '']);
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, Child);
+                ΔviewQuery(['foo'], false, Child);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1131,17 +1129,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', '']);
+                Δelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(Child, false, OtherChild);
+                ΔviewQuery(Child, false, OtherChild);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1165,17 +1163,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', '']);
+                Δelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(OtherChild, false, Child);
+                ΔviewQuery(OtherChild, false, Child);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1196,17 +1194,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div');
+                Δelement(0, 'div');
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(TemplateRef as any, false, ElementRef);
+                ΔviewQuery(TemplateRef as any, false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1229,17 +1227,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', ''], ['foo', '']);
+                Δelement(0, 'div', ['child', ''], ['foo', '']);
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], false, Child);
+                ΔviewQuery(['foo'], false, Child);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1263,17 +1261,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵelement(0, 'div', ['child', '']);
+                Δelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(TemplateRef as any, false, null);
+                ΔviewQuery(TemplateRef as any, false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1286,9 +1284,9 @@ describe('query', () => {
       it('should query templates if the type is TemplateRef (and respect "read" option)', () => {
         function Cmpt_Template_1(rf: RenderFlags, ctx1: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'div');
-            ɵɵtext(1, 'Test');
-            ɵɵelementEnd();
+            ΔelementStart(0, 'div');
+            Δtext(1, 'Test');
+            ΔelementEnd();
           }
         }
         /**
@@ -1304,28 +1302,28 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(
+                Δtemplate(
                     0, Cmpt_Template_1, 2, 0, 'ng-template', null, ['foo', ''],
-                    ɵɵtemplateRefExtractor);
-                ɵɵtemplate(
+                    ΔtemplateRefExtractor);
+                Δtemplate(
                     2, Cmpt_Template_1, 2, 0, 'ng-template', null, ['bar', ''],
-                    ɵɵtemplateRefExtractor);
-                ɵɵtemplate(
+                    ΔtemplateRefExtractor);
+                Δtemplate(
                     4, Cmpt_Template_1, 2, 0, 'ng-template', null, ['baz', ''],
-                    ɵɵtemplateRefExtractor);
+                    ΔtemplateRefExtractor);
               }
             },
             6, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(TemplateRef as any, false, null);
-                ɵɵviewQuery(TemplateRef as any, false, ElementRef);
+                ΔviewQuery(TemplateRef as any, false, null);
+                ΔviewQuery(TemplateRef as any, false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.tmplQuery = tmp as QueryList<any>);
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.elemQuery = tmp as QueryList<any>);
               }
             });
@@ -1353,12 +1351,12 @@ describe('query', () => {
       let directiveInstances: ViewContainerManipulatorDirective[] = [];
 
       class ViewContainerManipulatorDirective {
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: ViewContainerManipulatorDirective,
           selectors: [['', 'vc', '']],
           factory: () => {
             const directiveInstance =
-                new ViewContainerManipulatorDirective(ɵɵdirectiveInject(ViewContainerRef as any));
+                new ViewContainerManipulatorDirective(ΔdirectiveInject(ViewContainerRef as any));
             directiveInstances.push(directiveInstance);
             return directiveInstance;
           }
@@ -1379,7 +1377,7 @@ describe('query', () => {
 
         function Cmpt_Template_1(rf: RenderFlags, ctx1: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'div', null, ['foo', '']);
+            Δelement(0, 'div', null, ['foo', '']);
           }
         }
 
@@ -1395,21 +1393,21 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(
+                Δtemplate(
                     0, Cmpt_Template_1, 2, 0, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.value));
+                ΔelementProperty(0, 'ngIf', Δbind(ctx.value));
               }
             },
             2, 1, [NgIf], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1431,10 +1429,10 @@ describe('query', () => {
 
         function Cmpt_Template_1(rf1: RenderFlags, row: NgForOfContext<string>) {
           if (rf1 & RenderFlags.Create) {
-            ɵɵelement(0, 'div', null, ['foo', '']);
+            Δelement(0, 'div', null, ['foo', '']);
           }
           if (rf1 & RenderFlags.Update) {
-            ɵɵelementProperty(0, 'id', ɵɵbind(row.$implicit));
+            ΔelementProperty(0, 'id', Δbind(row.$implicit));
           }
         }
 
@@ -1450,7 +1448,7 @@ describe('query', () => {
           // TODO(issue/24571): remove '!'.
           value !: string[];
           query: any;
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: Cmpt,
             factory: () => new Cmpt(),
             selectors: [['my-app']],
@@ -1458,19 +1456,19 @@ describe('query', () => {
             vars: 1,
             template: function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(0, Cmpt_Template_1, 2, 1, 'ng-template', ['ngForOf', '']);
+                Δtemplate(0, Cmpt_Template_1, 2, 1, 'ng-template', ['ngForOf', '']);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.value));
+                ΔelementProperty(0, 'ngForOf', Δbind(ctx.value));
               }
             },
             viewQuery: function(rf: RenderFlags, ctx: Cmpt) {
               let tmp: any;
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             },
@@ -1504,19 +1502,19 @@ describe('query', () => {
 
            function Cmpt_Template_1(rf: RenderFlags, ctx: {idx: number}) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', null, ['foo', '']);
+               Δelement(0, 'div', null, ['foo', '']);
              }
              if (rf & RenderFlags.Update) {
-               ɵɵelementProperty(0, 'id', ɵɵbind('foo1_' + ctx.idx));
+               ΔelementProperty(0, 'id', Δbind('foo1_' + ctx.idx));
              }
            }
 
            function Cmpt_Template_5(rf: RenderFlags, ctx: {idx: number}) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', null, ['foo', '']);
+               Δelement(0, 'div', null, ['foo', '']);
              }
              if (rf & RenderFlags.Update) {
-               ɵɵelementProperty(0, 'id', ɵɵbind('foo2_' + ctx.idx));
+               ΔelementProperty(0, 'id', Δbind('foo2_' + ctx.idx));
              }
            }
 
@@ -1537,30 +1535,30 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵtemplate(
+                   Δtemplate(
                        0, Cmpt_Template_1, 2, 1, 'ng-template', null, ['tpl1', ''],
-                       ɵɵtemplateRefExtractor);
-                   ɵɵelement(2, 'div', ['id', 'middle'], ['foo', '']);
-                   ɵɵtemplate(
+                       ΔtemplateRefExtractor);
+                   Δelement(2, 'div', ['id', 'middle'], ['foo', '']);
+                   Δtemplate(
                        4, Cmpt_Template_5, 2, 1, 'ng-template', null, ['tpl2', ''],
-                       ɵɵtemplateRefExtractor);
-                   ɵɵtemplate(6, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
+                       ΔtemplateRefExtractor);
+                   Δtemplate(6, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
                  }
 
                  if (rf & RenderFlags.Update) {
-                   tpl1 = ɵɵreference(1);
-                   tpl2 = ɵɵreference(5);
+                   tpl1 = Δreference(1);
+                   tpl2 = Δreference(5);
                  }
 
                },
                8, 0, [ViewContainerManipulatorDirective], [],
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵviewQuery(['foo'], true, null);
+                   ΔviewQuery(['foo'], true, null);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -1613,10 +1611,10 @@ describe('query', () => {
 
            function Cmpt_Template_1(rf: RenderFlags, ctx: {idx: number, container_idx: number}) {
              if (rf & RenderFlags.Create) {
-               ɵɵelement(0, 'div', null, ['foo', '']);
+               Δelement(0, 'div', null, ['foo', '']);
              }
              if (rf & RenderFlags.Update) {
-               ɵɵelementProperty(0, 'id', ɵɵbind('foo_' + ctx.container_idx + '_' + ctx.idx));
+               ΔelementProperty(0, 'id', Δbind('foo_' + ctx.container_idx + '_' + ctx.idx));
              }
            }
 
@@ -1630,7 +1628,7 @@ describe('query', () => {
             */
            class Cmpt {
              query: any;
-             static ngComponentDef = ɵɵdefineComponent({
+             static ngComponentDef = ΔdefineComponent({
                type: Cmpt,
                factory: () => new Cmpt(),
                selectors: [['my-app']],
@@ -1639,25 +1637,25 @@ describe('query', () => {
                template: function(rf: RenderFlags, ctx: any) {
                  let tmp: any;
                  if (rf & RenderFlags.Create) {
-                   ɵɵtemplate(
+                   Δtemplate(
                        0, Cmpt_Template_1, 2, 1, 'ng-template', [], ['tpl', ''],
-                       ɵɵtemplateRefExtractor);
-                   ɵɵtemplate(2, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
-                   ɵɵtemplate(3, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
+                       ΔtemplateRefExtractor);
+                   Δtemplate(2, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
+                   Δtemplate(3, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
                  }
 
                  if (rf & RenderFlags.Update) {
-                   tpl = ɵɵreference(1);
+                   tpl = Δreference(1);
                  }
 
                },
                viewQuery: (rf: RenderFlags, cmpt: Cmpt) => {
                  let tmp: any;
                  if (rf & RenderFlags.Create) {
-                   ɵɵviewQuery(['foo'], true, null);
+                   ΔviewQuery(['foo'], true, null);
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                        (cmpt.query = tmp as QueryList<any>);
                  }
                },
@@ -1693,14 +1691,14 @@ describe('query', () => {
 
         function MyApp_Template_1(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'span', ['id', 'from_tpl'], ['foo', '']);
+            Δelement(0, 'span', ['id', 'from_tpl'], ['foo', '']);
           }
         }
 
         class MyApp {
           show = false;
           query: any;
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: MyApp,
             factory: () => new MyApp(),
             selectors: [['my-app']],
@@ -1712,25 +1710,25 @@ describe('query', () => {
              */
             template: (rf: RenderFlags, myApp: MyApp) => {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(
+                Δtemplate(
                     0, MyApp_Template_1, 2, 0, 'ng-template', undefined, ['tpl', ''],
-                    ɵɵtemplateRefExtractor);
-                ɵɵtemplate(
+                    ΔtemplateRefExtractor);
+                Δtemplate(
                     2, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'ngTemplateOutlet']);
               }
               if (rf & RenderFlags.Update) {
-                const tplRef = ɵɵreference(1);
-                ɵɵelementProperty(2, 'ngTemplateOutlet', ɵɵbind(myApp.show ? tplRef : null));
+                const tplRef = Δreference(1);
+                ΔelementProperty(2, 'ngTemplateOutlet', Δbind(myApp.show ? tplRef : null));
               }
             },
             directives: () => [NgTemplateOutlet],
             viewQuery: (rf: RenderFlags, myApp: MyApp) => {
               let tmp: any;
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (myApp.query = tmp as QueryList<any>);
               }
             }
@@ -1770,33 +1768,33 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵcontainer(0);
+                Δcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
+                ΔcontainerRefreshStart(0);
                 {
                   if (ctx.exp) {
-                    let rf1 = ɵɵembeddedViewStart(1, 2, 0);
+                    let rf1 = ΔembeddedViewStart(1, 2, 0);
                     {
                       if (rf1 & RenderFlags.Create) {
-                        ɵɵelement(0, 'div', null, ['foo', '']);
+                        Δelement(0, 'div', null, ['foo', '']);
                         firstEl = getNativeByIndex(0, getLView());
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1832,37 +1830,37 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelement(0, 'span', null, ['foo', '']);
+                   Δelement(0, 'span', null, ['foo', '']);
                    firstEl = getNativeByIndex(0, getLView());
-                   ɵɵcontainer(2);
-                   ɵɵelement(3, 'span', null, ['foo', '']);
+                   Δcontainer(2);
+                   Δelement(3, 'span', null, ['foo', '']);
                    lastEl = getNativeByIndex(3, getLView());
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵcontainerRefreshStart(2);
+                   ΔcontainerRefreshStart(2);
                    {
                      if (ctx.exp) {
-                       let rf1 = ɵɵembeddedViewStart(1, 2, 0);
+                       let rf1 = ΔembeddedViewStart(1, 2, 0);
                        {
                          if (rf1 & RenderFlags.Create) {
-                           ɵɵelement(0, 'div', null, ['foo', '']);
+                           Δelement(0, 'div', null, ['foo', '']);
                            viewEl = getNativeByIndex(0, getLView());
                          }
                        }
-                       ɵɵembeddedViewEnd();
+                       ΔembeddedViewEnd();
                      }
                    }
-                   ɵɵcontainerRefreshEnd();
+                   ΔcontainerRefreshEnd();
                  }
                },
                5, 0, [], [],
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵviewQuery(['foo'], true, null);
+                   ΔviewQuery(['foo'], true, null);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -1903,43 +1901,43 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵcontainer(0);
+                Δcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
+                ΔcontainerRefreshStart(0);
                 {
                   if (ctx.exp1) {
-                    let rf0 = ɵɵembeddedViewStart(0, 2, 0);
+                    let rf0 = ΔembeddedViewStart(0, 2, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        ɵɵelement(0, 'div', null, ['foo', '']);
+                        Δelement(0, 'div', null, ['foo', '']);
                         firstEl = getNativeByIndex(0, getLView());
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                   if (ctx.exp2) {
-                    let rf1 = ɵɵembeddedViewStart(1, 2, 0);
+                    let rf1 = ΔembeddedViewStart(1, 2, 0);
                     {
                       if (rf1 & RenderFlags.Create) {
-                        ɵɵelement(0, 'span', null, ['foo', '']);
+                        Δelement(0, 'span', null, ['foo', '']);
                         lastEl = getNativeByIndex(0, getLView());
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1977,50 +1975,50 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵcontainer(0);
+                Δcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
+                ΔcontainerRefreshStart(0);
                 {
                   if (ctx.exp1) {
-                    let rf0 = ɵɵembeddedViewStart(0, 3, 0);
+                    let rf0 = ΔembeddedViewStart(0, 3, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        ɵɵelement(0, 'div', null, ['foo', '']);
+                        Δelement(0, 'div', null, ['foo', '']);
                         firstEl = getNativeByIndex(0, getLView());
-                        ɵɵcontainer(2);
+                        Δcontainer(2);
                       }
                       if (rf0 & RenderFlags.Update) {
-                        ɵɵcontainerRefreshStart(2);
+                        ΔcontainerRefreshStart(2);
                         {
                           if (ctx.exp2) {
-                            let rf2 = ɵɵembeddedViewStart(0, 2, 0);
+                            let rf2 = ΔembeddedViewStart(0, 2, 0);
                             {
                               if (rf2) {
-                                ɵɵelement(0, 'span', null, ['foo', '']);
+                                Δelement(0, 'span', null, ['foo', '']);
                                 lastEl = getNativeByIndex(0, getLView());
                               }
                             }
-                            ɵɵembeddedViewEnd();
+                            ΔembeddedViewEnd();
                           }
                         }
-                        ɵɵcontainerRefreshEnd();
+                        ΔcontainerRefreshEnd();
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -2062,38 +2060,38 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵcontainer(0);
-                ɵɵelement(1, 'span', null, ['foo', '']);
+                Δcontainer(0);
+                Δelement(1, 'span', null, ['foo', '']);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵcontainerRefreshStart(0);
+                ΔcontainerRefreshStart(0);
                 {
                   if (ctx.exp) {
-                    let rf0 = ɵɵembeddedViewStart(0, 4, 0);
+                    let rf0 = ΔembeddedViewStart(0, 4, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        ɵɵelementStart(0, 'div', null, ['foo', '']);
-                        { ɵɵelement(2, 'div', null, ['foo', '']); }
-                        ɵɵelementEnd();
+                        ΔelementStart(0, 'div', null, ['foo', '']);
+                        { Δelement(2, 'div', null, ['foo', '']); }
+                        ΔelementEnd();
                       }
                     }
-                    ɵɵembeddedViewEnd();
+                    ΔembeddedViewEnd();
                   }
                 }
-                ɵɵcontainerRefreshEnd();
+                ΔcontainerRefreshEnd();
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵviewQuery(['foo'], true, null);
-                ɵɵviewQuery(['foo'], false, null);
+                ΔviewQuery(['foo'], true, null);
+                ΔviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.deep = tmp as QueryList<any>);
-                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                     (ctx.shallow = tmp as QueryList<any>);
               }
             });
@@ -2132,37 +2130,37 @@ describe('query', () => {
           'some-component-with-query',
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'div', null, ['foo', '']);
+              Δelement(0, 'div', null, ['foo', '']);
             }
           },
           2, 0, [], [],
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵviewQuery(['foo'], false, null);
+              ΔviewQuery(['foo'], false, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                   (ctx.query = queryInstance = tmp as QueryList<any>);
             }
           });
 
-      function createTemplate() { ɵɵcontainer(0); }
+      function createTemplate() { Δcontainer(0); }
 
       function updateTemplate() {
-        ɵɵcontainerRefreshStart(0);
+        ΔcontainerRefreshStart(0);
         {
           if (condition) {
-            let rf1 = ɵɵembeddedViewStart(1, 1, 0);
+            let rf1 = ΔembeddedViewStart(1, 1, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ɵɵelement(0, 'some-component-with-query');
+                Δelement(0, 'some-component-with-query');
               }
             }
-            ɵɵembeddedViewEnd();
+            ΔembeddedViewEnd();
           }
         }
-        ɵɵcontainerRefreshEnd();
+        ΔcontainerRefreshEnd();
       }
 
       /**
@@ -2189,18 +2187,18 @@ describe('query', () => {
         this.vcr.createEmbeddedView(this.temp);
       }
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: SomeDir,
         selectors: [['', 'someDir', '']],
         factory:
             () => new SomeDir(
-                ɵɵdirectiveInject(ViewContainerRef as any), ɵɵdirectiveInject(TemplateRef as any))
+                ΔdirectiveInject(ViewContainerRef as any), ΔdirectiveInject(TemplateRef as any))
       });
     }
 
     function AppComponent_Template_1(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'div');
+        Δelement(0, 'div');
       }
     }
 
@@ -2212,19 +2210,19 @@ describe('query', () => {
         'app',
         function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵtemplate(
+            Δtemplate(
                 0, AppComponent_Template_1, 1, 0, 'div', [AttributeMarker.Template, 'someDir']);
-            ɵɵelement(1, 'div', null, ['foo', '']);
+            Δelement(1, 'div', null, ['foo', '']);
           }
         },
         3, 0, [SomeDir], [],
         function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵviewQuery(['foo'], true, null);
+            ΔviewQuery(['foo'], true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                 (ctx.query = tmp as QueryList<any>);
           }
         });
@@ -2254,17 +2252,17 @@ describe('query', () => {
         this.contentCheckedQuerySnapshot = this.foos ? this.foos.length : 0;
       }
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: WithContentDirective,
         selectors: [['', 'with-content', '']],
         factory: () => withContentInstance = new WithContentDirective(),
         contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ɵɵcontentQuery(dirIndex, ['foo'], true, null);
+            ΔcontentQuery(dirIndex, ['foo'], true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
           }
         }
       });
@@ -2274,7 +2272,7 @@ describe('query', () => {
       // @ContentChildren('foo', {descendants: false})
       foos !: QueryList<ElementRef>;
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: ShallowComp,
         selectors: [['shallow-comp']],
         factory: () => shallowCompInstance = new ShallowComp(),
@@ -2283,11 +2281,11 @@ describe('query', () => {
         vars: 0,
         contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ɵɵcontentQuery(dirIndex, ['foo'], false, null);
+            ΔcontentQuery(dirIndex, ['foo'], false, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
           }
         }
       });
@@ -2301,9 +2299,9 @@ describe('query', () => {
        */
       const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
-          { ɵɵelement(1, 'span', null, ['foo', '']); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
+          { Δelement(1, 'span', null, ['foo', '']); }
+          ΔelementEnd();
         }
       }, 3, 0, [WithContentDirective]);
 
@@ -2332,23 +2330,23 @@ describe('query', () => {
        */
       const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵcontainer(0);
+          Δcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵcontainerRefreshStart(0);
+          ΔcontainerRefreshStart(0);
           {
             for (let i = 0; i < 3; i++) {
-              let rf = ɵɵembeddedViewStart(1, 3, 0);
+              let rf = ΔembeddedViewStart(1, 3, 0);
               if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
-                { ɵɵelement(1, 'span', null, ['foo', '']); }
-                ɵɵelementEnd();
+                ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
+                { Δelement(1, 'span', null, ['foo', '']); }
+                ΔelementEnd();
               }
-              ɵɵembeddedViewEnd();
+              ΔembeddedViewEnd();
             }
           }
 
-          ɵɵcontainerRefreshEnd();
+          ΔcontainerRefreshEnd();
         }
       }, 1, 0, [WithContentDirective]);
 
@@ -2374,7 +2372,7 @@ describe('query', () => {
        */
       const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', ['with-content', ''], ['foo', '']);
+          Δelement(0, 'div', ['with-content', ''], ['foo', '']);
         }
       }, 2, 0, [WithContentDirective]);
 
@@ -2386,7 +2384,7 @@ describe('query', () => {
     it('should match shallow content queries in views inserted / removed by ngIf', () => {
       function IfTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div', null, ['foo', '']);
+          Δelement(0, 'div', null, ['foo', '']);
         }
       }
 
@@ -2397,12 +2395,12 @@ describe('query', () => {
        */
       const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'shallow-comp');
-          { ɵɵtemplate(1, IfTemplate, 2, 0, 'div', [AttributeMarker.Template, 'ngIf', '']); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'shallow-comp');
+          { Δtemplate(1, IfTemplate, 2, 0, 'div', [AttributeMarker.Template, 'ngIf', '']); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(1, 'ngIf', ɵɵbind(ctx.showing));
+          ΔelementProperty(1, 'ngIf', Δbind(ctx.showing));
         }
       }, 2, 1, [ShallowComp, NgIf]);
 
@@ -2435,20 +2433,20 @@ describe('query', () => {
           'app-component',
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', ['with-content', '']);
-              { ɵɵelement(1, 'div', null, ['foo', '']); }
-              ɵɵelementEnd();
-              ɵɵelement(3, 'div', ['id', 'after'], ['bar', '']);
+              ΔelementStart(0, 'div', ['with-content', '']);
+              { Δelement(1, 'div', null, ['foo', '']); }
+              ΔelementEnd();
+              Δelement(3, 'div', ['id', 'after'], ['bar', '']);
             }
           },
           5, 0, [WithContentDirective], [],
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵviewQuery(['foo', 'bar'], true, null);
+              ΔviewQuery(['foo', 'bar'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                   (ctx.foos = tmp as QueryList<any>);
             }
           });
@@ -2476,20 +2474,20 @@ describe('query', () => {
           'app-component',
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', ['with-content', '']);
-              { ɵɵelement(1, 'div', ['id', 'yes'], ['foo', '']); }
-              ɵɵelementEnd();
-              ɵɵelement(3, 'div', null, ['foo', '']);
+              ΔelementStart(0, 'div', ['with-content', '']);
+              { Δelement(1, 'div', ['id', 'yes'], ['foo', '']); }
+              ΔelementEnd();
+              Δelement(3, 'div', null, ['foo', '']);
             }
           },
           5, 0, [WithContentDirective], [],
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵviewQuery(['bar'], true, null);
+              ΔviewQuery(['bar'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                   (ctx.bars = tmp as QueryList<any>);
             }
           });
@@ -2502,7 +2500,7 @@ describe('query', () => {
     it('should report results to appropriate queries where deep content queries are nested', () => {
       class QueryDirective {
         fooBars: any;
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: QueryDirective,
           selectors: [['', 'query', '']],
           exportAs: ['query'],
@@ -2511,11 +2509,11 @@ describe('query', () => {
             // @ContentChildren('foo, bar, baz', {descendants: true})
             // fooBars: QueryList<ElementRef>;
             if (rf & RenderFlags.Create) {
-              ɵɵcontentQuery(dirIndex, ['foo', 'bar', 'baz'], true, null);
+              ΔcontentQuery(dirIndex, ['foo', 'bar', 'baz'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
+              ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
             }
           }
         });
@@ -2537,19 +2535,19 @@ describe('query', () => {
            */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'query'], ['out', 'query']);
+              ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'query'], ['out', 'query']);
               {
-                ɵɵelement(2, 'span', ['id', 'foo'], ['foo', '']);
-                ɵɵelementStart(4, 'div', [AttributeMarker.Bindings, 'query'], ['in', 'query']);
-                { ɵɵelement(6, 'span', ['id', 'bar'], ['bar', '']); }
-                ɵɵelementEnd();
-                ɵɵelement(8, 'span', ['id', 'baz'], ['baz', '']);
+                Δelement(2, 'span', ['id', 'foo'], ['foo', '']);
+                ΔelementStart(4, 'div', [AttributeMarker.Bindings, 'query'], ['in', 'query']);
+                { Δelement(6, 'span', ['id', 'bar'], ['bar', '']); }
+                ΔelementEnd();
+                Δelement(8, 'span', ['id', 'baz'], ['baz', '']);
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              outInstance = ɵɵload<QueryDirective>(1);
-              inInstance = ɵɵload<QueryDirective>(5);
+              outInstance = Δload<QueryDirective>(1);
+              inInstance = Δload<QueryDirective>(5);
             }
           },
           10, 0, [QueryDirective]);
@@ -2566,7 +2564,7 @@ describe('query', () => {
 
       class QueryDirective {
         fooBars: any;
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: QueryDirective,
           selectors: [['', 'query', '']],
           exportAs: ['query'],
@@ -2575,11 +2573,11 @@ describe('query', () => {
             // @ContentChildren('foo', {descendants: true})
             // fooBars: QueryList<ElementRef>;
             if (rf & RenderFlags.Create) {
-              ɵɵcontentQuery(dirIndex, ['foo'], false, null);
+              ΔcontentQuery(dirIndex, ['foo'], false, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
+              ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
             }
           }
         });
@@ -2596,17 +2594,17 @@ describe('query', () => {
            */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', ['query', ''], ['out', 'query']);
+              ΔelementStart(0, 'div', ['query', ''], ['out', 'query']);
               {
-                ɵɵelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
-                { ɵɵelement(5, 'span', ['id', 'bar'], ['foo', '']); }
-                ɵɵelementEnd();
+                ΔelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
+                { Δelement(5, 'span', ['id', 'bar'], ['foo', '']); }
+                ΔelementEnd();
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              outInstance = ɵɵload<QueryDirective>(1);
-              inInstance = ɵɵload<QueryDirective>(3);
+              outInstance = Δload<QueryDirective>(1);
+              inInstance = Δload<QueryDirective>(3);
             }
           },
           7, 0, [QueryDirective]);
@@ -2622,7 +2620,7 @@ describe('query', () => {
 
       class QueryDirective {
         fooBars: any;
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: QueryDirective,
           selectors: [['', 'query', '']],
           exportAs: ['query'],
@@ -2631,11 +2629,11 @@ describe('query', () => {
             // @ContentChildren('foo', {descendants: true})
             // fooBars: QueryList<ElementRef>;
             if (rf & RenderFlags.Create) {
-              ɵɵcontentQuery(dirIndex, ['foo'], false, null);
+              ΔcontentQuery(dirIndex, ['foo'], false, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
+              ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
             }
           }
         });
@@ -2652,17 +2650,17 @@ describe('query', () => {
            */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', ['query', ''], ['out', 'query']);
+              ΔelementStart(0, 'div', ['query', ''], ['out', 'query']);
               {
-                ɵɵelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
-                { ɵɵelement(5, 'span', ['id', 'bar'], ['foo', '']); }
-                ɵɵelementEnd();
+                ΔelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
+                { Δelement(5, 'span', ['id', 'bar'], ['foo', '']); }
+                ΔelementEnd();
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              outInstance = ɵɵload<QueryDirective>(1);
-              inInstance = ɵɵload<QueryDirective>(3);
+              outInstance = Δload<QueryDirective>(1);
+              inInstance = Δload<QueryDirective>(3);
             }
           },
           7, 0, [QueryDirective]);
@@ -2682,7 +2680,7 @@ describe('query', () => {
        () => {
          class ShallowQueryDirective {
            foos: any;
-           static ngDirectiveDef = ɵɵdefineDirective({
+           static ngDirectiveDef = ΔdefineDirective({
              type: ShallowQueryDirective,
              selectors: [['', 'shallow-query', '']],
              exportAs: ['shallow-query'],
@@ -2691,11 +2689,11 @@ describe('query', () => {
                // @ContentChildren('foo', {descendants: false})
                // foos: QueryList<ElementRef>;
                if (rf & RenderFlags.Create) {
-                 ɵɵcontentQuery(dirIndex, ['foo'], false, null);
+                 ΔcontentQuery(dirIndex, ['foo'], false, null);
                }
                if (rf & RenderFlags.Update) {
                  let tmp: any;
-                 ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+                 ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
                }
              }
            });
@@ -2703,7 +2701,7 @@ describe('query', () => {
 
          class DeepQueryDirective {
            foos: any;
-           static ngDirectiveDef = ɵɵdefineDirective({
+           static ngDirectiveDef = ΔdefineDirective({
              type: DeepQueryDirective,
              selectors: [['', 'deep-query', '']],
              exportAs: ['deep-query'],
@@ -2712,11 +2710,11 @@ describe('query', () => {
                // @ContentChildren('foo', {descendants: true})
                // foos: QueryList<ElementRef>;
                if (rf & RenderFlags.Create) {
-                 ɵɵcontentQuery(dirIndex, ['foo'], true, null);
+                 ΔcontentQuery(dirIndex, ['foo'], true, null);
                }
                if (rf & RenderFlags.Update) {
                  let tmp: any;
-                 ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+                 ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
                }
              }
            });
@@ -2737,20 +2735,20 @@ describe('query', () => {
               */
              function(rf: RenderFlags, ctx: any) {
                if (rf & RenderFlags.Create) {
-                 ɵɵelementStart(
+                 ΔelementStart(
                      0, 'div', [AttributeMarker.Bindings, 'shallow-query', 'deep-query'],
                      ['shallow', 'shallow-query', 'deep', 'deep-query']);
                  {
-                   ɵɵelement(3, 'span', null, ['foo', '']);
-                   ɵɵelementStart(5, 'div');
-                   { ɵɵelement(6, 'span', null, ['foo', '']); }
-                   ɵɵelementEnd();
+                   Δelement(3, 'span', null, ['foo', '']);
+                   ΔelementStart(5, 'div');
+                   { Δelement(6, 'span', null, ['foo', '']); }
+                   ΔelementEnd();
                  }
-                 ɵɵelementEnd();
+                 ΔelementEnd();
                }
                if (rf & RenderFlags.Update) {
-                 shallowInstance = ɵɵload<ShallowQueryDirective>(1);
-                 deepInstance = ɵɵload<DeepQueryDirective>(2);
+                 shallowInstance = Δload<ShallowQueryDirective>(1);
+                 deepInstance = Δload<DeepQueryDirective>(2);
                }
              },
              8, 0, [ShallowQueryDirective, DeepQueryDirective]);
@@ -2765,7 +2763,7 @@ describe('query', () => {
     class TextDirective {
       value !: string;
 
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: TextDirective,
         selectors: [['', 'text', '']],
         factory: () => new TextDirective(),
@@ -2780,7 +2778,7 @@ describe('query', () => {
         // @ContentChildren(TextDirective)
         texts !: QueryList<TextDirective>;
 
-        static ngComponentDef = ɵɵdefineDirective({
+        static ngComponentDef = ΔdefineDirective({
           type: ContentQueryDirective,
           selectors: [['', 'content-query', '']],
           factory: () => contentQueryDirective = new ContentQueryDirective(),
@@ -2788,11 +2786,11 @@ describe('query', () => {
             // @ContentChildren(TextDirective, {descendants: true})
             // texts: QueryList<TextDirective>;
             if (rf & RenderFlags.Create) {
-              ɵɵcontentQuery(dirIndex, TextDirective, true, null);
+              ΔcontentQuery(dirIndex, TextDirective, true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<TextDirective>()) && (ctx.texts = tmp);
+              ΔqueryRefresh(tmp = ΔloadContentQuery<TextDirective>()) && (ctx.texts = tmp);
             }
           }
         });
@@ -2813,17 +2811,17 @@ describe('query', () => {
           */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', ['content-query']);
+              ΔelementStart(0, 'div', ['content-query']);
               {
-                ɵɵelement(1, 'span', ['text', 'A']);
-                ɵɵelementStart(2, 'div', ['text', 'B']);
-                ɵɵelementStart(3, 'span', ['text', 'C']);
-                { ɵɵelement(4, 'span', ['text', 'D']); }
-                ɵɵelementEnd();
-                ɵɵelementEnd();
-                ɵɵelement(5, 'span', ['text', 'E']);
+                Δelement(1, 'span', ['text', 'A']);
+                ΔelementStart(2, 'div', ['text', 'B']);
+                ΔelementStart(3, 'span', ['text', 'C']);
+                { Δelement(4, 'span', ['text', 'D']); }
+                ΔelementEnd();
+                ΔelementEnd();
+                Δelement(5, 'span', ['text', 'E']);
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
           },
           6, 0, [TextDirective, ContentQueryDirective]);
@@ -2848,19 +2846,19 @@ describe('query', () => {
         // @ViewChildren(TextDirective)
         texts !: QueryList<TextDirective>;
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ViewQueryComponent,
           selectors: [['view-query']],
           factory: () => new ViewQueryComponent(),
           template: function(rf: RenderFlags, ctx: ViewQueryComponent) {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'span', ['text', 'A']);
-              ɵɵelementStart(1, 'div', ['text', 'B']);
-              ɵɵelementStart(2, 'span', ['text', 'C']);
-              { ɵɵelement(3, 'span', ['text', 'D']); }
-              ɵɵelementEnd();
-              ɵɵelementEnd();
-              ɵɵelement(4, 'span', ['text', 'E']);
+              Δelement(0, 'span', ['text', 'A']);
+              ΔelementStart(1, 'div', ['text', 'B']);
+              ΔelementStart(2, 'span', ['text', 'C']);
+              { Δelement(3, 'span', ['text', 'D']); }
+              ΔelementEnd();
+              ΔelementEnd();
+              Δelement(4, 'span', ['text', 'E']);
             }
           },
           consts: 5,
@@ -2868,10 +2866,10 @@ describe('query', () => {
           viewQuery: function(rf: RenderFlags, ctx: ViewQueryComponent) {
             let tmp: any;
             if (rf & RenderFlags.Create) {
-              ɵɵviewQuery(TextDirective, true, null);
+              ΔviewQuery(TextDirective, true, null);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<TextDirective>>()) &&
+              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<TextDirective>>()) &&
                   (ctx.texts = tmp as QueryList<TextDirective>);
             }
           },
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 63069703cc..f52e1e6409 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -27,7 +27,7 @@ import {CreateComponentOptions} from '../../src/render3/component';
 import {getDirectivesAtNodeIndex, getLContext, isComponentInstance} from '../../src/render3/context_discovery';
 import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
 import {NG_ELEMENT_ID} from '../../src/render3/fields';
-import {ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, RenderFlags, renderComponent as _renderComponent, tick, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
+import {ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, RenderFlags, renderComponent as _renderComponent, tick, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
 import {DirectiveDefList, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {PlayerHandler} from '../../src/render3/interfaces/player';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, RendererFactory3, RendererStyleFlags3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
@@ -317,7 +317,7 @@ export function createComponent(
     viewProviders: Provider[] = [], hostBindings?: HostBindingsFunction<any>): ComponentType<any> {
   return class Component {
     value: any;
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: Component,
       selectors: [[name]],
       consts: consts,
@@ -328,7 +328,7 @@ export function createComponent(
       directives: directives, hostBindings,
       pipes: pipes,
       features: (providers.length > 0 || viewProviders.length > 0)?
-      [ɵɵProvidersFeature(providers || [], viewProviders || [])]: []
+      [ΔProvidersFeature(providers || [], viewProviders || [])]: []
     });
   };
 }
@@ -336,7 +336,7 @@ export function createComponent(
 export function createDirective(
     name: string, {exportAs}: {exportAs?: string[]} = {}): DirectiveType<any> {
   return class Directive {
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: Directive,
       selectors: [['', name, '']],
       factory: () => new Directive(),
diff --git a/packages/core/test/render3/renderer_factory_spec.ts b/packages/core/test/render3/renderer_factory_spec.ts
index 1e7473bdbd..b13582d769 100644
--- a/packages/core/test/render3/renderer_factory_spec.ts
+++ b/packages/core/test/render3/renderer_factory_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {RendererType2, ViewEncapsulation} from '../../src/core';
-import {ɵɵdefineComponent} from '../../src/render3/index';
-import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtext} from '../../src/render3/instructions/all';
+import {ΔdefineComponent} from '../../src/render3/index';
+import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {getRendererFactory2} from './imported_renderer2';
@@ -26,7 +26,7 @@ describe('renderer factory lifecycle', () => {
   rendererFactory.end = () => logs.push('end');
 
   class SomeComponent {
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: SomeComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['some-component']],
@@ -35,7 +35,7 @@ describe('renderer factory lifecycle', () => {
       template: function(rf: RenderFlags, ctx: SomeComponent) {
         if (rf & RenderFlags.Create) {
           logs.push('component create');
-          ɵɵtext(0, 'foo');
+          Δtext(0, 'foo');
         }
         if (rf & RenderFlags.Update) {
           logs.push('component update');
@@ -46,7 +46,7 @@ describe('renderer factory lifecycle', () => {
   }
 
   class SomeComponentWhichThrows {
-    static ngComponentDef = ɵɵdefineComponent({
+    static ngComponentDef = ΔdefineComponent({
       type: SomeComponentWhichThrows,
       encapsulation: ViewEncapsulation.None,
       selectors: [['some-component-with-Error']],
@@ -62,7 +62,7 @@ describe('renderer factory lifecycle', () => {
   function Template(rf: RenderFlags, ctx: any) {
     if (rf & RenderFlags.Create) {
       logs.push('function create');
-      ɵɵtext(0, 'bar');
+      Δtext(0, 'bar');
     }
     if (rf & RenderFlags.Update) {
       logs.push('function update');
@@ -74,8 +74,8 @@ describe('renderer factory lifecycle', () => {
   function TemplateWithComponent(rf: RenderFlags, ctx: any) {
     if (rf & RenderFlags.Create) {
       logs.push('function_with_component create');
-      ɵɵtext(0, 'bar');
-      ɵɵelement(1, 'some-component');
+      Δtext(0, 'bar');
+      Δelement(1, 'some-component');
     }
     if (rf & RenderFlags.Update) {
       logs.push('function_with_component update');
@@ -114,27 +114,27 @@ describe('Renderer2 destruction hooks', () => {
     let condition = true;
 
     function createTemplate() {
-      ɵɵelementStart(0, 'div');
-      { ɵɵcontainer(1); }
-      ɵɵelementEnd();
+      ΔelementStart(0, 'div');
+      { Δcontainer(1); }
+      ΔelementEnd();
     }
 
     function updateTemplate() {
-      ɵɵcontainerRefreshStart(1);
+      ΔcontainerRefreshStart(1);
       {
         if (condition) {
-          let rf1 = ɵɵembeddedViewStart(1, 3, 0);
+          let rf1 = ΔembeddedViewStart(1, 3, 0);
           {
             if (rf1 & RenderFlags.Create) {
-              ɵɵelement(0, 'span');
-              ɵɵelement(1, 'span');
-              ɵɵelement(2, 'span');
+              Δelement(0, 'span');
+              Δelement(1, 'span');
+              Δelement(2, 'span');
             }
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
       }
-      ɵɵcontainerRefreshEnd();
+      ΔcontainerRefreshEnd();
     }
 
     const t = new TemplateFixture(
@@ -150,7 +150,7 @@ describe('Renderer2 destruction hooks', () => {
 
   it('should call renderer.destroy for each component destroyed', () => {
     class SimpleComponent {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: SimpleComponent,
         encapsulation: ViewEncapsulation.None,
         selectors: [['simple']],
@@ -158,7 +158,7 @@ describe('Renderer2 destruction hooks', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: SimpleComponent) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'span');
+            Δelement(0, 'span');
           }
         },
         factory: () => new SimpleComponent,
@@ -168,27 +168,27 @@ describe('Renderer2 destruction hooks', () => {
     let condition = true;
 
     function createTemplate() {
-      ɵɵelementStart(0, 'div');
-      { ɵɵcontainer(1); }
-      ɵɵelementEnd();
+      ΔelementStart(0, 'div');
+      { Δcontainer(1); }
+      ΔelementEnd();
     }
 
     function updateTemplate() {
-      ɵɵcontainerRefreshStart(1);
+      ΔcontainerRefreshStart(1);
       {
         if (condition) {
-          let rf1 = ɵɵembeddedViewStart(1, 3, 0);
+          let rf1 = ΔembeddedViewStart(1, 3, 0);
           {
             if (rf1 & RenderFlags.Create) {
-              ɵɵelement(0, 'simple');
-              ɵɵelement(1, 'span');
-              ɵɵelement(2, 'simple');
+              Δelement(0, 'simple');
+              Δelement(1, 'span');
+              Δelement(2, 'simple');
             }
           }
-          ɵɵembeddedViewEnd();
+          ΔembeddedViewEnd();
         }
       }
-      ɵɵcontainerRefreshEnd();
+      ΔcontainerRefreshEnd();
     }
 
     const t = new TemplateFixture(
diff --git a/packages/core/test/render3/styling/class_and_style_bindings_spec.ts b/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
index 3dfecb239f..f85cc1e3af 100644
--- a/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
+++ b/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
@@ -9,7 +9,7 @@ import {createLView, createTView} from '@angular/core/src/render3/instructions/s
 
 import {createRootContext} from '../../../src/render3/component';
 import {getLContext} from '../../../src/render3/context_discovery';
-import {ɵɵclassMap, ɵɵclassProp, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵelementEnd, ɵɵelementStart, ɵɵnamespaceSVG, ɵɵselect, ɵɵstyleMap, ɵɵstyleProp, ɵɵstyling, ɵɵstylingApply} from '../../../src/render3/index';
+import {ΔclassMap, ΔclassProp, ΔdefineComponent, ΔdefineDirective, ΔelementEnd, ΔelementStart, ΔnamespaceSVG, Δselect, ΔstyleMap, ΔstyleProp, Δstyling, ΔstylingApply} from '../../../src/render3/index';
 import {RenderFlags} from '../../../src/render3/interfaces/definition';
 import {AttributeMarker, TAttributes} from '../../../src/render3/interfaces/node';
 import {BindingStore, BindingType, PlayState, Player, PlayerContext, PlayerFactory, PlayerHandler} from '../../../src/render3/interfaces/player';
@@ -22,7 +22,7 @@ import {CorePlayerHandler} from '../../../src/render3/styling/core_player_handle
 import {registerHostDirective} from '../../../src/render3/styling/host_instructions_queue';
 import {BoundPlayerFactory, bindPlayerFactory} from '../../../src/render3/styling/player_factory';
 import {allocStylingContext, createEmptyStylingContext} from '../../../src/render3/styling/util';
-import {ɵɵdefaultStyleSanitizer} from '../../../src/sanitization/sanitization';
+import {ΔdefaultStyleSanitizer} from '../../../src/sanitization/sanitization';
 import {StyleSanitizeFn} from '../../../src/sanitization/style_sanitizer';
 import {ComponentFixture, renderToHtml} from '../render_util';
 
@@ -383,7 +383,7 @@ describe('style and class based bindings', () => {
          () => {
            function Template(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵelementStart(0, 'span', [
+               ΔelementStart(0, 'span', [
                  AttributeMarker.Styles,
                  'width',
                  '200px',
@@ -392,14 +392,14 @@ describe('style and class based bindings', () => {
                  'opacity',
                  '0.5',
                ]);
-               ɵɵstyling(null, ['width']);
-               ɵɵelementEnd();
+               Δstyling(null, ['width']);
+               ΔelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               ɵɵselect(0);
-               ɵɵstyleMap(ctx.myStyles);
-               ɵɵstyleProp(0, ctx.myWidth);
-               ɵɵstylingApply();
+               Δselect(0);
+               ΔstyleMap(ctx.myStyles);
+               ΔstyleProp(0, ctx.myWidth);
+               ΔstylingApply();
              }
            }
 
@@ -419,7 +419,7 @@ describe('style and class based bindings', () => {
         class Comp {
           diameter: number = 100;
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: Comp,
             selectors: [['comp']],
             factory: () => new Comp(),
@@ -427,18 +427,18 @@ describe('style and class based bindings', () => {
             vars: 0,
             template: (rf: RenderFlags, ctx: Comp) => {
               if (rf & RenderFlags.Create) {
-                ɵɵnamespaceSVG();
-                ɵɵelementStart(0, 'svg');
-                ɵɵstyling(null, ['width', 'height']);
-                ɵɵelementStart(1, 'circle', ['stroke', 'green', 'fill', 'yellow']);
-                ɵɵelementEnd();
-                ɵɵelementEnd();
+                ΔnamespaceSVG();
+                ΔelementStart(0, 'svg');
+                Δstyling(null, ['width', 'height']);
+                ΔelementStart(1, 'circle', ['stroke', 'green', 'fill', 'yellow']);
+                ΔelementEnd();
+                ΔelementEnd();
               }
               if (rf & RenderFlags.Update) {
-                ɵɵselect(0);
-                ɵɵstyleProp(0, ctx.diameter, 'px');
-                ɵɵstyleProp(1, ctx.diameter, 'px');
-                ɵɵstylingApply();
+                Δselect(0);
+                ΔstyleProp(0, ctx.diameter, 'px');
+                ΔstyleProp(1, ctx.diameter, 'px');
+                ΔstylingApply();
               }
             }
           });
@@ -462,7 +462,7 @@ describe('style and class based bindings', () => {
           borderWidth: string = '3px';
           borderColor: string = 'red';
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: Comp,
             selectors: [['comp']],
             factory: () => new Comp(),
@@ -470,15 +470,15 @@ describe('style and class based bindings', () => {
             vars: 0,
             template: (rf: RenderFlags, ctx: Comp) => {
               if (rf & RenderFlags.Create) {
-                ɵɵelementStart(0, 'div');
-                ɵɵstyling(null, ['borderWidth', 'border-color']);
-                ɵɵelementEnd();
+                ΔelementStart(0, 'div');
+                Δstyling(null, ['borderWidth', 'border-color']);
+                ΔelementEnd();
               }
               if (rf & RenderFlags.Update) {
-                ɵɵselect(0);
-                ɵɵstyleProp(0, ctx.borderWidth);
-                ɵɵstyleProp(1, ctx.borderColor);
-                ɵɵstylingApply();
+                Δselect(0);
+                ΔstyleProp(0, ctx.borderWidth);
+                ΔstyleProp(1, ctx.borderColor);
+                ΔstylingApply();
               }
             }
           });
@@ -1279,7 +1279,7 @@ describe('style and class based bindings', () => {
          () => {
            const getStyles = trackStylesFactory();
            const styleBindings = ['border-image', 'border-width'];
-           const styleSanitizer = ɵɵdefaultStyleSanitizer;
+           const styleSanitizer = ΔdefaultStyleSanitizer;
            const stylingContext =
                createStylingContext(null, styleBindings, null, null, styleSanitizer);
 
@@ -3099,7 +3099,7 @@ describe('style and class based bindings', () => {
          const fooFactory = bindPlayerFactory(classBuildFn, true);
 
          class Comp {
-           static ngComponentDef = ɵɵdefineComponent({
+           static ngComponentDef = ΔdefineComponent({
              type: Comp,
              selectors: [['comp']],
              directives: [Comp],
@@ -3108,17 +3108,17 @@ describe('style and class based bindings', () => {
              vars: 0,
              template: (rf: RenderFlags, ctx: Comp) => {
                if (rf & RenderFlags.Create) {
-                 ɵɵelementStart(0, 'div');
-                 ɵɵstyling(['foo'], ['width']);
-                 ɵɵelementEnd();
+                 ΔelementStart(0, 'div');
+                 Δstyling(['foo'], ['width']);
+                 ΔelementEnd();
                }
                if (rf & RenderFlags.Update) {
-                 ɵɵselect(0);
-                 ɵɵstyleMap(styleMapFactory);
-                 ɵɵclassMap(classMapFactory);
-                 ɵɵstyleProp(0, widthFactory);
-                 ɵɵclassProp(0, fooFactory);
-                 ɵɵstylingApply();
+                 Δselect(0);
+                 ΔstyleMap(styleMapFactory);
+                 ΔclassMap(classMapFactory);
+                 ΔstyleProp(0, widthFactory);
+                 ΔclassProp(0, fooFactory);
+                 ΔstylingApply();
                }
              }
            });
@@ -3174,7 +3174,7 @@ describe('style and class based bindings', () => {
       let fooFactory = bindPlayerFactory(buildFn, true) as BoundPlayerFactory<any>;
 
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Comp,
           selectors: [['comp']],
           directives: [Comp],
@@ -3183,17 +3183,17 @@ describe('style and class based bindings', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: Comp) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div');
-              ɵɵstyling(['foo'], ['width']);
-              ɵɵelementEnd();
+              ΔelementStart(0, 'div');
+              Δstyling(['foo'], ['width']);
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              ɵɵselect(0);
-              ɵɵstyleMap(styleMapFactory);
-              ɵɵclassMap(classMapFactory);
-              ɵɵstyleProp(0, widthFactory);
-              ɵɵclassProp(0, fooFactory);
-              ɵɵstylingApply();
+              Δselect(0);
+              ΔstyleMap(styleMapFactory);
+              ΔclassMap(classMapFactory);
+              ΔstyleProp(0, widthFactory);
+              ΔclassProp(0, fooFactory);
+              ΔstylingApply();
             }
           }
         });
@@ -3251,18 +3251,18 @@ describe('style and class based bindings', () => {
       const fooFactory2 = bindPlayerFactory(classBuildFn, true);
 
       class MyDir {
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: MyDir,
           selectors: [['', 'my-dir', '']],
           factory: () => new MyDir(),
           hostBindings: function(rf: RenderFlags, ctx: MyDir, elementIndex: number) {
             if (rf & RenderFlags.Create) {
-              ɵɵstyling(['foo'], ['width']);
+              Δstyling(['foo'], ['width']);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵstyleProp(0, ctx.widthFactory);
-              ɵɵclassProp(0, ctx.fooFactory);
-              ɵɵstylingApply();
+              ΔstyleProp(0, ctx.widthFactory);
+              ΔclassProp(0, ctx.fooFactory);
+              ΔstylingApply();
             }
           }
         });
@@ -3272,7 +3272,7 @@ describe('style and class based bindings', () => {
       }
 
       class Comp {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Comp,
           selectors: [['comp']],
           directives: [Comp, MyDir],
@@ -3281,15 +3281,15 @@ describe('style and class based bindings', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: Comp) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelementStart(0, 'div', ['my-dir', '']);
-              ɵɵstyling(['foo'], ['width']);
-              ɵɵelementEnd();
+              ΔelementStart(0, 'div', ['my-dir', '']);
+              Δstyling(['foo'], ['width']);
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              ɵɵselect(0);
-              ɵɵstyleProp(0, ctx.widthFactory);
-              ɵɵclassProp(0, ctx.fooFactory);
-              ɵɵstylingApply();
+              Δselect(0);
+              ΔstyleProp(0, ctx.widthFactory);
+              ΔclassProp(0, ctx.fooFactory);
+              ΔstylingApply();
             }
           }
         });
diff --git a/packages/core/test/render3/styling/players_spec.ts b/packages/core/test/render3/styling/players_spec.ts
index f0b494ddf5..5f73651386 100644
--- a/packages/core/test/render3/styling/players_spec.ts
+++ b/packages/core/test/render3/styling/players_spec.ts
@@ -8,12 +8,12 @@
 import {QueryList} from '@angular/core';
 import {RenderFlags} from '@angular/core/src/render3';
 
-import {getHostElement, ɵɵdefineComponent, ɵɵloadViewQuery, ɵɵviewQuery} from '../../../src/render3/index';
-import {markDirty, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵselect, ɵɵstyling, ɵɵstylingApply} from '../../../src/render3/instructions/all';
+import {getHostElement, ΔdefineComponent, ΔloadViewQuery, ΔviewQuery} from '../../../src/render3/index';
+import {markDirty, Δelement, ΔelementEnd, ΔelementStart, Δselect, Δstyling, ΔstylingApply} from '../../../src/render3/instructions/all';
 import {PlayState, Player, PlayerHandler} from '../../../src/render3/interfaces/player';
 import {RElement} from '../../../src/render3/interfaces/renderer';
 import {addPlayer, getPlayers} from '../../../src/render3/players';
-import {ɵɵqueryRefresh} from '../../../src/render3/query';
+import {ΔqueryRefresh} from '../../../src/render3/query';
 import {getOrCreatePlayerContext} from '../../../src/render3/styling/util';
 import {ComponentFixture} from '../render_util';
 
@@ -228,7 +228,7 @@ function buildElementWithStyling() {
 }
 
 class Comp {
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     type: Comp,
     exportAs: ['child'],
     selectors: [['child-comp']],
@@ -237,7 +237,7 @@ class Comp {
     vars: 0,
     template: (rf: RenderFlags, ctx: Comp) => {
       if (rf & RenderFlags.Create) {
-        ɵɵelement(0, 'div');
+        Δelement(0, 'div');
       }
       ctx.logger();
     }
@@ -248,7 +248,7 @@ class Comp {
 }
 
 class CompWithStyling {
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     type: CompWithStyling,
     exportAs: ['child-styled'],
     selectors: [['child-styled-comp']],
@@ -257,13 +257,13 @@ class CompWithStyling {
     vars: 0,
     template: (rf: RenderFlags, ctx: CompWithStyling) => {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        ɵɵstyling(['fooClass']);
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        Δstyling(['fooClass']);
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵselect(0);
-        ɵɵstylingApply();
+        Δselect(0);
+        ΔstylingApply();
       }
     }
   });
@@ -272,7 +272,7 @@ class CompWithStyling {
 }
 
 class SuperComp {
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     type: SuperComp,
     selectors: [['super-comp']],
     factory: () => new SuperComp(),
@@ -280,18 +280,18 @@ class SuperComp {
     vars: 0,
     template: (rf: RenderFlags, ctx: SuperComp) => {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'div');
-        ɵɵelement(1, 'child-comp', ['child', ''], ['child', 'child']);
-        ɵɵelementEnd();
+        ΔelementStart(0, 'div');
+        Δelement(1, 'child-comp', ['child', ''], ['child', 'child']);
+        ΔelementEnd();
       }
     },
     viewQuery: function(rf: RenderFlags, ctx: SuperComp) {
       if (rf & RenderFlags.Create) {
-        ɵɵviewQuery(['child'], true, null);
+        ΔviewQuery(['child'], true, null);
       }
       if (rf & RenderFlags.Update) {
         let tmp: any;
-        ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+        ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
             (ctx.query = tmp as QueryList<any>);
       }
     },
diff --git a/packages/core/test/render3/template_ref_spec.ts b/packages/core/test/render3/template_ref_spec.ts
index 36b2b70b93..d5059f366e 100644
--- a/packages/core/test/render3/template_ref_spec.ts
+++ b/packages/core/test/render3/template_ref_spec.ts
@@ -8,8 +8,8 @@
 
 import {TemplateRef} from '@angular/core';
 
-import {AttributeMarker, RenderFlags, ɵɵdefineDirective} from '../../src/render3/index';
-import {ɵɵbind, ɵɵdirectiveInject, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementProperty, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
+import {AttributeMarker, RenderFlags, ΔdefineDirective} from '../../src/render3/index';
+import {Δbind, ΔdirectiveInject, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementProperty, Δtemplate, Δtext} from '../../src/render3/instructions/all';
 
 import {NgIf} from './common_with_def';
 import {ComponentFixture, createComponent, getDirectiveOnNode} from './render_util';
@@ -19,10 +19,10 @@ describe('TemplateRef', () => {
   describe('rootNodes', () => {
 
     class DirectiveWithTplRef {
-      static ngDirectiveDef = ɵɵdefineDirective({
+      static ngDirectiveDef = ΔdefineDirective({
         type: DirectiveWithTplRef,
         selectors: [['', 'tplRef', '']],
-        factory: () => new DirectiveWithTplRef(ɵɵdirectiveInject(TemplateRef as any))
+        factory: () => new DirectiveWithTplRef(ΔdirectiveInject(TemplateRef as any))
       });
 
       // injecting a ViewContainerRef to create a dynamic container in which embedded views will be
@@ -35,9 +35,9 @@ describe('TemplateRef', () => {
 
       function embeddedTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'div');
-          ɵɵtext(1, 'some text');
-          ɵɵelement(2, 'span');
+          Δelement(0, 'div');
+          Δtext(1, 'some text');
+          Δelement(2, 'span');
         }
       }
 
@@ -50,7 +50,7 @@ describe('TemplateRef', () => {
        */
       const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, embeddedTemplate, 3, 0, 'ng-template', ['tplRef', '']);
+          Δtemplate(0, embeddedTemplate, 3, 0, 'ng-template', ['tplRef', '']);
           directiveWithTplRef = getDirectiveOnNode(0, 0);
         }
       }, 1, 0, [DirectiveWithTplRef]);
@@ -79,7 +79,7 @@ describe('TemplateRef', () => {
        */
       const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, () => {}, 0, 0, 'ng-template', ['tplRef', '']);
+          Δtemplate(0, () => {}, 0, 0, 'ng-template', ['tplRef', '']);
           directiveWithTplRef = getDirectiveOnNode(0, 0);
         }
       }, 1, 0, [DirectiveWithTplRef]);
@@ -102,16 +102,16 @@ describe('TemplateRef', () => {
 
       function ngIfTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtext(0, 'text');
+          Δtext(0, 'text');
         }
       }
 
       function embeddedTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, ngIfTemplate, 1, 0, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
+          Δtemplate(0, ngIfTemplate, 1, 0, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'ngIf', ɵɵbind(ctx.showing));
+          ΔelementProperty(0, 'ngIf', Δbind(ctx.showing));
         }
       }
 
@@ -120,7 +120,7 @@ describe('TemplateRef', () => {
        */
       const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, embeddedTemplate, 1, 1, 'ng-template', ['tplRef', '']);
+          Δtemplate(0, embeddedTemplate, 1, 1, 'ng-template', ['tplRef', '']);
           directiveWithTplRef = getDirectiveOnNode(0, 0);
         }
       }, 1, 0, [DirectiveWithTplRef, NgIf]);
@@ -147,9 +147,9 @@ describe('TemplateRef', () => {
 
       function embeddedTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelementContainerStart(0);
-          { ɵɵtext(1, 'text'); }
-          ɵɵelementContainerEnd();
+          ΔelementContainerStart(0);
+          { Δtext(1, 'text'); }
+          ΔelementContainerEnd();
         }
       }
 
@@ -158,7 +158,7 @@ describe('TemplateRef', () => {
        */
       const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵtemplate(0, embeddedTemplate, 2, 0, 'ng-template', ['tplRef', '']);
+          Δtemplate(0, embeddedTemplate, 2, 0, 'ng-template', ['tplRef', '']);
           directiveWithTplRef = getDirectiveOnNode(0, 0);
         }
       }, 1, 0, [DirectiveWithTplRef]);
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 0e1ab26879..d0c1462cd7 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -6,19 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ComponentRef, ɵɵdefineInjector, ElementRef, EmbeddedViewRef, NgModuleRef, Pipe, PipeTransform, QueryList, RendererFactory2, TemplateRef, ViewContainerRef, ViewRef, ɵAPP_ROOT as APP_ROOT, ɵNgModuleDef as NgModuleDef,} from '../../src/core';
+import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ComponentRef, ΔdefineInjector, ElementRef, EmbeddedViewRef, NgModuleRef, Pipe, PipeTransform, QueryList, RendererFactory2, TemplateRef, ViewContainerRef, ViewRef, ɵAPP_ROOT as APP_ROOT, ɵNgModuleDef as NgModuleDef,} from '../../src/core';
 import {createInjector} from '../../src/di/r3_injector';
 import {ViewEncapsulation} from '../../src/metadata';
-import {AttributeMarker, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdefinePipe, injectComponentFactoryResolver, ɵɵlistener, ɵɵloadViewQuery, ɵɵNgOnChangesFeature, ɵɵqueryRefresh, ɵɵviewQuery,} from '../../src/render3/index';
+import {AttributeMarker, ΔdefineComponent, ΔdefineDirective, ΔdefinePipe, injectComponentFactoryResolver, Δlistener, ΔloadViewQuery, ΔNgOnChangesFeature, ΔqueryRefresh, ΔviewQuery,} from '../../src/render3/index';
 
-import {ɵɵallocHostVars, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementHostAttrs, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵinterpolation3, ɵɵnextContext, ɵɵprojection, ɵɵprojectionDef, ɵɵreference, ɵɵtemplate, ɵɵtext, ɵɵtextBinding,} from '../../src/render3/instructions/all';
+import {ΔallocHostVars, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementHostAttrs, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δinterpolation3, ΔnextContext, Δprojection, ΔprojectionDef, Δreference, Δtemplate, Δtext, ΔtextBinding,} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {RElement} from '../../src/render3/interfaces/renderer';
 import {NgModuleFactory} from '../../src/render3/ng_module_ref';
-import {ɵɵpipe, ɵɵpipeBind1} from '../../src/render3/pipe';
+import {Δpipe, ΔpipeBind1} from '../../src/render3/pipe';
 import {getLView} from '../../src/render3/state';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
-import {ɵɵtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
+import {ΔtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
 import {NgForOf} from '../../test/render3/common_with_def';
 
 import {getRendererFactory2} from './imported_renderer2';
@@ -36,12 +36,12 @@ describe('ViewContainerRef', () => {
   beforeEach(() => directiveInstance = null);
 
   class DirectiveWithVCRef {
-    static ngDirectiveDef = ɵɵdefineDirective({
+    static ngDirectiveDef = ΔdefineDirective({
       type: DirectiveWithVCRef,
       selectors: [['', 'vcref', '']],
       factory: () => directiveInstance = new DirectiveWithVCRef(
 
-                   ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                   ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
       inputs: {tplRef: 'tplRef', name: 'name'}
     });
 
@@ -61,10 +61,10 @@ describe('ViewContainerRef', () => {
      */
     function embeddedTemplate(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵtext(0);
+        Δtext(0);
       }
       if (rf & RenderFlags.Update) {
-        ɵɵtextBinding(0, ɵɵbind(ctx.name));
+        ΔtextBinding(0, Δbind(ctx.name));
       }
     }
 
@@ -78,14 +78,14 @@ describe('ViewContainerRef', () => {
      * <p vcref [tplRef]="tplRef"></p>
      */
     function createTemplate() {
-      ɵɵtemplate(
-          0, embeddedTemplate, 1, 1, 'ng-template', null, ['tplRef', ''], ɵɵtemplateRefExtractor);
-      ɵɵelement(2, 'p', ['vcref', '']);
+      Δtemplate(
+          0, embeddedTemplate, 1, 1, 'ng-template', null, ['tplRef', ''], ΔtemplateRefExtractor);
+      Δelement(2, 'p', ['vcref', '']);
     }
 
     function updateTemplate() {
-      const tplRef = ɵɵreference(1);
-      ɵɵelementProperty(2, 'tplRef', ɵɵbind(tplRef));
+      const tplRef = Δreference(1);
+      ΔelementProperty(2, 'tplRef', Δbind(tplRef));
     }
 
     describe('createEmbeddedView (incl. insert)', () => {
@@ -96,11 +96,11 @@ describe('ViewContainerRef', () => {
          * <footer></footer>
          */
         function createTemplate() {
-          ɵɵtemplate(
+          Δtemplate(
               0, embeddedTemplate, 1, 1, 'ng-template', null, ['tplRef', ''],
-              ɵɵtemplateRefExtractor);
-          ɵɵelement(2, 'header', ['vcref', '']);
-          ɵɵelement(3, 'footer');
+              ΔtemplateRefExtractor);
+          Δelement(2, 'header', ['vcref', '']);
+          Δelement(3, 'footer');
         }
 
         const fixture =
@@ -134,10 +134,10 @@ describe('ViewContainerRef', () => {
          * <footer></footer>
          */
         function createTemplate() {
-          ɵɵtemplate(
-              0, embeddedTemplate, 1, 1, 'ng-template', [], ['tplRef', ''], ɵɵtemplateRefExtractor);
-          ɵɵelement(2, 'header-cmp', ['vcref', '']);
-          ɵɵelement(3, 'footer');
+          Δtemplate(
+              0, embeddedTemplate, 1, 1, 'ng-template', [], ['tplRef', ''], ΔtemplateRefExtractor);
+          Δelement(2, 'header-cmp', ['vcref', '']);
+          Δelement(3, 'footer');
         }
 
         const fixture = new TemplateFixture(
@@ -171,11 +171,11 @@ describe('ViewContainerRef', () => {
          * <div vcref [tplRef]="tplRef"></div>
          */
         function createTemplate() {
-          ɵɵtemplate(
+          Δtemplate(
               0, embeddedTemplate, 1, 1, 'ng-template', null, ['tplRef', ''],
-              ɵɵtemplateRefExtractor);
-          ɵɵelement(2, 'div', ['vcref', '']);
-          ɵɵelement(3, 'div', ['vcref', '']);
+              ΔtemplateRefExtractor);
+          Δelement(2, 'div', ['vcref', '']);
+          Δelement(3, 'div', ['vcref', '']);
 
           // for testing only:
           firstDir = getDirectiveOnNode(2);
@@ -183,9 +183,9 @@ describe('ViewContainerRef', () => {
         }
 
         function update() {
-          const tplRef = ɵɵreference(1);
-          ɵɵelementProperty(2, 'tplRef', ɵɵbind(tplRef));
-          ɵɵelementProperty(3, 'tplRef', ɵɵbind(tplRef));
+          const tplRef = Δreference(1);
+          ΔelementProperty(2, 'tplRef', Δbind(tplRef));
+          ΔelementProperty(3, 'tplRef', Δbind(tplRef));
         }
 
         const fixture = new TemplateFixture(createTemplate, update, 4, 2, [DirectiveWithVCRef]);
@@ -203,15 +203,15 @@ describe('ViewContainerRef', () => {
          * <footer></footer>
          */
         function createTemplate() {
-          ɵɵtemplate(
+          Δtemplate(
               0, embeddedTemplate, 1, 1, 'ng-template', ['vcref', ''], ['tplRef', ''],
-              ɵɵtemplateRefExtractor);
-          ɵɵelement(2, 'footer');
+              ΔtemplateRefExtractor);
+          Δelement(2, 'footer');
         }
 
         function updateTemplate() {
-          const tplRef = ɵɵreference(1);
-          ɵɵelementProperty(0, 'tplRef', ɵɵbind(tplRef));
+          const tplRef = Δreference(1);
+          ΔelementProperty(0, 'tplRef', Δbind(tplRef));
         }
 
         const fixture =
@@ -240,13 +240,13 @@ describe('ViewContainerRef', () => {
            let directiveInstances: TestDirective[] = [];
 
            class TestDirective {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: TestDirective,
                selectors: [['', 'testdir', '']],
                factory: () => {
                  const instance = new TestDirective(
-                     ɵɵdirectiveInject(ViewContainerRef as any),
-                     ɵɵdirectiveInject(TemplateRef as any));
+                     ΔdirectiveInject(ViewContainerRef as any),
+                     ΔdirectiveInject(TemplateRef as any));
 
                  directiveInstances.push(instance);
 
@@ -263,13 +263,13 @@ describe('ViewContainerRef', () => {
 
            function EmbeddedTemplateA(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵtext(0, 'A');
+               Δtext(0, 'A');
              }
            }
 
            function EmbeddedTemplateB(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵtext(0, 'B');
+               Δtext(0, 'B');
              }
            }
 
@@ -282,7 +282,7 @@ describe('ViewContainerRef', () => {
            class TestComponent {
              // TODO(issue/24571): remove '!'.
              testDir !: TestDirective;
-             static ngComponentDef = ɵɵdefineComponent({
+             static ngComponentDef = ΔdefineComponent({
                type: TestComponent,
                encapsulation: ViewEncapsulation.None,
                selectors: [['test-cmp']],
@@ -291,10 +291,10 @@ describe('ViewContainerRef', () => {
                vars: 0,
                template: (rf: RenderFlags, cmp: TestComponent) => {
                  if (rf & RenderFlags.Create) {
-                   ɵɵtext(0, 'before|');
-                   ɵɵtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
-                   ɵɵtemplate(2, EmbeddedTemplateB, 1, 0, 'ng-template', ['testdir', '']);
-                   ɵɵtext(3, '|after');
+                   Δtext(0, 'before|');
+                   Δtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
+                   Δtemplate(2, EmbeddedTemplateB, 1, 0, 'ng-template', ['testdir', '']);
+                   Δtext(3, '|after');
                  }
                },
                directives: [TestDirective]
@@ -317,12 +317,12 @@ describe('ViewContainerRef', () => {
            let directiveInstance: TestDirective;
 
            class TestDirective {
-             static ngDirectiveDef = ɵɵdefineDirective({
+             static ngDirectiveDef = ΔdefineDirective({
                type: TestDirective,
                selectors: [['', 'testdir', '']],
                factory: () => directiveInstance = new TestDirective(
-                            ɵɵdirectiveInject(ViewContainerRef as any),
-                            ɵɵdirectiveInject(TemplateRef as any))
+                            ΔdirectiveInject(ViewContainerRef as any),
+                            ΔdirectiveInject(TemplateRef as any))
              });
 
              constructor(private _vcRef: ViewContainerRef, private _tplRef: TemplateRef<{}>) {}
@@ -339,7 +339,7 @@ describe('ViewContainerRef', () => {
 
            function EmbeddedTemplateA(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵtext(0, 'A');
+               Δtext(0, 'A');
              }
            }
 
@@ -355,7 +355,7 @@ describe('ViewContainerRef', () => {
              condition = false;
              // TODO(issue/24571): remove '!'.
              testDir !: TestDirective;
-             static ngComponentDef = ɵɵdefineComponent({
+             static ngComponentDef = ΔdefineComponent({
                type: TestComponent,
                encapsulation: ViewEncapsulation.None,
                selectors: [['test-cmp']],
@@ -364,25 +364,25 @@ describe('ViewContainerRef', () => {
                factory: () => new TestComponent(),
                template: (rf: RenderFlags, cmp: TestComponent) => {
                  if (rf & RenderFlags.Create) {
-                   ɵɵtext(0, 'before|');
-                   ɵɵtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
-                   ɵɵcontainer(2);
-                   ɵɵtext(3, '|after');
+                   Δtext(0, 'before|');
+                   Δtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
+                   Δcontainer(2);
+                   Δtext(3, '|after');
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵcontainerRefreshStart(2);
+                   ΔcontainerRefreshStart(2);
                    {
                      if (cmp.condition) {
-                       let rf1 = ɵɵembeddedViewStart(0, 1, 0);
+                       let rf1 = ΔembeddedViewStart(0, 1, 0);
                        {
                          if (rf1 & RenderFlags.Create) {
-                           ɵɵtext(0, 'B');
+                           Δtext(0, 'B');
                          }
                        }
-                       ɵɵembeddedViewEnd();
+                       ΔembeddedViewEnd();
                      }
                    }
-                   ɵɵcontainerRefreshEnd();
+                   ΔcontainerRefreshEnd();
                  }
                },
                directives: [TestDirective]
@@ -417,7 +417,7 @@ describe('ViewContainerRef', () => {
           // TODO(issue/24571): remove '!'.
           name !: string;
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: Child,
             encapsulation: ViewEncapsulation.None,
             selectors: [['child']],
@@ -426,10 +426,10 @@ describe('ViewContainerRef', () => {
             vars: 1,
             template: (rf: RenderFlags, cmp: Child) => {
               if (rf & RenderFlags.Create) {
-                ɵɵtext(0);
+                Δtext(0);
               }
               if (rf & RenderFlags.Update) {
-                ɵɵtextBinding(0, ɵɵinterpolation1('', cmp.name, ''));
+                ΔtextBinding(0, Δinterpolation1('', cmp.name, ''));
               }
             },
             inputs: {name: 'name'}
@@ -440,7 +440,7 @@ describe('ViewContainerRef', () => {
         class StarPipe implements PipeTransform {
           transform(value: any) { return `**${value}**`; }
 
-          static ngPipeDef = ɵɵdefinePipe({
+          static ngPipeDef = ΔdefinePipe({
             name: 'starPipe',
             type: StarPipe,
             factory: function StarPipe_Factory() { return new StarPipe(); },
@@ -449,11 +449,11 @@ describe('ViewContainerRef', () => {
 
         function SomeComponent_Template_0(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelement(0, 'child');
-            ɵɵpipe(1, 'starPipe');
+            Δelement(0, 'child');
+            Δpipe(1, 'starPipe');
           }
           if (rf & RenderFlags.Update) {
-            ɵɵelementProperty(0, 'name', ɵɵbind(ɵɵpipeBind1(1, 1, 'C')));
+            ΔelementProperty(0, 'name', Δbind(ΔpipeBind1(1, 1, 'C')));
           }
         }
 
@@ -467,7 +467,7 @@ describe('ViewContainerRef', () => {
           `
         })
         class SomeComponent {
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: SomeComponent,
             encapsulation: ViewEncapsulation.None,
             selectors: [['some-comp']],
@@ -476,19 +476,19 @@ describe('ViewContainerRef', () => {
             vars: 7,
             template: (rf: RenderFlags, cmp: SomeComponent) => {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(
+                Δtemplate(
                     0, SomeComponent_Template_0, 2, 3, 'ng-template', [], ['foo', ''],
-                    ɵɵtemplateRefExtractor);
-                ɵɵpipe(2, 'starPipe');
-                ɵɵelement(3, 'child', ['vcref', '']);
-                ɵɵpipe(4, 'starPipe');
-                ɵɵelement(5, 'child');
+                    ΔtemplateRefExtractor);
+                Δpipe(2, 'starPipe');
+                Δelement(3, 'child', ['vcref', '']);
+                Δpipe(4, 'starPipe');
+                Δelement(5, 'child');
               }
               if (rf & RenderFlags.Update) {
-                const tplRef = ɵɵreference(1);
-                ɵɵelementProperty(3, 'tplRef', ɵɵbind(tplRef));
-                ɵɵelementProperty(3, 'name', ɵɵbind(ɵɵpipeBind1(2, 3, 'A')));
-                ɵɵelementProperty(5, 'name', ɵɵbind(ɵɵpipeBind1(4, 5, 'B')));
+                const tplRef = Δreference(1);
+                ΔelementProperty(3, 'tplRef', Δbind(tplRef));
+                ΔelementProperty(3, 'name', Δbind(ΔpipeBind1(2, 3, 'A')));
+                ΔelementProperty(5, 'name', Δbind(ΔpipeBind1(4, 5, 'B')));
               }
             },
             directives: [Child, DirectiveWithVCRef],
@@ -515,10 +515,10 @@ describe('ViewContainerRef', () => {
 
         constructor(public vcr: ViewContainerRef) {}
 
-        static ngDirectiveDef = ɵɵdefineDirective({
+        static ngDirectiveDef = ΔdefineDirective({
           type: InsertionDir,
           selectors: [['', 'tplDir', '']],
-          factory: () => new InsertionDir(ɵɵdirectiveInject(ViewContainerRef as any)),
+          factory: () => new InsertionDir(ΔdirectiveInject(ViewContainerRef as any)),
           inputs: {tplDir: 'tplDir'}
         });
       }
@@ -536,7 +536,7 @@ describe('ViewContainerRef', () => {
              name = 'Child';
              tpl: TemplateRef<any>|null = null;
 
-             static ngComponentDef = ɵɵdefineComponent({
+             static ngComponentDef = ΔdefineComponent({
                type: Child,
                encapsulation: ViewEncapsulation.None,
                selectors: [['child']],
@@ -545,13 +545,13 @@ describe('ViewContainerRef', () => {
                vars: 2,
                template: function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'tplDir']);
-                   { ɵɵtext(1); }
-                   ɵɵelementEnd();
+                   ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'tplDir']);
+                   { Δtext(1); }
+                   ΔelementEnd();
                  }
                  if (rf & RenderFlags.Update) {
-                   ɵɵelementProperty(0, 'tplDir', ɵɵbind(ctx.tpl));
-                   ɵɵtextBinding(1, ɵɵbind(ctx.name));
+                   ΔelementProperty(0, 'tplDir', Δbind(ctx.tpl));
+                   ΔtextBinding(1, Δbind(ctx.name));
                  }
                },
                inputs: {tpl: 'tpl'},
@@ -569,27 +569,27 @@ describe('ViewContainerRef', () => {
             */
            const Parent = createComponent('parent', function(rf: RenderFlags, parent: any) {
              if (rf & RenderFlags.Create) {
-               ɵɵtemplate(
-                   0, fooTemplate, 2, 1, 'ng-template', null, ['foo', ''], ɵɵtemplateRefExtractor);
-               ɵɵelement(2, 'child');
+               Δtemplate(
+                   0, fooTemplate, 2, 1, 'ng-template', null, ['foo', ''], ΔtemplateRefExtractor);
+               Δelement(2, 'child');
              }
 
              if (rf & RenderFlags.Update) {
-               const tplRef = ɵɵreference(1);
-               ɵɵelementProperty(2, 'tpl', ɵɵbind(tplRef));
+               const tplRef = Δreference(1);
+               ΔelementProperty(2, 'tpl', Δbind(tplRef));
              }
 
            }, 3, 1, [Child]);
 
            function fooTemplate(rf1: RenderFlags, ctx: any) {
              if (rf1 & RenderFlags.Create) {
-               ɵɵelementStart(0, 'div');
-               { ɵɵtext(1); }
-               ɵɵelementEnd();
+               ΔelementStart(0, 'div');
+               { Δtext(1); }
+               ΔelementEnd();
              }
              if (rf1 & RenderFlags.Update) {
-               const parent = ɵɵnextContext();
-               ɵɵtextBinding(1, ɵɵbind(parent.name));
+               const parent = ΔnextContext();
+               ΔtextBinding(1, Δbind(parent.name));
              }
            }
 
@@ -622,7 +622,7 @@ describe('ViewContainerRef', () => {
           // @Input()
           rows !: any[];
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: LoopComp,
             encapsulation: ViewEncapsulation.None,
             selectors: [['loop-comp']],
@@ -631,12 +631,12 @@ describe('ViewContainerRef', () => {
             vars: 2,
             template: function(rf: RenderFlags, loop: any) {
               if (rf & RenderFlags.Create) {
-                ɵɵtemplate(0, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'ngForOf']);
+                Δtemplate(0, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'ngForOf']);
               }
 
               if (rf & RenderFlags.Update) {
-                ɵɵelementProperty(0, 'ngForOf', ɵɵbind(loop.rows));
-                ɵɵelementProperty(0, 'ngForTemplate', ɵɵbind(loop.tpl));
+                ΔelementProperty(0, 'ngForOf', Δbind(loop.rows));
+                ΔelementProperty(0, 'ngForTemplate', Δbind(loop.tpl));
               }
             },
             inputs: {tpl: 'tpl', rows: 'rows'},
@@ -661,48 +661,48 @@ describe('ViewContainerRef', () => {
          */
         const Parent = createComponent('parent', function(rf: RenderFlags, parent: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵtemplate(
+            Δtemplate(
                 0, rowTemplate, 3, 2, 'ng-template', null, ['rowTemplate', ''],
-                ɵɵtemplateRefExtractor);
-            ɵɵelement(2, 'loop-comp');
+                ΔtemplateRefExtractor);
+            Δelement(2, 'loop-comp');
           }
 
           if (rf & RenderFlags.Update) {
-            const rowTemplateRef = ɵɵreference(1);
-            ɵɵelementProperty(2, 'tpl', ɵɵbind(rowTemplateRef));
-            ɵɵelementProperty(2, 'rows', ɵɵbind(parent.rows));
+            const rowTemplateRef = Δreference(1);
+            ΔelementProperty(2, 'tpl', Δbind(rowTemplateRef));
+            ΔelementProperty(2, 'rows', Δbind(parent.rows));
           }
 
         }, 3, 2, [LoopComp]);
 
         function rowTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵtemplate(
+            Δtemplate(
                 0, cellTemplate, 2, 3, 'ng-template', null, ['cellTemplate', ''],
-                ɵɵtemplateRefExtractor);
-            ɵɵelement(2, 'loop-comp');
+                ΔtemplateRefExtractor);
+            Δelement(2, 'loop-comp');
           }
 
           if (rf & RenderFlags.Update) {
             const row = ctx.$implicit as any;
-            const cellTemplateRef = ɵɵreference(1);
-            ɵɵelementProperty(2, 'tpl', ɵɵbind(cellTemplateRef));
-            ɵɵelementProperty(2, 'rows', ɵɵbind(row.data));
+            const cellTemplateRef = Δreference(1);
+            ΔelementProperty(2, 'tpl', Δbind(cellTemplateRef));
+            ΔelementProperty(2, 'rows', Δbind(row.data));
           }
         }
 
         function cellTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'div');
-            { ɵɵtext(1); }
-            ɵɵelementEnd();
+            ΔelementStart(0, 'div');
+            { Δtext(1); }
+            ΔelementEnd();
           }
 
           if (rf & RenderFlags.Update) {
             const cell = ctx.$implicit as any;
-            const row = ɵɵnextContext().$implicit as any;
-            const parent = ɵɵnextContext();
-            ɵɵtextBinding(1, ɵɵinterpolation3('', cell, ' - ', row.value, ' - ', parent.name, ''));
+            const row = ΔnextContext().$implicit as any;
+            const parent = ΔnextContext();
+            ΔtextBinding(1, Δinterpolation3('', cell, ' - ', row.value, ' - ', parent.name, ''));
           }
         }
 
@@ -943,7 +943,7 @@ describe('ViewContainerRef', () => {
         class EmbeddedComponent {
           constructor() {}
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: EmbeddedComponent,
             encapsulation: ViewEncapsulation.None,
             selectors: [['embedded-cmp']],
@@ -953,7 +953,7 @@ describe('ViewContainerRef', () => {
             template: (rf: RenderFlags, cmp: EmbeddedComponent) => {
               templateExecutionCounter++;
               if (rf & RenderFlags.Create) {
-                ɵɵtext(0, 'foo');
+                Δtext(0, 'foo');
               }
             }
           });
@@ -986,24 +986,24 @@ describe('ViewContainerRef', () => {
         class EmbeddedComponent {
           constructor(public s: String) {}
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: EmbeddedComponent,
             encapsulation: ViewEncapsulation.None,
             selectors: [['embedded-cmp']],
-            factory: () => new EmbeddedComponent(ɵɵdirectiveInject(String)),
+            factory: () => new EmbeddedComponent(ΔdirectiveInject(String)),
             consts: 1,
             vars: 0,
             template: (rf: RenderFlags, cmp: EmbeddedComponent) => {
               templateExecutionCounter++;
               if (rf & RenderFlags.Create) {
-                ɵɵtext(0, 'foo');
+                Δtext(0, 'foo');
               }
             }
           });
         }
 
         class MyAppModule {
-          static ngInjectorDef = ɵɵdefineInjector({
+          static ngInjectorDef = ΔdefineInjector({
             factory: () => new MyAppModule(),
             imports: [],
             providers: [
@@ -1018,7 +1018,7 @@ describe('ViewContainerRef', () => {
         const ngModuleRef = myAppModuleFactory.create(null);
 
         class SomeModule {
-          static ngInjectorDef = ɵɵdefineInjector({
+          static ngInjectorDef = ΔdefineInjector({
             factory: () => new SomeModule(),
             providers: [
               {provide: NgModuleRef, useValue: ngModuleRef},
@@ -1057,12 +1057,12 @@ describe('ViewContainerRef', () => {
         class AppComp {
           constructor(public vcr: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: AppComp,
             selectors: [['app-comp']],
             factory:
                 () => new AppComp(
-                    ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                    ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
             consts: 0,
             vars: 0,
             template: (rf: RenderFlags, cmp: AppComp) => {}
@@ -1074,7 +1074,7 @@ describe('ViewContainerRef', () => {
 
           ngDoCheck() { this.doCheckCount++; }
 
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: DynamicComp,
             selectors: [['dynamic-comp']],
             factory: () => dynamicComp = new DynamicComp(),
@@ -1131,7 +1131,7 @@ describe('ViewContainerRef', () => {
       });
 
       class EmbeddedComponentWithNgContent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: EmbeddedComponentWithNgContent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['embedded-cmp-with-ngcontent']],
@@ -1140,10 +1140,10 @@ describe('ViewContainerRef', () => {
           vars: 0,
           template: (rf: RenderFlags, cmp: EmbeddedComponentWithNgContent) => {
             if (rf & RenderFlags.Create) {
-              ɵɵprojectionDef();
-              ɵɵprojection(0, 0);
-              ɵɵelement(1, 'hr');
-              ɵɵprojection(2, 1);
+              ΔprojectionDef();
+              Δprojection(0, 0);
+              Δelement(1, 'hr');
+              Δprojection(2, 1);
             }
           }
         });
@@ -1171,7 +1171,7 @@ describe('ViewContainerRef', () => {
 
       it('should support reprojection of projectable nodes', () => {
         class Reprojector {
-          static ngComponentDef = ɵɵdefineComponent({
+          static ngComponentDef = ΔdefineComponent({
             type: Reprojector,
             encapsulation: ViewEncapsulation.None,
             selectors: [['reprojector']],
@@ -1180,10 +1180,10 @@ describe('ViewContainerRef', () => {
             vars: 0,
             template: (rf: RenderFlags, cmp: Reprojector) => {
               if (rf & RenderFlags.Create) {
-                ɵɵprojectionDef();
-                ɵɵelementStart(0, 'embedded-cmp-with-ngcontent');
-                { ɵɵprojection(1, 0); }
-                ɵɵelementEnd();
+                ΔprojectionDef();
+                ΔelementStart(0, 'embedded-cmp-with-ngcontent');
+                { Δprojection(1, 0); }
+                ΔelementEnd();
               }
             },
             directives: [EmbeddedComponentWithNgContent]
@@ -1229,8 +1229,8 @@ describe('ViewContainerRef', () => {
     describe('getters', () => {
       it('should work on elements', () => {
         function createTemplate() {
-          ɵɵelement(0, 'header', ['vcref', '']);
-          ɵɵelement(1, 'footer');
+          Δelement(0, 'header', ['vcref', '']);
+          Δelement(1, 'footer');
         }
 
         new TemplateFixture(createTemplate, undefined, 2, 0, [DirectiveWithVCRef]);
@@ -1248,8 +1248,8 @@ describe('ViewContainerRef', () => {
             createComponent('header-cmp', function(rf: RenderFlags, ctx: any) {});
 
         function createTemplate() {
-          ɵɵelement(0, 'header-cmp', ['vcref', '']);
-          ɵɵelement(1, 'footer');
+          Δelement(0, 'header-cmp', ['vcref', '']);
+          Δelement(1, 'footer');
         }
 
         new TemplateFixture(createTemplate, undefined, 2, 0, [HeaderComponent, DirectiveWithVCRef]);
@@ -1264,8 +1264,8 @@ describe('ViewContainerRef', () => {
 
       it('should work on templates', () => {
         function createTemplate() {
-          ɵɵtemplate(0, embeddedTemplate, 1, 1, 'ng-template', ['vcref', '']);
-          ɵɵelement(1, 'footer');
+          Δtemplate(0, embeddedTemplate, 1, 1, 'ng-template', ['vcref', '']);
+          Δelement(1, 'footer');
         }
 
         new TemplateFixture(createTemplate, () => {}, 2, 0, [DirectiveWithVCRef]);
@@ -1280,19 +1280,19 @@ describe('ViewContainerRef', () => {
   describe('projection', () => {
     function embeddedTemplate(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ɵɵelementStart(0, 'span');
-        ɵɵtext(1);
-        ɵɵelementEnd();
+        ΔelementStart(0, 'span');
+        Δtext(1);
+        ΔelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ɵɵtextBinding(1, ctx.name);
+        ΔtextBinding(1, ctx.name);
       }
     }
 
     it('should project the ViewContainerRef content along its host, in an element', () => {
       @Component({selector: 'child', template: '<div><ng-content></ng-content></div>'})
       class Child {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Child,
           encapsulation: ViewEncapsulation.None,
           selectors: [['child']],
@@ -1301,10 +1301,10 @@ describe('ViewContainerRef', () => {
           vars: 0,
           template: (rf: RenderFlags, cmp: Child) => {
             if (rf & RenderFlags.Create) {
-              ɵɵprojectionDef();
-              ɵɵelementStart(0, 'div');
-              { ɵɵprojection(1); }
-              ɵɵelementEnd();
+              ΔprojectionDef();
+              ΔelementStart(0, 'div');
+              { Δprojection(1); }
+              ΔelementEnd();
             }
           }
         });
@@ -1320,7 +1320,7 @@ describe('ViewContainerRef', () => {
       })
       class Parent {
         name: string = 'bar';
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Parent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['parent']],
@@ -1329,22 +1329,22 @@ describe('ViewContainerRef', () => {
           vars: 2,
           template: (rf: RenderFlags, cmp: Parent) => {
             if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
+              Δtemplate(
                   0, embeddedTemplate, 2, 1, 'ng-template', null, ['foo', ''],
-                  ɵɵtemplateRefExtractor);
-              ɵɵelementStart(2, 'child');
+                  ΔtemplateRefExtractor);
+              ΔelementStart(2, 'child');
               {
-                ɵɵelementStart(3, 'header', ['vcref', '']);
-                { ɵɵtext(4, 'blah'); }
-                ɵɵelementEnd();
+                ΔelementStart(3, 'header', ['vcref', '']);
+                { Δtext(4, 'blah'); }
+                ΔelementEnd();
               }
-              ɵɵelementEnd();
+              ΔelementEnd();
             }
             let tplRef: any;
             if (rf & RenderFlags.Update) {
-              tplRef = ɵɵreference(1);
-              ɵɵelementProperty(3, 'tplRef', ɵɵbind(tplRef));
-              ɵɵelementProperty(3, 'name', ɵɵbind(cmp.name));
+              tplRef = Δreference(1);
+              ΔelementProperty(3, 'tplRef', Δbind(tplRef));
+              ΔelementProperty(3, 'name', Δbind(cmp.name));
             }
           },
           directives: [Child, DirectiveWithVCRef]
@@ -1373,7 +1373,7 @@ describe('ViewContainerRef', () => {
       })
       class ChildWithView {
         show: boolean = true;
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ChildWithView,
           encapsulation: ViewEncapsulation.None,
           selectors: [['child-with-view']],
@@ -1382,21 +1382,21 @@ describe('ViewContainerRef', () => {
           vars: 0,
           template: (rf: RenderFlags, cmp: ChildWithView) => {
             if (rf & RenderFlags.Create) {
-              ɵɵprojectionDef();
-              ɵɵtext(0, 'Before (inside)-');
-              ɵɵcontainer(1);
-              ɵɵtext(2, 'After (inside)');
+              ΔprojectionDef();
+              Δtext(0, 'Before (inside)-');
+              Δcontainer(1);
+              Δtext(2, 'After (inside)');
             }
             if (rf & RenderFlags.Update) {
-              ɵɵcontainerRefreshStart(1);
+              ΔcontainerRefreshStart(1);
               if (cmp.show) {
-                let rf0 = ɵɵembeddedViewStart(0, 1, 0);
+                let rf0 = ΔembeddedViewStart(0, 1, 0);
                 if (rf0 & RenderFlags.Create) {
-                  ɵɵprojection(0);
+                  Δprojection(0);
                 }
-                ɵɵembeddedViewEnd();
+                ΔembeddedViewEnd();
               }
-              ɵɵcontainerRefreshEnd();
+              ΔcontainerRefreshEnd();
             }
           }
         });
@@ -1416,7 +1416,7 @@ describe('ViewContainerRef', () => {
       })
       class Parent {
         name: string = 'bar';
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: Parent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['parent']],
@@ -1425,21 +1425,21 @@ describe('ViewContainerRef', () => {
           vars: 2,
           template: (rf: RenderFlags, cmp: Parent) => {
             if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
+              Δtemplate(
                   0, embeddedTemplate, 2, 1, 'ng-template', undefined, ['foo', ''],
-                  ɵɵtemplateRefExtractor);
-              ɵɵelementStart(2, 'child-with-view');
-              ɵɵtext(3, 'Before projected');
-              ɵɵelementStart(4, 'header', ['vcref', '']);
-              ɵɵtext(5, 'blah');
-              ɵɵelementEnd();
-              ɵɵtext(6, 'After projected-');
-              ɵɵelementEnd();
+                  ΔtemplateRefExtractor);
+              ΔelementStart(2, 'child-with-view');
+              Δtext(3, 'Before projected');
+              ΔelementStart(4, 'header', ['vcref', '']);
+              Δtext(5, 'blah');
+              ΔelementEnd();
+              Δtext(6, 'After projected-');
+              ΔelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              const tplRef = ɵɵreference(1);
-              ɵɵelementProperty(4, 'tplRef', ɵɵbind(tplRef));
-              ɵɵelementProperty(4, 'name', ɵɵbind(cmp.name));
+              const tplRef = Δreference(1);
+              ΔelementProperty(4, 'tplRef', Δbind(tplRef));
+              ΔelementProperty(4, 'name', Δbind(cmp.name));
             }
           },
           directives: [ChildWithView, DirectiveWithVCRef]
@@ -1466,7 +1466,7 @@ describe('ViewContainerRef', () => {
           <second><ng-content></ng-content></second>`
       })
       class ChildWithSelector {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: ChildWithSelector,
           encapsulation: ViewEncapsulation.None,
           selectors: [['child-with-selector']],
@@ -1475,13 +1475,13 @@ describe('ViewContainerRef', () => {
           vars: 0,
           template: (rf: RenderFlags, cmp: ChildWithSelector) => {
             if (rf & RenderFlags.Create) {
-              ɵɵprojectionDef([[['header']]]);
-              ɵɵelementStart(0, 'first');
-              { ɵɵprojection(1, 1); }
-              ɵɵelementEnd();
-              ɵɵelementStart(2, 'second');
-              { ɵɵprojection(3); }
-              ɵɵelementEnd();
+              ΔprojectionDef([[['header']]]);
+              ΔelementStart(0, 'first');
+              { Δprojection(1, 1); }
+              ΔelementEnd();
+              ΔelementStart(2, 'second');
+              { Δprojection(3); }
+              ΔelementEnd();
             }
           },
           directives: [ChildWithSelector, DirectiveWithVCRef]
@@ -1500,7 +1500,7 @@ describe('ViewContainerRef', () => {
            })
            class Parent {
              name: string = 'bar';
-             static ngComponentDef = ɵɵdefineComponent({
+             static ngComponentDef = ΔdefineComponent({
                type: Parent,
                encapsulation: ViewEncapsulation.None,
                selectors: [['parent']],
@@ -1510,19 +1510,19 @@ describe('ViewContainerRef', () => {
                template: (rf: RenderFlags, cmp: Parent) => {
                  let tplRef: any;
                  if (rf & RenderFlags.Create) {
-                   ɵɵtemplate(
+                   Δtemplate(
                        0, embeddedTemplate, 2, 1, 'ng-template', null, ['foo', ''],
-                       ɵɵtemplateRefExtractor);
-                   ɵɵelementStart(2, 'child-with-selector');
-                   ɵɵelementStart(3, 'header', ['vcref', '']);
-                   ɵɵtext(4, 'blah');
-                   ɵɵelementEnd();
-                   ɵɵelementEnd();
+                       ΔtemplateRefExtractor);
+                   ΔelementStart(2, 'child-with-selector');
+                   ΔelementStart(3, 'header', ['vcref', '']);
+                   Δtext(4, 'blah');
+                   ΔelementEnd();
+                   ΔelementEnd();
                  }
                  if (rf & RenderFlags.Update) {
-                   tplRef = ɵɵreference(1);
-                   ɵɵelementProperty(3, 'tplRef', ɵɵbind(tplRef));
-                   ɵɵelementProperty(3, 'name', ɵɵbind(cmp.name));
+                   tplRef = Δreference(1);
+                   ΔelementProperty(3, 'tplRef', Δbind(tplRef));
+                   ΔelementProperty(3, 'name', Δbind(cmp.name));
                  }
                },
                directives: [ChildWithSelector, DirectiveWithVCRef]
@@ -1554,7 +1554,7 @@ describe('ViewContainerRef', () => {
            })
            class Parent {
              name: string = 'bar';
-             static ngComponentDef = ɵɵdefineComponent({
+             static ngComponentDef = ΔdefineComponent({
                type: Parent,
                encapsulation: ViewEncapsulation.None,
                selectors: [['parent']],
@@ -1564,19 +1564,19 @@ describe('ViewContainerRef', () => {
                template: (rf: RenderFlags, cmp: Parent) => {
                  let tplRef: any;
                  if (rf & RenderFlags.Create) {
-                   ɵɵtemplate(
+                   Δtemplate(
                        0, embeddedTemplate, 2, 1, 'ng-template', null, ['foo', ''],
-                       ɵɵtemplateRefExtractor);
-                   ɵɵelementStart(2, 'child-with-selector');
-                   ɵɵelementStart(3, 'footer', ['vcref', '']);
-                   ɵɵtext(4, 'blah');
-                   ɵɵelementEnd();
-                   ɵɵelementEnd();
+                       ΔtemplateRefExtractor);
+                   ΔelementStart(2, 'child-with-selector');
+                   ΔelementStart(3, 'footer', ['vcref', '']);
+                   Δtext(4, 'blah');
+                   ΔelementEnd();
+                   ΔelementEnd();
                  }
                  if (rf & RenderFlags.Update) {
-                   tplRef = ɵɵreference(1);
-                   ɵɵelementProperty(3, 'tplRef', ɵɵbind(tplRef));
-                   ɵɵelementProperty(3, 'name', ɵɵbind(cmp.name));
+                   tplRef = Δreference(1);
+                   ΔelementProperty(3, 'tplRef', Δbind(tplRef));
+                   ΔelementProperty(3, 'name', Δbind(cmp.name));
                  }
                },
                directives: [ChildWithSelector, DirectiveWithVCRef]
@@ -1622,7 +1622,7 @@ describe('ViewContainerRef', () => {
 
       ngOnDestroy() { this.log('onDestroy-' + this.name); }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: ComponentWithHooks,
         encapsulation: ViewEncapsulation.None,
         selectors: [['hooks']],
@@ -1631,13 +1631,13 @@ describe('ViewContainerRef', () => {
         vars: 1,
         template: (rf: RenderFlags, cmp: ComponentWithHooks) => {
           if (rf & RenderFlags.Create) {
-            ɵɵtext(0);
+            Δtext(0);
           }
           if (rf & RenderFlags.Update) {
-            ɵɵtextBinding(0, ɵɵinterpolation1('', cmp.name, ''));
+            ΔtextBinding(0, Δinterpolation1('', cmp.name, ''));
           }
         },
-        features: [ɵɵNgOnChangesFeature()],
+        features: [ΔNgOnChangesFeature()],
         inputs: {name: 'name'}
       });
     }
@@ -1645,10 +1645,10 @@ describe('ViewContainerRef', () => {
     it('should call all hooks in correct order when creating with createEmbeddedView', () => {
       function SomeComponent_Template_0(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'hooks');
+          Δelement(0, 'hooks');
         }
         if (rf & RenderFlags.Update) {
-          ɵɵelementProperty(0, 'name', ɵɵbind('C'));
+          ΔelementProperty(0, 'name', Δbind('C'));
         }
       }
 
@@ -1662,7 +1662,7 @@ describe('ViewContainerRef', () => {
         `
       })
       class SomeComponent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: SomeComponent,
           selectors: [['some-comp']],
           factory: () => new SomeComponent(),
@@ -1670,21 +1670,21 @@ describe('ViewContainerRef', () => {
           vars: 3,
           template: (rf: RenderFlags, cmp: SomeComponent) => {
             if (rf & RenderFlags.Create) {
-              ɵɵtemplate(
+              Δtemplate(
                   0, SomeComponent_Template_0, 1, 1, 'ng-template', [], ['foo', ''],
-                  ɵɵtemplateRefExtractor);
-              ɵɵelement(2, 'hooks', ['vcref', '']);
-              ɵɵelement(3, 'hooks');
+                  ΔtemplateRefExtractor);
+              Δelement(2, 'hooks', ['vcref', '']);
+              Δelement(3, 'hooks');
             }
             if (rf & RenderFlags.Update) {
-              const tplRef = ɵɵreference(1);
-              ɵɵelementProperty(2, 'tplRef', ɵɵbind(tplRef));
-              ɵɵelementProperty(2, 'name', ɵɵbind('A'));
-              ɵɵelementProperty(3, 'name', ɵɵbind('B'));
+              const tplRef = Δreference(1);
+              ΔelementProperty(2, 'tplRef', Δbind(tplRef));
+              ΔelementProperty(2, 'name', Δbind('A'));
+              ΔelementProperty(3, 'name', Δbind('B'));
             }
           },
           directives: [ComponentWithHooks, DirectiveWithVCRef],
-          features: [ɵɵNgOnChangesFeature()],
+          features: [ΔNgOnChangesFeature()],
         });
       }
 
@@ -1759,7 +1759,7 @@ describe('ViewContainerRef', () => {
         `
       })
       class SomeComponent {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: SomeComponent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['some-comp']],
@@ -1768,16 +1768,16 @@ describe('ViewContainerRef', () => {
           vars: 2,
           template: (rf: RenderFlags, cmp: SomeComponent) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'hooks', ['vcref', '']);
-              ɵɵelement(1, 'hooks');
+              Δelement(0, 'hooks', ['vcref', '']);
+              Δelement(1, 'hooks');
             }
             if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(0, 'name', ɵɵbind('A'));
-              ɵɵelementProperty(1, 'name', ɵɵbind('B'));
+              ΔelementProperty(0, 'name', Δbind('A'));
+              ΔelementProperty(1, 'name', Δbind('B'));
             }
           },
           directives: [ComponentWithHooks, DirectiveWithVCRef],
-          features: [ɵɵNgOnChangesFeature()],
+          features: [ΔNgOnChangesFeature()],
         });
       }
 
@@ -1856,7 +1856,7 @@ describe('ViewContainerRef', () => {
       class HostBindingCmpt {
         title = 'initial';
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: HostBindingCmpt,
           selectors: [['host-bindings']],
           factory: () => new HostBindingCmpt(),
@@ -1865,11 +1865,11 @@ describe('ViewContainerRef', () => {
           template: (rf: RenderFlags, cmp: HostBindingCmpt) => {},
           hostBindings: function(rf: RenderFlags, ctx: HostBindingCmpt, elIndex: number) {
             if (rf & RenderFlags.Create) {
-              ɵɵelementHostAttrs(['id', 'attribute']);
-              ɵɵallocHostVars(1);
+              ΔelementHostAttrs(['id', 'attribute']);
+              ΔallocHostVars(1);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵelementProperty(elIndex, 'title', ɵɵbind(ctx.title));
+              ΔelementProperty(elIndex, 'title', Δbind(ctx.title));
             }
           },
         });
@@ -1881,7 +1881,7 @@ describe('ViewContainerRef', () => {
         `
       })
       class AppCmpt {
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: AppCmpt,
           selectors: [['app']],
           factory: () => new AppCmpt(),
@@ -1889,7 +1889,7 @@ describe('ViewContainerRef', () => {
           vars: 0,
           template: (rf: RenderFlags, cmp: AppCmpt) => {
             if (rf & RenderFlags.Create) {
-              ɵɵtemplate(0, null, 0, 0, 'ng-template', ['vcref', '']);
+              Δtemplate(0, null, 0, 0, 'ng-template', ['vcref', '']);
             }
           },
           directives: [HostBindingCmpt, DirectiveWithVCRef]
@@ -1916,11 +1916,11 @@ describe('ViewContainerRef', () => {
 
     @Component({selector: 'app', template: ''})
     class AppCmpt {
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: AppCmpt,
         selectors: [['app']],
         factory: () => new AppCmpt(
-                     ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                     ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
         consts: 0,
         vars: 0,
         template: (rf: RenderFlags, cmp: AppCmpt) => {}
@@ -1944,7 +1944,7 @@ describe('ViewContainerRef', () => {
       const DynamicComponent =
           createComponent('dynamic-cmpt', function(rf: RenderFlags, parent: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵtext(0, 'inserted dynamically');
+              Δtext(0, 'inserted dynamically');
             }
           }, 1, 0);
 
@@ -1984,7 +1984,7 @@ describe('ViewContainerRef', () => {
         ngDoCheck() { this.checkCount++; }
 
         /** check count: {{ checkCount }} */
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: DynamicCompWithBindings,
           selectors: [['dynamic-cmpt-with-bindings']],
           factory: () => new DynamicCompWithBindings(),
@@ -1992,10 +1992,10 @@ describe('ViewContainerRef', () => {
           vars: 1,
           template: (rf: RenderFlags, ctx: DynamicCompWithBindings) => {
             if (rf & RenderFlags.Create) {
-              ɵɵtext(0);
+              Δtext(0);
             }
             if (rf & RenderFlags.Update) {
-              ɵɵtextBinding(0, ɵɵinterpolation1('check count: ', ctx.checkCount, ''));
+              ΔtextBinding(0, Δinterpolation1('check count: ', ctx.checkCount, ''));
             }
           }
         });
@@ -2020,19 +2020,19 @@ describe('ViewContainerRef', () => {
       let name = 'text';
       const Child = createComponent('child', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          ɵɵelementStart(0, 'div');
-          { ɵɵtext(1); }
-          ɵɵelementEnd();
+          ΔelementStart(0, 'div');
+          { Δtext(1); }
+          ΔelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ɵɵtextBinding(1, ɵɵbind(name));
+          ΔtextBinding(1, Δbind(name));
         }
       }, 2, 1);
 
       const DynamicCompWithChildren =
           createComponent('dynamic-cmpt-with-children', (rf: RenderFlags, ctx: any) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'child');
+              Δelement(0, 'child');
             }
           }, 1, 0, [Child]);
 
@@ -2058,7 +2058,7 @@ describe('ViewContainerRef', () => {
         // @ViewChildren('foo')
         foo !: QueryList<any>;
 
-        static ngComponentDef = ɵɵdefineComponent({
+        static ngComponentDef = ΔdefineComponent({
           type: DynamicCompWithViewQueries,
           selectors: [['dynamic-cmpt-with-view-queries']],
           factory: () => dynamicComp = new DynamicCompWithViewQueries(),
@@ -2066,18 +2066,18 @@ describe('ViewContainerRef', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: DynamicCompWithViewQueries) => {
             if (rf & RenderFlags.Create) {
-              ɵɵelement(0, 'div', ['bar', ''], ['foo', '']);
+              Δelement(0, 'div', ['bar', ''], ['foo', '']);
             }
             // testing only
             fooEl = getNativeByIndex(0, getLView()) as RElement;
           },
           viewQuery: function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ɵɵviewQuery(['foo'], true, null);
+              ΔviewQuery(['foo'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
                   (ctx.foo = tmp as QueryList<any>);
             }
           }
@@ -2102,7 +2102,7 @@ describe('ViewContainerRef', () => {
 
       ngOnDestroy() { this.viewRef.destroy(); }
 
-      static ngComponentDef = ɵɵdefineComponent({
+      static ngComponentDef = ΔdefineComponent({
         type: CompWithListenerThatDestroysItself,
         selectors: [['comp-with-listener-and-on-destroy']],
         consts: 2,
@@ -2110,18 +2110,18 @@ describe('ViewContainerRef', () => {
         /** <button (click)="onClick()"> Click me </button> */
         template: function CompTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ɵɵelementStart(0, 'button');
+            ΔelementStart(0, 'button');
             {
-              ɵɵlistener('click', function() { return ctx.onClick(); });
-              ɵɵtext(1, 'Click me');
+              Δlistener('click', function() { return ctx.onClick(); });
+              Δtext(1, 'Click me');
             }
-            ɵɵelementEnd();
+            ΔelementEnd();
           }
         },
         // We want the ViewRef, so we rely on the knowledge that `ViewRef` is actually given
         // when injecting `ChangeDetectorRef`.
         factory: () => new CompWithListenerThatDestroysItself(
-                     ɵɵdirectiveInject(ChangeDetectorRef as any)),
+                     ΔdirectiveInject(ChangeDetectorRef as any)),
       });
     }
 
@@ -2129,7 +2129,7 @@ describe('ViewContainerRef', () => {
     it('should not error when destroying a view with listeners twice', () => {
       const CompWithChildListener = createComponent('test-app', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          ɵɵelement(0, 'comp-with-listener-and-on-destroy');
+          Δelement(0, 'comp-with-listener-and-on-destroy');
         }
       }, 1, 0, [CompWithListenerThatDestroysItself]);
 
diff --git a/packages/core/test/sanitization/sanatization_spec.ts b/packages/core/test/sanitization/sanatization_spec.ts
index 6c42ec2120..2b5b2eee51 100644
--- a/packages/core/test/sanitization/sanatization_spec.ts
+++ b/packages/core/test/sanitization/sanatization_spec.ts
@@ -12,7 +12,7 @@ import {HEADER_OFFSET, LView} from '@angular/core/src/render3/interfaces/view';
 import {setTNodeAndViewData} from '@angular/core/src/render3/state';
 
 import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl} from '../../src/sanitization/bypass';
-import {getUrlSanitizer, ɵɵsanitizeHtml, ɵɵsanitizeResourceUrl, ɵɵsanitizeScript, ɵɵsanitizeStyle, ɵɵsanitizeUrl, ɵɵsanitizeUrlOrResourceUrl} from '../../src/sanitization/sanitization';
+import {getUrlSanitizer, ΔsanitizeHtml, ΔsanitizeResourceUrl, ΔsanitizeScript, ΔsanitizeStyle, ΔsanitizeUrl, ΔsanitizeUrlOrResourceUrl} from '../../src/sanitization/sanitization';
 import {SecurityContext} from '../../src/sanitization/security';
 
 function fakeLView(): LView {
@@ -27,54 +27,54 @@ describe('sanitization', () => {
     toString() { return this.value; }
   }
   it('should sanitize html', () => {
-    expect(ɵɵsanitizeHtml('<div></div>')).toEqual('<div></div>');
-    expect(ɵɵsanitizeHtml(new Wrap('<div></div>'))).toEqual('<div></div>');
-    expect(ɵɵsanitizeHtml('<img src="javascript:true">'))
+    expect(ΔsanitizeHtml('<div></div>')).toEqual('<div></div>');
+    expect(ΔsanitizeHtml(new Wrap('<div></div>'))).toEqual('<div></div>');
+    expect(ΔsanitizeHtml('<img src="javascript:true">'))
         .toEqual('<img src="unsafe:javascript:true">');
-    expect(ɵɵsanitizeHtml(new Wrap('<img src="javascript:true">')))
+    expect(ΔsanitizeHtml(new Wrap('<img src="javascript:true">')))
         .toEqual('<img src="unsafe:javascript:true">');
-    expect(ɵɵsanitizeHtml(bypassSanitizationTrustUrl('<img src="javascript:true">')))
+    expect(ΔsanitizeHtml(bypassSanitizationTrustUrl('<img src="javascript:true">')))
         .toEqual('<img src="unsafe:javascript:true">');
-    expect(ɵɵsanitizeHtml(bypassSanitizationTrustHtml('<img src="javascript:true">')))
+    expect(ΔsanitizeHtml(bypassSanitizationTrustHtml('<img src="javascript:true">')))
         .toEqual('<img src="javascript:true">');
   });
 
   it('should sanitize url', () => {
-    expect(ɵɵsanitizeUrl('http://server')).toEqual('http://server');
-    expect(ɵɵsanitizeUrl(new Wrap('http://server'))).toEqual('http://server');
-    expect(ɵɵsanitizeUrl('javascript:true')).toEqual('unsafe:javascript:true');
-    expect(ɵɵsanitizeUrl(new Wrap('javascript:true'))).toEqual('unsafe:javascript:true');
-    expect(ɵɵsanitizeUrl(bypassSanitizationTrustHtml('javascript:true')))
+    expect(ΔsanitizeUrl('http://server')).toEqual('http://server');
+    expect(ΔsanitizeUrl(new Wrap('http://server'))).toEqual('http://server');
+    expect(ΔsanitizeUrl('javascript:true')).toEqual('unsafe:javascript:true');
+    expect(ΔsanitizeUrl(new Wrap('javascript:true'))).toEqual('unsafe:javascript:true');
+    expect(ΔsanitizeUrl(bypassSanitizationTrustHtml('javascript:true')))
         .toEqual('unsafe:javascript:true');
-    expect(ɵɵsanitizeUrl(bypassSanitizationTrustUrl('javascript:true'))).toEqual('javascript:true');
+    expect(ΔsanitizeUrl(bypassSanitizationTrustUrl('javascript:true'))).toEqual('javascript:true');
   });
 
   it('should sanitize resourceUrl', () => {
     const ERROR = 'unsafe value used in a resource URL context (see http://g.co/ng/security#xss)';
-    expect(() => ɵɵsanitizeResourceUrl('http://server')).toThrowError(ERROR);
-    expect(() => ɵɵsanitizeResourceUrl('javascript:true')).toThrowError(ERROR);
-    expect(() => ɵɵsanitizeResourceUrl(bypassSanitizationTrustHtml('javascript:true')))
+    expect(() => ΔsanitizeResourceUrl('http://server')).toThrowError(ERROR);
+    expect(() => ΔsanitizeResourceUrl('javascript:true')).toThrowError(ERROR);
+    expect(() => ΔsanitizeResourceUrl(bypassSanitizationTrustHtml('javascript:true')))
         .toThrowError(ERROR);
-    expect(ɵɵsanitizeResourceUrl(bypassSanitizationTrustResourceUrl('javascript:true')))
+    expect(ΔsanitizeResourceUrl(bypassSanitizationTrustResourceUrl('javascript:true')))
         .toEqual('javascript:true');
   });
 
   it('should sanitize style', () => {
-    expect(ɵɵsanitizeStyle('red')).toEqual('red');
-    expect(ɵɵsanitizeStyle(new Wrap('red'))).toEqual('red');
-    expect(ɵɵsanitizeStyle('url("http://server")')).toEqual('unsafe');
-    expect(ɵɵsanitizeStyle(new Wrap('url("http://server")'))).toEqual('unsafe');
-    expect(ɵɵsanitizeStyle(bypassSanitizationTrustHtml('url("http://server")'))).toEqual('unsafe');
-    expect(ɵɵsanitizeStyle(bypassSanitizationTrustStyle('url("http://server")')))
+    expect(ΔsanitizeStyle('red')).toEqual('red');
+    expect(ΔsanitizeStyle(new Wrap('red'))).toEqual('red');
+    expect(ΔsanitizeStyle('url("http://server")')).toEqual('unsafe');
+    expect(ΔsanitizeStyle(new Wrap('url("http://server")'))).toEqual('unsafe');
+    expect(ΔsanitizeStyle(bypassSanitizationTrustHtml('url("http://server")'))).toEqual('unsafe');
+    expect(ΔsanitizeStyle(bypassSanitizationTrustStyle('url("http://server")')))
         .toEqual('url("http://server")');
   });
 
   it('should sanitize script', () => {
     const ERROR = 'unsafe value used in a script context';
-    expect(() => ɵɵsanitizeScript('true')).toThrowError(ERROR);
-    expect(() => ɵɵsanitizeScript('true')).toThrowError(ERROR);
-    expect(() => ɵɵsanitizeScript(bypassSanitizationTrustHtml('true'))).toThrowError(ERROR);
-    expect(ɵɵsanitizeScript(bypassSanitizationTrustScript('true'))).toEqual('true');
+    expect(() => ΔsanitizeScript('true')).toThrowError(ERROR);
+    expect(() => ΔsanitizeScript('true')).toThrowError(ERROR);
+    expect(() => ΔsanitizeScript(bypassSanitizationTrustHtml('true'))).toThrowError(ERROR);
+    expect(ΔsanitizeScript(bypassSanitizationTrustScript('true'))).toEqual('true');
   });
 
   it('should select correct sanitizer for URL props', () => {
@@ -83,7 +83,7 @@ describe('sanitization', () => {
     const schema = SECURITY_SCHEMA();
     const contextsByProp: Map<string, Set<number>> = new Map();
     const sanitizerNameByContext: Map<number, Function> = new Map([
-      [SecurityContext.URL, ɵɵsanitizeUrl], [SecurityContext.RESOURCE_URL, ɵɵsanitizeResourceUrl]
+      [SecurityContext.URL, ΔsanitizeUrl], [SecurityContext.RESOURCE_URL, ΔsanitizeResourceUrl]
     ]);
     Object.keys(schema).forEach(key => {
       const context = schema[key];
@@ -102,29 +102,28 @@ describe('sanitization', () => {
 
   it('should sanitize resourceUrls via sanitizeUrlOrResourceUrl', () => {
     const ERROR = 'unsafe value used in a resource URL context (see http://g.co/ng/security#xss)';
-    expect(() => ɵɵsanitizeUrlOrResourceUrl('http://server', 'iframe', 'src')).toThrowError(ERROR);
-    expect(() => ɵɵsanitizeUrlOrResourceUrl('javascript:true', 'iframe', 'src'))
-        .toThrowError(ERROR);
+    expect(() => ΔsanitizeUrlOrResourceUrl('http://server', 'iframe', 'src')).toThrowError(ERROR);
+    expect(() => ΔsanitizeUrlOrResourceUrl('javascript:true', 'iframe', 'src')).toThrowError(ERROR);
     expect(
-        () => ɵɵsanitizeUrlOrResourceUrl(
+        () => ΔsanitizeUrlOrResourceUrl(
             bypassSanitizationTrustHtml('javascript:true'), 'iframe', 'src'))
         .toThrowError(ERROR);
-    expect(ɵɵsanitizeUrlOrResourceUrl(
+    expect(ΔsanitizeUrlOrResourceUrl(
                bypassSanitizationTrustResourceUrl('javascript:true'), 'iframe', 'src'))
         .toEqual('javascript:true');
   });
 
   it('should sanitize urls via sanitizeUrlOrResourceUrl', () => {
-    expect(ɵɵsanitizeUrlOrResourceUrl('http://server', 'a', 'href')).toEqual('http://server');
-    expect(ɵɵsanitizeUrlOrResourceUrl(new Wrap('http://server'), 'a', 'href'))
+    expect(ΔsanitizeUrlOrResourceUrl('http://server', 'a', 'href')).toEqual('http://server');
+    expect(ΔsanitizeUrlOrResourceUrl(new Wrap('http://server'), 'a', 'href'))
         .toEqual('http://server');
-    expect(ɵɵsanitizeUrlOrResourceUrl('javascript:true', 'a', 'href'))
+    expect(ΔsanitizeUrlOrResourceUrl('javascript:true', 'a', 'href'))
         .toEqual('unsafe:javascript:true');
-    expect(ɵɵsanitizeUrlOrResourceUrl(new Wrap('javascript:true'), 'a', 'href'))
+    expect(ΔsanitizeUrlOrResourceUrl(new Wrap('javascript:true'), 'a', 'href'))
         .toEqual('unsafe:javascript:true');
-    expect(ɵɵsanitizeUrlOrResourceUrl(bypassSanitizationTrustHtml('javascript:true'), 'a', 'href'))
+    expect(ΔsanitizeUrlOrResourceUrl(bypassSanitizationTrustHtml('javascript:true'), 'a', 'href'))
         .toEqual('unsafe:javascript:true');
-    expect(ɵɵsanitizeUrlOrResourceUrl(bypassSanitizationTrustUrl('javascript:true'), 'a', 'href'))
+    expect(ΔsanitizeUrlOrResourceUrl(bypassSanitizationTrustUrl('javascript:true'), 'a', 'href'))
         .toEqual('javascript:true');
   });
 });
diff --git a/packages/core/test/strict_types/inheritance_spec.ts b/packages/core/test/strict_types/inheritance_spec.ts
index b1b5261bd5..39693adc84 100644
--- a/packages/core/test/strict_types/inheritance_spec.ts
+++ b/packages/core/test/strict_types/inheritance_spec.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵɵComponentDefWithMeta, ɵɵPipeDefWithMeta as PipeDefWithMeta} from '@angular/core';
+import {ΔComponentDefWithMeta, ΔPipeDefWithMeta as PipeDefWithMeta} from '@angular/core';
 
 declare class SuperComponent {
-  static ngComponentDef: ɵɵComponentDefWithMeta<SuperComponent, '[super]', never, {}, {}, never>;
+  static ngComponentDef: ΔComponentDefWithMeta<SuperComponent, '[super]', never, {}, {}, never>;
 }
 
 declare class SubComponent extends SuperComponent {
@@ -18,7 +18,7 @@ declare class SubComponent extends SuperComponent {
   // would produce type errors when the "strictFunctionTypes" option is enabled.
   onlyInSubtype: string;
 
-  static ngComponentDef: ɵɵComponentDefWithMeta<SubComponent, '[sub]', never, {}, {}, never>;
+  static ngComponentDef: ΔComponentDefWithMeta<SubComponent, '[sub]', never, {}, {}, never>;
 }
 
 declare class SuperPipe { static ngPipeDef: PipeDefWithMeta<SuperPipe, 'super'>; }
diff --git a/packages/core/test/test_bed_spec.ts b/packages/core/test/test_bed_spec.ts
index fa546d6ac1..a2b32bbd9c 100644
--- a/packages/core/test/test_bed_spec.ts
+++ b/packages/core/test/test_bed_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, ErrorHandler, Inject, Injectable, InjectionToken, Input, NgModule, Optional, Pipe, ɵsetClassMetadata as setClassMetadata, ɵɵdefineComponent as defineComponent, ɵɵtext as text} from '@angular/core';
+import {Component, Directive, ErrorHandler, Inject, Injectable, InjectionToken, Input, NgModule, Optional, Pipe, ɵsetClassMetadata as setClassMetadata, ΔdefineComponent as defineComponent, Δtext as text} from '@angular/core';
 import {TestBed, getTestBed} from '@angular/core/testing/src/test_bed';
 import {By} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
diff --git a/packages/core/test/view/ng_module_spec.ts b/packages/core/test/view/ng_module_spec.ts
index ec81d5c0ed..0f270b9cb2 100644
--- a/packages/core/test/view/ng_module_spec.ts
+++ b/packages/core/test/view/ng_module_spec.ts
@@ -10,7 +10,7 @@ import {NgModuleRef} from '@angular/core';
 import {InjectFlags, inject} from '@angular/core/src/di';
 import {Injector} from '@angular/core/src/di/injector';
 import {INJECTOR} from '@angular/core/src/di/injector_compatibility';
-import {ɵɵInjectableDef, ɵɵdefineInjectable} from '@angular/core/src/di/interface/defs';
+import {ΔInjectableDef, ΔdefineInjectable} from '@angular/core/src/di/interface/defs';
 import {NgModuleDefinition, NgModuleProviderDef, NodeFlags} from '@angular/core/src/view';
 import {moduleDef} from '@angular/core/src/view/ng_module';
 import {createNgModuleRef} from '@angular/core/src/view/refs';
@@ -27,14 +27,14 @@ class MyChildModule {}
 class NotMyModule {}
 
 class Bar {
-  static ngInjectableDef: ɵɵInjectableDef<Bar> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<Bar> = ΔdefineInjectable({
     factory: () => new Bar(),
     providedIn: MyModule,
   });
 }
 
 class Baz {
-  static ngInjectableDef: ɵɵInjectableDef<Baz> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<Baz> = ΔdefineInjectable({
     factory: () => new Baz(),
     providedIn: NotMyModule,
   });
@@ -43,7 +43,7 @@ class Baz {
 class HasNormalDep {
   constructor(public foo: Foo) {}
 
-  static ngInjectableDef: ɵɵInjectableDef<HasNormalDep> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<HasNormalDep> = ΔdefineInjectable({
     factory: () => new HasNormalDep(inject(Foo)),
     providedIn: MyModule,
   });
@@ -52,7 +52,7 @@ class HasNormalDep {
 class HasDefinedDep {
   constructor(public bar: Bar) {}
 
-  static ngInjectableDef: ɵɵInjectableDef<HasDefinedDep> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<HasDefinedDep> = ΔdefineInjectable({
     factory: () => new HasDefinedDep(inject(Bar)),
     providedIn: MyModule,
   });
@@ -61,14 +61,14 @@ class HasDefinedDep {
 class HasOptionalDep {
   constructor(public baz: Baz|null) {}
 
-  static ngInjectableDef: ɵɵInjectableDef<HasOptionalDep> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<HasOptionalDep> = ΔdefineInjectable({
     factory: () => new HasOptionalDep(inject(Baz, InjectFlags.Optional)),
     providedIn: MyModule,
   });
 }
 
 class ChildDep {
-  static ngInjectableDef: ɵɵInjectableDef<ChildDep> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<ChildDep> = ΔdefineInjectable({
     factory: () => new ChildDep(),
     providedIn: MyChildModule,
   });
@@ -76,7 +76,7 @@ class ChildDep {
 
 class FromChildWithOptionalDep {
   constructor(public baz: Baz|null) {}
-  static ngInjectableDef: ɵɵInjectableDef<FromChildWithOptionalDep> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<FromChildWithOptionalDep> = ΔdefineInjectable({
     factory: () => new FromChildWithOptionalDep(inject(Baz, InjectFlags.Default)),
     providedIn: MyChildModule,
   });
@@ -86,7 +86,7 @@ class FromChildWithSkipSelfDep {
   constructor(
       public skipSelfChildDep: ChildDep|null, public selfChildDep: ChildDep|null,
       public optionalSelfBar: Bar|null) {}
-  static ngInjectableDef: ɵɵInjectableDef<FromChildWithSkipSelfDep> = ɵɵdefineInjectable({
+  static ngInjectableDef: ΔInjectableDef<FromChildWithSkipSelfDep> = ΔdefineInjectable({
     factory: () => new FromChildWithSkipSelfDep(
                  inject(ChildDep, InjectFlags.SkipSelf|InjectFlags.Optional),
                  inject(ChildDep, InjectFlags.Self),
@@ -209,7 +209,7 @@ describe('NgModuleRef_ injector', () => {
 
       ngOnDestroy(): void { Service.destroyed++; }
 
-      static ngInjectableDef: ɵɵInjectableDef<Service> = ɵɵdefineInjectable({
+      static ngInjectableDef: ΔInjectableDef<Service> = ΔdefineInjectable({
         factory: () => new Service(),
         providedIn: 'root',
       });
diff --git a/packages/core/testing/src/r3_test_bed_compiler.ts b/packages/core/testing/src/r3_test_bed_compiler.ts
index e18e7f81fa..c9153b4063 100644
--- a/packages/core/testing/src/r3_test_bed_compiler.ts
+++ b/packages/core/testing/src/r3_test_bed_compiler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgZone, Injector, Pipe, PlatformRef, Provider, Type, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵNG_COMPONENT_DEF as NG_COMPONENT_DEF, ɵNG_DIRECTIVE_DEF as NG_DIRECTIVE_DEF, ɵNG_INJECTOR_DEF as NG_INJECTOR_DEF, ɵNG_MODULE_DEF as NG_MODULE_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ɵɵInjectableDef as InjectableDef, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵDirectiveDef as DirectiveDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵtransitiveScopesFor as transitiveScopesFor,} from '@angular/core';
+import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgZone, Injector, Pipe, PlatformRef, Provider, Type, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵNG_COMPONENT_DEF as NG_COMPONENT_DEF, ɵNG_DIRECTIVE_DEF as NG_DIRECTIVE_DEF, ɵNG_INJECTOR_DEF as NG_INJECTOR_DEF, ɵNG_MODULE_DEF as NG_MODULE_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ΔInjectableDef as InjectableDef, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵDirectiveDef as DirectiveDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵtransitiveScopesFor as transitiveScopesFor,} from '@angular/core';
 import {ResourceLoader} from '@angular/compiler';
 
 import {clearResolutionOfComponentResourcesQueue, restoreComponentResolutionQueue, resolveComponentResources, isComponentDefPendingResolution} from '../../src/metadata/resource_loading';
diff --git a/packages/core/testing/src/test_bed.ts b/packages/core/testing/src/test_bed.ts
index 77961d62bb..880e1ae3da 100644
--- a/packages/core/testing/src/test_bed.ts
+++ b/packages/core/testing/src/test_bed.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectFlags, InjectionToken, Injector, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, StaticProvider, Type, ɵAPP_ROOT as APP_ROOT, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearOverrides as clearOverrides, ɵgetInjectableDef as getInjectableDef, ɵivyEnabled as ivyEnabled, ɵoverrideComponentView as overrideComponentView, ɵoverrideProvider as overrideProvider, ɵstringify as stringify, ɵɵInjectableDef} from '@angular/core';
+import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectFlags, InjectionToken, Injector, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, StaticProvider, Type, ɵAPP_ROOT as APP_ROOT, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearOverrides as clearOverrides, ɵgetInjectableDef as getInjectableDef, ɵivyEnabled as ivyEnabled, ɵoverrideComponentView as overrideComponentView, ɵoverrideProvider as overrideProvider, ɵstringify as stringify, ΔInjectableDef} from '@angular/core';
 
 import {AsyncTestCompleter} from './async_test_completer';
 import {ComponentFixture} from './component_fixture';
@@ -559,7 +559,7 @@ export class TestBedViewEngine implements Injector, TestBed {
         deps?: any[],
       },
       deprecated = false): void {
-    let def: ɵɵInjectableDef<any>|null = null;
+    let def: ΔInjectableDef<any>|null = null;
     if (typeof token !== 'string' && (def = getInjectableDef(token)) && def.providedIn === 'root') {
       if (provider.useFactory) {
         this._rootProviderOverrides.push(
diff --git a/packages/platform-browser/src/browser/meta.ts b/packages/platform-browser/src/browser/meta.ts
index eb8ad345d3..e32b984a46 100644
--- a/packages/platform-browser/src/browser/meta.ts
+++ b/packages/platform-browser/src/browser/meta.ts
@@ -7,7 +7,7 @@
  */
 
 import {DOCUMENT} from '@angular/common';
-import {Inject, Injectable, ɵɵinject} from '@angular/core';
+import {Inject, Injectable, Δinject} from '@angular/core';
 
 import {DomAdapter, getDOM} from '../dom/dom_adapter';
 
@@ -34,7 +34,7 @@ export type MetaDefinition = {
  * Factory to create Meta service.
  */
 export function createMeta() {
-  return new Meta(ɵɵinject(DOCUMENT));
+  return new Meta(Δinject(DOCUMENT));
 }
 
 /**
diff --git a/packages/platform-browser/src/browser/title.ts b/packages/platform-browser/src/browser/title.ts
index 623f2f8ea8..a5f7b807fa 100644
--- a/packages/platform-browser/src/browser/title.ts
+++ b/packages/platform-browser/src/browser/title.ts
@@ -7,7 +7,7 @@
  */
 
 import {DOCUMENT} from '@angular/common';
-import {Inject, Injectable, ɵɵinject} from '@angular/core';
+import {Inject, Injectable, Δinject} from '@angular/core';
 
 import {getDOM} from '../dom/dom_adapter';
 
@@ -15,7 +15,7 @@ import {getDOM} from '../dom/dom_adapter';
  * Factory to create Title service.
  */
 export function createTitle() {
-  return new Title(ɵɵinject(DOCUMENT));
+  return new Title(Δinject(DOCUMENT));
 }
 
 /**
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 1a3c687730..dc664d6c6f 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -266,7 +266,7 @@ export declare class DefaultIterableDiffer<V> implements IterableDiffer<V>, Iter
 }
 
 /** @deprecated */
-export declare const defineInjectable: typeof ɵɵdefineInjectable;
+export declare const defineInjectable: typeof ΔdefineInjectable;
 
 export declare function destroyPlatform(): void;
 
@@ -383,7 +383,7 @@ export interface HostListenerDecorator {
     new (eventName: string, args?: string[]): any;
 }
 
-export declare const inject: typeof ɵɵinject;
+export declare const inject: typeof Δinject;
 
 export interface Inject {
     token: any;
@@ -659,386 +659,6 @@ export interface OutputDecorator {
     new (bindingPropertyName?: string): any;
 }
 
-export declare function ɵɵallocHostVars(count: number): void;
-
-export interface ɵɵBaseDef<T> {
-    contentQueries: ContentQueriesFunction<T> | null;
-    /** @deprecated */ readonly declaredInputs: {
-        [P in keyof T]: string;
-    };
-    hostBindings: HostBindingsFunction<T> | null;
-    readonly inputs: {
-        [P in keyof T]: string;
-    };
-    readonly outputs: {
-        [P in keyof T]: string;
-    };
-    viewQuery: ViewQueriesFunction<T> | null;
-}
-
-export declare function ɵɵbind<T>(value: T): T | NO_CHANGE;
-
-export declare function ɵɵclassMap(classes: {
-    [styleName: string]: any;
-} | NO_CHANGE | string | null): void;
-
-export declare function ɵɵclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
-
-export declare type ɵɵComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = ComponentDef<T>;
-
-export declare function ɵɵcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
-
-export declare function ɵɵcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
-
-export declare function ɵɵcontainer(index: number): void;
-
-export declare function ɵɵcontainerRefreshEnd(): void;
-
-export declare function ɵɵcontainerRefreshStart(index: number): void;
-
-export declare function ɵɵcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
-
-export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
-
-export declare function ɵɵdefineBase<T>(baseDefinition: {
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    contentQueries?: ContentQueriesFunction<T> | null;
-    viewQuery?: ViewQueriesFunction<T> | null;
-    hostBindings?: HostBindingsFunction<T>;
-}): ɵɵBaseDef<T>;
-
-export declare function ɵɵdefineComponent<T>(componentDefinition: {
-    type: Type<T>;
-    selectors: CssSelectorList;
-    factory: FactoryFn<T>;
-    consts: number;
-    vars: number;
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    hostBindings?: HostBindingsFunction<T>;
-    contentQueries?: ContentQueriesFunction<T>;
-    exportAs?: string[];
-    template: ComponentTemplate<T>;
-    ngContentSelectors?: string[];
-    viewQuery?: ViewQueriesFunction<T> | null;
-    features?: ComponentDefFeature[];
-    encapsulation?: ViewEncapsulation;
-    data?: {
-        [kind: string]: any;
-    };
-    styles?: string[];
-    changeDetection?: ChangeDetectionStrategy;
-    directives?: DirectiveTypesOrFactory | null;
-    pipes?: PipeTypesOrFactory | null;
-    schemas?: SchemaMetadata[] | null;
-}): never;
-
-export declare const ɵɵdefineDirective: <T>(directiveDefinition: {
-    type: Type<T>;
-    selectors: (string | SelectorFlags)[][];
-    factory: FactoryFn<T>;
-    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
-    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
-    features?: DirectiveDefFeature[] | undefined;
-    hostBindings?: HostBindingsFunction<T> | undefined;
-    contentQueries?: ContentQueriesFunction<T> | undefined;
-    viewQuery?: ViewQueriesFunction<T> | null | undefined;
-    exportAs?: string[] | undefined;
-}) => never;
-
-export declare function ɵɵdefineInjectable<T>(opts: {
-    providedIn?: Type<any> | 'root' | 'any' | null;
-    factory: () => T;
-}): never;
-
-export declare function ɵɵdefineInjector(options: {
-    factory: () => any;
-    providers?: any[];
-    imports?: any[];
-}): never;
-
-export declare function ɵɵdefineNgModule<T>(def: {
-    type: T;
-    bootstrap?: Type<any>[] | (() => Type<any>[]);
-    declarations?: Type<any>[] | (() => Type<any>[]);
-    imports?: Type<any>[] | (() => Type<any>[]);
-    exports?: Type<any>[] | (() => Type<any>[]);
-    schemas?: SchemaMetadata[] | null;
-    id?: string | null;
-}): never;
-
-export declare function ɵɵdefinePipe<T>(pipeDef: {
-    name: string;
-    type: Type<T>;
-    factory: FactoryFn<T>;
-    pure?: boolean;
-}): never;
-
-export declare type ɵɵDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = DirectiveDef<T>;
-
-export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
-
-export declare function ɵɵdisableBindings(): void;
-
-export declare function ɵɵelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ɵɵelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
-
-export declare function ɵɵelementContainerEnd(): void;
-
-export declare function ɵɵelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ɵɵelementEnd(): void;
-
-export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
-
-export declare function ɵɵelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
-
-export declare function ɵɵelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ɵɵembeddedViewEnd(): void;
-
-export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
-
-export declare function ɵɵenableBindings(): void;
-
-export declare function ɵɵgetCurrentView(): OpaqueViewState;
-
-export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
-
-export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
-
-export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
-
-export declare function ɵɵi18nApply(index: number): void;
-
-export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
-
-export declare function ɵɵi18nEnd(): void;
-
-export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
-
-/** @deprecated */
-export declare function ɵɵi18nLocalize(input: string, placeholders?: {
-    [key: string]: string;
-}): string;
-
-export declare function ɵɵi18nPostprocess(message: string, replacements?: {
-    [key: string]: (string | string[]);
-}): string;
-
-export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void;
-
-export declare function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
-
-export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
-
-export interface ɵɵInjectableDef<T> {
-    factory: () => T;
-    providedIn: InjectorType<any> | 'root' | 'any' | null;
-    value: T | undefined;
-}
-
-export declare function ɵɵinjectAttribute(attrNameToInject: string): string | null;
-
-export interface ɵɵInjectorDef<T> {
-    factory: () => T;
-    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
-    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
-}
-
-export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
-
-export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
-
-export declare function ɵɵload<T>(index: number): T;
-
-export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
-
-export declare function ɵɵloadViewQuery<T>(): T;
-
-export declare function ɵɵnamespaceHTML(): void;
-
-export declare function ɵɵnamespaceMathML(): void;
-
-export declare function ɵɵnamespaceSVG(): void;
-
-export declare function ɵɵnextContext<T = any>(level?: number): T;
-
-export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
-
-export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
-
-export declare function ɵɵpipe(index: number, pipeName: string): any;
-
-export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
-
-export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
-
-export declare function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
-
-export declare function ɵɵpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
-
-export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
-
-export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
-
-export declare function ɵɵprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
-
-export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
-
-export declare function ɵɵproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
-
-export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
-
-export declare function ɵɵpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
-
-export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
-
-export declare function ɵɵreference<T>(index: number): T;
-
-export declare function ɵɵresolveBody(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: HTMLElement;
-};
-
-export declare function ɵɵresolveDocument(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: Document;
-};
-
-export declare function ɵɵresolveWindow(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: Window | null;
-};
-
-export declare function ɵɵrestoreView(viewToRestore: OpaqueViewState): void;
-
-export declare function ɵɵsanitizeHtml(unsafeHtml: any): string;
-
-export declare function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string;
-
-export declare function ɵɵsanitizeScript(unsafeScript: any): string;
-
-export declare function ɵɵsanitizeStyle(unsafeStyle: any): string;
-
-export declare function ɵɵsanitizeUrl(unsafeUrl: any): string;
-
-export declare function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any;
-
-export declare function ɵɵselect(index: number): void;
-
-export declare function ɵɵsetComponentScope(type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void;
-
-export declare function ɵɵsetNgModuleScope(type: any, scope: {
-    declarations?: Type<any>[] | (() => Type<any>[]);
-    imports?: Type<any>[] | (() => Type<any>[]);
-    exports?: Type<any>[] | (() => Type<any>[]);
-}): void;
-
-export declare function ɵɵstaticContentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): void;
-
-export declare function ɵɵstaticViewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): void;
-
-export declare function ɵɵstyleMap(styles: {
-    [styleName: string]: any;
-} | NO_CHANGE | null): void;
-
-export declare function ɵɵstyleProp(styleIndex: number, value: string | number | String | PlayerFactory | null, suffix?: string | null, forceOverride?: boolean): void;
-
-export declare function ɵɵstyling(classBindingNames?: string[] | null, styleBindingNames?: string[] | null, styleSanitizer?: StyleSanitizeFn | null): void;
-
-export declare function ɵɵstylingApply(): void;
-
-export declare function ɵɵtemplate(index: number, templateFn: ComponentTemplate<any> | null, consts: number, vars: number, tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null, localRefExtractor?: LocalRefExtractor): void;
-
-export declare function ɵɵtemplateRefExtractor(tNode: TNode, currentView: LView): ViewEngine_TemplateRef<{}> | null;
-
-export declare function ɵɵtext(index: number, value?: any): void;
-
-export declare function ɵɵtextBinding<T>(index: number, value: T | NO_CHANGE): void;
-
-export declare function ɵɵviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
-
 export declare const PACKAGE_ROOT_URL: InjectionToken<string>;
 
 export interface Pipe {
@@ -1431,3 +1051,383 @@ export interface WtfScopeFn {
 }
 
 export declare const wtfStartTimeRange: (rangeType: string, action: string) => any;
+
+export declare function ΔallocHostVars(count: number): void;
+
+export interface ΔBaseDef<T> {
+    contentQueries: ContentQueriesFunction<T> | null;
+    /** @deprecated */ readonly declaredInputs: {
+        [P in keyof T]: string;
+    };
+    hostBindings: HostBindingsFunction<T> | null;
+    readonly inputs: {
+        [P in keyof T]: string;
+    };
+    readonly outputs: {
+        [P in keyof T]: string;
+    };
+    viewQuery: ViewQueriesFunction<T> | null;
+}
+
+export declare function Δbind<T>(value: T): T | NO_CHANGE;
+
+export declare function ΔclassMap(classes: {
+    [styleName: string]: any;
+} | NO_CHANGE | string | null): void;
+
+export declare function ΔclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
+
+export declare type ΔComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = ComponentDef<T>;
+
+export declare function ΔcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+
+export declare function ΔcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+
+export declare function Δcontainer(index: number): void;
+
+export declare function ΔcontainerRefreshEnd(): void;
+
+export declare function ΔcontainerRefreshStart(index: number): void;
+
+export declare function ΔcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
+
+export declare const ΔdefaultStyleSanitizer: StyleSanitizeFn;
+
+export declare function ΔdefineBase<T>(baseDefinition: {
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    contentQueries?: ContentQueriesFunction<T> | null;
+    viewQuery?: ViewQueriesFunction<T> | null;
+    hostBindings?: HostBindingsFunction<T>;
+}): ΔBaseDef<T>;
+
+export declare function ΔdefineComponent<T>(componentDefinition: {
+    type: Type<T>;
+    selectors: CssSelectorList;
+    factory: FactoryFn<T>;
+    consts: number;
+    vars: number;
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    hostBindings?: HostBindingsFunction<T>;
+    contentQueries?: ContentQueriesFunction<T>;
+    exportAs?: string[];
+    template: ComponentTemplate<T>;
+    ngContentSelectors?: string[];
+    viewQuery?: ViewQueriesFunction<T> | null;
+    features?: ComponentDefFeature[];
+    encapsulation?: ViewEncapsulation;
+    data?: {
+        [kind: string]: any;
+    };
+    styles?: string[];
+    changeDetection?: ChangeDetectionStrategy;
+    directives?: DirectiveTypesOrFactory | null;
+    pipes?: PipeTypesOrFactory | null;
+    schemas?: SchemaMetadata[] | null;
+}): never;
+
+export declare const ΔdefineDirective: <T>(directiveDefinition: {
+    type: Type<T>;
+    selectors: (string | SelectorFlags)[][];
+    factory: FactoryFn<T>;
+    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
+    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
+    features?: DirectiveDefFeature[] | undefined;
+    hostBindings?: HostBindingsFunction<T> | undefined;
+    contentQueries?: ContentQueriesFunction<T> | undefined;
+    viewQuery?: ViewQueriesFunction<T> | null | undefined;
+    exportAs?: string[] | undefined;
+}) => never;
+
+export declare function ΔdefineInjectable<T>(opts: {
+    providedIn?: Type<any> | 'root' | 'any' | null;
+    factory: () => T;
+}): never;
+
+export declare function ΔdefineInjector(options: {
+    factory: () => any;
+    providers?: any[];
+    imports?: any[];
+}): never;
+
+export declare function ΔdefineNgModule<T>(def: {
+    type: T;
+    bootstrap?: Type<any>[] | (() => Type<any>[]);
+    declarations?: Type<any>[] | (() => Type<any>[]);
+    imports?: Type<any>[] | (() => Type<any>[]);
+    exports?: Type<any>[] | (() => Type<any>[]);
+    schemas?: SchemaMetadata[] | null;
+    id?: string | null;
+}): never;
+
+export declare function ΔdefinePipe<T>(pipeDef: {
+    name: string;
+    type: Type<T>;
+    factory: FactoryFn<T>;
+    pure?: boolean;
+}): never;
+
+export declare type ΔDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = DirectiveDef<T>;
+
+export declare function ΔdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function ΔdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
+
+export declare function ΔdisableBindings(): void;
+
+export declare function Δelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ΔelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
+
+export declare function ΔelementContainerEnd(): void;
+
+export declare function ΔelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ΔelementEnd(): void;
+
+export declare function ΔelementHostAttrs(attrs: TAttributes): void;
+
+export declare function ΔelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+
+export declare function ΔelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ΔembeddedViewEnd(): void;
+
+export declare function ΔembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
+
+export declare function ΔenableBindings(): void;
+
+export declare function ΔgetCurrentView(): OpaqueViewState;
+
+export declare function ΔgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
+
+export declare function ΔgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
+
+export declare function Δi18n(index: number, message: string, subTemplateIndex?: number): void;
+
+export declare function Δi18nApply(index: number): void;
+
+export declare function Δi18nAttributes(index: number, values: string[]): void;
+
+export declare function Δi18nEnd(): void;
+
+export declare function Δi18nExp<T>(expression: T | NO_CHANGE): void;
+
+/** @deprecated */
+export declare function Δi18nLocalize(input: string, placeholders?: {
+    [key: string]: string;
+}): string;
+
+export declare function Δi18nPostprocess(message: string, replacements?: {
+    [key: string]: (string | string[]);
+}): string;
+
+export declare function Δi18nStart(index: number, message: string, subTemplateIndex?: number): void;
+
+export declare function ΔInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
+
+export declare function Δinject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function Δinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
+
+export interface ΔInjectableDef<T> {
+    factory: () => T;
+    providedIn: InjectorType<any> | 'root' | 'any' | null;
+    value: T | undefined;
+}
+
+export declare function ΔinjectAttribute(attrNameToInject: string): string | null;
+
+export interface ΔInjectorDef<T> {
+    factory: () => T;
+    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
+    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
+}
+
+export declare function Δinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
+
+export declare function Δinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
+
+export declare function Δinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
+
+export declare function Δinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
+
+export declare function Δinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
+
+export declare function Δinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
+
+export declare function Δinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
+
+export declare function Δinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
+
+export declare function ΔinterpolationV(values: any[]): string | NO_CHANGE;
+
+export declare function Δlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+
+export declare function Δload<T>(index: number): T;
+
+export declare function ΔloadContentQuery<T>(): QueryList<T>;
+
+export declare function ΔloadViewQuery<T>(): T;
+
+export declare function ΔnamespaceHTML(): void;
+
+export declare function ΔnamespaceMathML(): void;
+
+export declare function ΔnamespaceSVG(): void;
+
+export declare function ΔnextContext<T = any>(level?: number): T;
+
+export declare type ΔNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
+
+export declare function ΔNgOnChangesFeature<T>(): DirectiveDefFeature;
+
+export declare function Δpipe(index: number, pipeName: string): any;
+
+export declare function ΔpipeBind1(index: number, slotOffset: number, v1: any): any;
+
+export declare function ΔpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
+
+export declare function ΔpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
+
+export declare function ΔpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
+
+export declare function ΔpipeBindV(index: number, slotOffset: number, values: any[]): any;
+
+export declare type ΔPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
+
+export declare function Δprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
+
+export declare function ΔprojectionDef(selectors?: CssSelectorList[]): void;
+
+export declare function Δproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ΔProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
+
+export declare function ΔpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
+
+export declare function ΔpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
+
+export declare function ΔpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
+
+export declare function ΔpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
+
+export declare function ΔpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
+
+export declare function ΔpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
+
+export declare function ΔpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
+
+export declare function ΔpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
+
+export declare function ΔpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
+
+export declare function ΔpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
+
+export declare function ΔqueryRefresh(queryList: QueryList<any>): boolean;
+
+export declare function Δreference<T>(index: number): T;
+
+export declare function ΔresolveBody(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: HTMLElement;
+};
+
+export declare function ΔresolveDocument(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: Document;
+};
+
+export declare function ΔresolveWindow(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: Window | null;
+};
+
+export declare function ΔrestoreView(viewToRestore: OpaqueViewState): void;
+
+export declare function ΔsanitizeHtml(unsafeHtml: any): string;
+
+export declare function ΔsanitizeResourceUrl(unsafeResourceUrl: any): string;
+
+export declare function ΔsanitizeScript(unsafeScript: any): string;
+
+export declare function ΔsanitizeStyle(unsafeStyle: any): string;
+
+export declare function ΔsanitizeUrl(unsafeUrl: any): string;
+
+export declare function ΔsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any;
+
+export declare function Δselect(index: number): void;
+
+export declare function ΔsetComponentScope(type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void;
+
+export declare function ΔsetNgModuleScope(type: any, scope: {
+    declarations?: Type<any>[] | (() => Type<any>[]);
+    imports?: Type<any>[] | (() => Type<any>[]);
+    exports?: Type<any>[] | (() => Type<any>[]);
+}): void;
+
+export declare function ΔstaticContentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): void;
+
+export declare function ΔstaticViewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): void;
+
+export declare function ΔstyleMap(styles: {
+    [styleName: string]: any;
+} | NO_CHANGE | null): void;
+
+export declare function ΔstyleProp(styleIndex: number, value: string | number | String | PlayerFactory | null, suffix?: string | null, forceOverride?: boolean): void;
+
+export declare function Δstyling(classBindingNames?: string[] | null, styleBindingNames?: string[] | null, styleSanitizer?: StyleSanitizeFn | null): void;
+
+export declare function ΔstylingApply(): void;
+
+export declare function Δtemplate(index: number, templateFn: ComponentTemplate<any> | null, consts: number, vars: number, tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null, localRefExtractor?: LocalRefExtractor): void;
+
+export declare function ΔtemplateRefExtractor(tNode: TNode, currentView: LView): ViewEngine_TemplateRef<{}> | null;
+
+export declare function Δtext(index: number, value?: any): void;
+
+export declare function ΔtextBinding<T>(index: number, value: T | NO_CHANGE): void;
+
+export declare function ΔviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
diff --git a/tools/ts-api-guardian/index.bzl b/tools/ts-api-guardian/index.bzl
index a33863f7f3..71f35129b8 100644
--- a/tools/ts-api-guardian/index.bzl
+++ b/tools/ts-api-guardian/index.bzl
@@ -24,9 +24,7 @@ def ts_api_guardian_test(
         golden,
         actual,
         data = [],
-        # Match one, but not two ɵ characters. Ivy instructions are currently prefixed with ɵɵ and
-        # should appear in ts_api_guardian tests.
-        strip_export_pattern = ["^__", "^ɵ[^ɵ]"],
+        strip_export_pattern = ["^__", "^ɵ"],
         allow_module_identifiers = COMMON_MODULE_IDENTIFIERS,
         use_angular_tag_rules = True,
         **kwargs):

From 018a5168a5eae50a80996d2679119cafcf1eff64 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Tue, 14 May 2019 08:18:27 -0700
Subject: [PATCH 031/275] =?UTF-8?q?refactor(ivy):=20mark=20=CE=94defineInj?=
 =?UTF-8?q?ectable=20as=20codeGenApi.=20(#30362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR Close #30362
---
 packages/core/src/di/interface/defs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/di/interface/defs.ts b/packages/core/src/di/interface/defs.ts
index 593e16a06b..d58957090a 100644
--- a/packages/core/src/di/interface/defs.ts
+++ b/packages/core/src/di/interface/defs.ts
@@ -129,7 +129,7 @@ export interface InjectorTypeWithProviders<T> {
  * * `factory` gives the zero argument function which will create an instance of the injectable.
  *   The factory can call `inject` to access the `Injector` and request injection of dependencies.
  *
- * @publicApi
+ * @codeGenApi
  */
 export function ΔdefineInjectable<T>(opts: {
   providedIn?: Type<any>| 'root' | 'any' | null,

From 4f9b16783b838f03793a33eed39dd6c8112519d9 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Tue, 14 May 2019 10:12:48 -0700
Subject: [PATCH 032/275] =?UTF-8?q?refactor(ivy):=20deprecate=20=C9=B5?=
 =?UTF-8?q?=C9=B5inject=20and=20=C9=B5=C9=B5defineInjectable=20(#30362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- They are to be removed before the end of RC

PR Close #30362
---
 packages/core/src/core_private_export.ts       | 2 +-
 packages/core/src/di/index.ts                  | 4 ++--
 packages/core/src/di/injector_compatibility.ts | 6 ++++++
 packages/core/src/di/interface/defs.ts         | 7 +++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index 98595d9b27..41a2a4d67c 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -13,7 +13,7 @@ export {devModeEqual as ɵdevModeEqual} from './change_detection/change_detectio
 export {isListLikeIterable as ɵisListLikeIterable} from './change_detection/change_detection_util';
 export {ChangeDetectorStatus as ɵChangeDetectorStatus, isDefaultChangeDetectionStrategy as ɵisDefaultChangeDetectionStrategy} from './change_detection/constants';
 export {Console as ɵConsole} from './console';
-export {inject, setCurrentInjector as ɵsetCurrentInjector, Δinject} from './di/injector_compatibility';
+export {inject, setCurrentInjector as ɵsetCurrentInjector, ɵɵinject, Δinject} from './di/injector_compatibility';
 export {getInjectableDef as ɵgetInjectableDef, ΔInjectableDef as ΔInjectableDef, ΔInjectorDef} from './di/interface/defs';
 export {APP_ROOT as ɵAPP_ROOT} from './di/scope';
 export {ivyEnabled as ɵivyEnabled} from './ivy_switch';
diff --git a/packages/core/src/di/index.ts b/packages/core/src/di/index.ts
index 02f2ed5631..1733f522a0 100644
--- a/packages/core/src/di/index.ts
+++ b/packages/core/src/di/index.ts
@@ -14,11 +14,11 @@
 
 export * from './metadata';
 export {InjectFlags} from './interface/injector';
-export {ΔdefineInjectable, defineInjectable, ΔdefineInjector, InjectableType, InjectorType} from './interface/defs';
+export {ΔdefineInjectable, defineInjectable, ɵɵdefineInjectable, ΔdefineInjector, InjectableType, InjectorType} from './interface/defs';
 export {forwardRef, resolveForwardRef, ForwardRefFn} from './forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './injectable';
 export {Injector} from './injector';
-export {Δinject, inject, INJECTOR} from './injector_compatibility';
+export {Δinject, inject, ɵɵinject, INJECTOR} from './injector_compatibility';
 export {ReflectiveInjector} from './reflective_injector';
 export {StaticProvider, ValueProvider, ConstructorSansProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './interface/provider';
 export {ResolvedReflectiveFactory, ResolvedReflectiveProvider} from './reflective_provider';
diff --git a/packages/core/src/di/injector_compatibility.ts b/packages/core/src/di/injector_compatibility.ts
index 1b1b291738..10eb13f290 100644
--- a/packages/core/src/di/injector_compatibility.ts
+++ b/packages/core/src/di/injector_compatibility.ts
@@ -139,6 +139,12 @@ export function Δinject<T>(token: Type<T>| InjectionToken<T>, flags = InjectFla
  */
 export const inject = Δinject;
 
+/**
+ * @deprecated delete by v8, use `inject`.
+ * @codeGenApi
+ */
+export const ɵɵinject = Δinject;
+
 /**
  * Injects `root` tokens in limp mode.
  *
diff --git a/packages/core/src/di/interface/defs.ts b/packages/core/src/di/interface/defs.ts
index d58957090a..041e599e08 100644
--- a/packages/core/src/di/interface/defs.ts
+++ b/packages/core/src/di/interface/defs.ts
@@ -147,6 +147,13 @@ export function ΔdefineInjectable<T>(opts: {
  */
 export const defineInjectable = ΔdefineInjectable;
 
+/**
+ * @deprecated delete before v8. Use `defineInjectable`, which is also deprecated, but will be
+ * around until v10.
+ * @publicApi
+ */
+export const ɵɵdefineInjectable = ΔdefineInjectable;
+
 /**
  * Construct an `InjectorDef` which configures an injector.
  *

From 0fd9d086e4b225b5ebd3ea92871445ee345da59d Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Wed, 8 May 2019 15:49:08 -0700
Subject: [PATCH 033/275] fix(router): ensure navigations start with the
 current URL value incase redirect is skipped (#30344)

In some cases where multiple navigations happen to the same URL, the router will not process a given URL. In those cases, we fall into logic that resets state for the next navigation. One piece of this resetting is to set the `browserUrlTree` to the most recent `urlAfterRedirects`i.

However, there was bug in this logic because in some cases the `urlAfterRedirects` is a stale value. This happens any time a URL won't be processed, and the previous URL will also not be processed. This creates unpredictable behavior, not the least of which ends up being a broken `back` button.

This PR kicks off new navigations with the current value the router assumes is in the browser. All the logic around how to handle future navigations is based on this value compared to the current transition, so it's important to kick off all new navigations with the current value so in the edge case described above we don't end up with an old value being set into `browserUrlTree`.

Fixes #30340
Related to #30160

PR Close #30344
---
 packages/router/src/router.ts            |  9 +++-
 packages/router/test/integration.spec.ts | 60 ++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index ea7436666d..5144c250ed 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -773,7 +773,14 @@ export class Router {
     this.routerState.root.component = this.rootComponentType;
   }
 
-  private getTransition(): NavigationTransition { return this.transitions.value; }
+  private getTransition(): NavigationTransition {
+    const transition = this.transitions.value;
+    // This value needs to be set. Other values such as extractedUrl are set on initial navigation
+    // but the urlAfterRedirects may not get set if we aren't processing the new URL *and* not
+    // processing the previous URL.
+    transition.urlAfterRedirects = this.browserUrlTree;
+    return transition;
+  }
 
   private setTransition(t: Partial<NavigationTransition>): void {
     this.transitions.next({...this.getTransition(), ...t});
diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts
index e5e85e84e1..3766ef7065 100644
--- a/packages/router/test/integration.spec.ts
+++ b/packages/router/test/integration.spec.ts
@@ -218,6 +218,39 @@ describe('Integration', () => {
        })));
   });
 
+
+  /**
+   * get/setTransition are private APIs. This test is needed though to guarantee the correct
+   * values are being used. Related to https://github.com/angular/angular/issues/30340 where
+   * stale transition data was being used when kicking off a new navigation.
+   */
+  describe('get/setTransition', () => {
+    it('should provide the most recent NavigationTransition',
+       fakeAsync(inject([Router, Location], (router: Router, location: SpyLocation) => {
+         router.resetConfig([
+           {path: '', component: SimpleCmp}, {path: 'a', component: SimpleCmp},
+           {path: 'b', component: SimpleCmp}
+         ]);
+
+         const fixture = createRoot(router, RootCmp);
+
+         const initialTransition = (router as any).getTransition();
+
+         // Confirm initial value
+         expect(initialTransition.urlAfterRedirects.toString()).toBe('/');
+
+
+         router.navigateByUrl('/a', {replaceUrl: true});
+
+         tick();
+
+         // After a navigation, we should see the URL after redirect
+         const nextTransition = (router as any).getTransition();
+         // Confirm initial value
+         expect(nextTransition.urlAfterRedirects.toString()).toBe('/a');
+       })));
+  });
+
   describe('navigation warning', () => {
     let warnings: string[] = [];
 
@@ -662,6 +695,33 @@ describe('Integration', () => {
          expect(location.path()).toEqual('/login');
        })));
 
+    it('should set browserUrlTree with urlUpdateStrategy="eagar" and false `shouldProcessUrl`',
+       fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
+         const fixture = TestBed.createComponent(RootCmp);
+         advance(fixture);
+
+         router.urlUpdateStrategy = 'eager';
+
+         router.resetConfig([
+           {path: 'team/:id', component: SimpleCmp},
+           {path: 'login', component: AbsoluteSimpleLinkCmp}
+         ]);
+
+         router.navigateByUrl('/team/22');
+         advance(fixture, 1);
+
+         expect((router as any).browserUrlTree.toString()).toBe('/team/22');
+
+         // Force to not process URL changes
+         router.urlHandlingStrategy.shouldProcessUrl = (url: UrlTree) => false;
+
+         router.navigateByUrl('/login');
+         advance(fixture, 1);
+
+         // Do not change locations
+         expect((router as any).browserUrlTree.toString()).toBe('/team/22');
+       })));
+
     it('should eagerly update URL after redirects are applied with urlUpdateStrategy="eagar"',
        fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
          const fixture = TestBed.createComponent(RootCmp);

From 79d4b16f8a87f13b0acc0c26e3c9227d649ed42d Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Wed, 8 May 2019 16:05:31 -0700
Subject: [PATCH 034/275] Revert "Revert "fix(router): fix a problem with
 router not responding to back button (#30160)" (#30320)" (#30344)

This reverts commit 8ced321bb65087c83ef5e3aed00ef4ab569514db.

PR Close #30344
---
 packages/router/src/router.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index 5144c250ed..c19621c0c8 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -556,6 +556,7 @@ export class Router {
                      * way the next navigation will be coming from the current URL in the browser.
                      */
                     this.rawUrlTree = t.rawUrl;
+                    this.browserUrlTree = t.urlAfterRedirects;
                     t.resolve(null);
                     return EMPTY;
                   }

From d20b0f4b936e6589da86f3d1931f66c546593f70 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Wed, 15 May 2019 12:49:41 -0700
Subject: [PATCH 035/275] docs: release notes for the v8.0.0-rc.4 release

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4420875f3f..fee29c5706 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+<a name="8.0.0-rc.4"></a>
+# [8.0.0-rc.4](https://github.com/angular/angular/compare/8.0.0-rc.3...8.0.0-rc.4) (2019-05-15)
+
+
+### Bug Fixes
+
+* **bazel:** Directly spawn native Bazel binary ([#30306](https://github.com/angular/angular/issues/30306)) ([d1fcc2b](https://github.com/angular/angular/commit/d1fcc2b))
+* **bazel:** pass correct arguments to http_server in Windows ([#30346](https://github.com/angular/angular/issues/30346)) ([71eba45](https://github.com/angular/angular/commit/71eba45)), closes [#29785](https://github.com/angular/angular/issues/29785)
+* **bazel:** Use existing npm/yarn lock files ([#30438](https://github.com/angular/angular/issues/30438)) ([3136d9f](https://github.com/angular/angular/commit/3136d9f))
+* **compiler:** ensure strict mode when evaluating in JIT ([#30122](https://github.com/angular/angular/issues/30122)) ([192f108](https://github.com/angular/angular/commit/192f108))
+* **core:** migrations not always migrating all files ([#30269](https://github.com/angular/angular/issues/30269)) ([e8ceae1](https://github.com/angular/angular/commit/e8ceae1))
+* **core:** static-query migration errors not printed properly ([#30458](https://github.com/angular/angular/issues/30458)) ([fde3f46](https://github.com/angular/angular/commit/fde3f46))
+* **core:** static-query migration fails with default parameter values ([#30269](https://github.com/angular/angular/issues/30269)) ([c3246e6](https://github.com/angular/angular/commit/c3246e6))
+* **core:** static-query migration should gracefully exit if AOT compiler throws ([#30269](https://github.com/angular/angular/issues/30269)) ([a71d8a8](https://github.com/angular/angular/commit/a71d8a8))
+* **core:** static-query migration should handle queries on accessors ([#30327](https://github.com/angular/angular/issues/30327)) ([dd299f9](https://github.com/angular/angular/commit/dd299f9))
+* **core:** static-query migration should not fallback to test strategy ([#30458](https://github.com/angular/angular/issues/30458)) ([0fa48e8](https://github.com/angular/angular/commit/0fa48e8))
+* **core:** static-query migration should not prompt if no queries are used ([#30254](https://github.com/angular/angular/issues/30254)) ([12fb639](https://github.com/angular/angular/commit/12fb639))
+* **core:** static-query usage migration strategy should detect ambiguous query usage ([#30215](https://github.com/angular/angular/issues/30215)) ([e295c6a](https://github.com/angular/angular/commit/e295c6a))
+* **router:** ensure navigations start with the current URL value incase redirect is skipped ([#30344](https://github.com/angular/angular/issues/30344)) ([9b88920](https://github.com/angular/angular/commit/9b88920)), closes [#30340](https://github.com/angular/angular/issues/30340) [#30160](https://github.com/angular/angular/issues/30160)
+* **router:** IE 11 bug can break URL unification when comparing objects ([#30393](https://github.com/angular/angular/issues/30393)) ([c383491](https://github.com/angular/angular/commit/c383491))
+
+
+### Features
+
+* **bazel:** use rbe_autoconfig() and new container. ([#29336](https://github.com/angular/angular/issues/29336)) ([e562acc](https://github.com/angular/angular/commit/e562acc))
+
+
+
 <a name="8.0.0-rc.3"></a>
 # [8.0.0-rc.3](https://github.com/angular/angular/compare/8.0.0-rc.2...8.0.0-rc.3) (2019-05-07)
 

From 53f356427f1ad3f95b61e7a4d0fe6ace0b4b304d Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Tue, 14 May 2019 14:25:12 -0700
Subject: [PATCH 036/275] fix(router): type cast correctly for IE 11 bug
 breaking URL Unification when comparing objects (#30464)

PR #30393 corrected behavior where Object.keys sometimes returns an `undefined` value. However, the types didn't reflect this in the code. That fix actually missed one value that could return `undefined`. This PR corrects this by casting the types to what they can be in IE 11. This ensures the code behaves as it should when this edge case comes up.

PR Close #30464
---
 packages/router/src/utils/collection.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/router/src/utils/collection.ts b/packages/router/src/utils/collection.ts
index 149182dde2..b71c5257f7 100644
--- a/packages/router/src/utils/collection.ts
+++ b/packages/router/src/utils/collection.ts
@@ -21,10 +21,13 @@ export function shallowEqualArrays(a: any[], b: any[]): boolean {
 }
 
 export function shallowEqual(a: {[x: string]: any}, b: {[x: string]: any}): boolean {
-  const k1 = Object.keys(a);
-  const k2 = Object.keys(b);
-  // IE 11 sometimes returns an `undefined` value here. This guard is for IE 11 only.
-  if (!(k1 || k2) || k1.length != k2.length) {
+  // Casting Object.keys return values to include `undefined` as there are some cases
+  // in IE 11 where this can happen. Cannot provide a test because the behavior only
+  // exists in certain circumstances in IE 11, therefore doing this cast ensures the
+  // logic is correct for when this edge case is hit.
+  const k1 = Object.keys(a) as string[] | undefined;
+  const k2 = Object.keys(b) as string[] | undefined;
+  if (!k1 || !k2 || k1.length != k2.length) {
     return false;
   }
   let key: string;

From 35c1750fcc905c2a51254d790c35951de72c2357 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 13 May 2019 16:24:49 -0700
Subject: [PATCH 037/275] test(ivy): port TemplateRef tests over to acceptance
 tests (#30443)

- Moves template ref tests from render3 unit tests to acceptance tests.
- Marks tests testing ivy specific changes as `onlyInIvy`.
- Deletes old render3 unit tests that are no longer necessary

PR Close #30443
---
 .../core/test/acceptance/template_ref_spec.ts | 114 ++++++++++-
 .../core/test/render3/template_ref_spec.ts    | 178 ------------------
 2 files changed, 113 insertions(+), 179 deletions(-)
 delete mode 100644 packages/core/test/render3/template_ref_spec.ts

diff --git a/packages/core/test/acceptance/template_ref_spec.ts b/packages/core/test/acceptance/template_ref_spec.ts
index 981cc43bac..7184479bad 100644
--- a/packages/core/test/acceptance/template_ref_spec.ts
+++ b/packages/core/test/acceptance/template_ref_spec.ts
@@ -9,6 +9,7 @@
 import {Component, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
+import {onlyInIvy} from '@angular/private/testing';
 
 describe('TemplateRef', () => {
   describe('rootNodes', () => {
@@ -52,6 +53,117 @@ describe('TemplateRef', () => {
 
       expect(rootNodeTextContent).toEqual(['Header', 'Item one', 'Item two']);
     });
-  });
 
+    it('should return root render nodes for an embedded view instance', () => {
+      @Component({
+        template: `
+          <ng-template #templateRef>
+            <div></div>
+            some text
+            <span></span>
+          </ng-template>
+        `
+      })
+      class App {
+        @ViewChild('templateRef')
+        templateRef !: TemplateRef<any>;
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const embeddedView = fixture.componentInstance.templateRef.createEmbeddedView({});
+      expect(embeddedView.rootNodes.length).toBe(3);
+    });
+
+    /**
+     * This is different as compared to the view engine implementation which returns a comment node
+     * in this case:
+     * https://stackblitz.com/edit/angular-uiqry6?file=src/app/app.component.ts
+     *
+     * Returning a comment node for a template ref with no nodes is wrong is fixed in Ivy.
+     */
+    onlyInIvy('Fixed: Ivy no longer adds a comment node in this case.')
+        .it('should return an empty array for embedded view with no nodes', () => {
+          @Component({
+            template: `
+              <ng-template #templateRef></ng-template>
+            `
+          })
+          class App {
+            @ViewChild('templateRef')
+            templateRef !: TemplateRef<any>;
+          }
+
+          TestBed.configureTestingModule({
+            declarations: [App],
+          });
+          const fixture = TestBed.createComponent(App);
+          fixture.detectChanges();
+
+          const embeddedView = fixture.componentInstance.templateRef.createEmbeddedView({});
+          expect(embeddedView.rootNodes.length).toBe(0);
+        });
+
+    it('should not descend into containers when retrieving root nodes', () => {
+      /**
+       * NOTE: In VE, if `SUFFIX` text node below is _not_ present, VE will add an
+       * additional `<!---->` comment, thus being slightly different than Ivy.
+       * (resulting in 1 root node in Ivy and 2 in VE).
+       */
+      @Component({
+        template: `
+          <ng-template #templateRef><ng-template [ngIf]="true">text</ng-template>SUFFIX</ng-template>
+        `
+      })
+      class App {
+        @ViewChild('templateRef')
+        templateRef !: TemplateRef<any>;
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const embeddedView = fixture.componentInstance.templateRef.createEmbeddedView({});
+      expect(embeddedView.rootNodes.length).toBe(2);
+      expect(embeddedView.rootNodes[0].nodeType).toBe(Node.COMMENT_NODE);
+      expect(embeddedView.rootNodes[1].nodeType).toBe(Node.TEXT_NODE);
+    });
+
+    /**
+     * Contrary to containers (<ng-template>) we _do_ descend into element containers
+     * (<ng-container>)
+     */
+    it('should descend into element containers when retrieving root nodes', () => {
+      @Component({
+        template: `
+          <ng-template #templateRef>
+            <ng-container>text</ng-container>
+          </ng-template>
+        `
+      })
+      class App {
+        @ViewChild('templateRef')
+        templateRef !: TemplateRef<any>;
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const embeddedView = fixture.componentInstance.templateRef.createEmbeddedView({});
+
+      expect(embeddedView.rootNodes.length).toBe(2);
+      expect(embeddedView.rootNodes[0].nodeType).toBe(Node.COMMENT_NODE);
+      expect(embeddedView.rootNodes[1].nodeType).toBe(Node.TEXT_NODE);
+    });
+  });
 });
diff --git a/packages/core/test/render3/template_ref_spec.ts b/packages/core/test/render3/template_ref_spec.ts
deleted file mode 100644
index d5059f366e..0000000000
--- a/packages/core/test/render3/template_ref_spec.ts
+++ /dev/null
@@ -1,178 +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 {TemplateRef} from '@angular/core';
-
-import {AttributeMarker, RenderFlags, ΔdefineDirective} from '../../src/render3/index';
-import {Δbind, ΔdirectiveInject, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementProperty, Δtemplate, Δtext} from '../../src/render3/instructions/all';
-
-import {NgIf} from './common_with_def';
-import {ComponentFixture, createComponent, getDirectiveOnNode} from './render_util';
-
-describe('TemplateRef', () => {
-
-  describe('rootNodes', () => {
-
-    class DirectiveWithTplRef {
-      static ngDirectiveDef = ΔdefineDirective({
-        type: DirectiveWithTplRef,
-        selectors: [['', 'tplRef', '']],
-        factory: () => new DirectiveWithTplRef(ΔdirectiveInject(TemplateRef as any))
-      });
-
-      // injecting a ViewContainerRef to create a dynamic container in which embedded views will be
-      // created
-      constructor(public tplRef: TemplateRef<{}>) {}
-    }
-
-    it('should return root render nodes for an embedded view instance', () => {
-      let directiveWithTplRef: DirectiveWithTplRef;
-
-      function embeddedTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'div');
-          Δtext(1, 'some text');
-          Δelement(2, 'span');
-        }
-      }
-
-      /*
-          <ng-template tplRef>
-              <div></div>
-              some text
-              <span></span>
-          </ng-template>
-       */
-      const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, embeddedTemplate, 3, 0, 'ng-template', ['tplRef', '']);
-          directiveWithTplRef = getDirectiveOnNode(0, 0);
-        }
-      }, 1, 0, [DirectiveWithTplRef]);
-
-
-      const fixture = new ComponentFixture(AppComponent);
-      expect(directiveWithTplRef !).toBeDefined();
-
-      const viewRef = directiveWithTplRef !.tplRef.createEmbeddedView({});
-      expect(viewRef.rootNodes.length).toBe(3);
-    });
-
-    /**
-     * This is different as compared to the view engine implementation which returns a comment node
-     * in this case:
-     * https://stackblitz.com/edit/angular-uiqry6?file=src/app/app.component.ts
-     *
-     * Returning a comment node for a template ref with no nodes is wrong and should be fixed in
-     * ivy.
-     */
-    it('should return an empty array for embedded view with no nodes', () => {
-      let directiveWithTplRef: DirectiveWithTplRef;
-
-      /*
-          <ng-template tplRef></ng-template>
-       */
-      const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, () => {}, 0, 0, 'ng-template', ['tplRef', '']);
-          directiveWithTplRef = getDirectiveOnNode(0, 0);
-        }
-      }, 1, 0, [DirectiveWithTplRef]);
-
-
-      const fixture = new ComponentFixture(AppComponent);
-      expect(directiveWithTplRef !).toBeDefined();
-
-      const viewRef = directiveWithTplRef !.tplRef.createEmbeddedView({});
-      expect(viewRef.rootNodes.length).toBe(0);
-    });
-
-    /**
-     * This is somehow surprising but the current view engine don't descend into containers when
-     * getting root nodes of an embedded view:
-     * https://stackblitz.com/edit/angular-z8zev7?file=src/app/app.component.ts
-     */
-    it('should not descend into containers when retrieving root nodes', () => {
-      let directiveWithTplRef: DirectiveWithTplRef;
-
-      function ngIfTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtext(0, 'text');
-        }
-      }
-
-      function embeddedTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, ngIfTemplate, 1, 0, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'ngIf', Δbind(ctx.showing));
-        }
-      }
-
-      /*
-          <ng-template tplRef><ng-template [ngIf]="true">text</ng-template></ng-template>
-       */
-      const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, embeddedTemplate, 1, 1, 'ng-template', ['tplRef', '']);
-          directiveWithTplRef = getDirectiveOnNode(0, 0);
-        }
-      }, 1, 0, [DirectiveWithTplRef, NgIf]);
-
-
-      const fixture = new ComponentFixture(AppComponent);
-      expect(directiveWithTplRef !).toBeDefined();
-
-      const viewRef = directiveWithTplRef !.tplRef.createEmbeddedView({});
-
-      // assert that we've got a comment node (only!) corresponding to <ng-template [ngIf]="true">
-      expect(viewRef.rootNodes.length).toBe(1);
-      expect(viewRef.rootNodes[0].nodeType).toBe(8);
-    });
-
-
-    /**
-     * Contrary to containers (<ng-template>) we _do_ descend into element containers
-     * (<ng-container):
-     * https://stackblitz.com/edit/angular-yovmmp?file=src/app/app.component.ts
-     */
-    it('should descend into element containers when retrieving root nodes', () => {
-      let directiveWithTplRef: DirectiveWithTplRef;
-
-      function embeddedTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementContainerStart(0);
-          { Δtext(1, 'text'); }
-          ΔelementContainerEnd();
-        }
-      }
-
-      /*
-          <ng-template tplRef><ng-container>text</ng-container></ng-template>
-       */
-      const AppComponent = createComponent('app-cmp', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, embeddedTemplate, 2, 0, 'ng-template', ['tplRef', '']);
-          directiveWithTplRef = getDirectiveOnNode(0, 0);
-        }
-      }, 1, 0, [DirectiveWithTplRef]);
-
-
-      const fixture = new ComponentFixture(AppComponent);
-      expect(directiveWithTplRef !).toBeDefined();
-
-      const viewRef = directiveWithTplRef !.tplRef.createEmbeddedView({});
-
-      expect(viewRef.rootNodes.length).toBe(2);
-      expect(viewRef.rootNodes[0].nodeType)
-          .toBe(8);  // a comment node (only!) corresponding to <ng-container>
-      expect(viewRef.rootNodes[1].nodeType).toBe(3);  // a text node
-    });
-  });
-});

From 1a0e500eea811617193369add6007e878a9c36a7 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 13 May 2019 19:43:11 +0100
Subject: [PATCH 038/275] fix(ivy): support sub-class services that only
 inherit `@Injectable` (#30388)

In View engine it is possible to instantiate a service that that has no
`@Injectable` decorator as long as it satisfies one of:

1) It has no dependencies and so a constructor with no parameters.
This is already supported in Ivy.
2) It has no constructor of its own and sub-classes a service which has
dependencies but has its own `@Injectable` decorator. This second
scenario was broken in Ivy.

In Ivy, previous to this commit, if a class to be instantiated did not have
its own `@Injectable` decorator and did not provide a constructor of
its own, then it would be created using `new` with no arguments -
i.e. falling back to the first scenario.

After this commit Ivy correctly uses the `ngInjectableDef` inherited
from the super-class to provide the `factory` for instantiating the
sub-class.

FW-1314

PR Close #30388
---
 packages/core/src/di/interface/defs.ts        | 28 +++++++-
 packages/core/src/di/r3_injector.ts           | 65 +++++++++++++------
 packages/core/test/acceptance/di_spec.ts      | 38 ++++++++++-
 .../injection/bundle.golden_symbols.json      |  6 ++
 4 files changed, 113 insertions(+), 24 deletions(-)

diff --git a/packages/core/src/di/interface/defs.ts b/packages/core/src/di/interface/defs.ts
index 041e599e08..f98c09cf6a 100644
--- a/packages/core/src/di/interface/defs.ts
+++ b/packages/core/src/di/interface/defs.ts
@@ -182,12 +182,34 @@ export function ΔdefineInjector(options: {factory: () => any, providers?: any[]
 }
 
 /**
- * Read the `ngInjectableDef` type in a way which is immune to accidentally reading inherited value.
+ * Read the `ngInjectableDef` for `type` in a way which is immune to accidentally reading inherited
+ * value.
  *
- * @param type type which may have `ngInjectableDef`
+ * @param type A type which may have its own (non-inherited) `ngInjectableDef`.
  */
 export function getInjectableDef<T>(type: any): ΔInjectableDef<T>|null {
-  return type && type.hasOwnProperty(NG_INJECTABLE_DEF) ? (type as any)[NG_INJECTABLE_DEF] : null;
+  return type && type.hasOwnProperty(NG_INJECTABLE_DEF) ? type[NG_INJECTABLE_DEF] : null;
+}
+
+/**
+ * Read the `ngInjectableDef` for `type` or read the `ngInjectableDef` from one of its ancestors.
+ *
+ * @param type A type which may have `ngInjectableDef`, via inheritance.
+ *
+ * @deprecated Will be removed in v10, where an error will occur in the scenario if we find the
+ * `ngInjectableDef` on an ancestor only.
+ */
+export function getInheritedInjectableDef<T>(type: any): ΔInjectableDef<T>|null {
+  if (type && type[NG_INJECTABLE_DEF]) {
+    // TODO(FW-1307): Re-add ngDevMode when closure can handle it
+    // ngDevMode &&
+    console.warn(
+        `DEPRECATED: DI is instantiating a token "${type.name}" that inherits its @Injectable decorator but does not provide one itself.\n` +
+        `This will become an error in v10. Please add @Injectable() to the "${type.name}" class.`);
+    return type[NG_INJECTABLE_DEF];
+  } else {
+    return null;
+  }
 }
 
 /**
diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index 5a61c08c88..d7c2daca54 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -15,7 +15,7 @@ import {resolveForwardRef} from './forward_ref';
 import {InjectionToken} from './injection_token';
 import {Injector} from './injector';
 import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, injectArgs, setCurrentInjector, Δinject} from './injector_compatibility';
-import {InjectableType, InjectorType, InjectorTypeWithProviders, getInjectableDef, getInjectorDef, ΔInjectableDef} from './interface/defs';
+import {InjectorType, InjectorTypeWithProviders, getInheritedInjectableDef, getInjectableDef, getInjectorDef, ΔInjectableDef} from './interface/defs';
 import {InjectFlags} from './interface/injector';
 import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider} from './interface/provider';
 import {APP_ROOT} from './scope';
@@ -378,25 +378,52 @@ export class R3Injector {
 }
 
 function injectableDefOrInjectorDefFactory(token: Type<any>| InjectionToken<any>): () => any {
-  const injectableDef = getInjectableDef(token as InjectableType<any>);
-  if (injectableDef === null) {
-    const injectorDef = getInjectorDef(token as InjectorType<any>);
-    if (injectorDef !== null) {
-      return injectorDef.factory;
-    } else if (token instanceof InjectionToken) {
-      throw new Error(`Token ${stringify(token)} is missing an ngInjectableDef definition.`);
-    } else if (token instanceof Function) {
-      const paramLength = token.length;
-      if (paramLength > 0) {
-        const args: string[] = new Array(paramLength).fill('?');
-        throw new Error(
-            `Can't resolve all parameters for ${stringify(token)}: (${args.join(', ')}).`);
-      }
-      return () => new (token as Type<any>)();
-    }
-    throw new Error('unreachable');
+  // Most tokens will have an ngInjectableDef directly on them, which specifies a factory directly.
+  const injectableDef = getInjectableDef(token);
+  if (injectableDef !== null) {
+    return injectableDef.factory;
+  }
+
+  // If the token is an NgModule, it's also injectable but the factory is on its ngInjectorDef.
+  const injectorDef = getInjectorDef(token);
+  if (injectorDef !== null) {
+    return injectorDef.factory;
+  }
+
+  // InjectionTokens should have an ngInjectableDef and thus should be handled above.
+  // If it's missing that, it's an error.
+  if (token instanceof InjectionToken) {
+    throw new Error(`Token ${stringify(token)} is missing an ngInjectableDef definition.`);
+  }
+
+  // Undecorated types can sometimes be created if they have no constructor arguments.
+  if (token instanceof Function) {
+    return getUndecoratedInjectableFactory(token);
+  }
+
+  // There was no way to resolve a factory for this token.
+  throw new Error('unreachable');
+}
+
+function getUndecoratedInjectableFactory(token: Function) {
+  // If the token has parameters then it has dependencies that we cannot resolve implicitly.
+  const paramLength = token.length;
+  if (paramLength > 0) {
+    const args: string[] = new Array(paramLength).fill('?');
+    throw new Error(`Can't resolve all parameters for ${stringify(token)}: (${args.join(', ')}).`);
+  }
+
+  // The constructor function appears to have no parameters.
+  // This might be because it inherits from a super-class. In which case, use an ngInjectableDef
+  // from an ancestor if there is one.
+  // Otherwise this really is a simple class with no dependencies, so return a factory that
+  // just instantiates the zero-arg constructor.
+  const inheritedInjectableDef = getInheritedInjectableDef(token);
+  if (inheritedInjectableDef !== null) {
+    return inheritedInjectableDef.factory;
+  } else {
+    return () => new (token as Type<any>)();
   }
-  return injectableDef.factory;
 }
 
 function providerToRecord(
diff --git a/packages/core/test/acceptance/di_spec.ts b/packages/core/test/acceptance/di_spec.ts
index f0baec7bc8..a60bf34bbb 100644
--- a/packages/core/test/acceptance/di_spec.ts
+++ b/packages/core/test/acceptance/di_spec.ts
@@ -10,7 +10,7 @@ import {CommonModule} from '@angular/common';
 import {Attribute, ChangeDetectorRef, Component, Directive, ElementRef, EventEmitter, Host, HostBinding, INJECTOR, Inject, Injectable, Injector, Input, LOCALE_ID, Optional, Output, Pipe, PipeTransform, Self, SkipSelf, TemplateRef, ViewChild, ViewContainerRef, forwardRef} from '@angular/core';
 import {ViewRef} from '@angular/core/src/render3/view_ref';
 import {TestBed} from '@angular/core/testing';
-import {onlyInIvy} from '@angular/private/testing';
+import {ivyEnabled, onlyInIvy} from '@angular/private/testing';
 
 describe('di', () => {
   describe('no dependencies', () => {
@@ -370,7 +370,7 @@ describe('di', () => {
                <div dirA #dir="dirA">{{ dir.dirB.value }}</div>
            </ng-template>
          </div>
-         
+
          <div dirB value="insertion">
            <div structuralDir [tmp]="foo"></div>
            <!-- insertion point -->
@@ -858,6 +858,40 @@ describe('di', () => {
       const divElement = fixture.nativeElement.querySelector('div');
       expect(divElement.textContent).toEqual('MyService');
     });
+
+    it('should support sub-classes with no @Injectable decorator', () => {
+      @Injectable()
+      class Dependency {
+      }
+
+      @Injectable()
+      class SuperClass {
+        constructor(public dep: Dependency) {}
+      }
+
+      // Note, no @Injectable decorators for these two classes
+      class SubClass extends SuperClass {}
+      class SubSubClass extends SubClass {}
+
+      @Component({template: ''})
+      class MyComp {
+        constructor(public myService: SuperClass) {}
+      }
+      TestBed.configureTestingModule({
+        declarations: [MyComp],
+        providers: [{provide: SuperClass, useClass: SubSubClass}, Dependency]
+      });
+
+      const warnSpy = spyOn(console, 'warn');
+      const fixture = TestBed.createComponent(MyComp);
+      expect(fixture.componentInstance.myService.dep instanceof Dependency).toBe(true);
+
+      if (ivyEnabled) {
+        expect(warnSpy).toHaveBeenCalledWith(
+            `DEPRECATED: DI is instantiating a token "SubSubClass" that inherits its @Injectable decorator but does not provide one itself.\n` +
+            `This will become an error in v10. Please add @Injectable() to the "SubSubClass" class.`);
+      }
+    });
   });
 
   describe('inject', () => {
diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json
index 5e59706419..50cbf4564b 100644
--- a/packages/core/test/bundling/injection/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json
@@ -122,6 +122,9 @@
   {
     "name": "getGlobal"
   },
+  {
+    "name": "getInheritedInjectableDef"
+  },
   {
     "name": "getInjectableDef"
   },
@@ -131,6 +134,9 @@
   {
     "name": "getNullInjector"
   },
+  {
+    "name": "getUndecoratedInjectableFactory"
+  },
   {
     "name": "hasDeps"
   },

From 45e11915dc1d643d1d13a1e42204f58a44a34b0e Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 10 May 2019 14:07:45 +0200
Subject: [PATCH 039/275] test(ivy): move render3 query tests to acceptance
 (#30382)

Moves all manual render3 query tests that use the `elementProperty`
instructions to TestBed acceptance tests.

PR Close #30382
---
 packages/core/test/acceptance/query_spec.ts | 289 +++++++++++-
 packages/core/test/render3/query_spec.ts    | 476 +-------------------
 2 files changed, 290 insertions(+), 475 deletions(-)

diff --git a/packages/core/test/acceptance/query_spec.ts b/packages/core/test/acceptance/query_spec.ts
index 3a260bfce7..c269578e39 100644
--- a/packages/core/test/acceptance/query_spec.ts
+++ b/packages/core/test/acceptance/query_spec.ts
@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, ContentChild, ContentChildren, Directive, ElementRef, Input, QueryList, TemplateRef, Type, ViewChild, ViewChildren} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {Component, ContentChild, ContentChildren, Directive, ElementRef, Input, QueryList, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {onlyInIvy} from '@angular/private/testing';
 
@@ -601,6 +603,44 @@ describe('query logic', () => {
       expect(fixture.componentInstance.subComp.foo.length).toBe(2);
     });
 
+    it('should match shallow content queries in views inserted / removed by ngIf', () => {
+      @Component({
+        selector: 'test-comp',
+        template: `
+          <shallow-comp>
+            <div *ngIf="showing" #foo></div>
+          </shallow-comp>
+        `
+      })
+      class TestComponent {
+        showing = false;
+      }
+
+      @Component({
+        selector: 'shallow-comp',
+        template: '',
+      })
+      class ShallowComp {
+        @ContentChildren('foo', {descendants: false}) foos !: QueryList<ElementRef>;
+      }
+
+      TestBed.configureTestingModule(
+          {declarations: [TestComponent, ShallowComp], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(TestComponent);
+      fixture.detectChanges();
+
+      const shallowComp = fixture.debugElement.query(By.directive(ShallowComp)).componentInstance;
+      const queryList = shallowComp !.foos;
+      expect(queryList.length).toBe(0);
+
+      fixture.componentInstance.showing = true;
+      fixture.detectChanges();
+      expect(queryList.length).toBe(1);
+
+      fixture.componentInstance.showing = false;
+      fixture.detectChanges();
+      expect(queryList.length).toBe(0);
+    });
   });
 
   // Some root components may have ContentChildren queries if they are also
@@ -665,6 +705,253 @@ describe('query logic', () => {
 
   });
 
+  describe('view boundaries', () => {
+
+    describe('ViewContainerRef', () => {
+
+      @Directive({selector: '[vc]', exportAs: 'vc'})
+      class ViewContainerManipulatorDirective {
+        constructor(private _vcRef: ViewContainerRef) {}
+
+        insertTpl(tpl: TemplateRef<{}>, ctx: {}, idx?: number) {
+          this._vcRef.createEmbeddedView(tpl, ctx, idx);
+        }
+
+        remove(index?: number) { this._vcRef.remove(index); }
+      }
+
+      it('should report results in views inserted / removed by ngIf', () => {
+        @Component({
+          selector: 'test-comp',
+          template: `
+            <ng-template [ngIf]="value">
+              <div #foo></div>
+            </ng-template>
+          `
+        })
+        class TestComponent {
+          value: boolean = false;
+          @ViewChildren('foo') query !: QueryList<any>;
+        }
+
+        TestBed.configureTestingModule({declarations: [TestComponent]});
+
+        const fixture = TestBed.createComponent(TestComponent);
+        fixture.detectChanges();
+
+        const queryList = fixture.componentInstance.query;
+        expect(queryList.length).toBe(0);
+
+        fixture.componentInstance.value = true;
+        fixture.detectChanges();
+        expect(queryList.length).toBe(1);
+
+        fixture.componentInstance.value = false;
+        fixture.detectChanges();
+        expect(queryList.length).toBe(0);
+      });
+
+      it('should report results in views inserted / removed by ngFor', () => {
+        @Component({
+          selector: 'test-comp',
+          template: `
+            <ng-template ngFor let-item [ngForOf]="value">
+              <div #foo [id]="item"></div>
+            </ng-template>
+          `,
+        })
+        class TestComponent {
+          value: string[]|undefined;
+          @ViewChildren('foo') query !: QueryList<any>;
+        }
+
+        TestBed.configureTestingModule({declarations: [TestComponent]});
+        const fixture = TestBed.createComponent(TestComponent);
+        fixture.detectChanges();
+
+        const queryList = fixture.componentInstance.query;
+        expect(queryList.length).toBe(0);
+
+        fixture.componentInstance.value = ['a', 'b', 'c'];
+        fixture.detectChanges();
+        expect(queryList.length).toBe(3);
+
+        // Remove the "b" element from the value.
+        fixture.componentInstance.value.splice(1, 1);
+        fixture.detectChanges();
+        expect(queryList.length).toBe(2);
+
+        // make sure that the "b" element has been removed from query results
+        expect(queryList.first.nativeElement.id).toBe('a');
+        expect(queryList.last.nativeElement.id).toBe('c');
+      });
+
+      // https://stackblitz.com/edit/angular-rrmmuf?file=src/app/app.component.ts
+      it('should report results when different instances of TemplateRef are inserted into one ViewContainerRefs',
+         () => {
+           @Component({
+             selector: 'test-comp',
+             template: `
+               <ng-template #tpl1 let-idx="idx">
+                 <div #foo [id]="'foo1_' + idx"></div>
+               </ng-template>
+               
+               <div #foo id="middle"></div>
+               
+               <ng-template #tpl2 let-idx="idx">
+                 <div #foo [id]="'foo2_' + idx"></div>
+               </ng-template>
+               
+               <ng-template vc></ng-template>
+             `,
+           })
+           class TestComponent {
+             @ViewChild(ViewContainerManipulatorDirective) vc !: ViewContainerManipulatorDirective;
+             @ViewChild('tpl1') tpl1 !: TemplateRef<any>;
+             @ViewChild('tpl2') tpl2 !: TemplateRef<any>;
+             @ViewChildren('foo') query !: QueryList<any>;
+           }
+
+           TestBed.configureTestingModule(
+               {declarations: [ViewContainerManipulatorDirective, TestComponent]});
+           const fixture = TestBed.createComponent(TestComponent);
+           fixture.detectChanges();
+
+           const queryList = fixture.componentInstance.query;
+           const {tpl1, tpl2, vc} = fixture.componentInstance;
+
+           expect(queryList.length).toBe(1);
+           expect(queryList.first.nativeElement.getAttribute('id')).toBe('middle');
+
+           vc.insertTpl(tpl1 !, {idx: 0}, 0);
+           vc.insertTpl(tpl2 !, {idx: 1}, 1);
+           fixture.detectChanges();
+
+           expect(queryList.length).toBe(3);
+           let qListArr = queryList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
+           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
+
+           vc.insertTpl(tpl1 !, {idx: 1}, 1);
+           fixture.detectChanges();
+
+           expect(queryList.length).toBe(4);
+           qListArr = queryList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('foo1_1');
+           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('middle');
+           expect(qListArr[3].nativeElement.getAttribute('id')).toBe('foo2_1');
+
+           vc.remove(1);
+           fixture.detectChanges();
+
+           expect(queryList.length).toBe(3);
+           qListArr = queryList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
+           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
+
+           vc.remove(1);
+           fixture.detectChanges();
+
+           expect(queryList.length).toBe(2);
+           qListArr = queryList.toArray();
+           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
+           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
+         });
+
+      // https://stackblitz.com/edit/angular-7vvo9j?file=src%2Fapp%2Fapp.component.ts
+      // https://stackblitz.com/edit/angular-xzwp6n
+      onlyInIvy('FW-1318: QueryList entries are ordered differently in Ivy.')
+          .it('should report results when the same TemplateRef is inserted into different ViewContainerRefs',
+              () => {
+                @Component({
+                  selector: 'test-comp',
+                  template: `
+               <ng-template #tpl let-idx="idx" let-container_idx="container_idx">
+                 <div #foo [id]="'foo_' + container_idx + '_' + idx"></div>
+               </ng-template>
+
+               <ng-template vc #vi0="vc"></ng-template>
+               <ng-template vc #vi1="vc"></ng-template> 
+             `,
+                })
+                class TestComponent {
+                  @ViewChild('tpl') tpl !: TemplateRef<any>;
+                  @ViewChild('vi0') vi0 !: ViewContainerManipulatorDirective;
+                  @ViewChild('vi1') vi1 !: ViewContainerManipulatorDirective;
+                  @ViewChildren('foo') query !: QueryList<any>;
+                }
+
+                TestBed.configureTestingModule(
+                    {declarations: [ViewContainerManipulatorDirective, TestComponent]});
+                const fixture = TestBed.createComponent(TestComponent);
+                fixture.detectChanges();
+
+                const queryList = fixture.componentInstance.query;
+                const {tpl, vi0, vi1} = fixture.componentInstance;
+
+                expect(queryList.length).toBe(0);
+
+                vi0.insertTpl(tpl !, {idx: 0, container_idx: 0}, 0);
+                vi1.insertTpl(tpl !, {idx: 0, container_idx: 1}, 0);
+                fixture.detectChanges();
+
+                expect(queryList.length).toBe(2);
+                let qListArr = queryList.toArray();
+                expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo_1_0');
+                expect(qListArr[1].nativeElement.getAttribute('id')).toBe('foo_0_0');
+
+                vi0.remove();
+                fixture.detectChanges();
+
+                expect(queryList.length).toBe(1);
+                qListArr = queryList.toArray();
+                expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo_1_0');
+
+                vi1.remove();
+                fixture.detectChanges();
+                expect(queryList.length).toBe(0);
+              });
+
+      // https://stackblitz.com/edit/angular-wpd6gv?file=src%2Fapp%2Fapp.component.ts
+      it('should report results from views inserted in a lifecycle hook', () => {
+        @Component({
+          selector: 'my-app',
+          template: `
+            <ng-template #tpl>
+              <span #foo id="from_tpl"></span>
+            </ng-template>
+            
+            <ng-template [ngTemplateOutlet]="show ? tpl : null"></ng-template>
+          `,
+        })
+        class MyApp {
+          show = false;
+          @ViewChildren('foo') query !: QueryList<any>;
+        }
+
+        TestBed.configureTestingModule({declarations: [MyApp], imports: [CommonModule]});
+        const fixture = TestBed.createComponent(MyApp);
+        fixture.detectChanges();
+
+        const queryList = fixture.componentInstance.query;
+        expect(queryList.length).toBe(0);
+
+        fixture.componentInstance.show = true;
+        fixture.detectChanges();
+        expect(queryList.length).toBe(1);
+        expect(queryList.first.nativeElement.id).toBe('from_tpl');
+
+        fixture.componentInstance.show = false;
+        fixture.detectChanges();
+        expect(queryList.length).toBe(0);
+      });
+
+    });
+  });
+
 });
 
 function initWithTemplate(compType: Type<any>, template: string) {
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 033fc2ea72..0ee0ff8859 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -6,19 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgForOfContext} from '@angular/common';
 import {ElementRef, QueryList, TemplateRef, ViewContainerRef} from '@angular/core';
 
 import {EventEmitter} from '../..';
 import {AttributeMarker, detectChanges, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
-import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δload, Δreference, Δtemplate, Δtext} from '../../src/render3/instructions/all';
+import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δload, Δtemplate, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {query, ΔcontentQuery, ΔloadContentQuery, ΔloadViewQuery, ΔqueryRefresh, ΔviewQuery} from '../../src/render3/query';
 import {getLView} from '../../src/render3/state';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
 import {ΔtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
 
-import {NgForOf, NgIf, NgTemplateOutlet} from './common_with_def';
 import {ComponentFixture, TemplateFixture, createComponent, createDirective, getDirectiveOnNode, renderComponent} from './render_util';
 
 
@@ -1346,412 +1344,6 @@ describe('query', () => {
 
   describe('view boundaries', () => {
 
-    describe('ViewContainerRef', () => {
-
-      let directiveInstances: ViewContainerManipulatorDirective[] = [];
-
-      class ViewContainerManipulatorDirective {
-        static ngDirectiveDef = ΔdefineDirective({
-          type: ViewContainerManipulatorDirective,
-          selectors: [['', 'vc', '']],
-          factory: () => {
-            const directiveInstance =
-                new ViewContainerManipulatorDirective(ΔdirectiveInject(ViewContainerRef as any));
-            directiveInstances.push(directiveInstance);
-            return directiveInstance;
-          }
-        });
-
-        constructor(private _vcRef: ViewContainerRef) {}
-
-        insertTpl(tpl: TemplateRef<{}>, ctx: {}, idx?: number) {
-          this._vcRef.createEmbeddedView(tpl, ctx, idx);
-        }
-
-        remove(index?: number) { this._vcRef.remove(index); }
-      }
-
-      beforeEach(() => { directiveInstances = []; });
-
-      it('should report results in views inserted / removed by ngIf', () => {
-
-        function Cmpt_Template_1(rf: RenderFlags, ctx1: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'div', null, ['foo', '']);
-          }
-        }
-
-        /**
-         * <ng-template [ngIf]="value">
-         *    <div #foo></div>
-         * </ng-template>
-         * class Cmpt {
-         *  @ViewChildren('foo') query;
-         * }
-         */
-        const Cmpt = createComponent(
-            'cmpt',
-            function(rf: RenderFlags, ctx: any) {
-              if (rf & RenderFlags.Create) {
-                Δtemplate(
-                    0, Cmpt_Template_1, 2, 0, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
-              }
-              if (rf & RenderFlags.Update) {
-                ΔelementProperty(0, 'ngIf', Δbind(ctx.value));
-              }
-            },
-            2, 1, [NgIf], [],
-            function(rf: RenderFlags, ctx: any) {
-              if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
-              }
-              if (rf & RenderFlags.Update) {
-                let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
-                    (ctx.query = tmp as QueryList<any>);
-              }
-            });
-
-        const fixture = new ComponentFixture(Cmpt);
-        const qList = fixture.component.query;
-        expect(qList.length).toBe(0);
-
-        fixture.component.value = true;
-        fixture.update();
-        expect(qList.length).toBe(1);
-
-        fixture.component.value = false;
-        fixture.update();
-        expect(qList.length).toBe(0);
-      });
-
-      it('should report results in views inserted / removed by ngFor', () => {
-
-        function Cmpt_Template_1(rf1: RenderFlags, row: NgForOfContext<string>) {
-          if (rf1 & RenderFlags.Create) {
-            Δelement(0, 'div', null, ['foo', '']);
-          }
-          if (rf1 & RenderFlags.Update) {
-            ΔelementProperty(0, 'id', Δbind(row.$implicit));
-          }
-        }
-
-        /**
-         * <ng-template ngFor let-item [ngForOf]="value">
-         *    <div #foo [id]="item"></div>
-         * </ng-template>
-         * class Cmpt {
-         *  @ViewChildren('foo') query;
-         * }
-         */
-        class Cmpt {
-          // TODO(issue/24571): remove '!'.
-          value !: string[];
-          query: any;
-          static ngComponentDef = ΔdefineComponent({
-            type: Cmpt,
-            factory: () => new Cmpt(),
-            selectors: [['my-app']],
-            consts: 2,
-            vars: 1,
-            template: function(rf: RenderFlags, ctx: any) {
-              if (rf & RenderFlags.Create) {
-                Δtemplate(0, Cmpt_Template_1, 2, 1, 'ng-template', ['ngForOf', '']);
-              }
-              if (rf & RenderFlags.Update) {
-                ΔelementProperty(0, 'ngForOf', Δbind(ctx.value));
-              }
-            },
-            viewQuery: function(rf: RenderFlags, ctx: Cmpt) {
-              let tmp: any;
-              if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
-              }
-              if (rf & RenderFlags.Update) {
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
-                    (ctx.query = tmp as QueryList<any>);
-              }
-            },
-            directives: () => [NgForOf]
-          });
-        }
-
-        const fixture = new ComponentFixture(Cmpt);
-        const qList = fixture.component.query;
-        expect(qList.length).toBe(0);
-
-        fixture.component.value = ['a', 'b', 'c'];
-        fixture.update();
-        expect(qList.length).toBe(3);
-
-        fixture.component.value.splice(1, 1);  // remove "b"
-        fixture.update();
-        expect(qList.length).toBe(2);
-
-        // make sure that a proper element was removed from query results
-        expect(qList.first.nativeElement.id).toBe('a');
-        expect(qList.last.nativeElement.id).toBe('c');
-
-      });
-
-      // https://stackblitz.com/edit/angular-rrmmuf?file=src/app/app.component.ts
-      it('should report results when different instances of TemplateRef are inserted into one ViewContainerRefs',
-         () => {
-           let tpl1: TemplateRef<{}>;
-           let tpl2: TemplateRef<{}>;
-
-           function Cmpt_Template_1(rf: RenderFlags, ctx: {idx: number}) {
-             if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', null, ['foo', '']);
-             }
-             if (rf & RenderFlags.Update) {
-               ΔelementProperty(0, 'id', Δbind('foo1_' + ctx.idx));
-             }
-           }
-
-           function Cmpt_Template_5(rf: RenderFlags, ctx: {idx: number}) {
-             if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', null, ['foo', '']);
-             }
-             if (rf & RenderFlags.Update) {
-               ΔelementProperty(0, 'id', Δbind('foo2_' + ctx.idx));
-             }
-           }
-
-           /**
-            * <ng-template #tpl1 let-idx="idx">
-            *   <div #foo [id]="'foo1_'+idx"></div>
-            * </ng-template>
-            *
-            * <div #foo id="middle"></div>
-            *
-            * <ng-template #tpl2 let-idx="idx">
-            *   <div #foo [id]="'foo2_'+idx"></div>
-            * </ng-template>
-            *
-            * <ng-template viewInserter #vi="vi"></ng-template>
-            */
-           const Cmpt = createComponent(
-               'cmpt',
-               function(rf: RenderFlags, ctx: any) {
-                 if (rf & RenderFlags.Create) {
-                   Δtemplate(
-                       0, Cmpt_Template_1, 2, 1, 'ng-template', null, ['tpl1', ''],
-                       ΔtemplateRefExtractor);
-                   Δelement(2, 'div', ['id', 'middle'], ['foo', '']);
-                   Δtemplate(
-                       4, Cmpt_Template_5, 2, 1, 'ng-template', null, ['tpl2', ''],
-                       ΔtemplateRefExtractor);
-                   Δtemplate(6, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
-                 }
-
-                 if (rf & RenderFlags.Update) {
-                   tpl1 = Δreference(1);
-                   tpl2 = Δreference(5);
-                 }
-
-               },
-               8, 0, [ViewContainerManipulatorDirective], [],
-               function(rf: RenderFlags, ctx: any) {
-                 if (rf & RenderFlags.Create) {
-                   ΔviewQuery(['foo'], true, null);
-                 }
-                 if (rf & RenderFlags.Update) {
-                   let tmp: any;
-                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
-                       (ctx.query = tmp as QueryList<any>);
-                 }
-               });
-
-           const fixture = new ComponentFixture(Cmpt);
-           const qList = fixture.component.query;
-
-           expect(qList.length).toBe(1);
-           expect(qList.first.nativeElement.getAttribute('id')).toBe('middle');
-
-           directiveInstances[0].insertTpl(tpl1 !, {idx: 0}, 0);
-           directiveInstances[0].insertTpl(tpl2 !, {idx: 1}, 1);
-           fixture.update();
-           expect(qList.length).toBe(3);
-           let qListArr = qList.toArray();
-           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
-           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
-           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
-
-           directiveInstances[0].insertTpl(tpl1 !, {idx: 1}, 1);
-           fixture.update();
-           expect(qList.length).toBe(4);
-           qListArr = qList.toArray();
-           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
-           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('foo1_1');
-           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('middle');
-           expect(qListArr[3].nativeElement.getAttribute('id')).toBe('foo2_1');
-
-           directiveInstances[0].remove(1);
-           fixture.update();
-           expect(qList.length).toBe(3);
-           qListArr = qList.toArray();
-           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
-           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
-           expect(qListArr[2].nativeElement.getAttribute('id')).toBe('foo2_1');
-
-           directiveInstances[0].remove(1);
-           fixture.update();
-           expect(qList.length).toBe(2);
-           qListArr = qList.toArray();
-           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo1_0');
-           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('middle');
-         });
-
-      // https://stackblitz.com/edit/angular-7vvo9j?file=src%2Fapp%2Fapp.component.ts
-      // https://stackblitz.com/edit/angular-xzwp6n
-      it('should report results when the same TemplateRef is inserted into different ViewContainerRefs',
-         () => {
-           let tpl: TemplateRef<{}>;
-
-           function Cmpt_Template_1(rf: RenderFlags, ctx: {idx: number, container_idx: number}) {
-             if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', null, ['foo', '']);
-             }
-             if (rf & RenderFlags.Update) {
-               ΔelementProperty(0, 'id', Δbind('foo_' + ctx.container_idx + '_' + ctx.idx));
-             }
-           }
-
-           /**
-            * <ng-template #tpl let-idx="idx" let-container_idx="container_idx">
-            *   <div #foo [id]="'foo_'+container_idx+'_'+idx"></div>
-            * </ng-template>
-            *
-            * <ng-template viewInserter #vi1="vi"></ng-template>
-            * <ng-template viewInserter #vi2="vi"></ng-template>
-            */
-           class Cmpt {
-             query: any;
-             static ngComponentDef = ΔdefineComponent({
-               type: Cmpt,
-               factory: () => new Cmpt(),
-               selectors: [['my-app']],
-               consts: 4,
-               vars: 0,
-               template: function(rf: RenderFlags, ctx: any) {
-                 let tmp: any;
-                 if (rf & RenderFlags.Create) {
-                   Δtemplate(
-                       0, Cmpt_Template_1, 2, 1, 'ng-template', [], ['tpl', ''],
-                       ΔtemplateRefExtractor);
-                   Δtemplate(2, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
-                   Δtemplate(3, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'vc']);
-                 }
-
-                 if (rf & RenderFlags.Update) {
-                   tpl = Δreference(1);
-                 }
-
-               },
-               viewQuery: (rf: RenderFlags, cmpt: Cmpt) => {
-                 let tmp: any;
-                 if (rf & RenderFlags.Create) {
-                   ΔviewQuery(['foo'], true, null);
-                 }
-                 if (rf & RenderFlags.Update) {
-                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
-                       (cmpt.query = tmp as QueryList<any>);
-                 }
-               },
-               directives: () => [ViewContainerManipulatorDirective],
-             });
-           }
-           const fixture = new ComponentFixture(Cmpt);
-           const qList = fixture.component.query;
-
-           expect(qList.length).toBe(0);
-
-           directiveInstances[0].insertTpl(tpl !, {idx: 0, container_idx: 0}, 0);
-           directiveInstances[1].insertTpl(tpl !, {idx: 0, container_idx: 1}, 0);
-           fixture.update();
-           expect(qList.length).toBe(2);
-           let qListArr = qList.toArray();
-           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo_1_0');
-           expect(qListArr[1].nativeElement.getAttribute('id')).toBe('foo_0_0');
-
-           directiveInstances[0].remove();
-           fixture.update();
-           expect(qList.length).toBe(1);
-           qListArr = qList.toArray();
-           expect(qListArr[0].nativeElement.getAttribute('id')).toBe('foo_1_0');
-
-           directiveInstances[1].remove();
-           fixture.update();
-           expect(qList.length).toBe(0);
-         });
-
-      // https://stackblitz.com/edit/angular-wpd6gv?file=src%2Fapp%2Fapp.component.ts
-      it('should report results from views inserted in a lifecycle hook', () => {
-
-        function MyApp_Template_1(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'span', ['id', 'from_tpl'], ['foo', '']);
-          }
-        }
-
-        class MyApp {
-          show = false;
-          query: any;
-          static ngComponentDef = ΔdefineComponent({
-            type: MyApp,
-            factory: () => new MyApp(),
-            selectors: [['my-app']],
-            consts: 4,
-            vars: 1,
-            /**
-             * <ng-template #tpl><span #foo id="from_tpl"></span></ng-template>
-             * <ng-template [ngTemplateOutlet]="show ? tpl : null"></ng-template>
-             */
-            template: (rf: RenderFlags, myApp: MyApp) => {
-              if (rf & RenderFlags.Create) {
-                Δtemplate(
-                    0, MyApp_Template_1, 2, 0, 'ng-template', undefined, ['tpl', ''],
-                    ΔtemplateRefExtractor);
-                Δtemplate(
-                    2, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'ngTemplateOutlet']);
-              }
-              if (rf & RenderFlags.Update) {
-                const tplRef = Δreference(1);
-                ΔelementProperty(2, 'ngTemplateOutlet', Δbind(myApp.show ? tplRef : null));
-              }
-            },
-            directives: () => [NgTemplateOutlet],
-            viewQuery: (rf: RenderFlags, myApp: MyApp) => {
-              let tmp: any;
-              if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
-              }
-              if (rf & RenderFlags.Update) {
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
-                    (myApp.query = tmp as QueryList<any>);
-              }
-            }
-          });
-        }
-
-        const fixture = new ComponentFixture(MyApp);
-        const qList = fixture.component.query;
-
-        expect(qList.length).toBe(0);
-
-        fixture.component.show = true;
-        fixture.update();
-        expect(qList.length).toBe(1);
-        expect(qList.first.nativeElement.id).toBe('from_tpl');
-
-        fixture.component.show = false;
-        fixture.update();
-        expect(qList.length).toBe(0);
-      });
-
-    });
-
     describe('JS blocks', () => {
 
       it('should report results in embedded views', () => {
@@ -2233,12 +1825,8 @@ describe('query', () => {
 
   describe('content', () => {
     let withContentInstance: WithContentDirective|null;
-    let shallowCompInstance: ShallowComp|null;
 
-    beforeEach(() => {
-      withContentInstance = null;
-      shallowCompInstance = null;
-    });
+    beforeEach(() => { withContentInstance = null; });
 
     class WithContentDirective {
       // @ContentChildren('foo')
@@ -2268,29 +1856,6 @@ describe('query', () => {
       });
     }
 
-    class ShallowComp {
-      // @ContentChildren('foo', {descendants: false})
-      foos !: QueryList<ElementRef>;
-
-      static ngComponentDef = ΔdefineComponent({
-        type: ShallowComp,
-        selectors: [['shallow-comp']],
-        factory: () => shallowCompInstance = new ShallowComp(),
-        template: function(rf: RenderFlags, ctx: any) {},
-        consts: 0,
-        vars: 0,
-        contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
-          if (rf & RenderFlags.Create) {
-            ΔcontentQuery(dirIndex, ['foo'], false, null);
-          }
-          if (rf & RenderFlags.Update) {
-            let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
-          }
-        }
-      });
-    }
-
     it('should support content queries for directives', () => {
       /**
        * <div with-content>
@@ -2381,43 +1946,6 @@ describe('query', () => {
           .toBe(0, `Expected content query not to match <div with-content #foo>.`);
     });
 
-    it('should match shallow content queries in views inserted / removed by ngIf', () => {
-      function IfTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'div', null, ['foo', '']);
-        }
-      }
-
-      /**
-       * <shallow-comp>
-       *    <div *ngIf="showing" #foo></div>
-       * </shallow-comp>
-       */
-      const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'shallow-comp');
-          { Δtemplate(1, IfTemplate, 2, 0, 'div', [AttributeMarker.Template, 'ngIf', '']); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(1, 'ngIf', Δbind(ctx.showing));
-        }
-      }, 2, 1, [ShallowComp, NgIf]);
-
-      const fixture = new ComponentFixture(AppComponent);
-      const qList = shallowCompInstance !.foos;
-      expect(qList.length).toBe(0);
-
-      fixture.component.showing = true;
-      fixture.update();
-      expect(qList.length).toBe(1);
-
-      fixture.component.showing = false;
-      fixture.update();
-      expect(qList.length).toBe(0);
-    });
-
-
     // https://stackblitz.com/edit/angular-wlenwd?file=src%2Fapp%2Fapp.component.ts
     it('should support view and content queries matching the same element', () => {
       /**

From 8555016eece8b8d123369e6cda74d1011fed9d82 Mon Sep 17 00:00:00 2001
From: Vincent Guo <dreambo8563@outlook.com>
Date: Mon, 13 May 2019 11:57:55 +0800
Subject: [PATCH 040/275] docs: fix the payload in event-binding sample code
 (#30429)

after reading the context. there are  some clues to infer the payload should be the `item`, not `item.name`.
1.  EventEmitter<Item>.
2.  the desc say that:
The component defines a deleteRequest property that returns an EventEmitter. When the user clicks delete, the component invokes the delete() method, telling the EventEmitter to emit an **Item** object.

PR Close #30429
---
 .../event-binding/src/app/item-detail/item-detail.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.ts b/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.ts
index 94ea032ce3..b05b901f6d 100644
--- a/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.ts
+++ b/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.ts
@@ -21,7 +21,7 @@ export class ItemDetailComponent {
   @Output() deleteRequest = new EventEmitter<Item>();
 
   delete() {
-    this.deleteRequest.emit(this.item.name);
+    this.deleteRequest.emit(this.item);
     this.displayNone = this.displayNone ? '' : 'none';
     this.lineThrough = this.lineThrough ? '' : 'line-through';
   }

From 3a8f74e3923c5789bb2eda494e146e41ddd2511a Mon Sep 17 00:00:00 2001
From: Jimmy Kasprzak <jimmykasprzak@gmail.com>
Date: Sun, 12 May 2019 20:12:17 +0200
Subject: [PATCH 041/275] docs: fix example "testing" app compilation (#30427)

PR Close #30427
---
 .../testing/src/app/model/testing/index.ts    |  2 +-
 aio/tools/examples/example-boilerplate.js     |  9 ++++++--
 .../boilerplate/testing/src/tsconfig.app.json | 22 +++++++++++++++++++
 .../testing/src/tsconfig.spec.json            | 19 ++++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 aio/tools/examples/shared/boilerplate/testing/src/tsconfig.app.json
 create mode 100644 aio/tools/examples/shared/boilerplate/testing/src/tsconfig.spec.json

diff --git a/aio/content/examples/testing/src/app/model/testing/index.ts b/aio/content/examples/testing/src/app/model/testing/index.ts
index 6da76e67db..898f64c278 100644
--- a/aio/content/examples/testing/src/app/model/testing/index.ts
+++ b/aio/content/examples/testing/src/app/model/testing/index.ts
@@ -1 +1 @@
-export * from './fake-hero.service';
+export * from './test-hero.service';
diff --git a/aio/tools/examples/example-boilerplate.js b/aio/tools/examples/example-boilerplate.js
index 0bc5596607..cd34a0bed3 100644
--- a/aio/tools/examples/example-boilerplate.js
+++ b/aio/tools/examples/example-boilerplate.js
@@ -35,7 +35,12 @@ BOILERPLATE_PATHS.i18n = [...cliRelativePath, 'angular.json', 'package.json'];
 
 BOILERPLATE_PATHS['service-worker'] = [...cliRelativePath, 'angular.json', 'package.json'];
 
-BOILERPLATE_PATHS.testing = [...cliRelativePath, 'angular.json'];
+BOILERPLATE_PATHS.testing = [
+  ...cliRelativePath,
+  'angular.json',
+  'src/tsconfig.app.json',
+  'src/tsconfig.spec.json'
+];
 
 BOILERPLATE_PATHS.universal = [...cliRelativePath, 'angular.json', 'package.json'];
 
@@ -93,7 +98,7 @@ class ExampleBoilerPlate {
 
       // Copy the boilerplate common files
       const useCommonBoilerplate = exampleConfig.useCommonBoilerplate !== false;
-      
+
       if (useCommonBoilerplate) {
         BOILERPLATE_PATHS.common.forEach(filePath => this.copyFile(BOILERPLATE_COMMON_BASE_PATH, exampleFolder, filePath));
       }
diff --git a/aio/tools/examples/shared/boilerplate/testing/src/tsconfig.app.json b/aio/tools/examples/shared/boilerplate/testing/src/tsconfig.app.json
new file mode 100644
index 0000000000..ad0bfc37fd
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/testing/src/tsconfig.app.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts",
+    "**/*.avoid.ts",
+    "**/*.0.ts",
+    "**/*.1.ts",
+    "**/*.1b.ts",
+    "**/*.2.ts",
+    "**/*.3.ts",
+    "**/*.4.ts",
+    "**/*.5.ts",
+    "**/*.6.ts",
+    "**/*.7.ts",
+    "**/testing"
+  ]
+}
diff --git a/aio/tools/examples/shared/boilerplate/testing/src/tsconfig.spec.json b/aio/tools/examples/shared/boilerplate/testing/src/tsconfig.spec.json
new file mode 100644
index 0000000000..ca77f8ff5c
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/testing/src/tsconfig.spec.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts",
+    "**/testing"
+  ]
+}

From 0051ddf0f3139370884b909afa78be2e1f99577f Mon Sep 17 00:00:00 2001
From: Piotr Tomiak <piotr.tomiak@jetbrains.com>
Date: Wed, 10 Apr 2019 16:39:42 +0300
Subject: [PATCH 042/275] docs: correct types in transform method to match
 specification. (#29812)

PR Close #29812
---
 .../examples/pipes/src/app/exponential-strength.pipe.ts      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/aio/content/examples/pipes/src/app/exponential-strength.pipe.ts b/aio/content/examples/pipes/src/app/exponential-strength.pipe.ts
index d277483853..de8a8fca2d 100644
--- a/aio/content/examples/pipes/src/app/exponential-strength.pipe.ts
+++ b/aio/content/examples/pipes/src/app/exponential-strength.pipe.ts
@@ -11,8 +11,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 */
 @Pipe({name: 'exponentialStrength'})
 export class ExponentialStrengthPipe implements PipeTransform {
-  transform(value: number, exponent: string): number {
-    let exp = parseFloat(exponent);
-    return Math.pow(value, isNaN(exp) ? 1 : exp);
+  transform(value: number, exponent?: number): number {
+    return Math.pow(value, isNaN(exponent) ? 1 : exponent);
   }
 }

From 79903b184248a57d7e9e10d69c94098f4fe34fa6 Mon Sep 17 00:00:00 2001
From: TwoDCube <2dcube01@gmail.com>
Date: Tue, 14 May 2019 20:18:40 +0200
Subject: [PATCH 043/275] docs: fix typo in animations doc (#30457)

PR Close #30457
---
 aio/content/guide/animations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/animations.md b/aio/content/guide/animations.md
index e266c72f9f..1bcc9a5c2d 100644
--- a/aio/content/guide/animations.md
+++ b/aio/content/guide/animations.md
@@ -125,7 +125,7 @@ The third argument, `easing`, controls how the animation [accelerates and decele
 
 * Run for 200ms, with no delay. Use a standard curve to start slow, accelerate in the middle, and then decelerate slowly at the end: `'0.2s ease-in-out'`
 
-* Start immediately, run for 200ms. Use a acceleration curve to start slow and end at full velocity: `'0.2s ease-in'`
+* Start immediately, run for 200ms. Use an acceleration curve to start slow and end at full velocity: `'0.2s ease-in'`
 
 <div class="alert is-helpful">
 

From f2ae452f012045d5612669213f13d571659a282d Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Thu, 16 May 2019 14:42:58 +0200
Subject: [PATCH 044/275] perf(ivy): don't relink the whole tree when `TNode`
 exists (#30511) PR Close #30511

---
 .../core/src/render3/instructions/shared.ts   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 096af66622..06154bae14 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -271,18 +271,16 @@ export function createNodeAtIndex(
     const tParentNode = parentInSameView ? parent as TElementNode | TContainerNode : null;
 
     tNode = tView.data[adjustedIndex] = createTNode(tParentNode, type, adjustedIndex, name, attrs);
-  }
 
-  // Now link ourselves into the tree.
-  // We need this even if tNode exists, otherwise we might end up pointing to unexisting tNodes when
-  // we use i18n (especially with ICU expressions that update the DOM during the update phase).
-  if (previousOrParentTNode) {
-    if (isParent && previousOrParentTNode.child == null &&
-        (tNode.parent !== null || previousOrParentTNode.type === TNodeType.View)) {
-      // We are in the same view, which means we are adding content node to the parent view.
-      previousOrParentTNode.child = tNode;
-    } else if (!isParent) {
-      previousOrParentTNode.next = tNode;
+    // Now link ourselves into the tree.
+    if (previousOrParentTNode) {
+      if (isParent && previousOrParentTNode.child == null &&
+          (tNode.parent !== null || previousOrParentTNode.type === TNodeType.View)) {
+        // We are in the same view, which means we are adding content node to the parent view.
+        previousOrParentTNode.child = tNode;
+      } else if (!isParent) {
+        previousOrParentTNode.next = tNode;
+      }
     }
   }
 

From c62c5e2999cb12933afd72fe95d5600ae1d33c44 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 15 May 2019 18:22:50 -0700
Subject: [PATCH 045/275] fix(ivy): do not throw if host style is on a template
 node (#30498)

In View Engine, we would simply ignore host style bindings on template nodes. In Ivy,
we are throwing a "Cannot read length of undefined" error instead. For backwards
compatibility, we should also ignore these bindings rather than blowing up.

PR Close #30498
---
 .../styling/host_instructions_queue.ts        |  9 ++++++---
 packages/core/test/acceptance/styling_spec.ts | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/render3/styling/host_instructions_queue.ts b/packages/core/src/render3/styling/host_instructions_queue.ts
index a691397fb4..e5045cd9e7 100644
--- a/packages/core/src/render3/styling/host_instructions_queue.ts
+++ b/packages/core/src/render3/styling/host_instructions_queue.ts
@@ -35,9 +35,12 @@ export function registerHostDirective(context: StylingContext, directiveIndex: n
  */
 export function enqueueHostInstruction<T extends Function>(
     context: StylingContext, priority: number, instructionFn: T, instructionFnArgs: ParamsOf<T>) {
-  const buffer: HostInstructionsQueue = context[StylingIndex.HostInstructionsQueue] !;
-  const index = findNextInsertionIndex(buffer, priority);
-  buffer.splice(index, 0, priority, instructionFn, instructionFnArgs);
+  const buffer: HostInstructionsQueue|null = context[StylingIndex.HostInstructionsQueue];
+  // Buffer may be null if host element is a template node. In this case, just ignore the style.
+  if (buffer != null) {
+    const index = findNextInsertionIndex(buffer, priority);
+    buffer.splice(index, 0, priority, instructionFn, instructionFnArgs);
+  }
 }
 
 /**
diff --git a/packages/core/test/acceptance/styling_spec.ts b/packages/core/test/acceptance/styling_spec.ts
index fa5e7237b6..66a53b619d 100644
--- a/packages/core/test/acceptance/styling_spec.ts
+++ b/packages/core/test/acceptance/styling_spec.ts
@@ -160,4 +160,24 @@ describe('styling', () => {
       tNode: 3,
     });
   });
+
+  it('should not throw if host style binding is on a template node', () => {
+    // This ex is a bit contrived. In real apps, you might have a shared class that is extended both
+    // by components with host elements and by directives on template nodes. In that case, the host
+    // styles for the template directives should just be ignored.
+    @Directive({selector: 'ng-template[styleDir]', host: {'[style.display]': 'display'}})
+    class StyleDir {
+      display = 'block';
+    }
+
+    @Component({selector: 'app-comp', template: `<ng-template styleDir></ng-template>`})
+    class MyApp {
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp, StyleDir]});
+    expect(() => {
+      const fixture = TestBed.createComponent(MyApp);
+      fixture.detectChanges();
+    }).not.toThrow();
+  });
 });

From b766987b98ad08f02374d678448cfa589333ff45 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 15 May 2019 18:36:18 +0200
Subject: [PATCH 046/275] build: remove extra unused deps for `compiler:test`
 (#30482)

It's unnecessary for a jasmine_node_test rule to depend on a TypeScript library. This dependency is already satisfied via the 'data' and also having it in 'deps' causes CI flakiness on Windows

PR Close #30482
---
 packages/compiler/test/BUILD.bazel | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index 005800ee6e..d7ca9ec4fc 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -83,7 +83,6 @@ jasmine_node_test(
     deps = [
         ":test_lib",
         ":test_node_only_lib",
-        "//packages/core",
         "//tools/testing:node",
         "@npm//base64-js",
         "@npm//source-map",

From f9404d9e7c80c9c55ce6c07595afea0b282767f0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 15 May 2019 18:37:35 +0200
Subject: [PATCH 047/275] refactor: remove unused local imports and use spread
 instead of slice (#30482)

This is a purly estatic change and a minor cleanup

PR Close #30482
---
 packages/compiler/test/aot/test_util.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/compiler/test/aot/test_util.ts b/packages/compiler/test/aot/test_util.ts
index dad5d13b67..263bf4739a 100644
--- a/packages/compiler/test/aot/test_util.ts
+++ b/packages/compiler/test/aot/test_util.ts
@@ -32,11 +32,7 @@ export function isDirectory(data: MockFileOrDirectory | undefined): data is Mock
   return typeof data !== 'string';
 }
 
-const NODE_MODULES = '/node_modules/';
-const IS_GENERATED = /\.(ngfactory|ngstyle)$/;
-const angularts = /@angular\/(\w|\/|-)+\.tsx?$/;
 const rxjs = /\/rxjs\//;
-const tsxfile = /\.tsx$/;
 export const settings: ts.CompilerOptions = {
   target: ts.ScriptTarget.ES5,
   declaration: true,
@@ -231,7 +227,7 @@ export class MockCompilerHost implements ts.CompilerHost {
   private traces: string[] = [];
 
   constructor(scriptNames: string[], private data: MockDirectory) {
-    this.scriptNames = scriptNames.slice(0);
+    this.scriptNames = [...scriptNames];
   }
 
   // Test API
@@ -778,7 +774,7 @@ export function compile(
     aotHost.tsFilesOnly();
   }
   const tsSettings = {...settings, ...tsOptions};
-  const program = ts.createProgram(host.scriptNames.slice(0), tsSettings, host);
+  const program = ts.createProgram([...host.scriptNames], tsSettings, host);
   preCompile(program);
   const {compiler, reflector} = createAotCompiler(aotHost, options, (err) => { throw err; });
   const analyzedModules =
@@ -792,7 +788,7 @@ export function compile(
       host.override(file.genFileUrl, source);
     }
   });
-  const newProgram = ts.createProgram(host.scriptNames.slice(0), tsSettings, host);
+  const newProgram = ts.createProgram([...host.scriptNames], tsSettings, host);
   postCompile(newProgram);
   if (emit) {
     newProgram.emit();

From 077809398c1cfbb63325540362949d2eff261b5d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 15 May 2019 19:28:50 +0200
Subject: [PATCH 048/275] test: fix compiler tests in windows ci (#30482)

This is a tentative fix for the error `Cannot write file '/node_modules/@angular/core/core.ngfactory.d.ts' because it would overwrite input file.` that is showing in codefresh windows ci.

PR Close #30482
---
 packages/compiler/test/aot/test_util.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler/test/aot/test_util.ts b/packages/compiler/test/aot/test_util.ts
index 263bf4739a..788ed4184e 100644
--- a/packages/compiler/test/aot/test_util.ts
+++ b/packages/compiler/test/aot/test_util.ts
@@ -744,7 +744,7 @@ function isDts(fileName: string): boolean {
 }
 
 function isSourceOrDts(fileName: string): boolean {
-  return /\.ts$/.test(fileName);
+  return /\.ts$/.test(fileName) && !/(ngfactory|ngstyle|ngsummary).d.ts$/.test(fileName);
 }
 
 function resolveNpmTreeArtifact(manifestPath: string, resolveFile = 'package.json') {

From 1aff524b63fd9108ae2ca47fe1d7dc61155fb7e1 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Tue, 14 May 2019 15:00:21 -0700
Subject: [PATCH 049/275] feat(common): add ability to watch for AngularJS URL
 updates through `onUrlChange` hook (#30466)

The LocationShim (replacement for `$location`) was added to centralize dealing with the browser URL. Additionally, an `onUrlChange` method was added to Angular's Location service. This PR adds a corresponding method to the LocationShim so updates from AngularJS can be tracked in Angular.

PR Close #30466
---
 packages/common/upgrade/src/location_shim.ts | 34 ++++++++
 packages/common/upgrade/test/upgrade.spec.ts | 81 ++++++++++++++++++++
 tools/public_api_guard/common/upgrade.d.ts   |  1 +
 3 files changed, 116 insertions(+)

diff --git a/packages/common/upgrade/src/location_shim.ts b/packages/common/upgrade/src/location_shim.ts
index 49eb8d4c4b..6a81891e94 100644
--- a/packages/common/upgrade/src/location_shim.ts
+++ b/packages/common/upgrade/src/location_shim.ts
@@ -39,9 +39,16 @@ export class $locationShim {
   private $$search: any = '';
   private $$hash: string = '';
   private $$state: unknown;
+  private $$changeListeners: [
+    ((url: string, state: unknown, oldUrl: string, oldState: unknown, err?: (e: Error) => void) =>
+         void),
+    (e: Error) => void
+  ][] = [];
 
   private cachedState: unknown = null;
 
+
+
   constructor(
       $injector: any, private location: Location, private platformLocation: PlatformLocation,
       private urlCodec: UrlCodec, private locationStrategy: LocationStrategy) {
@@ -313,6 +320,32 @@ export class $locationShim {
     }
   }
 
+  /**
+   * Register URL change listeners. This API can be used to catch updates performed by the
+   * AngularJS framework. These changes are a subset of the `$locationChangeStart/Success` events
+   * as those events fire when AngularJS updates it's internally referenced version of the browser
+   * URL. It's possible for `$locationChange` events to happen, but for the browser URL
+   * (window.location) to remain unchanged. This `onChange` callback will fire only when AngularJS
+   * actually updates the browser URL (window.location).
+   */
+  onChange(
+      fn: (url: string, state: unknown, oldUrl: string, oldState: unknown) => void,
+      err: (e: Error) => void = (e: Error) => {}) {
+    this.$$changeListeners.push([fn, err]);
+  }
+
+  /** @internal */
+  $$notifyChangeListeners(
+      url: string = '', state: unknown, oldUrl: string = '', oldState: unknown) {
+    this.$$changeListeners.forEach(([fn, err]) => {
+      try {
+        fn(url, state, oldUrl, oldState);
+      } catch (e) {
+        err(e);
+      }
+    });
+  }
+
   $$parse(url: string) {
     let pathUrl: string|undefined;
     if (url.startsWith('/')) {
@@ -363,6 +396,7 @@ export class $locationShim {
       // state object; this makes possible quick checking if the state changed in the digest
       // loop. Checking deep equality would be too expensive.
       this.$$state = this.browserState();
+      this.$$notifyChangeListeners(url, state, oldUrl, oldState);
     } catch (e) {
       // Restore old values if pushState fails
       this.url(oldUrl);
diff --git a/packages/common/upgrade/test/upgrade.spec.ts b/packages/common/upgrade/test/upgrade.spec.ts
index 72b476eb9c..14d422fa2b 100644
--- a/packages/common/upgrade/test/upgrade.spec.ts
+++ b/packages/common/upgrade/test/upgrade.spec.ts
@@ -624,6 +624,87 @@ describe('New URL Parsing', () => {
   });
 });
 
+describe('$location.onChange()', () => {
+
+  let $location: $locationShim;
+  let upgradeModule: UpgradeModule;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        LocationUpgradeTestModule.config({useHash: false, startUrl: 'http://host.com/'}),
+      ],
+      providers: [UpgradeModule],
+    });
+
+    upgradeModule = TestBed.get(UpgradeModule);
+    upgradeModule.$injector = {get: injectorFactory()};
+  });
+
+  beforeEach(inject([$locationShim], (loc: $locationShim) => { $location = loc; }));
+
+  it('should have onChange method', () => { expect(typeof $location.onChange).toBe('function'); });
+
+  it('should add registered functions to changeListeners', () => {
+
+    function changeListener(url: string, state: unknown) { return undefined; }
+    function errorHandler(e: Error) {}
+
+    expect(($location as any).$$changeListeners.length).toBe(0);
+
+    $location.onChange(changeListener, errorHandler);
+
+    expect(($location as any).$$changeListeners.length).toBe(1);
+    expect(($location as any).$$changeListeners[0][0]).toEqual(changeListener);
+    expect(($location as any).$$changeListeners[0][1]).toEqual(errorHandler);
+  });
+
+  it('should call changeListeners when URL is updated', () => {
+
+    const onChangeVals =
+        {url: 'url', state: 'state' as unknown, oldUrl: 'oldUrl', oldState: 'oldState' as unknown};
+
+    function changeListener(url: string, state: unknown, oldUrl: string, oldState: unknown) {
+      onChangeVals.url = url;
+      onChangeVals.state = state;
+      onChangeVals.oldUrl = oldUrl;
+      onChangeVals.oldState = oldState;
+    }
+
+    $location.onChange(changeListener);
+
+    // Mock out setting browserUrl
+    ($location as any).browserUrl = (url: string, replace: boolean, state: unknown) => {};
+
+    const newState = {foo: 'bar'};
+    ($location as any).setBrowserUrlWithFallback('/newUrl', false, newState);
+    expect(onChangeVals.url).toBe('/newUrl');
+    expect(onChangeVals.state).toBe(newState);
+    expect(onChangeVals.oldUrl).toBe('/');
+    expect(onChangeVals.oldState).toBe(null);
+  });
+
+  it('should call forward errors to error handler', () => {
+
+    let error !: Error;
+
+    function changeListener(url: string, state: unknown, oldUrl: string, oldState: unknown) {
+      throw new Error('Handle error');
+    }
+    function errorHandler(e: Error) { error = e; }
+
+    $location.onChange(changeListener, errorHandler);
+
+    // Mock out setting browserUrl
+    ($location as any).browserUrl = (url: string, replace: boolean, state: unknown) => {};
+
+    ($location as any).setBrowserUrlWithFallback('/newUrl');
+    expect(error.message).toBe('Handle error');
+  });
+
+});
+
 function parseLinkAndReturn(location: $locationShim, toUrl: string, relHref?: string) {
   const resetUrl = location.$$parseLinkUrl(toUrl, relHref);
   return resetUrl && location.absUrl() || undefined;
diff --git a/tools/public_api_guard/common/upgrade.d.ts b/tools/public_api_guard/common/upgrade.d.ts
index 3f50d4970f..420eb3411e 100644
--- a/tools/public_api_guard/common/upgrade.d.ts
+++ b/tools/public_api_guard/common/upgrade.d.ts
@@ -6,6 +6,7 @@ export declare class $locationShim {
     hash(hash: string | number | null): this;
     hash(): string;
     host(): string;
+    onChange(fn: (url: string, state: unknown, oldUrl: string, oldState: unknown) => void, err?: (e: Error) => void): void;
     path(): string;
     path(path: string | number | null): this;
     port(): number | null;

From b6b1aec22b2ccc326ef0965babe65c6d93ac107c Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Tue, 14 May 2019 13:14:06 -0700
Subject: [PATCH 050/275] fix(bazel): Disable sandbox on Mac OS (#30460)

Removing the sandbox improves build time by almost 40%.

For a hello world (ng new) application:
ng build with sandbox: 22.0 seconds
ng build without sandbox: 13.3 seconds

PR Close #30460
---
 packages/bazel/src/builders/bazel.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/bazel/src/builders/bazel.ts b/packages/bazel/src/builders/bazel.ts
index a9f143e453..e2dd5cb82f 100644
--- a/packages/bazel/src/builders/bazel.ts
+++ b/packages/bazel/src/builders/bazel.ts
@@ -10,6 +10,7 @@
 
 import {spawn} from 'child_process';
 import {copyFileSync, existsSync, readFileSync, readdirSync, statSync, unlinkSync, writeFileSync} from 'fs';
+import {platform} from 'os';
 import {dirname, join, normalize} from 'path';
 
 export type Executable = 'bazel' | 'ibazel';
@@ -133,6 +134,24 @@ function replaceYarnWithNpm(source: string, dest: string) {
   writeFileSync(dest, destContent);
 }
 
+/**
+ * Disable sandbox on Mac OS by setting spawn_strategy in .bazelrc.
+ * For a hello world (ng new) application, removing the sandbox improves build
+ * time by almost 40%.
+ * ng build with sandbox: 22.0 seconds
+ * ng build without sandbox: 13.3 seconds
+ */
+function disableSandbox(source: string, dest: string) {
+  const srcContent = readFileSync(source, 'utf-8');
+  const destContent = `${srcContent}
+# Disable sandbox on Mac OS for performance reason.
+build --spawn_strategy=local
+run --spawn_strategy=local
+test --spawn_strategy=local
+`;
+  writeFileSync(dest, destContent);
+}
+
 /**
  * Copy Bazel files (WORKSPACE, BUILD.bazel, etc) from the template directory to
  * the project `root` directory, and return the absolute paths of the files
@@ -154,6 +173,8 @@ export function copyBazelFiles(root: string, templateDir: string) {
       if (!existsSync(dest)) {
         if (!useYarn && name === 'WORKSPACE') {
           replaceYarnWithNpm(source, dest);
+        } else if (platform() === 'darwin' && name === '.bazelrc') {
+          disableSandbox(source, dest);
         } else {
           copyFileSync(source, dest);
         }

From e9ead2bc09b31c2a1eaf4cf869caef1fc22af396 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Fri, 3 May 2019 00:34:09 +0200
Subject: [PATCH 051/275] feat(ivy): more accurate type narrowing for `ngIf`
 directive (#30248)

A structural directive can specify a template guard for an input, such that
the type of that input's binding can be narrowed based on the guard's return
type. Previously, such template guards could only be methods, of which an
invocation would be inserted into the type-check block (TCB). For `NgIf`,
the template guard narrowed the type of its expression to be `NonNullable`
using the following declaration:

```typescript
export declare class NgIf {
  static ngTemplateGuard_ngIf<E>(dir: NgIf, expr: E): expr is NonNullable<E>
}
```

This works fine for usages such as `*ngIf="person"` but starts to introduce
false-positives when e.g. an explicit non-null check like
`*ngIf="person !== null"` is used, as the method invocation in the TCB
would not have the desired effect of narrowing `person` to become
non-nullable:

```typescript
if (NgIf.ngTemplateGuard_ngIf(directive, ctx.person !== null)) {
  // Usages of `ctx.person` within this block would
  // not have been narrowed to be non-nullable.
}
```

This commit introduces a new strategy for template guards to allow for the
binding expression itself to be used as template guard in the TCB. Now,
the TCB generated for `*ngIf="person !== null"` would look as follows:

```typescript
if (ctx.person !== null) {
  // This time `ctx.person` will successfully have
  // been narrowed to be non-nullable.
}
```

This strategy can be activated by declaring the template guard as a
property declaration with `'binding'` as literal return type.

See #30235 for an example where this led to a false positive.

PR Close #30248
---
 packages/common/src/directives/ng_if.ts       | 10 ++---
 .../src/ngtsc/metadata/src/api.ts             | 21 +++++++++-
 .../src/ngtsc/metadata/src/util.ts            | 41 ++++++++++++++-----
 .../src/ngtsc/typecheck/src/api.ts            |  3 +-
 .../ngtsc/typecheck/src/type_check_block.ts   | 26 +++++++-----
 .../typecheck/test/type_check_block_spec.ts   | 34 +++++++++++++++
 .../test/ngtsc/template_typecheck_spec.ts     | 25 ++++++++++-
 tools/public_api_guard/common/common.d.ts     |  2 +-
 8 files changed, 132 insertions(+), 30 deletions(-)

diff --git a/packages/common/src/directives/ng_if.ts b/packages/common/src/directives/ng_if.ts
index 4d9f63ddce..95a54972f0 100644
--- a/packages/common/src/directives/ng_if.ts
+++ b/packages/common/src/directives/ng_if.ts
@@ -219,12 +219,12 @@ export class NgIf {
   /**
    * Assert the correct type of the expression bound to the `ngIf` input within the template.
    *
-   * The presence of this method is a signal to the Ivy template type check compiler that when the
-   * `NgIf` structural directive renders its template, the type of the expression bound to `ngIf`
-   * should be narrowed in some way. For `NgIf`, it is narrowed to be non-null, which allows the
-   * strictNullChecks feature of TypeScript to work with `NgIf`.
+   * The presence of this static field is a signal to the Ivy template type check compiler that
+   * when the `NgIf` structural directive renders its template, the type of the expression bound
+   * to `ngIf` should be narrowed in some way. For `NgIf`, the binding expression itself is used to
+   * narrow its type, which allows the strictNullChecks feature of TypeScript to work with `NgIf`.
    */
-  static ngTemplateGuard_ngIf<E>(dir: NgIf, expr: E): expr is NonNullable<E> { return true; }
+  static ngTemplateGuard_ngIf: 'binding';
 }
 
 /**
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/api.ts b/packages/compiler-cli/src/ngtsc/metadata/src/api.ts
index 66c9f9f737..c8770b758d 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/api.ts
@@ -31,7 +31,7 @@ export interface DirectiveMeta extends T2DirectiveMeta {
    */
   selector: string;
   queries: string[];
-  ngTemplateGuards: string[];
+  ngTemplateGuards: TemplateGuardMeta[];
   hasNgTemplateContextGuard: boolean;
 
   /**
@@ -43,6 +43,25 @@ export interface DirectiveMeta extends T2DirectiveMeta {
   baseClass: Reference<ClassDeclaration>|'dynamic'|null;
 }
 
+/**
+ * Metadata that describes a template guard for one of the directive's inputs.
+ */
+export interface TemplateGuardMeta {
+  /**
+   * The input name that this guard should be applied to.
+   */
+  inputName: string;
+
+  /**
+   * Represents the type of the template guard.
+   *
+   * - 'invocation' means that a call to the template guard function is emitted so that its return
+   *   type can result in narrowing of the input type.
+   * - 'binding' means that the input binding expression itself is used as template guard.
+   */
+  type: 'invocation'|'binding';
+}
+
 /**
  * Metadata for a pipe within an NgModule's scope.
  */
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/util.ts b/packages/compiler-cli/src/ngtsc/metadata/src/util.ts
index fbb67aac59..31a39e9362 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/util.ts
@@ -9,10 +9,10 @@
 import * as ts from 'typescript';
 
 import {Reference} from '../../imports';
-import {ClassDeclaration, ClassMemberKind, ReflectionHost, isNamedClassDeclaration, reflectTypeEntityToDeclaration} from '../../reflection';
+import {ClassDeclaration, ClassMember, ClassMemberKind, ReflectionHost, isNamedClassDeclaration, reflectTypeEntityToDeclaration} from '../../reflection';
 import {nodeDebugInfo} from '../../util/src/typescript';
 
-import {DirectiveMeta, MetadataReader, NgModuleMeta, PipeMeta} from './api';
+import {DirectiveMeta, MetadataReader, NgModuleMeta, PipeMeta, TemplateGuardMeta} from './api';
 
 export function extractReferencesFromType(
     checker: ts.TypeChecker, def: ts.TypeNode, ngModuleImportedFrom: string | null,
@@ -80,20 +80,39 @@ export function readStringArrayType(type: ts.TypeNode): string[] {
 
 
 export function extractDirectiveGuards(node: ClassDeclaration, reflector: ReflectionHost): {
-  ngTemplateGuards: string[],
+  ngTemplateGuards: TemplateGuardMeta[],
   hasNgTemplateContextGuard: boolean,
 } {
-  const methods = nodeStaticMethodNames(node, reflector);
-  const ngTemplateGuards = methods.filter(method => method.startsWith('ngTemplateGuard_'))
-                               .map(method => method.split('_', 2)[1]);
-  const hasNgTemplateContextGuard = methods.some(name => name === 'ngTemplateContextGuard');
+  const staticMembers = reflector.getMembersOfClass(node).filter(member => member.isStatic);
+  const ngTemplateGuards = staticMembers.map(extractTemplateGuard)
+                               .filter((guard): guard is TemplateGuardMeta => guard !== null);
+  const hasNgTemplateContextGuard = staticMembers.some(
+      member => member.kind === ClassMemberKind.Method && member.name === 'ngTemplateContextGuard');
   return {hasNgTemplateContextGuard, ngTemplateGuards};
 }
 
-function nodeStaticMethodNames(node: ClassDeclaration, reflector: ReflectionHost): string[] {
-  return reflector.getMembersOfClass(node)
-      .filter(member => member.kind === ClassMemberKind.Method && member.isStatic)
-      .map(member => member.name);
+function extractTemplateGuard(member: ClassMember): TemplateGuardMeta|null {
+  if (!member.name.startsWith('ngTemplateGuard_')) {
+    return null;
+  }
+  const inputName = member.name.split('_', 2)[1];
+  if (member.kind === ClassMemberKind.Property) {
+    let type: string|null = null;
+    if (member.type !== null && ts.isLiteralTypeNode(member.type) &&
+        ts.isStringLiteral(member.type.literal)) {
+      type = member.type.literal.text;
+    }
+
+    // Only property members with string literal type 'binding' are considered as template guard.
+    if (type !== 'binding') {
+      return null;
+    }
+    return {inputName, type};
+  } else if (member.kind === ClassMemberKind.Method) {
+    return {inputName, type: 'invocation'};
+  } else {
+    return null;
+  }
 }
 
 /**
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts
index 64f2046980..5d251b5fd1 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts
@@ -10,6 +10,7 @@ import {BoundTarget, DirectiveMeta} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {Reference} from '../../imports';
+import {TemplateGuardMeta} from '../../metadata';
 import {ClassDeclaration} from '../../reflection';
 
 /**
@@ -19,7 +20,7 @@ import {ClassDeclaration} from '../../reflection';
 export interface TypeCheckableDirectiveMeta extends DirectiveMeta {
   ref: Reference<ClassDeclaration>;
   queries: string[];
-  ngTemplateGuards: string[];
+  ngTemplateGuards: TemplateGuardMeta[];
   hasNgTemplateContextGuard: boolean;
 }
 
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
index 0e5160830a..7ee4cd8670 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
@@ -185,22 +185,28 @@ class TcbTemplateBodyOp extends TcbOp {
         // There are two kinds of guards. Template guards (ngTemplateGuards) allow type narrowing of
         // the expression passed to an @Input of the directive. Scan the directive to see if it has
         // any template guards, and generate them if needed.
-        dir.ngTemplateGuards.forEach(inputName => {
+        dir.ngTemplateGuards.forEach(guard => {
           // For each template guard function on the directive, look for a binding to that input.
-          const boundInput = this.template.inputs.find(i => i.name === inputName) ||
+          const boundInput = this.template.inputs.find(i => i.name === guard.inputName) ||
               this.template.templateAttrs.find(
                   (i: TmplAstTextAttribute | TmplAstBoundAttribute): i is TmplAstBoundAttribute =>
-                      i instanceof TmplAstBoundAttribute && i.name === inputName);
+                      i instanceof TmplAstBoundAttribute && i.name === guard.inputName);
           if (boundInput !== undefined) {
             // If there is such a binding, generate an expression for it.
             const expr = tcbExpression(boundInput.value, this.tcb, this.scope);
-            // Call the guard function on the directive with the directive instance and that
-            // expression.
-            const guardInvoke = tsCallMethod(dirId, `ngTemplateGuard_${inputName}`, [
-              dirInstId,
-              expr,
-            ]);
-            directiveGuards.push(guardInvoke);
+
+            if (guard.type === 'binding') {
+              // Use the binding expression itself as guard.
+              directiveGuards.push(expr);
+            } else {
+              // Call the guard function on the directive with the directive instance and that
+              // expression.
+              const guardInvoke = tsCallMethod(dirId, `ngTemplateGuard_${guard.inputName}`, [
+                dirInstId,
+                expr,
+              ]);
+              directiveGuards.push(guardInvoke);
+            }
           }
         });
 
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
index 4c5c1af190..aed6cd41b4 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
@@ -82,6 +82,40 @@ describe('type check blocks', () => {
     expect(block).toContain('(ctx.a as any);');
   });
 
+  describe('template guards', () => {
+    it('should emit invocation guards', () => {
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'NgIf',
+        selector: '[ngIf]',
+        inputs: {'ngIf': 'ngIf'},
+        ngTemplateGuards: [{
+          inputName: 'ngIf',
+          type: 'invocation',
+        }]
+      }];
+      const TEMPLATE = `<div *ngIf="person"></div>`;
+      const block = tcb(TEMPLATE, DIRECTIVES);
+      expect(block).toContain('if (NgIf.ngTemplateGuard_ngIf(_t1, ctx.person))');
+    });
+
+    it('should emit binding guards', () => {
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'NgIf',
+        selector: '[ngIf]',
+        inputs: {'ngIf': 'ngIf'},
+        ngTemplateGuards: [{
+          inputName: 'ngIf',
+          type: 'binding',
+        }]
+      }];
+      const TEMPLATE = `<div *ngIf="person !== null"></div>`;
+      const block = tcb(TEMPLATE, DIRECTIVES);
+      expect(block).toContain('if (ctx.person !== null)');
+    });
+  });
+
   describe('config', () => {
     const DIRECTIVES: TestDeclaration[] = [{
       type: 'directive',
diff --git a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
index 00fc2b5e57..7a8dd63f32 100644
--- a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
@@ -39,7 +39,7 @@ export declare class NgForOf<T> {
 
 export declare class NgIf {
   ngIf: any;
-  static ngTemplateGuard_ngIf<E>(dir: NgIf, expr: E): expr is NonNullable<E>
+  static ngTemplateGuard_ngIf: 'binding';
   static ngDirectiveDef: i0.ΔDirectiveDefWithMeta<NgForOf<any>, '[ngIf]', never, {'ngIf': 'ngIf'}, {}, never>;
 }
 
@@ -100,6 +100,29 @@ describe('ngtsc type checking', () => {
     env.driveMain();
   });
 
+  it('should check usage of NgIf with explicit non-null guard', () => {
+    env.write('test.ts', `
+    import {CommonModule} from '@angular/common';
+    import {Component, NgModule} from '@angular/core';
+
+    @Component({
+      selector: 'test',
+      template: '<div *ngIf="user !== null">{{user.name}}</div>',
+    })
+    class TestCmp {
+      user: {name: string}|null;
+    }
+
+    @NgModule({
+      declarations: [TestCmp],
+      imports: [CommonModule],
+    })
+    class Module {}
+    `);
+
+    env.driveMain();
+  });
+
   it('should check basic usage of NgFor', () => {
     env.write('test.ts', `
     import {CommonModule} from '@angular/common';
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts
index 50eee2b32f..b8a8fc5b57 100644
--- a/tools/public_api_guard/common/common.d.ts
+++ b/tools/public_api_guard/common/common.d.ts
@@ -263,7 +263,7 @@ export declare class NgIf {
     ngIfElse: TemplateRef<NgIfContext> | null;
     ngIfThen: TemplateRef<NgIfContext> | null;
     constructor(_viewContainer: ViewContainerRef, templateRef: TemplateRef<NgIfContext>);
-    static ngTemplateGuard_ngIf<E>(dir: NgIf, expr: E): expr is NonNullable<E>;
+    static ngTemplateGuard_ngIf: 'binding';
 }
 
 export declare class NgIfContext {

From 3f7e823b805622993189032aee79862cc271598b Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 13 May 2019 14:56:50 -0700
Subject: [PATCH 052/275] test(ivy): add exhaustive inheritance tests (#30442)

- Adds inheritance tests for many combinations of directive, component and bare class inheritance
- Adds tests that are failing in ivy, but should work, marks them with `xit` and a TODO.
- Removes render3 unit tests that cover the same things.

PR Close #30442
---
 .../inherit_definition_feature_spec.ts        | 4502 ++++++++++++++++-
 .../inherit_definition_feature_spec.ts        |  639 ---
 2 files changed, 4396 insertions(+), 745 deletions(-)
 delete mode 100644 packages/core/test/render3/inherit_definition_feature_spec.ts

diff --git a/packages/core/test/acceptance/inherit_definition_feature_spec.ts b/packages/core/test/acceptance/inherit_definition_feature_spec.ts
index cc053dea37..353588802a 100644
--- a/packages/core/test/acceptance/inherit_definition_feature_spec.ts
+++ b/packages/core/test/acceptance/inherit_definition_feature_spec.ts
@@ -6,155 +6,4445 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, Input, OnChanges, Type} from '@angular/core';
+import {Component, ContentChildren, Directive, EventEmitter, HostBinding, Input, OnChanges, Output, QueryList, ViewChildren} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+import {onlyInIvy} from '@angular/private/testing';
 
-describe('ngOnChanges', () => {
-  it('should be inherited when super is a directive', () => {
-    const log: string[] = [];
+describe('inheritance', () => {
+  onlyInIvy('View Engine does not provide this check')
+      .it('should throw when trying to inherit a component from a directive', () => {
+        @Component({
+          selector: 'my-comp',
+          template: '<div></div>',
+        })
+        class MyComponent {
+        }
 
-    @Directive({selector: '[superDir]'})
-    class SuperDirective implements OnChanges {
-      @Input() someInput = '';
+        @Directive({
+          selector: '[my-dir]',
+        })
+        class MyDirective extends MyComponent {
+        }
 
-      ngOnChanges() { log.push('on changes!'); }
+        @Component({
+          template: `<div my-dir></div>`,
+        })
+        class App {
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, MyDirective],
+        });
+
+        expect(() => {
+          TestBed.createComponent(App);
+        }).toThrowError('Directives cannot inherit Components');
+      });
+
+  describe('ngOnChanges', () => {
+    @Component({selector: 'app-comp', template: ``})
+    class AppComp {
     }
 
-    @Directive({selector: '[subDir]'})
-    class SubDirective extends SuperDirective {
-    }
+    it('should be inherited when super is a directive', () => {
+      const log: string[] = [];
 
-    TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-    TestBed.overrideComponent(
-        AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-    const fixture = TestBed.createComponent(AppComp);
-    fixture.detectChanges();
+      @Directive({selector: '[superDir]'})
+      class SuperDirective implements OnChanges {
+        @Input() someInput = '';
 
-    expect(log).toEqual(['on changes!']);
+        ngOnChanges() { log.push('on changes!'); }
+      }
+
+      @Directive({selector: '[subDir]'})
+      class SubDirective extends SuperDirective {
+      }
+
+      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
+      TestBed.overrideComponent(
+          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
+      const fixture = TestBed.createComponent(AppComp);
+      fixture.detectChanges();
+
+      expect(log).toEqual(['on changes!']);
+    });
+
+    it('should be inherited when super is a simple class', () => {
+      const log: string[] = [];
+
+      class SuperClass {
+        ngOnChanges() { log.push('on changes!'); }
+      }
+
+      @Directive({selector: '[subDir]'})
+      class SubDirective extends SuperClass {
+        @Input() someInput = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
+      TestBed.overrideComponent(
+          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
+      const fixture = TestBed.createComponent(AppComp);
+      fixture.detectChanges();
+
+      expect(log).toEqual(['on changes!']);
+    });
+
+    it('should be inherited when super is a directive and grand-super is a directive', () => {
+      const log: string[] = [];
+
+      @Directive({selector: '[grandSuperDir]'})
+      class GrandSuperDirective implements OnChanges {
+        @Input() someInput = '';
+
+        ngOnChanges() { log.push('on changes!'); }
+      }
+
+      @Directive({selector: '[superDir]'})
+      class SuperDirective extends GrandSuperDirective {
+      }
+
+      @Directive({selector: '[subDir]'})
+      class SubDirective extends SuperDirective {
+      }
+
+      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
+      TestBed.overrideComponent(
+          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
+      const fixture = TestBed.createComponent(AppComp);
+      fixture.detectChanges();
+
+      expect(log).toEqual(['on changes!']);
+    });
+
+    it('should be inherited when super is a directive and grand-super is a simple class', () => {
+      const log: string[] = [];
+
+      class GrandSuperClass {
+        ngOnChanges() { log.push('on changes!'); }
+      }
+
+      @Directive({selector: '[superDir]'})
+      class SuperDirective extends GrandSuperClass {
+        @Input() someInput = '';
+      }
+
+      @Directive({selector: '[subDir]'})
+      class SubDirective extends SuperDirective {
+      }
+
+      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
+      TestBed.overrideComponent(
+          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
+      const fixture = TestBed.createComponent(AppComp);
+      fixture.detectChanges();
+
+      expect(log).toEqual(['on changes!']);
+    });
+
+    it('should be inherited when super is a simple class and grand-super is a directive', () => {
+      const log: string[] = [];
+
+      @Directive({selector: '[grandSuperDir]'})
+      class GrandSuperDirective implements OnChanges {
+        @Input() someInput = '';
+
+        ngOnChanges() { log.push('on changes!'); }
+      }
+
+      class SuperClass extends GrandSuperDirective {}
+
+      @Directive({selector: '[subDir]'})
+      class SubDirective extends SuperClass {
+      }
+
+      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
+      TestBed.overrideComponent(
+          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
+      const fixture = TestBed.createComponent(AppComp);
+      fixture.detectChanges();
+
+      expect(log).toEqual(['on changes!']);
+    });
+
+    it('should be inherited when super is a simple class and grand-super is a simple class', () => {
+      const log: string[] = [];
+
+      class GrandSuperClass {
+        ngOnChanges() { log.push('on changes!'); }
+      }
+
+      class SuperClass extends GrandSuperClass {}
+
+      @Directive({selector: '[subDir]'})
+      class SubDirective extends SuperClass {
+        @Input() someInput = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
+      TestBed.overrideComponent(
+          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
+      const fixture = TestBed.createComponent(AppComp);
+      fixture.detectChanges();
+
+      expect(log).toEqual(['on changes!']);
+    });
   });
 
-  it('should be inherited when super is a simple class', () => {
-    const log: string[] = [];
+  describe('of bare super class by a directive', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
 
-    class SuperClass {
-      ngOnChanges() { log.push('on changes!'); }
-    }
+      class SuperDirective {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
 
-    @Directive({selector: '[subDir]'})
-    class SubDirective extends SuperClass {
-      @Input() someInput = '';
-    }
+      beforeEach(() => fired.length = 0);
 
-    TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-    TestBed.overrideComponent(
-        AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-    const fixture = TestBed.createComponent(AppComp);
-    fixture.detectChanges();
+      it('ngOnInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnInit() { fired.push('sub init'); }
+        }
 
-    expect(log).toEqual(['on changes!']);
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      class SuperDirective {
+        @Input()
+        foo = '';
+
+        @Input()
+        bar = '';
+
+        @Input()
+        baz = '';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`})
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const subDir =
+          fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
+
+      expect(subDir.foo).toBe('a');
+      expect(subDir.bar).toBe('b');
+      expect(subDir.baz).toBe('c');
+      expect(subDir.qux).toBe('d');
+    });
+
+
+    it('should inherit outputs', () => {
+      class SuperDirective {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        ngOnInit() { this.foo.emit('test'); }
+      }
+
+      @Component({
+        template: `
+        <div sub-dir (foo)="handleFoo($event)"></div>
+      `
+      })
+      class App {
+        foo = '';
+
+        handleFoo(event: string) { this.foo = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test');
+    });
+
+    it('should compose host bindings for styles', () => {
+      class SuperDirective {
+        @HostBinding('style.color')
+        color = 'red';
+
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+      }
+
+      @Component({
+        template: `
+        <p sub-dir>test</p>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+      expect(queryResult.nativeElement.tagName).toBe('P');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      class SuperDirective {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+      }
+      @Component({
+        template: `
+        <p sub-dir superTitle="test">test</p>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+      expect(queryResult.nativeElement.title).toBe('test!!!');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      class SuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <ul sub-dir>
+          <li child-dir>one</li>
+          <li child-dir>two</li>
+        </ul>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, ChildDir],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(2);
+    });
   });
 
-  it('should be inherited when super is a directive and grand-super is a directive', () => {
-    const log: string[] = [];
+  describe('of a directive by another directive', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
 
-    @Directive({selector: '[grandSuperDir]'})
-    class GrandSuperDirective implements OnChanges {
-      @Input() someInput = '';
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
 
-      ngOnChanges() { log.push('on changes!'); }
-    }
+      beforeEach(() => fired.length = 0);
 
-    @Directive({selector: '[superDir]'})
-    class SuperDirective extends GrandSuperDirective {
-    }
+      it('ngOnInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnInit() { fired.push('sub init'); }
+        }
 
-    @Directive({selector: '[subDir]'})
-    class SubDirective extends SuperDirective {
-    }
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
 
-    TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-    TestBed.overrideComponent(
-        AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-    const fixture = TestBed.createComponent(AppComp);
-    fixture.detectChanges();
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
 
-    expect(log).toEqual(['on changes!']);
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      @Directive({selector: '[super-dir]'})
+      class SuperDirective {
+        @Input()
+        foo = '';
+
+        @Input()
+        bar = '';
+
+        @Input()
+        baz = '';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`})
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const subDir =
+          fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
+
+      expect(subDir.foo).toBe('a');
+      expect(subDir.bar).toBe('b');
+      expect(subDir.baz).toBe('c');
+      expect(subDir.qux).toBe('d');
+    });
+
+
+    it('should inherit outputs', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        ngOnInit() { this.foo.emit('test'); }
+      }
+
+      @Component({
+        template: `
+        <div sub-dir (foo)="handleFoo($event)"></div>
+      `
+      })
+      class App {
+        foo = '';
+
+        handleFoo(event: string) { this.foo = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test');
+    });
+
+    it('should compose host bindings for styles', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @HostBinding('style.color')
+        color = 'red';
+
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+      }
+
+      @Component({
+        template: `
+        <p sub-dir>test</p>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+      expect(queryResult.nativeElement.tagName).toBe('P');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+      }
+      @Component({
+        template: `
+        <p sub-dir superTitle="test">test</p>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+      expect(queryResult.nativeElement.title).toBe('test!!!');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <ul sub-dir>
+          <li child-dir>one</li>
+          <li child-dir>two</li>
+        </ul>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, ChildDir, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(2);
+    });
   });
 
-  it('should be inherited when super is a directive and grand-super is a simple class', () => {
-    const log: string[] = [];
+  describe('of a directive by a bare class then by another directive', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
 
-    class GrandSuperClass {
-      ngOnChanges() { log.push('on changes!'); }
-    }
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperSuperDirective {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
 
-    @Directive({selector: '[superDir]'})
-    class SuperDirective extends GrandSuperClass {
-      @Input() someInput = '';
-    }
+      class SuperDirective extends SuperSuperDirective {}
 
-    @Directive({selector: '[subDir]'})
-    class SubDirective extends SuperDirective {
-    }
+      beforeEach(() => fired.length = 0);
 
-    TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-    TestBed.overrideComponent(
-        AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-    const fixture = TestBed.createComponent(AppComp);
-    fixture.detectChanges();
+      it('ngOnInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnInit() { fired.push('sub init'); }
+        }
 
-    expect(log).toEqual(['on changes!']);
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Directive({
+          selector: '[subDir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<p *ngIf="showing" subDir></p>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [SubDirective, App, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      @Directive({selector: '[super-dir]'})
+      class SuperSuperDirective {
+        @Input()
+        foo = '';
+
+        @Input()
+        baz = '';
+      }
+
+      class SuperDirective extends SuperSuperDirective {
+        @Input()
+        bar = '';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({
+        selector: 'my-app',
+        template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`,
+      })
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const subDir =
+          fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
+
+      expect(subDir.foo).toBe('a');
+      expect(subDir.bar).toBe('b');
+      expect(subDir.baz).toBe('c');
+      expect(subDir.qux).toBe('d');
+    });
+
+    it('should inherit outputs', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperSuperDirective {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      class SuperDirective extends SuperSuperDirective {
+        @Output()
+        bar = new EventEmitter<string>();
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        ngOnInit() {
+          this.foo.emit('test1');
+          this.bar.emit('test2');
+        }
+      }
+
+      @Component({
+        template: `
+          <div sub-dir (foo)="handleFoo($event)" (bar)="handleBar($event)"></div>
+        `
+      })
+      class App {
+        foo = '';
+
+        bar = '';
+
+        handleFoo(event: string) { this.foo = event; }
+
+        handleBar(event: string) { this.bar = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test1');
+      expect(app.bar).toBe('test2');
+    });
+
+    it('should compose host bindings for styles', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperSuperDirective {
+        @HostBinding('style.color')
+        color = 'red';
+      }
+
+      class SuperDirective extends SuperSuperDirective {
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+      }
+
+      @Component({
+        template: `
+          <p sub-dir>test</p>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+      expect(queryResult.nativeElement.tagName).toBe('P');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperSuperDirective {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      class SuperDirective extends SuperSuperDirective {
+        @HostBinding('accessKey')
+        get boundAltKey() { return this.superAccessKey + '???'; }
+
+        @Input()
+        superAccessKey = '';
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+      }
+      @Component({
+        template: `
+        <p sub-dir superTitle="test1" superAccessKey="test2">test</p>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const p: HTMLParagraphElement =
+          fixture.debugElement.query(By.directive(SubDirective)).nativeElement;
+
+      expect(p.title).toBe('test1!!!');
+      expect(p.accessKey).toBe('test2???');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundChildDir1s: QueryList<ChildDir1>;
+      let foundChildDir2s: QueryList<ChildDir2>;
+
+      @Directive({selector: '[child-dir-one]'})
+      class ChildDir1 {
+      }
+
+      @Directive({selector: '[child-dir-two]'})
+      class ChildDir2 {
+      }
+
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperSuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir1)
+        childDir1s !: QueryList<ChildDir1>;
+      }
+
+      class SuperDirective extends SuperSuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir1)
+        childDir2s !: QueryList<ChildDir2>;
+      }
+
+      @Directive({
+        selector: '[sub-dir]',
+      })
+      class SubDirective extends SuperDirective {
+        ngAfterViewInit() {
+          foundChildDir1s = this.childDir1s;
+          foundChildDir2s = this.childDir2s;
+        }
+      }
+
+      @Component({
+        template: `
+        <ul sub-dir>
+          <li child-dir-one child-dir-two>one</li>
+          <li child-dir-one>two</li>
+          <li child-dir-two>three</li>
+        </ul>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, ChildDir1, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundChildDir1s !.length).toBe(2);
+      expect(foundChildDir2s !.length).toBe(2);
+    });
   });
 
-  it('should be inherited when super is a simple class and grand-super is a directive', () => {
-    const log: string[] = [];
+  describe('of bare super class by a component', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
 
-    @Directive({selector: '[grandSuperDir]'})
-    class GrandSuperDirective implements OnChanges {
-      @Input() someInput = '';
+      class SuperComponent {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
 
-      ngOnChanges() { log.push('on changes!'); }
-    }
+      beforeEach(() => fired.length = 0);
 
-    class SuperClass extends GrandSuperDirective {}
+      it('ngOnInit', () => {
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends SuperComponent {
+          ngOnInit() { fired.push('sub init'); }
+        }
 
-    @Directive({selector: '[subDir]'})
-    class SubDirective extends SuperClass {
-    }
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
 
-    TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-    TestBed.overrideComponent(
-        AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-    const fixture = TestBed.createComponent(AppComp);
-    fixture.detectChanges();
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
 
-    expect(log).toEqual(['on changes!']);
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Directive({
+          selector: 'my-comp',
+        })
+        class MyComponent extends SuperComponent {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      class SuperComponent {
+        @Input()
+        foo = '';
+
+        @Input()
+        bar = '';
+
+        @Input()
+        baz = '';
+      }
+
+      @Component({selector: 'my-comp', template: `<p>test</p>`})
+      class MyComponent extends SuperComponent {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const subDir: MyComponent =
+          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+      expect(subDir.foo).toEqual('a');
+      expect(subDir.bar).toEqual('b');
+      expect(subDir.baz).toEqual('c');
+      expect(subDir.qux).toEqual('d');
+    });
+
+
+    it('should inherit outputs', () => {
+      class SuperComponent {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+        ngOnInit() { this.foo.emit('test'); }
+      }
+
+      @Component({
+        template: `
+          <my-comp (foo)="handleFoo($event)"></my-comp>
+        `
+      })
+      class App {
+        foo = '';
+
+        handleFoo(event: string) { this.foo = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test');
+    });
+
+    it('should compose host bindings for styles', () => {
+      class SuperComponent {
+        @HostBinding('style.color')
+        color = 'red';
+
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+      }
+
+      @Component({
+        template: `
+          <my-comp>test</my-comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      class SuperComponent {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+      }
+      @Component({
+        template: `
+        <my-comp superTitle="test">test</my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.title).toBe('test!!!');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      class SuperComponent {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Component({selector: 'my-comp', template: `<ul><ng-content></ng-content></ul>`})
+      class MyComponent extends SuperComponent {
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp>
+          <li child-dir>one</li>
+          <li child-dir>two</li>
+        </my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, ChildDir],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(2);
+    });
   });
 
-  it('should be inherited when super is a simple class and grand-super is a simple class', () => {
-    const log: string[] = [];
+  describe('of a directive inherited by a component', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
 
-    class GrandSuperClass {
-      ngOnChanges() { log.push('on changes!'); }
-    }
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
 
-    class SuperClass extends GrandSuperClass {}
+      beforeEach(() => fired.length = 0);
 
-    @Directive({selector: '[subDir]'})
-    class SubDirective extends SuperClass {
-      @Input() someInput = '';
-    }
+      it('ngOnInit', () => {
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends SuperDirective {
+          ngOnInit() { fired.push('sub init'); }
+        }
 
-    TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-    TestBed.overrideComponent(
-        AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-    const fixture = TestBed.createComponent(AppComp);
-    fixture.detectChanges();
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
 
-    expect(log).toEqual(['on changes!']);
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @Input()
+        foo = '';
+
+        @Input()
+        bar = '';
+
+        @Input()
+        baz = '';
+      }
+
+      @Component({selector: 'my-comp', template: `<p>test</p>`})
+      class MyComponent extends SuperDirective {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const subDir: MyComponent =
+          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+      expect(subDir.foo).toEqual('a');
+      expect(subDir.bar).toEqual('b');
+      expect(subDir.baz).toEqual('c');
+      expect(subDir.qux).toEqual('d');
+    });
+
+    it('should inherit outputs', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperDirective {
+        ngOnInit() { this.foo.emit('test'); }
+      }
+
+      @Component({
+        template: `
+          <my-comp (foo)="handleFoo($event)"></my-comp>
+        `
+      })
+      class App {
+        foo = '';
+
+        handleFoo(event: string) { this.foo = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test');
+    });
+
+    it('should compose host bindings for styles', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @HostBinding('style.color')
+        color = 'red';
+
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperDirective {
+      }
+
+      @Component({
+        template: `
+          <my-comp>test</my-comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperDirective {
+      }
+      @Component({
+        template: `
+        <my-comp superTitle="test">test</my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.title).toBe('test!!!');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Component({selector: 'my-comp', template: `<ul><ng-content></ng-content></ul>`})
+      class MyComponent extends SuperDirective {
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp>
+          <li child-dir>one</li>
+          <li child-dir>two</li>
+        </my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperDirective, ChildDir],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(2);
+    });
+
+    it('should inherit ViewChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ViewChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `
+          <ul>
+            <li child-dir *ngFor="let item of items">{{item}}</li>
+          </ul>
+        `,
+      })
+      class MyComponent extends SuperDirective {
+        items = [1, 2, 3, 4, 5];
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp></my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, ChildDir, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(5);
+    });
+  });
+
+  describe('of a directive inherited by a bare class and then by a component', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
+
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
+
+      class BareClass extends SuperDirective {}
+
+      beforeEach(() => fired.length = 0);
+
+      it('ngOnInit', () => {
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends BareClass {
+          ngOnInit() { fired.push('sub init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Directive({
+          selector: 'my-comp',
+        })
+        class MyComponent extends BareClass {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @Input()
+        foo = '';
+
+        @Input()
+        baz = '';
+      }
+
+      class BareClass extends SuperDirective {
+        @Input()
+        bar = '';
+      }
+
+      @Component({selector: 'my-comp', template: `<p>test</p>`})
+      class MyComponent extends BareClass {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, BareClass, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const subDir: MyComponent =
+          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+      expect(subDir.foo).toEqual('a');
+      expect(subDir.bar).toEqual('b');
+      expect(subDir.baz).toEqual('c');
+      expect(subDir.qux).toEqual('d');
+    });
+
+
+    it('should inherit outputs', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      class BareClass extends SuperDirective {}
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends BareClass {
+        ngOnInit() { this.foo.emit('test'); }
+      }
+
+      @Component({
+        template: `
+          <my-comp (foo)="handleFoo($event)"></my-comp>
+        `
+      })
+      class App {
+        foo = '';
+
+        handleFoo(event: string) { this.foo = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test');
+    });
+
+    it('should compose host bindings for styles', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @HostBinding('style.color')
+        color = 'red';
+
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      class BareClass extends SuperDirective {}
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends BareClass {
+      }
+
+      @Component({
+        template: `
+          <my-comp>test</my-comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      class BareClass extends SuperDirective {
+        @HostBinding('accessKey')
+        get boundAccessKey() { return this.superAccessKey + '???'; }
+
+        @Input()
+        superAccessKey = '';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends BareClass {
+      }
+      @Component({
+        template: `
+          <my-comp superTitle="test1" superAccessKey="test2">test</my-comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SuperDirective, BareClass, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.title).toBe('test1!!!');
+      expect(queryResult.nativeElement.accessKey).toBe('test2???');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      class BareClass extends SuperDirective {}
+
+      @Component({
+        selector: 'my-comp',
+        template: `<ul><ng-content></ng-content></ul>`,
+      })
+      class MyComponent extends BareClass {
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp>
+          <li child-dir>one</li>
+          <li child-dir>two</li>
+        </my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, ChildDir, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(2);
+    });
+
+    it('should inherit ViewChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Directive({
+        selector: '[super-dir]',
+      })
+      class SuperDirective {
+        // TODO(issue/24571): remove '!'.
+        @ViewChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      class BareClass extends SuperDirective {}
+
+      @Component({
+        selector: 'my-comp',
+        template: `
+          <ul>
+            <li child-dir *ngFor="let item of items">{{item}}</li>
+          </ul>
+        `,
+      })
+      class MyComponent extends BareClass {
+        items = [1, 2, 3, 4, 5];
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp></my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, ChildDir, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(5);
+    });
+  });
+
+  describe('of a component inherited by a component', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
+
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
+
+      beforeEach(() => fired.length = 0);
+
+      it('ngOnInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnInit() { fired.push('sub init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        @Input()
+        foo = '';
+
+        @Input()
+        bar = '';
+
+        @Input()
+        baz = '';
+      }
+
+      @Component({selector: 'my-comp', template: `<p>test</p>`})
+      class MyComponent extends SuperComponent {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const subDir: MyComponent =
+          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+      expect(subDir.foo).toEqual('a');
+      expect(subDir.bar).toEqual('b');
+      expect(subDir.baz).toEqual('c');
+      expect(subDir.qux).toEqual('d');
+    });
+
+    it('should inherit outputs', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+        ngOnInit() { this.foo.emit('test'); }
+      }
+
+      @Component({
+        template: `
+          <my-comp (foo)="handleFoo($event)"></my-comp>
+        `
+      })
+      class App {
+        foo = '';
+
+        handleFoo(event: string) { this.foo = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test');
+    });
+
+    it('should compose host bindings for styles', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        @HostBinding('style.color')
+        color = 'red';
+
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+      }
+
+      @Component({
+        template: `
+          <my-comp>test</my-comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+      }
+      @Component({
+        template: `
+        <my-comp superTitle="test">test</my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.title).toBe('test!!!');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<ul><ng-content></ng-content></ul>`,
+      })
+      class MyComponent extends SuperComponent {
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp>
+          <li child-dir>one</li>
+          <li child-dir>two</li>
+        </my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent, ChildDir],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(2);
+    });
+
+    it('should inherit ViewChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        // TODO(issue/24571): remove '!'.
+        @ViewChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `
+          <ul>
+            <li child-dir *ngFor="let item of items">{{item}}</li>
+          </ul>
+        `,
+      })
+      class MyComponent extends SuperComponent {
+        items = [1, 2, 3, 4, 5];
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp></my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, ChildDir, SuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(5);
+    });
+  });
+
+  describe('of a component inherited by a bare class then by a component', () => {
+    describe('lifecycle hooks', () => {
+      const fired: string[] = [];
+
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperSuperComponent {
+        ngOnInit() { fired.push('super init'); }
+        ngOnDestroy() { fired.push('super destroy'); }
+        ngAfterContentInit() { fired.push('super after content init'); }
+        ngAfterContentChecked() { fired.push('super after content checked'); }
+        ngAfterViewInit() { fired.push('super after view init'); }
+        ngAfterViewChecked() { fired.push('super after view checked'); }
+        ngDoCheck() { fired.push('super do check'); }
+      }
+
+      class SuperComponent extends SuperSuperComponent {}
+
+      beforeEach(() => fired.length = 0);
+
+      it('ngOnInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnInit() { fired.push('sub init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngDoCheck', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngDoCheck() { fired.push('sub do check'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'sub do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterContentInit() { fired.push('sub after content init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'sub after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterContentChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterContentChecked() { fired.push('sub after content checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'sub after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewInit', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterViewInit() { fired.push('sub after view init'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'sub after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngAfterViewChecked', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngAfterViewChecked() { fired.push('sub after view checked'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'sub after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super destroy',
+        ]);
+      });
+
+      it('ngOnDestroy', () => {
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnDestroy() { fired.push('sub destroy'); }
+        }
+
+        @Component({
+          template: `<my-comp *ngIf="showing"></my-comp>`,
+        })
+        class App {
+          showing = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [MyComponent, App, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'super init',
+          'super do check',
+          'super after content init',
+          'super after content checked',
+          'super after view init',
+          'super after view checked',
+        ]);
+
+        fired.length = 0;
+        fixture.componentInstance.showing = false;
+        fixture.detectChanges();
+
+        expect(fired).toEqual([
+          'sub destroy',
+        ]);
+      });
+    });
+
+    it('should inherit inputs', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperSuperComponent {
+        @Input()
+        foo = '';
+
+        @Input()
+        baz = '';
+      }
+
+      class BareClass extends SuperSuperComponent {
+        @Input()
+        bar = '';
+      }
+
+      @Component({selector: 'my-comp', template: `<p>test</p>`})
+      class MyComponent extends BareClass {
+        @Input()
+        baz = '';
+
+        @Input()
+        qux = '';
+      }
+
+      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+      class App {
+        a = 'a';
+        b = 'b';
+        c = 'c';
+        d = 'd';
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperSuperComponent, BareClass],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const myComp: MyComponent =
+          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+      expect(myComp.foo).toEqual('a');
+      expect(myComp.bar).toEqual('b');
+      expect(myComp.baz).toEqual('c');
+      expect(myComp.qux).toEqual('d');
+    });
+
+    it('should inherit outputs', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperSuperComponent {
+        @Output()
+        foo = new EventEmitter<string>();
+      }
+
+      class SuperComponent extends SuperSuperComponent {
+        @Output()
+        bar = new EventEmitter<string>();
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+        ngOnInit() {
+          this.foo.emit('test1');
+          this.bar.emit('test2');
+        }
+      }
+
+      @Component({
+        template: `
+          <my-comp (foo)="handleFoo($event)" (bar)="handleBar($event)"></my-comp>
+        `
+      })
+      class App {
+        foo = '';
+
+        handleFoo(event: string) { this.foo = event; }
+
+        bar = '';
+
+        handleBar(event: string) { this.bar = event; }
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const app = fixture.componentInstance;
+
+      expect(app.foo).toBe('test1');
+      expect(app.bar).toBe('test2');
+    });
+
+    it('should compose host bindings for styles', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperSuperComponent {
+        @HostBinding('style.color')
+        color = 'red';
+      }
+
+      class SuperComponent extends SuperSuperComponent {
+        @HostBinding('style.backgroundColor')
+        bg = 'black';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+      }
+
+      @Component({
+        template: `
+          <my-comp>test</my-comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+      expect(queryResult.nativeElement.style.color).toBe('red');
+      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
+    });
+
+    it('should compose host bindings (non-style related)', () => {
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperSuperComponent {
+        @HostBinding('title')
+        get boundTitle() { return this.superTitle + '!!!'; }
+
+        @Input()
+        superTitle = '';
+      }
+
+      class SuperComponent extends SuperSuperComponent {
+        @HostBinding('accessKey')
+        get boundAccessKey() { return this.superAccessKey + '???'; }
+
+        @Input()
+        superAccessKey = '';
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<p>test</p>`,
+      })
+      class MyComponent extends SuperComponent {
+      }
+      @Component({
+        template: `
+          <my-comp superTitle="test1" superAccessKey="test2">test</my-comp>
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+      expect(queryResult.nativeElement.title).toBe('test1!!!');
+      expect(queryResult.nativeElement.accessKey).toBe('test2???');
+    });
+
+    it('should inherit ContentChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        // TODO(issue/24571): remove '!'.
+        @ContentChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `<ul><ng-content></ng-content></ul>`,
+      })
+      class MyComponent extends SuperComponent {
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp>
+          <li child-dir>one</li>
+          <li child-dir>two</li>
+        </my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, SuperComponent, ChildDir],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(2);
+    });
+
+    it('should inherit ViewChildren queries', () => {
+      let foundQueryList: QueryList<ChildDir>;
+
+      @Directive({selector: '[child-dir]'})
+      class ChildDir {
+      }
+
+      @Component({
+        selector: 'super-comp',
+        template: `<p>super</p>`,
+      })
+      class SuperComponent {
+        // TODO(issue/24571): remove '!'.
+        @ViewChildren(ChildDir)
+        customDirs !: QueryList<ChildDir>;
+      }
+
+      @Component({
+        selector: 'my-comp',
+        template: `
+          <ul>
+            <li child-dir *ngFor="let item of items">{{item}}</li>
+          </ul>
+        `,
+      })
+      class MyComponent extends SuperComponent {
+        items = [1, 2, 3, 4, 5];
+        ngAfterViewInit() { foundQueryList = this.customDirs; }
+      }
+
+      @Component({
+        template: `
+        <my-comp></my-comp>
+      `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, MyComponent, ChildDir, SuperComponent],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(foundQueryList !.length).toBe(5);
+    });
   });
 });
-
-@Component({selector: 'app-comp', template: ``})
-class AppComp {
-}
diff --git a/packages/core/test/render3/inherit_definition_feature_spec.ts b/packages/core/test/render3/inherit_definition_feature_spec.ts
deleted file mode 100644
index 4d78e7eb7e..0000000000
--- a/packages/core/test/render3/inherit_definition_feature_spec.ts
+++ /dev/null
@@ -1,639 +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 {ElementRef, Inject, InjectionToken, QueryList, ɵAttributeMarker as AttributeMarker} from '../../src/core';
-import {ΔallocHostVars, Δbind, ComponentDef, ΔcontentQuery, ΔdefineBase, ΔdefineComponent, ΔdefineDirective, DirectiveDef, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔInheritDefinitionFeature, Δload, ΔloadContentQuery, ΔloadViewQuery, ΔNgOnChangesFeature, ΔProvidersFeature, ΔqueryRefresh, RenderFlags, ΔviewQuery,} from '../../src/render3/index';
-
-import {ComponentFixture, createComponent, getDirectiveOnNode} from './render_util';
-
-describe('InheritDefinitionFeature', () => {
-  it('should inherit lifecycle hooks', () => {
-    class SuperDirective {
-      ngOnInit() {}
-      ngOnDestroy() {}
-      ngAfterContentInit() {}
-      ngAfterContentChecked() {}
-      ngAfterViewInit() {}
-      ngAfterViewChecked() {}
-      ngDoCheck() {}
-    }
-
-    class SubDirective extends SuperDirective {
-      ngAfterViewInit() {}
-      ngAfterViewChecked() {}
-      ngDoCheck() {}
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SubDirective,
-        selectors: [['', 'subDir', '']],
-        factory: () => new SubDirective(),
-        features: [ΔInheritDefinitionFeature]
-      });
-    }
-
-    const finalDef = SubDirective.ngDirectiveDef as DirectiveDef<any>;
-
-
-    expect(finalDef.onInit).toBe(SuperDirective.prototype.ngOnInit);
-    expect(finalDef.onDestroy).toBe(SuperDirective.prototype.ngOnDestroy);
-    expect(finalDef.afterContentChecked).toBe(SuperDirective.prototype.ngAfterContentChecked);
-    expect(finalDef.afterContentInit).toBe(SuperDirective.prototype.ngAfterContentInit);
-    expect(finalDef.afterViewChecked).toBe(SubDirective.prototype.ngAfterViewChecked);
-    expect(finalDef.afterViewInit).toBe(SubDirective.prototype.ngAfterViewInit);
-    expect(finalDef.doCheck).toBe(SubDirective.prototype.ngDoCheck);
-  });
-
-  it('should inherit inputs', () => {
-    class SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        inputs: {
-          superFoo: ['foo', 'declaredFoo'],
-          superBar: 'bar',
-          superBaz: 'baz',
-        },
-        type: SuperDirective,
-        selectors: [['', 'superDir', '']],
-        factory: () => new SuperDirective(),
-      });
-    }
-
-    class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SubDirective,
-        inputs: {
-          subBaz: 'baz',
-          subQux: 'qux',
-        },
-        selectors: [['', 'subDir', '']],
-        factory: () => new SubDirective(),
-        features: [ΔInheritDefinitionFeature]
-      });
-    }
-
-    const subDef = SubDirective.ngDirectiveDef as DirectiveDef<any>;
-
-    expect(subDef.inputs).toEqual({
-      foo: 'superFoo',
-      bar: 'superBar',
-      baz: 'subBaz',
-      qux: 'subQux',
-    });
-    expect(subDef.declaredInputs).toEqual({
-      foo: 'declaredFoo',
-      bar: 'bar',
-      baz: 'baz',
-      qux: 'qux',
-    });
-  });
-
-  it('should inherit outputs', () => {
-    class SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        outputs: {
-          superFoo: 'foo',
-          superBar: 'bar',
-          superBaz: 'baz',
-        },
-        type: SuperDirective,
-        selectors: [['', 'superDir', '']],
-        factory: () => new SuperDirective(),
-      });
-    }
-
-    class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SubDirective,
-        outputs: {
-          subBaz: 'baz',
-          subQux: 'qux',
-        },
-        selectors: [['', 'subDir', '']],
-        factory: () => new SubDirective(),
-        features: [ΔInheritDefinitionFeature]
-      });
-    }
-
-    const subDef = SubDirective.ngDirectiveDef as DirectiveDef<any>;
-
-    expect(subDef.outputs).toEqual({
-      foo: 'superFoo',
-      bar: 'superBar',
-      baz: 'subBaz',
-      qux: 'subQux',
-    });
-  });
-
-  it('should detect EMPTY inputs and outputs', () => {
-    class SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        inputs: {
-          testIn: 'testIn',
-        },
-        outputs: {
-          testOut: 'testOut',
-        },
-        type: SuperDirective,
-        selectors: [['', 'superDir', '']],
-        factory: () => new SuperDirective(),
-      });
-    }
-
-    class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SubDirective,
-        selectors: [['', 'subDir', '']],
-        factory: () => new SubDirective(),
-        features: [ΔInheritDefinitionFeature]
-      });
-    }
-
-    const subDef = SubDirective.ngDirectiveDef as DirectiveDef<any>;
-
-    expect(subDef.inputs).toEqual({
-      testIn: 'testIn',
-    });
-    expect(subDef.outputs).toEqual({
-      testOut: 'testOut',
-    });
-  });
-
-  it('should inherit inputs from ngBaseDefs along the way', () => {
-
-    class Class5 {
-      input5 = 'data, so data';
-
-      static ngBaseDef = ΔdefineBase({
-        inputs: {
-          input5: 'input5',
-        },
-      });
-    }
-
-    class Class4 extends Class5 {
-      input4 = 'hehe';
-
-      static ngDirectiveDef = ΔdefineDirective({
-        inputs: {
-          input4: 'input4',
-        },
-        type: Class4,
-        selectors: [['', 'superDir', '']],
-        factory: () => new Class4(),
-        features: [ΔInheritDefinitionFeature],
-      });
-    }
-
-    class Class3 extends Class4 {}
-
-    class Class2 extends Class3 {
-      input3 = 'wee';
-
-      static ngBaseDef = ΔdefineBase({
-        inputs: {
-          input3: ['alias3', 'input3'],
-        }
-      }) as any;
-    }
-
-    class Class1 extends Class2 {
-      input1 = 'test';
-      input2 = 'whatever';
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: Class1,
-        inputs: {
-          input1: 'input1',
-          input2: 'input2',
-        },
-        selectors: [['', 'subDir', '']],
-        factory: () => new Class1(),
-        features: [ΔInheritDefinitionFeature],
-      });
-    }
-
-    const subDef = Class1.ngDirectiveDef as DirectiveDef<any>;
-
-    expect(subDef.inputs).toEqual({
-      input1: 'input1',
-      input2: 'input2',
-      alias3: 'input3',
-      input4: 'input4',
-      input5: 'input5',
-    });
-    expect(subDef.declaredInputs).toEqual({
-      input1: 'input1',
-      input2: 'input2',
-      alias3: 'input3',
-      input4: 'input4',
-      input5: 'input5',
-    });
-  });
-
-  it('should inherit outputs from ngBaseDefs along the way', () => {
-
-    class Class5 {
-      output5 = 'data, so data';
-
-      static ngBaseDef = ΔdefineBase({
-        outputs: {
-          output5: 'alias5',
-        },
-      });
-    }
-
-    class Class4 extends Class5 {
-      output4 = 'hehe';
-
-      static ngDirectiveDef = ΔdefineDirective({
-        outputs: {
-          output4: 'alias4',
-        },
-        type: Class4,
-        selectors: [['', 'superDir', '']],
-        factory: () => new Class4(),
-        features: [ΔInheritDefinitionFeature],
-      });
-    }
-
-    class Class3 extends Class4 {}
-
-    class Class2 extends Class3 {
-      output3 = 'wee';
-
-      static ngBaseDef = ΔdefineBase({
-        outputs: {
-          output3: 'alias3',
-        }
-      }) as any;
-    }
-
-    class Class1 extends Class2 {
-      output1 = 'test';
-      output2 = 'whatever';
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: Class1,
-        outputs: {
-          output1: 'alias1',
-          output2: 'alias2',
-        },
-        selectors: [['', 'subDir', '']],
-        factory: () => new Class1(),
-        features: [ΔInheritDefinitionFeature],
-      });
-    }
-
-    const subDef = Class1.ngDirectiveDef as DirectiveDef<any>;
-
-    expect(subDef.outputs).toEqual({
-      alias1: 'output1',
-      alias2: 'output2',
-      alias3: 'output3',
-      alias4: 'output4',
-      alias5: 'output5',
-    });
-  });
-
-  it('should compose hostBindings', () => {
-    let subDir !: SubDirective;
-
-    class SuperDirective {
-      id = 'my-id';
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SuperDirective,
-        selectors: [['', 'superDir', '']],
-        hostBindings: (rf: RenderFlags, ctx: SuperDirective, elementIndex: number) => {
-          if (rf & RenderFlags.Create) {
-            ΔallocHostVars(1);
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementProperty(elementIndex, 'id', Δbind(ctx.id));
-          }
-        },
-        factory: () => new SuperDirective(),
-      });
-    }
-
-    class SubDirective extends SuperDirective {
-      title = 'my-title';
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SubDirective,
-        selectors: [['', 'subDir', '']],
-        hostBindings: (rf: RenderFlags, ctx: SubDirective, elementIndex: number) => {
-          if (rf & RenderFlags.Create) {
-            ΔallocHostVars(1);
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementProperty(elementIndex, 'title', Δbind(ctx.title));
-          }
-        },
-        factory: () => subDir = new SubDirective(),
-        features: [ΔInheritDefinitionFeature]
-      });
-    }
-
-
-    const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        Δelement(0, 'div', ['subDir', '']);
-      }
-    }, 1, 0, [SubDirective]);
-
-    const fixture = new ComponentFixture(App);
-    const divEl = fixture.hostElement.querySelector('div') as HTMLElement;
-
-    expect(divEl.id).toEqual('my-id');
-    expect(divEl.title).toEqual('my-title');
-
-    subDir.title = 'new-title';
-    fixture.update();
-    expect(divEl.id).toEqual('my-id');
-    expect(divEl.title).toEqual('new-title');
-
-    subDir.id = 'new-id';
-    fixture.update();
-    expect(divEl.id).toEqual('new-id');
-    expect(divEl.title).toEqual('new-title');
-  });
-
-  describe('view query', () => {
-
-    const SomeComp = createComponent('some-comp', (rf: RenderFlags, ctx: any) => {});
-
-    /*
-     * class SuperComponent {
-     *  @ViewChildren('super') superQuery;
-     * }
-     */
-    class SuperComponent {
-      superQuery?: QueryList<any>;
-      static ngComponentDef = ΔdefineComponent({
-        type: SuperComponent,
-        template: () => {},
-        consts: 0,
-        vars: 0,
-        selectors: [['super-comp']],
-        viewQuery: <T>(rf: RenderFlags, ctx: any) => {
-          if (rf & RenderFlags.Create) {
-            ΔviewQuery(['super'], false, null);
-          }
-          if (rf & RenderFlags.Update) {
-            let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
-                (ctx.superQuery = tmp as QueryList<any>);
-          }
-        },
-        factory: () => new SuperComponent(),
-      });
-    }
-
-    /**
-     * <div id="sub" #sub></div>
-     * <div id="super" #super></div>
-     * <some-comp></some-comp>
-     * class SubComponent extends SuperComponent {
-     *  @ViewChildren('sub') subQuery;
-     * }
-     */
-    class SubComponent extends SuperComponent {
-      subQuery?: QueryList<any>;
-      static ngComponentDef = ΔdefineComponent({
-        type: SubComponent,
-        template: (rf: RenderFlags, ctx: any) => {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'div', ['id', 'sub'], ['sub', '']);
-            Δelement(2, 'div', ['id', 'super'], ['super', '']);
-            Δelement(4, 'some-comp');
-          }
-        },
-        consts: 5,
-        vars: 0,
-        selectors: [['sub-comp']],
-        viewQuery: (rf: RenderFlags, ctx: any) => {
-          if (rf & RenderFlags.Create) {
-            ΔviewQuery(['sub'], false, null);
-          }
-          if (rf & RenderFlags.Update) {
-            let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
-                (ctx.subQuery = tmp as QueryList<any>);
-          }
-        },
-        factory: () => new SubComponent(),
-        features: [ΔInheritDefinitionFeature],
-        directives: [SomeComp]
-      });
-    }
-
-
-    it('should compose viewQuery (basic mechanics check)', () => {
-      const log: Array<[string, RenderFlags, any]> = [];
-
-      class SuperComponent {
-        static ngComponentDef = ΔdefineComponent({
-          type: SuperComponent,
-          template: () => {},
-          consts: 0,
-          vars: 0,
-          selectors: [['', 'superDir', '']],
-          viewQuery: <T>(rf: RenderFlags, ctx: T) => {
-            log.push(['super', rf, ctx]);
-          },
-          factory: () => new SuperComponent(),
-        });
-      }
-
-      class SubComponent extends SuperComponent {
-        static ngComponentDef = ΔdefineComponent({
-          type: SubComponent,
-          template: () => {},
-          consts: 0,
-          vars: 0,
-          selectors: [['', 'subDir', '']],
-          viewQuery: (rf: RenderFlags, ctx: SubComponent) => {
-            log.push(['sub', rf, ctx]);
-          },
-          factory: () => new SubComponent(),
-          features: [ΔInheritDefinitionFeature]
-        });
-      }
-
-      const subDef = SubComponent.ngComponentDef as ComponentDef<any>;
-
-      const context = {foo: 'bar'};
-
-      subDef.viewQuery !(RenderFlags.Create, context);
-
-      expect(log).toEqual(
-          [['super', RenderFlags.Create, context], ['sub', RenderFlags.Create, context]]);
-    });
-
-
-
-    it('should compose viewQuery (query logic check)', () => {
-      const fixture = new ComponentFixture(SubComponent);
-
-      const check = (key: string): void => {
-        const qList = (fixture.component as any)[`${key}Query`] as QueryList<any>;
-        expect(qList.length).toBe(1);
-        expect(qList.first.nativeElement).toEqual(fixture.hostElement.querySelector(`#${key}`));
-        expect(qList.first.nativeElement.id).toEqual(key);
-      };
-
-      check('sub');
-      check('super');
-    });
-
-    it('should work with multiple viewQuery comps', () => {
-      let subCompOne !: SubComponent;
-      let subCompTwo !: SubComponent;
-
-      const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'sub-comp');
-          Δelement(1, 'sub-comp');
-        }
-        subCompOne = getDirectiveOnNode(0);
-        subCompTwo = getDirectiveOnNode(1);
-      }, 2, 0, [SubComponent, SuperComponent]);
-
-      const fixture = new ComponentFixture(App);
-
-      const check = (comp: SubComponent): void => {
-        const qList = comp.subQuery as QueryList<any>;
-        expect(qList.length).toBe(1);
-        expect(qList.first.nativeElement).toEqual(fixture.hostElement.querySelector('#sub'));
-        expect(qList.first.nativeElement.id).toEqual('sub');
-      };
-
-      check(subCompOne);
-      check(subCompTwo);
-    });
-
-  });
-
-
-  it('should compose contentQueries (basic mechanics check)', () => {
-    const log: string[] = [];
-
-    class SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SuperDirective,
-        selectors: [['', 'superDir', '']],
-        contentQueries: () => { log.push('super'); },
-        factory: () => new SuperDirective(),
-      });
-    }
-
-    class SubDirective extends SuperDirective {
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SubDirective,
-        selectors: [['', 'subDir', '']],
-        contentQueries: () => { log.push('sub'); },
-        factory: () => new SubDirective(),
-        features: [ΔInheritDefinitionFeature]
-      });
-    }
-
-    const subDef = SubDirective.ngDirectiveDef as DirectiveDef<any>;
-
-    subDef.contentQueries !(RenderFlags.Create, {}, 0);
-
-    expect(log).toEqual(['super', 'sub']);
-  });
-
-  it('should compose contentQueries (verify query sets)', () => {
-    let dirInstance: SubDirective;
-    class SuperDirective {
-      // @ContentChildren('foo')
-      foos !: QueryList<ElementRef>;
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SuperDirective,
-        selectors: [['', 'super-dir', '']],
-        factory: () => new SuperDirective(),
-        contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
-          if (rf & RenderFlags.Create) {
-            ΔcontentQuery(dirIndex, ['foo'], true, null);
-          }
-          if (rf & RenderFlags.Update) {
-            let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
-          }
-        }
-      });
-    }
-
-    class SubDirective extends SuperDirective {
-      // @ContentChildren('bar')
-      bars !: QueryList<ElementRef>;
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: SubDirective,
-        selectors: [['', 'sub-dir', '']],
-        factory: () => dirInstance = new SubDirective(),
-        contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
-          if (rf & RenderFlags.Create) {
-            ΔcontentQuery(dirIndex, ['bar'], true, null);
-          }
-          if (rf & RenderFlags.Update) {
-            let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.bars = tmp);
-          }
-        },
-        features: [ΔInheritDefinitionFeature]
-      });
-    }
-
-    /**
-     * <div sub-dir>
-     *   <span #foo></span>
-     *   <span #bar></span>
-     * </div>
-     */
-    const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'sub-dir']);
-        {
-          Δelement(1, 'span', null, ['foo', '']);
-          Δelement(3, 'span', null, ['bar', '']);
-        }
-        ΔelementEnd();
-      }
-    }, 5, 0, [SubDirective]);
-
-    const fixture = new ComponentFixture(AppComponent);
-    expect(dirInstance !.foos.length).toBe(1);
-    expect(dirInstance !.bars.length).toBe(1);
-  });
-
-  it('should throw if inheriting a component from a directive', () => {
-    class SuperComponent {
-      static ngComponentDef = ΔdefineComponent({
-        type: SuperComponent,
-        template: () => {},
-        selectors: [['', 'superDir', '']],
-        consts: 0,
-        vars: 0,
-        factory: () => new SuperComponent()
-      });
-    }
-
-    expect(() => {
-      class SubDirective extends SuperComponent{static ngDirectiveDef = ΔdefineDirective({
-                                                  type: SubDirective,
-                                                  selectors: [['', 'subDir', '']],
-                                                  factory: () => new SubDirective(),
-                                                  features: [ΔInheritDefinitionFeature]
-                                                });}
-    }).toThrowError('Directives cannot inherit Components');
-  });
-
-});

From 1b613c3ebf0deccd471c9597998c38a6823a83f6 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Thu, 2 May 2019 22:58:07 +0200
Subject: [PATCH 053/275] fix(ivy): evaluate external declaration usages as
 dynamic (#30247)

Previously, ngtsc would fail to evaluate expressions that access properties
from e.g. the `window` object. This resulted in hard to debug error messages
as no indication on where the problem originated was present in the output.

This commit cleans up the handling of unknown property accesses, such that
evaluating such expressions no longer fail but instead result in a `DynamicValue`.

Fixes #30226

PR Close #30247
---
 .../src/ngtsc/partial_evaluator/src/dynamic.ts     |  3 ++-
 .../src/ngtsc/partial_evaluator/src/interpreter.ts |  8 ++++++--
 .../ngtsc/partial_evaluator/test/evaluator_spec.ts | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts
index a0553d2b78..85880d8e74 100644
--- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts
+++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts
@@ -32,7 +32,8 @@ export const enum DynamicValueReason {
 
   /**
    * An external reference could not be resolved to a value which can be evaluated.
-   * (E.g. a call expression for a function declared in `.d.ts`.)
+   * For example a call expression for a function declared in `.d.ts`, or accessing native globals
+   * such as `window`.
    */
   EXTERNAL_REFERENCE,
 
diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts
index 80005e48a0..56b9ac70c0 100644
--- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts
+++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts
@@ -11,6 +11,7 @@ import * as ts from 'typescript';
 import {Reference} from '../../imports';
 import {OwningModule} from '../../imports/src/references';
 import {Declaration, ReflectionHost} from '../../reflection';
+import {isDeclaration} from '../../util/src/typescript';
 
 import {ArrayConcatBuiltinFn, ArraySliceBuiltinFn} from './builtin';
 import {DynamicValue} from './dynamic';
@@ -361,12 +362,15 @@ export class StaticInterpreter {
           }
         }
         return value;
+      } else if (isDeclaration(ref)) {
+        return DynamicValue.fromDynamicInput(
+            node, DynamicValue.fromExternalReference(ref, lhs as Reference<ts.Declaration>));
       }
     } else if (lhs instanceof DynamicValue) {
       return DynamicValue.fromDynamicInput(node, lhs);
-    } else {
-      throw new Error(`Invalid dot property access: ${lhs} dot ${rhs}`);
     }
+
+    return DynamicValue.fromUnknown(node);
   }
 
   private visitCallExpression(node: ts.CallExpression, context: Context): ResolvedValue {
diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts
index a4a1d5523a..4cf93ea800 100644
--- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts
@@ -122,6 +122,20 @@ describe('ngtsc metadata', () => {
     expect(evaluate(`const x = 3;`, '!!x')).toEqual(true);
   });
 
+  it('resolves access from external variable declarations as dynamic value', () => {
+    const value = evaluate('declare const window: any;', 'window.location');
+    if (!(value instanceof DynamicValue)) {
+      return fail(`Should have resolved to a DynamicValue`);
+    }
+    expect(value.isFromDynamicInput()).toEqual(true);
+    expect(value.node.getText()).toEqual('window.location');
+    if (!(value.reason instanceof DynamicValue)) {
+      return fail(`Should have a DynamicValue as reason`);
+    }
+    expect(value.reason.isFromExternalReference()).toEqual(true);
+    expect(value.reason.node.getText()).toEqual('window: any');
+  });
+
   it('imports work', () => {
     const {program} = makeProgram([
       {name: 'second.ts', contents: 'export function foo(bar) { return bar; }'},

From f5127f601da52d71481b37534080c21ef50075dd Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Tue, 7 May 2019 15:31:20 -0500
Subject: [PATCH 054/275] docs: add section to upgrade guide on using the
 unified location service (#30331)

The LocationUpgradeModule provides a unified way of handling URL updates
across AngularJS and Angular.

PR Close #30331
---
 aio/content/guide/upgrade.md | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index e3493a3fe2..1de9a0d605 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -838,6 +838,53 @@ After this, the service is injectable anywhere in AngularJS code:
 <code-example path="upgrade-module/src/app/a-to-ajs-providers/hero-detail.component.ts" header="hero-detail.component.ts">
 </code-example>
 
+## Using the Unified Angular Location Service
+
+AngularJS and Angular both have separate routers for configuration, handling navigation, encoding and decoding URLs, redirects, and interacting with browser APIs. When migrating from AngularJS to Angular, you have the option of running both routers to handle navigating in different parts of your application. As your migrating from AngularJS, you want to take advantage of new APIs, and move as much of this functionality to Angular.
+
+To aid in your migration from AngularJS to Angular, a unified location service is provided to shift the routing responsibility previously handled by the `$location` provider in AngularJS to Angular. 
+
+To use the `LocationUpgradeModule`, import the symbol from `@angular/common/upgrade` and add it to your `AppModule` imports using the static `LocationUpgradeModule.config()` method.
+
+```ts
+// Other imports ...
+import { LocationUpgradeModule } from '@angular/common/upgrade';
+
+@NgModule({
+  imports: [
+    // Other NgModule imports...
+    LocationUpgradeModule.config()
+  ]
+})
+export class AppModule {}
+```
+
+The `LocationUpgradeModule.config()` method accepts a configuration object that allows you configure the `LocationStrategy` with the `useHash` property, and the URL prefix with `hashPrefix` property.
+
+The `useHash` property defaults to `false`, and the `hashPrefix` defaults to an empty `string`. Pass the configuration object to override the defaults.
+
+```ts
+LocationUpgradeModule.config({
+  useHash: true
+  hashPrefix: '!'
+})
+```
+
+This registers the drop-in replacement for the `$location` provider in AngularJS. Once registered, all navigation, routing broadcast messages, and any necessary digest cycles in AngularJS triggered during navigation are handled by Angular. This gives you a single way to navigate within both sides of your hybrid application consistently. 
+
+For usage of the `$location` service as a provider in AngularJS, you need to downgrade the `$locationShim` using a factory provider.
+
+```ts
+// Other imports ...
+import { $locationShim } from '@angular/common/upgrade';
+import { downgradeInjectable } from '@angular/upgrade/static';
+
+angular.module('myHybridApp', [...])
+  .factory('$location', downgradeInjectable($locationShim));
+```
+
+Once you introduce the Angular Router, using the Angular Router triggers navigations through the unified location service, still providing a single source for navigating with AngularJS and Angular.
+
 ## Using Ahead-of-time compilation with hybrid apps
 
 You can take advantage of Ahead-of-time (AOT) compilation on hybrid apps just like on any other

From 0e923324916ba3a3544dc35cf9fa4ff87a0f216e Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Wed, 8 May 2019 09:45:40 -0500
Subject: [PATCH 055/275] refactor(common): update argument length in
 UrlCodec.areEqual method and AngularJSUrlCodec.areEqual methods (#30331)

dgeni requires that method arguments be at least 2 characters long

PR Close #30331
---
 packages/common/upgrade/src/params.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/common/upgrade/src/params.ts b/packages/common/upgrade/src/params.ts
index a357c17a51..612e15310a 100644
--- a/packages/common/upgrade/src/params.ts
+++ b/packages/common/upgrade/src/params.ts
@@ -25,7 +25,7 @@ export abstract class UrlCodec {
   abstract normalize(path: string, search: {[k: string]: unknown}, hash: string, baseUrl?: string):
       string;
 
-  abstract areEqual(a: string, b: string): boolean;
+  abstract areEqual(valA: string, valB: string): boolean;
 
   abstract parse(url: string, base?: string): {
     href: string,
@@ -134,7 +134,7 @@ export class AngularJSUrlCodec implements UrlCodec {
     }
   }
 
-  areEqual(a: string, b: string) { return this.normalize(a) === this.normalize(b); }
+  areEqual(valA: string, valB: string) { return this.normalize(valA) === this.normalize(valB); }
 
   // https://github.com/angular/angular.js/blob/864c7f0/src/ng/urlUtils.js#L60
   parse(url: string, base?: string) {

From 6cb3b50a03df161806efe411ca004279a5487eee Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Wed, 8 May 2019 09:49:11 -0500
Subject: [PATCH 056/275] docs(docs-infra): add common/upgrade to API package
 sources (#30331)

Closes #30332

PR Close #30331
---
 aio/tools/transforms/angular-api-package/index.js | 1 +
 tools/public_api_guard/common/upgrade.d.ts        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index 42d48c605e..1645490a01 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -86,6 +86,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
       'common/http/testing/index.ts',
       'common/index.ts',
       'common/testing/index.ts',
+      'common/upgrade/index.ts',
       'core/index.ts',
       'core/testing/index.ts',
       'elements/index.ts',
diff --git a/tools/public_api_guard/common/upgrade.d.ts b/tools/public_api_guard/common/upgrade.d.ts
index 420eb3411e..4ea123fffa 100644
--- a/tools/public_api_guard/common/upgrade.d.ts
+++ b/tools/public_api_guard/common/upgrade.d.ts
@@ -35,7 +35,7 @@ export declare class $locationShimProvider {
 }
 
 export declare class AngularJSUrlCodec implements UrlCodec {
-    areEqual(a: string, b: string): boolean;
+    areEqual(valA: string, valB: string): boolean;
     decodeHash(hash: string): string;
     decodePath(path: string, html5Mode?: boolean): string;
     decodeSearch(search: string): {
@@ -77,7 +77,7 @@ export declare class LocationUpgradeModule {
 }
 
 export declare abstract class UrlCodec {
-    abstract areEqual(a: string, b: string): boolean;
+    abstract areEqual(valA: string, valB: string): boolean;
     abstract decodeHash(hash: string): string;
     abstract decodePath(path: string): string;
     abstract decodeSearch(search: string): {

From bf94932c7a71c4fd19348d5e5dc2084d6abbe2c5 Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Wed, 8 May 2019 09:50:06 -0500
Subject: [PATCH 057/275] docs: add link to location upgrade config (#30331)

PR Close #30331
---
 aio/content/guide/upgrade.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index 1de9a0d605..24b074556d 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -840,9 +840,9 @@ After this, the service is injectable anywhere in AngularJS code:
 
 ## Using the Unified Angular Location Service
 
-AngularJS and Angular both have separate routers for configuration, handling navigation, encoding and decoding URLs, redirects, and interacting with browser APIs. When migrating from AngularJS to Angular, you have the option of running both routers to handle navigating in different parts of your application. As your migrating from AngularJS, you want to take advantage of new APIs, and move as much of this functionality to Angular.
+In AngularJS, the [$location service](https://docs.angularjs.org/api/ng/service/$location) handles all routing configuration and navigation, encoding and decoding of URLS, redirects, and interactions with browser APIs. Angular uses its own underlying `Location` service for all of these tasks. 
 
-To aid in your migration from AngularJS to Angular, a unified location service is provided to shift the routing responsibility previously handled by the `$location` provider in AngularJS to Angular. 
+When you migrate from AngularJS to Angular you will want to move as much responsibility as possible to Angular, so that you can take advantage of new APIs. To help with the transition, Angular provides the `LocationUpgradeModule`. This module enables a _unified_ location service that shifts responsibilities from the AngularJS `$location` service to the Angular `Location` service.
 
 To use the `LocationUpgradeModule`, import the symbol from `@angular/common/upgrade` and add it to your `AppModule` imports using the static `LocationUpgradeModule.config()` method.
 
@@ -859,7 +859,7 @@ import { LocationUpgradeModule } from '@angular/common/upgrade';
 export class AppModule {}
 ```
 
-The `LocationUpgradeModule.config()` method accepts a configuration object that allows you configure the `LocationStrategy` with the `useHash` property, and the URL prefix with `hashPrefix` property.
+The `LocationUpgradeModule.config()` method accepts a configuration object that allows you to configure options including the `LocationStrategy` with the `useHash` property, and the URL prefix with the `hashPrefix` property.
 
 The `useHash` property defaults to `false`, and the `hashPrefix` defaults to an empty `string`. Pass the configuration object to override the defaults.
 
@@ -870,7 +870,13 @@ LocationUpgradeModule.config({
 })
 ```
 
-This registers the drop-in replacement for the `$location` provider in AngularJS. Once registered, all navigation, routing broadcast messages, and any necessary digest cycles in AngularJS triggered during navigation are handled by Angular. This gives you a single way to navigate within both sides of your hybrid application consistently. 
+<div class="alert is-important">
+
+**Note:** See the `LocationUpgradeConfig` for more configuration options available to the `LocationUpgradeModule.config()` method.
+
+</div>
+
+This registers a drop-in replacement for the `$location` provider in AngularJS. Once registered, all navigation, routing broadcast messages, and any necessary digest cycles in AngularJS triggered during navigation are handled by Angular. This gives you a single way to navigate within both sides of your hybrid application consistently.
 
 For usage of the `$location` service as a provider in AngularJS, you need to downgrade the `$locationShim` using a factory provider.
 

From 739e5a4f53bcdf488b89b69e324e12dea6cdf19a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 12 Mar 2019 17:03:50 +0000
Subject: [PATCH 058/275] test: add integration test for side effects (#29329)

This new tests keeps track of the known side effects for Angular ES modules.

PR Close #29329
---
 integration/side-effects/.gitignore           |   3 +
 integration/side-effects/README.md            |   9 +
 integration/side-effects/package.json         |  19 +
 integration/side-effects/side-effects.json    | 132 ++++++
 .../snapshots/animations-browser/esm2015.js   |  14 +
 .../snapshots/animations-browser/esm5.js      |  16 +
 .../snapshots/animations/esm2015.js           |   1 +
 .../side-effects/snapshots/animations/esm5.js |   1 +
 .../side-effects/snapshots/common/esm2015.js  |   1 +
 .../side-effects/snapshots/common/esm5.js     |   3 +
 .../side-effects/snapshots/core/esm2015.js    | 151 +++++++
 .../side-effects/snapshots/core/esm5.js       |  17 +
 .../snapshots/elements/esm2015.js             |   9 +
 .../side-effects/snapshots/elements/esm5.js   |  11 +
 .../side-effects/snapshots/forms/esm2015.js   |   7 +
 .../side-effects/snapshots/forms/esm5.js      |   9 +
 .../snapshots/platform-browser/esm2015.js     |  17 +
 .../snapshots/platform-browser/esm5.js        |  19 +
 .../side-effects/snapshots/router/esm2015.js  |   9 +
 .../side-effects/snapshots/router/esm5.js     |  11 +
 integration/side-effects/yarn.lock            | 375 ++++++++++++++++++
 package.json                                  |   1 +
 yarn.lock                                     | 151 ++++++-
 23 files changed, 984 insertions(+), 2 deletions(-)
 create mode 100644 integration/side-effects/.gitignore
 create mode 100644 integration/side-effects/README.md
 create mode 100644 integration/side-effects/package.json
 create mode 100644 integration/side-effects/side-effects.json
 create mode 100644 integration/side-effects/snapshots/animations-browser/esm2015.js
 create mode 100644 integration/side-effects/snapshots/animations-browser/esm5.js
 create mode 100644 integration/side-effects/snapshots/animations/esm2015.js
 create mode 100644 integration/side-effects/snapshots/animations/esm5.js
 create mode 100644 integration/side-effects/snapshots/common/esm2015.js
 create mode 100644 integration/side-effects/snapshots/common/esm5.js
 create mode 100644 integration/side-effects/snapshots/core/esm2015.js
 create mode 100644 integration/side-effects/snapshots/core/esm5.js
 create mode 100644 integration/side-effects/snapshots/elements/esm2015.js
 create mode 100644 integration/side-effects/snapshots/elements/esm5.js
 create mode 100644 integration/side-effects/snapshots/forms/esm2015.js
 create mode 100644 integration/side-effects/snapshots/forms/esm5.js
 create mode 100644 integration/side-effects/snapshots/platform-browser/esm2015.js
 create mode 100644 integration/side-effects/snapshots/platform-browser/esm5.js
 create mode 100644 integration/side-effects/snapshots/router/esm2015.js
 create mode 100644 integration/side-effects/snapshots/router/esm5.js
 create mode 100644 integration/side-effects/yarn.lock

diff --git a/integration/side-effects/.gitignore b/integration/side-effects/.gitignore
new file mode 100644
index 0000000000..0ec6ec881c
--- /dev/null
+++ b/integration/side-effects/.gitignore
@@ -0,0 +1,3 @@
+# The check-side-effects package generates and deletes this file.
+# If the process is killed, it will be left behind.
+check-side-effects.tmp-input.js
diff --git a/integration/side-effects/README.md b/integration/side-effects/README.md
new file mode 100644
index 0000000000..b9a8146eaa
--- /dev/null
+++ b/integration/side-effects/README.md
@@ -0,0 +1,9 @@
+This test checks if the side effects for loading Angular packages have changed using <https://github.com/filipesilva/check-side-effects>.
+
+Running `yarn test` will check all ES modules listed in `side-effects.json`.
+
+Running `yarn update` will update any changed side effects.
+
+To add a new ES module to this test, add a new entry in `side-effects.json`.
+
+Usually the ESM and FESM should have the same output, but retained objects that were renamed during the flattening step will leave behind a different name.
diff --git a/integration/side-effects/package.json b/integration/side-effects/package.json
new file mode 100644
index 0000000000..d4d211ee37
--- /dev/null
+++ b/integration/side-effects/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "angular-side-effects",
+  "version": "0.0.0",
+  "license": "MIT",
+  "scripts": {
+    "test": "check-side-effects --test side-effects.json --pure-getters",
+    "update": "yarn test --update"
+  },
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/elements": "file:../../dist/packages-dist/elements",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "check-side-effects": "file:../../node_modules/check-side-effects"
+  }
+}
diff --git a/integration/side-effects/side-effects.json b/integration/side-effects/side-effects.json
new file mode 100644
index 0000000000..8ea44701f2
--- /dev/null
+++ b/integration/side-effects/side-effects.json
@@ -0,0 +1,132 @@
+{
+  "tests": [
+    {
+      "esModules": "./node_modules/@angular/animations/esm5/animations.js",
+      "expectedOutput": "./snapshots/animations/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm5/animations.js",
+      "expectedOutput": "./snapshots/animations/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/esm2015/animations.js",
+      "expectedOutput": "./snapshots/animations/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm2015/animations.js",
+      "expectedOutput": "./snapshots/animations/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/esm5/browser/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm5/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/esm2015/browser/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm2015/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/esm5/common.js",
+      "expectedOutput": "./snapshots/common/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/fesm5/common.js",
+      "expectedOutput": "./snapshots/common/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/esm2015/common.js",
+      "expectedOutput": "./snapshots/common/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/fesm2015/common.js",
+      "expectedOutput": "./snapshots/common/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/esm5/core.js",
+      "expectedOutput": "./snapshots/core/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/fesm5/core.js",
+      "expectedOutput": "./snapshots/core/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/esm2015/core.js",
+      "expectedOutput": "./snapshots/core/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/fesm2015/core.js",
+      "expectedOutput": "./snapshots/core/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/esm5/elements.js",
+      "expectedOutput": "./snapshots/elements/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/fesm5/elements.js",
+      "expectedOutput": "./snapshots/elements/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/esm2015/elements.js",
+      "expectedOutput": "./snapshots/elements/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/fesm2015/elements.js",
+      "expectedOutput": "./snapshots/elements/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/esm5/forms.js",
+      "expectedOutput": "./snapshots/forms/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/fesm5/forms.js",
+      "expectedOutput": "./snapshots/forms/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/esm2015/forms.js",
+      "expectedOutput": "./snapshots/forms/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/fesm2015/forms.js",
+      "expectedOutput": "./snapshots/forms/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/esm5/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/fesm5/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/esm2015/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/fesm2015/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/esm5/router.js",
+      "expectedOutput": "./snapshots/router/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/fesm5/router.js",
+      "expectedOutput": "./snapshots/router/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/esm2015/router.js",
+      "expectedOutput": "./snapshots/router/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/fesm2015/router.js",
+      "expectedOutput": "./snapshots/router/esm2015.js"
+    }
+  ]
+}
diff --git a/integration/side-effects/snapshots/animations-browser/esm2015.js b/integration/side-effects/snapshots/animations-browser/esm2015.js
new file mode 100644
index 0000000000..780ec46ce9
--- /dev/null
+++ b/integration/side-effects/snapshots/animations-browser/esm2015.js
@@ -0,0 +1,14 @@
+import "@angular/animations";
+
+import "@angular/core";
+
+function isNode() {
+    return "undefined" !== typeof process;
+}
+
+const _isNode = isNode();
+
+if (_isNode || "undefined" !== typeof Element) if (_isNode || Element.prototype.matches) ; else {
+    const proto = Element.prototype;
+    const fn = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector || proto.oMatchesSelector || proto.webkitMatchesSelector;
+}
diff --git a/integration/side-effects/snapshots/animations-browser/esm5.js b/integration/side-effects/snapshots/animations-browser/esm5.js
new file mode 100644
index 0000000000..729322a2d5
--- /dev/null
+++ b/integration/side-effects/snapshots/animations-browser/esm5.js
@@ -0,0 +1,16 @@
+import "tslib";
+
+import "@angular/animations";
+
+import "@angular/core";
+
+function isNode() {
+    return "undefined" !== typeof process;
+}
+
+var _isNode = isNode();
+
+if (_isNode || "undefined" !== typeof Element) if (_isNode || Element.prototype.matches) ; else {
+    var proto = Element.prototype;
+    var fn_1 = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector || proto.oMatchesSelector || proto.webkitMatchesSelector;
+}
diff --git a/integration/side-effects/snapshots/animations/esm2015.js b/integration/side-effects/snapshots/animations/esm2015.js
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/integration/side-effects/snapshots/animations/esm2015.js
@@ -0,0 +1 @@
+
diff --git a/integration/side-effects/snapshots/animations/esm5.js b/integration/side-effects/snapshots/animations/esm5.js
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/integration/side-effects/snapshots/animations/esm5.js
@@ -0,0 +1 @@
+
diff --git a/integration/side-effects/snapshots/common/esm2015.js b/integration/side-effects/snapshots/common/esm2015.js
new file mode 100644
index 0000000000..595d8ae0af
--- /dev/null
+++ b/integration/side-effects/snapshots/common/esm2015.js
@@ -0,0 +1 @@
+import "@angular/core";
diff --git a/integration/side-effects/snapshots/common/esm5.js b/integration/side-effects/snapshots/common/esm5.js
new file mode 100644
index 0000000000..783048bfcf
--- /dev/null
+++ b/integration/side-effects/snapshots/common/esm5.js
@@ -0,0 +1,3 @@
+import "@angular/core";
+
+import "tslib";
diff --git a/integration/side-effects/snapshots/core/esm2015.js b/integration/side-effects/snapshots/core/esm2015.js
new file mode 100644
index 0000000000..458c867642
--- /dev/null
+++ b/integration/side-effects/snapshots/core/esm2015.js
@@ -0,0 +1,151 @@
+import { Subject, Subscription } from "rxjs";
+
+import "rxjs/operators";
+
+function getGlobal() {
+    const __globalThis = "undefined" !== typeof globalThis && globalThis;
+    const __window = "undefined" !== typeof window && window;
+    const __self = "undefined" !== typeof self && "undefined" !== typeof WorkerGlobalScope && self instanceof WorkerGlobalScope && self;
+    const __global = "undefined" !== typeof global && global;
+    return __globalThis || __global || __window || __self;
+}
+
+const _global = getGlobal();
+
+let _symbolIterator = null;
+
+function getSymbolIterator() {
+    if (!_symbolIterator) {
+        const Symbol = _global["Symbol"];
+        if (Symbol && Symbol.iterator) _symbolIterator = Symbol.iterator; else {
+            const keys = Object.getOwnPropertyNames(Map.prototype);
+            for (let i = 0; i < keys.length; ++i) {
+                const key = keys[i];
+                if ("entries" !== key && "size" !== key && Map.prototype[key] === Map.prototype["entries"]) _symbolIterator = key;
+            }
+        }
+    }
+    return _symbolIterator;
+}
+
+if ("undefined" === typeof ngI18nClosureMode) _global["ngI18nClosureMode"] = "undefined" !== typeof goog && "function" === typeof goog.getMsg;
+
+function flatten(list, mapFn) {
+    const result = [];
+    let i = 0;
+    while (i < list.length) {
+        const item = list[i];
+        if (Array.isArray(item)) if (item.length > 0) {
+            list = item.concat(list.slice(i + 1));
+            i = 0;
+        } else i++; else {
+            result.push(mapFn ? mapFn(item) : item);
+            i++;
+        }
+    }
+    return result;
+}
+
+class EventEmitter extends Subject {
+    constructor(isAsync = false) {
+        super();
+        this.__isAsync = isAsync;
+    }
+    emit(value) {
+        super.next(value);
+    }
+    subscribe(generatorOrNext, error, complete) {
+        let schedulerFn;
+        let errorFn = err => null;
+        let completeFn = () => null;
+        if (generatorOrNext && "object" === typeof generatorOrNext) {
+            schedulerFn = this.__isAsync ? value => {
+                setTimeout(() => generatorOrNext.next(value));
+            } : value => {
+                generatorOrNext.next(value);
+            };
+            if (generatorOrNext.error) errorFn = this.__isAsync ? err => {
+                setTimeout(() => generatorOrNext.error(err));
+            } : err => {
+                generatorOrNext.error(err);
+            };
+            if (generatorOrNext.complete) completeFn = this.__isAsync ? () => {
+                setTimeout(() => generatorOrNext.complete());
+            } : () => {
+                generatorOrNext.complete();
+            };
+        } else {
+            schedulerFn = this.__isAsync ? value => {
+                setTimeout(() => generatorOrNext(value));
+            } : value => {
+                generatorOrNext(value);
+            };
+            if (error) errorFn = this.__isAsync ? err => {
+                setTimeout(() => error(err));
+            } : err => {
+                error(err);
+            };
+            if (complete) completeFn = this.__isAsync ? () => {
+                setTimeout(() => complete());
+            } : () => {
+                complete();
+            };
+        }
+        const sink = super.subscribe(schedulerFn, errorFn, completeFn);
+        if (generatorOrNext instanceof Subscription) generatorOrNext.add(sink);
+        return sink;
+    }
+}
+
+class QueryList {
+    constructor() {
+        this.dirty = true;
+        this._results = [];
+        this.changes = new EventEmitter();
+        this.length = 0;
+    }
+    map(fn) {
+        return this._results.map(fn);
+    }
+    filter(fn) {
+        return this._results.filter(fn);
+    }
+    find(fn) {
+        return this._results.find(fn);
+    }
+    reduce(fn, init) {
+        return this._results.reduce(fn, init);
+    }
+    forEach(fn) {
+        this._results.forEach(fn);
+    }
+    some(fn) {
+        return this._results.some(fn);
+    }
+    toArray() {
+        return this._results.slice();
+    }
+    [getSymbolIterator()]() {
+        return this._results[getSymbolIterator()]();
+    }
+    toString() {
+        return this._results.toString();
+    }
+    reset(resultsTree) {
+        this._results = flatten(resultsTree);
+        this.dirty = false;
+        this.length = this._results.length;
+        this.last = this._results[this.length - 1];
+        this.first = this._results[0];
+    }
+    notifyOnChanges() {
+        this.changes.emit(this);
+    }
+    setDirty() {
+        this.dirty = true;
+    }
+    destroy() {
+        this.changes.complete();
+        this.changes.unsubscribe();
+    }
+}
diff --git a/integration/side-effects/snapshots/core/esm5.js b/integration/side-effects/snapshots/core/esm5.js
new file mode 100644
index 0000000000..9f82d57120
--- /dev/null
+++ b/integration/side-effects/snapshots/core/esm5.js
@@ -0,0 +1,17 @@
+import "tslib";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+function getGlobal() {
+    var __globalThis = "undefined" !== typeof globalThis && globalThis;
+    var __window = "undefined" !== typeof window && window;
+    var __self = "undefined" !== typeof self && "undefined" !== typeof WorkerGlobalScope && self instanceof WorkerGlobalScope && self;
+    var __global = "undefined" !== typeof global && global;
+    return __globalThis || __global || __window || __self;
+}
+
+var _global = getGlobal();
+
+if ("undefined" === typeof ngI18nClosureMode) _global["ngI18nClosureMode"] = "undefined" !== typeof goog && "function" === typeof goog.getMsg;
diff --git a/integration/side-effects/snapshots/elements/esm2015.js b/integration/side-effects/snapshots/elements/esm2015.js
new file mode 100644
index 0000000000..0e8151832e
--- /dev/null
+++ b/integration/side-effects/snapshots/elements/esm2015.js
@@ -0,0 +1,9 @@
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+const elProto = Element.prototype;
+
+const matches = elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector || elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
diff --git a/integration/side-effects/snapshots/elements/esm5.js b/integration/side-effects/snapshots/elements/esm5.js
new file mode 100644
index 0000000000..07189e8bad
--- /dev/null
+++ b/integration/side-effects/snapshots/elements/esm5.js
@@ -0,0 +1,11 @@
+import "tslib";
+
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+var elProto = Element.prototype;
+
+var matches = elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector || elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
diff --git a/integration/side-effects/snapshots/forms/esm2015.js b/integration/side-effects/snapshots/forms/esm2015.js
new file mode 100644
index 0000000000..7b26ecaa69
--- /dev/null
+++ b/integration/side-effects/snapshots/forms/esm2015.js
@@ -0,0 +1,7 @@
+import "@angular/core";
+
+import "@angular/platform-browser";
+
+import "rxjs";
+
+import "rxjs/operators";
diff --git a/integration/side-effects/snapshots/forms/esm5.js b/integration/side-effects/snapshots/forms/esm5.js
new file mode 100644
index 0000000000..70eeb745ff
--- /dev/null
+++ b/integration/side-effects/snapshots/forms/esm5.js
@@ -0,0 +1,9 @@
+import "tslib";
+
+import "@angular/core";
+
+import "@angular/platform-browser";
+
+import "rxjs";
+
+import "rxjs/operators";
diff --git a/integration/side-effects/snapshots/platform-browser/esm2015.js b/integration/side-effects/snapshots/platform-browser/esm2015.js
new file mode 100644
index 0000000000..62cb36ba14
--- /dev/null
+++ b/integration/side-effects/snapshots/platform-browser/esm2015.js
@@ -0,0 +1,17 @@
+import "@angular/common";
+
+import { ɵglobal } from "@angular/core";
+
+let nodeContains;
+
+if (ɵglobal["Node"]) nodeContains = ɵglobal["Node"].prototype.contains || function(node) {
+    return !!(16 & this.compareDocumentPosition(node));
+};
+
+const ɵ0 = function(v) {
+    return "__zone_symbol__" + v;
+};
+
+const __symbol__ = "undefined" !== typeof Zone && Zone["__symbol__"] || ɵ0;
+
+const blackListedEvents = "undefined" !== typeof Zone && Zone[__symbol__("BLACK_LISTED_EVENTS")];
diff --git a/integration/side-effects/snapshots/platform-browser/esm5.js b/integration/side-effects/snapshots/platform-browser/esm5.js
new file mode 100644
index 0000000000..3608753e37
--- /dev/null
+++ b/integration/side-effects/snapshots/platform-browser/esm5.js
@@ -0,0 +1,19 @@
+import "tslib";
+
+import "@angular/common";
+
+import { ɵglobal } from "@angular/core";
+
+var nodeContains;
+
+if (ɵglobal["Node"]) nodeContains = ɵglobal["Node"].prototype.contains || function(node) {
+    return !!(16 & this.compareDocumentPosition(node));
+};
+
+var ɵ0 = function(v) {
+    return "__zone_symbol__" + v;
+};
+
+var __symbol__ = "undefined" !== typeof Zone && Zone["__symbol__"] || ɵ0;
+
+var blackListedEvents = "undefined" !== typeof Zone && Zone[__symbol__("BLACK_LISTED_EVENTS")];
diff --git a/integration/side-effects/snapshots/router/esm2015.js b/integration/side-effects/snapshots/router/esm2015.js
new file mode 100644
index 0000000000..0f9f04eb6f
--- /dev/null
+++ b/integration/side-effects/snapshots/router/esm2015.js
@@ -0,0 +1,9 @@
+import "@angular/common";
+
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+import "@angular/platform-browser";
diff --git a/integration/side-effects/snapshots/router/esm5.js b/integration/side-effects/snapshots/router/esm5.js
new file mode 100644
index 0000000000..22e1dbe38a
--- /dev/null
+++ b/integration/side-effects/snapshots/router/esm5.js
@@ -0,0 +1,11 @@
+import "tslib";
+
+import "@angular/common";
+
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+import "@angular/platform-browser";
diff --git a/integration/side-effects/yarn.lock b/integration/side-effects/yarn.lock
new file mode 100644
index 0000000000..a5c82011f4
--- /dev/null
+++ b/integration/side-effects/yarn.lock
@@ -0,0 +1,375 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@angular-devkit/build-optimizer@0.14.0-beta.5":
+  version "0.14.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.14.0-beta.5.tgz#f842a0b2717517cdc8e40704076d6182feccb81a"
+  integrity sha512-sQ86BGrd65QD9fV+wgDWNFKS2kxsZFj/lSn3pjgguV43XjGvnNlXnsVAgZOruygyXjB/afEOkNpO/4sKFNxiMw==
+  dependencies:
+    loader-utils "1.2.3"
+    source-map "0.5.6"
+    typescript "3.2.4"
+    webpack-sources "1.3.0"
+
+"@angular/animations@file:../../dist/packages-dist/animations":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/common@file:../../dist/packages-dist/common":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/core@file:../../dist/packages-dist/core":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/elements@file:../../dist/packages-dist/elements":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/forms@file:../../dist/packages-dist/forms":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/router@file:../../dist/packages-dist/router":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
+"@types/node@*":
+  version "11.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.1.tgz#9ee55ffce20f72e141863b0036a6e51c6fc09a1f"
+  integrity sha512-2azXFP9n4aA2QNLkKm/F9pzKxgYj1SMawZ5Eh9iC21RH3XNcFsivLVU2NhpMgQm7YobSByvIol4c42ZFusXFHQ==
+
+"@types/node@^11.13.9":
+  version "11.13.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.10.tgz#4df59e5966b56f512bac98898bcbee5067411f0f"
+  integrity sha512-leUNzbFTMX94TWaIKz8N15Chu55F9QSH+INKayQr5xpkasBQBRF3qQXfo3/dOnMU/dEIit+Y/SU8HyOjq++GwA==
+
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
+acorn@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+builtin-modules@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
+  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+"check-side-effects@file:../../node_modules/check-side-effects":
+  version "0.0.20"
+  dependencies:
+    "@angular-devkit/build-optimizer" "0.14.0-beta.5"
+    minimist "~1.2.0"
+    rollup "~1.11.3"
+    rollup-plugin-node-resolve "~4.2.3"
+    rollup-plugin-terser "~4.0.4"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+commander@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+jest-worker@^24.0.0:
+  version "24.4.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.4.0.tgz#fbc452b0120bb5c2a70cdc88fa132b48eeb11dd0"
+  integrity sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^1.0.1"
+    supports-color "^6.1.0"
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+loader-utils@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
+minimist@^1.2.0, minimist@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+
+readable-stream@^2.0.1:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+resolve@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+  dependencies:
+    path-parse "^1.0.6"
+
+rollup-plugin-node-resolve@~4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.3.tgz#638a373a54287d19fcc088fdd1c6fd8a58e4d90a"
+  integrity sha512-r+WaesPzdGEynpLZLALFEDugA4ACa5zn7bc/+LVX4vAXQQ8IgDHv0xfsSvJ8tDXUtprfBtrDtRFg27ifKjcJTg==
+  dependencies:
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.10.0"
+
+rollup-plugin-terser@~4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz#6f661ef284fa7c27963d242601691dc3d23f994e"
+  integrity sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    jest-worker "^24.0.0"
+    serialize-javascript "^1.6.1"
+    terser "^3.14.1"
+
+rollup@~1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.11.3.tgz#6f436db2a2d6b63f808bf60ad01a177643dedb81"
+  integrity sha512-81MR7alHcFKxgWzGfG7jSdv+JQxSOIOD/Fa3iNUmpzbd7p+V19e1l9uffqT8/7YAHgGOzmoPGN3Fx3L2ptOf5g==
+  dependencies:
+    "@types/estree" "0.0.39"
+    "@types/node" "^11.13.9"
+    acorn "^6.1.1"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+serialize-javascript@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-map-support@~0.5.10:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
+  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+
+source-map@^0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+terser@^3.14.1:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+
+typescript@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+webpack-sources@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
diff --git a/package.json b/package.json
index 907b9a7bfb..8f99a0ad9e 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
     "@types/minimist": "^1.2.0",
     "@types/systemjs": "0.19.32",
     "browserstacktunnel-wrapper": "2.0.1",
+    "check-side-effects": "0.0.20",
     "clang-format": "1.0.41",
     "cldr": "4.10.0",
     "cldr-data-downloader": "0.3.2",
diff --git a/yarn.lock b/yarn.lock
index 1907ddbbfd..d7e6cc0af0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,6 +10,16 @@
     "@angular-devkit/core" "8.0.0-beta.15"
     rxjs "6.4.0"
 
+"@angular-devkit/build-optimizer@0.14.0-beta.5":
+  version "0.14.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.14.0-beta.5.tgz#f842a0b2717517cdc8e40704076d6182feccb81a"
+  integrity sha512-sQ86BGrd65QD9fV+wgDWNFKS2kxsZFj/lSn3pjgguV43XjGvnNlXnsVAgZOruygyXjB/afEOkNpO/4sKFNxiMw==
+  dependencies:
+    loader-utils "1.2.3"
+    source-map "0.5.6"
+    typescript "3.2.4"
+    webpack-sources "1.3.0"
+
 "@angular-devkit/build-optimizer@^0.800.0-beta.15":
   version "0.800.0-beta.15"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.0-beta.15.tgz#1474df7321ec90e7a2ce95a8fdb65fe44c1bb201"
@@ -64,6 +74,22 @@
     universal-analytics "^0.4.20"
     uuid "^3.3.2"
 
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
 "@bazel/bazel-darwin_x64@0.26.0-rc5":
   version "0.26.0-rc5"
   resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.0-rc5.tgz#237a564ee03abe16ced3622624e40fb5564a9d54"
@@ -528,11 +554,23 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
   integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
+"@types/node@^11.13.9":
+  version "11.13.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.10.tgz#4df59e5966b56f512bac98898bcbee5067411f0f"
+  integrity sha512-leUNzbFTMX94TWaIKz8N15Chu55F9QSH+INKayQr5xpkasBQBRF3qQXfo3/dOnMU/dEIit+Y/SU8HyOjq++GwA==
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
   integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/rx-core-binding@*":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
@@ -765,6 +803,11 @@ acorn@^6.0.5:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
   integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
 
+acorn@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -1747,6 +1790,11 @@ builtin-modules@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1"
   integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==
 
+builtin-modules@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
+  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
@@ -1927,7 +1975,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1951,6 +1999,17 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
+check-side-effects@0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/check-side-effects/-/check-side-effects-0.0.20.tgz#b35cbb1f2eb210c1a051c7d78aa9fbd939ee31ea"
+  integrity sha512-tx7dvqAK0z8PM/gTTnfi6oW1Scn9f8EbMSZ1mu//4oIpNWF6ZNW2SFX7Cnsgq9xZjYeoD+YaUVx9CC0fEFizkQ==
+  dependencies:
+    "@angular-devkit/build-optimizer" "0.14.0-beta.5"
+    minimist "~1.2.0"
+    rollup "~1.11.3"
+    rollup-plugin-node-resolve "~4.2.3"
+    rollup-plugin-terser "~4.0.4"
+
 chokidar@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -2327,6 +2386,11 @@ commander@^2.13.0, commander@^2.7.1, commander@^2.8.1, commander@~2.19.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
+commander@^2.19.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
 commander@^2.5.0, commander@^2.9.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
@@ -6067,6 +6131,14 @@ jasminewd2@^2.1.0:
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
+jest-worker@^24.0.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
+  integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
+  dependencies:
+    merge-stream "^1.0.1"
+    supports-color "^6.1.0"
+
 jetpack-id@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/jetpack-id/-/jetpack-id-0.0.4.tgz#6fc35a394a4aea190820a2ce7f23d2bb53512a9b"
@@ -6157,6 +6229,11 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -7212,6 +7289,13 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
 methmeth@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/methmeth/-/methmeth-1.1.0.tgz#e80a26618e52f5c4222861bb748510bd10e29089"
@@ -7381,7 +7465,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -9421,6 +9505,16 @@ rollup-plugin-node-resolve@^4.0.0:
     is-module "^1.0.0"
     resolve "^1.10.0"
 
+rollup-plugin-node-resolve@~4.2.3:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.4.tgz#7d370f8d6fd3031006a0032c38262dd9be3c6250"
+  integrity sha512-t/64I6l7fZ9BxqD3XlX4ZeO6+5RLKyfpwE2CiPNUKa+GocPlQhf/C208ou8y3AwtNsc6bjSk/8/6y/YAyxCIvw==
+  dependencies:
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.10.0"
+
 rollup-plugin-sourcemaps@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
@@ -9429,6 +9523,16 @@ rollup-plugin-sourcemaps@^0.4.2:
     rollup-pluginutils "^2.0.1"
     source-map-resolve "^0.5.0"
 
+rollup-plugin-terser@~4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz#6f661ef284fa7c27963d242601691dc3d23f994e"
+  integrity sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    jest-worker "^24.0.0"
+    serialize-javascript "^1.6.1"
+    terser "^3.14.1"
+
 rollup-pluginutils@^2.0.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4"
@@ -9462,6 +9566,15 @@ rollup@^1.1.0:
     "@types/node" "*"
     acorn "^6.0.5"
 
+rollup@~1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.11.3.tgz#6f436db2a2d6b63f808bf60ad01a177643dedb81"
+  integrity sha512-81MR7alHcFKxgWzGfG7jSdv+JQxSOIOD/Fa3iNUmpzbd7p+V19e1l9uffqT8/7YAHgGOzmoPGN3Fx3L2ptOf5g==
+  dependencies:
+    "@types/estree" "0.0.39"
+    "@types/node" "^11.13.9"
+    acorn "^6.1.1"
+
 router@^1.3.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/router/-/router-1.3.3.tgz#c142f6b5ea4d6b3359022ca95b6580bd217f89cf"
@@ -9686,6 +9799,11 @@ sequencify@~0.0.7:
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
   integrity sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=
 
+serialize-javascript@^1.6.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
+  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
+
 serializerr@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/serializerr/-/serializerr-1.0.3.tgz#12d4c5aa1c3ffb8f6d1dc5f395aa9455569c3f91"
@@ -10003,6 +10121,14 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
+source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -10503,6 +10629,13 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -10559,6 +10692,15 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
+terser@^3.14.1:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
 test-exclude@^5.2.2:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
@@ -10930,6 +11072,11 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+
 typescript@3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.3.tgz#0eb320e4ace9b10eadf5bc6103286b0f8b7c224f"

From ac34a1429be08e05b110b87f8224d0c25e61a0ef Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 2 May 2019 16:44:24 +0100
Subject: [PATCH 059/275] refactor: remove toplevel property accesses (#29329)

PR Close #29329
---
 integration/_payload-limits.json              |   2 +-
 .../snapshots/animations-browser/esm2015.js   |  11 -
 .../snapshots/animations-browser/esm5.js      |  11 -
 .../snapshots/elements/esm2015.js             |   4 -
 .../side-effects/snapshots/elements/esm5.js   |   4 -
 .../snapshots/platform-browser/esm2015.js     |  16 +-
 .../snapshots/platform-browser/esm5.js        |  16 +-
 package.json                                  |   1 +
 .../web_animations_style_normalizer.ts        |   7 +-
 .../animations/browser/src/render/shared.ts   |  22 +-
 packages/core/src/di/injector.ts              |   5 +-
 packages/core/src/render3/empty.ts            |   4 +
 .../core/src/render3/instructions/shared.ts   |   2 +-
 .../core/src/render3/interfaces/injector.ts   |   4 +-
 packages/core/src/render3/jit/environment.ts  | 243 +++++++++---------
 packages/core/src/render3/util/misc_utils.ts  |   7 +-
 packages/core/src/util/empty.ts               |   4 +
 packages/core/src/util/microtask.ts           |   3 +-
 .../core/src/util/ng_i18n_closure_mode.ts     |   4 +
 .../cyclic_import/bundle.golden_symbols.json  |   3 -
 .../hello_world/bundle.golden_symbols.json    |   3 -
 .../bundling/todo/bundle.golden_symbols.json  |   3 -
 packages/elements/src/utils.ts                |   8 +-
 packages/forms/src/directives/ng_form.ts      |   2 +-
 packages/forms/src/directives/ng_model.ts     |   2 +-
 packages/http/src/static_request.ts           |   6 +-
 .../src/browser/browser_adapter.ts            |  14 +-
 .../src/dom/debug/ng_probe.ts                 |  25 +-
 .../platform-browser/src/dom/dom_renderer.ts  |   2 +-
 .../src/dom/events/dom_events.ts              |  24 +-
 tslint.json                                   |  17 +-
 yarn.lock                                     |   5 +
 32 files changed, 231 insertions(+), 253 deletions(-)

diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
index edcb9b1800..1b13ca56bd 100644
--- a/integration/_payload-limits.json
+++ b/integration/_payload-limits.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1497,
-        "main": 164945,
+        "main": 166739,
         "polyfills": 43626
       }
     }
diff --git a/integration/side-effects/snapshots/animations-browser/esm2015.js b/integration/side-effects/snapshots/animations-browser/esm2015.js
index 780ec46ce9..a23be397a1 100644
--- a/integration/side-effects/snapshots/animations-browser/esm2015.js
+++ b/integration/side-effects/snapshots/animations-browser/esm2015.js
@@ -1,14 +1,3 @@
 import "@angular/animations";
 
 import "@angular/core";
-
-function isNode() {
-    return "undefined" !== typeof process;
-}
-
-const _isNode = isNode();
-
-if (_isNode || "undefined" !== typeof Element) if (_isNode || Element.prototype.matches) ; else {
-    const proto = Element.prototype;
-    const fn = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector || proto.oMatchesSelector || proto.webkitMatchesSelector;
-}
diff --git a/integration/side-effects/snapshots/animations-browser/esm5.js b/integration/side-effects/snapshots/animations-browser/esm5.js
index 729322a2d5..58aec1ffc5 100644
--- a/integration/side-effects/snapshots/animations-browser/esm5.js
+++ b/integration/side-effects/snapshots/animations-browser/esm5.js
@@ -3,14 +3,3 @@ import "tslib";
 import "@angular/animations";
 
 import "@angular/core";
-
-function isNode() {
-    return "undefined" !== typeof process;
-}
-
-var _isNode = isNode();
-
-if (_isNode || "undefined" !== typeof Element) if (_isNode || Element.prototype.matches) ; else {
-    var proto = Element.prototype;
-    var fn_1 = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector || proto.oMatchesSelector || proto.webkitMatchesSelector;
-}
diff --git a/integration/side-effects/snapshots/elements/esm2015.js b/integration/side-effects/snapshots/elements/esm2015.js
index 0e8151832e..38f33e40ed 100644
--- a/integration/side-effects/snapshots/elements/esm2015.js
+++ b/integration/side-effects/snapshots/elements/esm2015.js
@@ -3,7 +3,3 @@ import "@angular/core";
 import "rxjs";
 
 import "rxjs/operators";
-
-const elProto = Element.prototype;
-
-const matches = elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector || elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
diff --git a/integration/side-effects/snapshots/elements/esm5.js b/integration/side-effects/snapshots/elements/esm5.js
index 07189e8bad..4500888aa3 100644
--- a/integration/side-effects/snapshots/elements/esm5.js
+++ b/integration/side-effects/snapshots/elements/esm5.js
@@ -5,7 +5,3 @@ import "@angular/core";
 import "rxjs";
 
 import "rxjs/operators";
-
-var elProto = Element.prototype;
-
-var matches = elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector || elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
diff --git a/integration/side-effects/snapshots/platform-browser/esm2015.js b/integration/side-effects/snapshots/platform-browser/esm2015.js
index 62cb36ba14..aa3513a190 100644
--- a/integration/side-effects/snapshots/platform-browser/esm2015.js
+++ b/integration/side-effects/snapshots/platform-browser/esm2015.js
@@ -1,17 +1,3 @@
 import "@angular/common";
 
-import { ɵglobal } from "@angular/core";
-
-let nodeContains;
-
-if (ɵglobal["Node"]) nodeContains = ɵglobal["Node"].prototype.contains || function(node) {
-    return !!(16 & this.compareDocumentPosition(node));
-};
-
-const ɵ0 = function(v) {
-    return "__zone_symbol__" + v;
-};
-
-const __symbol__ = "undefined" !== typeof Zone && Zone["__symbol__"] || ɵ0;
-
-const blackListedEvents = "undefined" !== typeof Zone && Zone[__symbol__("BLACK_LISTED_EVENTS")];
+import "@angular/core";
diff --git a/integration/side-effects/snapshots/platform-browser/esm5.js b/integration/side-effects/snapshots/platform-browser/esm5.js
index 3608753e37..013438f340 100644
--- a/integration/side-effects/snapshots/platform-browser/esm5.js
+++ b/integration/side-effects/snapshots/platform-browser/esm5.js
@@ -2,18 +2,4 @@ import "tslib";
 
 import "@angular/common";
 
-import { ɵglobal } from "@angular/core";
-
-var nodeContains;
-
-if (ɵglobal["Node"]) nodeContains = ɵglobal["Node"].prototype.contains || function(node) {
-    return !!(16 & this.compareDocumentPosition(node));
-};
-
-var ɵ0 = function(v) {
-    return "__zone_symbol__" + v;
-};
-
-var __symbol__ = "undefined" !== typeof Zone && Zone["__symbol__"] || ɵ0;
-
-var blackListedEvents = "undefined" !== typeof Zone && Zone[__symbol__("BLACK_LISTED_EVENTS")];
+import "@angular/core";
diff --git a/package.json b/package.json
index 8f99a0ad9e..c3cfaa216c 100644
--- a/package.json
+++ b/package.json
@@ -155,6 +155,7 @@
     "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz",
     "semver": "5.4.1",
     "tslint-eslint-rules": "4.1.1",
+    "tslint-no-toplevel-property-access": "0.0.2",
     "tsutils": "2.27.2",
     "universal-analytics": "0.4.15",
     "vlq": "0.2.2",
diff --git a/packages/animations/browser/src/dsl/style_normalization/web_animations_style_normalizer.ts b/packages/animations/browser/src/dsl/style_normalization/web_animations_style_normalizer.ts
index 2a79684e90..9cefed0d08 100644
--- a/packages/animations/browser/src/dsl/style_normalization/web_animations_style_normalizer.ts
+++ b/packages/animations/browser/src/dsl/style_normalization/web_animations_style_normalizer.ts
@@ -34,9 +34,10 @@ export class WebAnimationsStyleNormalizer extends AnimationStyleNormalizer {
   }
 }
 
-const DIMENSIONAL_PROP_MAP = makeBooleanMap(
-    'width,height,minWidth,minHeight,maxWidth,maxHeight,left,top,bottom,right,fontSize,outlineWidth,outlineOffset,paddingTop,paddingLeft,paddingBottom,paddingRight,marginTop,marginLeft,marginBottom,marginRight,borderRadius,borderWidth,borderTopWidth,borderLeftWidth,borderRightWidth,borderBottomWidth,textIndent,perspective'
-        .split(','));
+const DIMENSIONAL_PROP_MAP =
+    (() => makeBooleanMap(
+         'width,height,minWidth,minHeight,maxWidth,maxHeight,left,top,bottom,right,fontSize,outlineWidth,outlineOffset,paddingTop,paddingLeft,paddingBottom,paddingRight,marginTop,marginLeft,marginBottom,marginRight,borderRadius,borderWidth,borderTopWidth,borderLeftWidth,borderRightWidth,borderBottomWidth,textIndent,perspective'
+             .split(',')))();
 
 function makeBooleanMap(keys: string[]): {[key: string]: boolean} {
   const map: {[key: string]: boolean} = {};
diff --git a/packages/animations/browser/src/render/shared.ts b/packages/animations/browser/src/render/shared.ts
index 9d769e0b2f..81f769d713 100644
--- a/packages/animations/browser/src/render/shared.ts
+++ b/packages/animations/browser/src/render/shared.ts
@@ -158,16 +158,20 @@ if (_isNode || typeof Element !== 'undefined') {
   // this is well supported in all browsers
   _contains = (elm1: any, elm2: any) => { return elm1.contains(elm2) as boolean; };
 
-  if (_isNode || Element.prototype.matches) {
-    _matches = (element: any, selector: string) => element.matches(selector);
-  } else {
-    const proto = Element.prototype as any;
-    const fn = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector ||
-        proto.oMatchesSelector || proto.webkitMatchesSelector;
-    if (fn) {
-      _matches = (element: any, selector: string) => fn.apply(element, [selector]);
+  _matches = (() => {
+    if (_isNode || Element.prototype.matches) {
+      return (element: any, selector: string) => element.matches(selector);
+    } else {
+      const proto = Element.prototype as any;
+      const fn = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector ||
+          proto.oMatchesSelector || proto.webkitMatchesSelector;
+      if (fn) {
+        return (element: any, selector: string) => fn.apply(element, [selector]);
+      } else {
+        return _matches;
+      }
     }
-  }
+  })();
 
   _query = (element: any, selector: string, multi: boolean): any[] => {
     let results: any[] = [];
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index cff4e614e7..3216018e5a 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -117,7 +117,6 @@ const enum OptionFlags {
   CheckParent = 1 << 2,
   Default = CheckSelf | CheckParent
 }
-const NULL_INJECTOR = Injector.NULL;
 const NO_NEW_LINE = 'ɵ';
 
 export class StaticInjector implements Injector {
@@ -127,7 +126,7 @@ export class StaticInjector implements Injector {
   private _records: Map<any, Record>;
 
   constructor(
-      providers: StaticProvider[], parent: Injector = NULL_INJECTOR, source: string|null = null) {
+      providers: StaticProvider[], parent: Injector = Injector.NULL, source: string|null = null) {
     this.parent = parent;
     this.source = source;
     const records = this._records = new Map<any, Record>();
@@ -304,7 +303,7 @@ function resolveToken(
               records,
               // If we don't know how to resolve dependency and we should not check parent for it,
               // than pass in Null injector.
-              !childRecord && !(options & OptionFlags.CheckParent) ? NULL_INJECTOR : parent,
+              !childRecord && !(options & OptionFlags.CheckParent) ? Injector.NULL : parent,
               options & OptionFlags.Optional ? null : Injector.THROW_IF_NOT_FOUND,
               InjectFlags.Default));
         }
diff --git a/packages/core/src/render3/empty.ts b/packages/core/src/render3/empty.ts
index a3870a64cd..d0494193fd 100644
--- a/packages/core/src/render3/empty.ts
+++ b/packages/core/src/render3/empty.ts
@@ -19,6 +19,10 @@ export const EMPTY_ARRAY: any[] = [];
 
 // freezing the values prevents any code from accidentally inserting new values in
 if (typeof ngDevMode !== 'undefined' && ngDevMode) {
+  // These property accesses can be ignored because ngDevMode will be set to false
+  // when optimizing code and the whole if statement will be dropped.
+  // tslint:disable-next-line:no-toplevel-property-access
   Object.freeze(EMPTY_OBJ);
+  // tslint:disable-next-line:no-toplevel-property-access
   Object.freeze(EMPTY_ARRAY);
 }
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 06154bae14..df17271738 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -45,7 +45,7 @@ import {getComponentViewByIndex, getNativeByIndex, getNativeByTNode, getTNode, i
  * A permanent marker promise which signifies that the current CD tree is
  * clean.
  */
-const _CLEAN_PROMISE = Promise.resolve(null);
+const _CLEAN_PROMISE = (() => Promise.resolve(null))();
 
 export const enum BindingDirection {
   Input,
diff --git a/packages/core/src/render3/interfaces/injector.ts b/packages/core/src/render3/interfaces/injector.ts
index e3c0e5541e..5fc27c72fe 100644
--- a/packages/core/src/render3/interfaces/injector.ts
+++ b/packages/core/src/render3/interfaces/injector.ts
@@ -241,10 +241,10 @@ export class NodeInjectorFactory {
   }
 }
 
-const FactoryPrototype = NodeInjectorFactory.prototype;
 export function isFactory(obj: any): obj is NodeInjectorFactory {
   // See: https://jsperf.com/instanceof-vs-getprototypeof
-  return obj !== null && typeof obj == 'object' && Object.getPrototypeOf(obj) == FactoryPrototype;
+  return obj !== null && typeof obj == 'object' &&
+      Object.getPrototypeOf(obj) == NodeInjectorFactory.prototype;
 }
 
 // Note: This hack is necessary so we don't erroneously get a circular dependency
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index e4a070f611..1518a0e7f6 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -17,125 +17,126 @@ import * as sanitization from '../../sanitization/sanitization';
  *
  * This should be kept up to date with the public exports of @angular/core.
  */
-export const angularCoreEnv: {[name: string]: Function} = {
-  'ΔdefineBase': r3.ΔdefineBase,
-  'ΔdefineComponent': r3.ΔdefineComponent,
-  'ΔdefineDirective': r3.ΔdefineDirective,
-  'ΔdefineInjectable': ΔdefineInjectable,
-  'ΔdefineInjector': ΔdefineInjector,
-  'ΔdefineNgModule': r3.ΔdefineNgModule,
-  'ΔdefinePipe': r3.ΔdefinePipe,
-  'ΔdirectiveInject': r3.ΔdirectiveInject,
-  'ΔgetFactoryOf': r3.ΔgetFactoryOf,
-  'ΔgetInheritedFactory': r3.ΔgetInheritedFactory,
-  'Δinject': Δinject,
-  'ΔinjectAttribute': r3.ΔinjectAttribute,
-  'ΔtemplateRefExtractor': r3.ΔtemplateRefExtractor,
-  'ΔNgOnChangesFeature': r3.ΔNgOnChangesFeature,
-  'ΔProvidersFeature': r3.ΔProvidersFeature,
-  'ΔInheritDefinitionFeature': r3.ΔInheritDefinitionFeature,
-  'ΔelementAttribute': r3.ΔelementAttribute,
-  'Δbind': r3.Δbind,
-  'Δcontainer': r3.Δcontainer,
-  'ΔnextContext': r3.ΔnextContext,
-  'ΔcontainerRefreshStart': r3.ΔcontainerRefreshStart,
-  'ΔcontainerRefreshEnd': r3.ΔcontainerRefreshEnd,
-  'ΔnamespaceHTML': r3.ΔnamespaceHTML,
-  'ΔnamespaceMathML': r3.ΔnamespaceMathML,
-  'ΔnamespaceSVG': r3.ΔnamespaceSVG,
-  'ΔenableBindings': r3.ΔenableBindings,
-  'ΔdisableBindings': r3.ΔdisableBindings,
-  'ΔallocHostVars': r3.ΔallocHostVars,
-  'ΔelementStart': r3.ΔelementStart,
-  'ΔelementEnd': r3.ΔelementEnd,
-  'Δelement': r3.Δelement,
-  'ΔelementContainerStart': r3.ΔelementContainerStart,
-  'ΔelementContainerEnd': r3.ΔelementContainerEnd,
-  'ΔpureFunction0': r3.ΔpureFunction0,
-  'ΔpureFunction1': r3.ΔpureFunction1,
-  'ΔpureFunction2': r3.ΔpureFunction2,
-  'ΔpureFunction3': r3.ΔpureFunction3,
-  'ΔpureFunction4': r3.ΔpureFunction4,
-  'ΔpureFunction5': r3.ΔpureFunction5,
-  'ΔpureFunction6': r3.ΔpureFunction6,
-  'ΔpureFunction7': r3.ΔpureFunction7,
-  'ΔpureFunction8': r3.ΔpureFunction8,
-  'ΔpureFunctionV': r3.ΔpureFunctionV,
-  'ΔgetCurrentView': r3.ΔgetCurrentView,
-  'ΔrestoreView': r3.ΔrestoreView,
-  'Δinterpolation1': r3.Δinterpolation1,
-  'Δinterpolation2': r3.Δinterpolation2,
-  'Δinterpolation3': r3.Δinterpolation3,
-  'Δinterpolation4': r3.Δinterpolation4,
-  'Δinterpolation5': r3.Δinterpolation5,
-  'Δinterpolation6': r3.Δinterpolation6,
-  'Δinterpolation7': r3.Δinterpolation7,
-  'Δinterpolation8': r3.Δinterpolation8,
-  'ΔinterpolationV': r3.ΔinterpolationV,
-  'Δlistener': r3.Δlistener,
-  'Δload': r3.Δload,
-  'Δprojection': r3.Δprojection,
-  'ΔelementProperty': r3.ΔelementProperty,
-  'ΔcomponentHostSyntheticProperty': r3.ΔcomponentHostSyntheticProperty,
-  'ΔcomponentHostSyntheticListener': r3.ΔcomponentHostSyntheticListener,
-  'ΔpipeBind1': r3.ΔpipeBind1,
-  'ΔpipeBind2': r3.ΔpipeBind2,
-  'ΔpipeBind3': r3.ΔpipeBind3,
-  'ΔpipeBind4': r3.ΔpipeBind4,
-  'ΔpipeBindV': r3.ΔpipeBindV,
-  'ΔprojectionDef': r3.ΔprojectionDef,
-  'Δproperty': r3.Δproperty,
-  'ΔpropertyInterpolate': r3.ΔpropertyInterpolate,
-  'ΔpropertyInterpolate1': r3.ΔpropertyInterpolate1,
-  'ΔpropertyInterpolate2': r3.ΔpropertyInterpolate2,
-  'ΔpropertyInterpolate3': r3.ΔpropertyInterpolate3,
-  'ΔpropertyInterpolate4': r3.ΔpropertyInterpolate4,
-  'ΔpropertyInterpolate5': r3.ΔpropertyInterpolate5,
-  'ΔpropertyInterpolate6': r3.ΔpropertyInterpolate6,
-  'ΔpropertyInterpolate7': r3.ΔpropertyInterpolate7,
-  'ΔpropertyInterpolate8': r3.ΔpropertyInterpolate8,
-  'ΔpropertyInterpolateV': r3.ΔpropertyInterpolateV,
-  'Δpipe': r3.Δpipe,
-  'ΔqueryRefresh': r3.ΔqueryRefresh,
-  'ΔviewQuery': r3.ΔviewQuery,
-  'ΔstaticViewQuery': r3.ΔstaticViewQuery,
-  'ΔstaticContentQuery': r3.ΔstaticContentQuery,
-  'ΔloadViewQuery': r3.ΔloadViewQuery,
-  'ΔcontentQuery': r3.ΔcontentQuery,
-  'ΔloadContentQuery': r3.ΔloadContentQuery,
-  'Δreference': r3.Δreference,
-  'ΔelementHostAttrs': r3.ΔelementHostAttrs,
-  'ΔclassMap': r3.ΔclassMap,
-  'Δstyling': r3.Δstyling,
-  'ΔstyleMap': r3.ΔstyleMap,
-  'ΔstyleProp': r3.ΔstyleProp,
-  'ΔstylingApply': r3.ΔstylingApply,
-  'ΔclassProp': r3.ΔclassProp,
-  'Δselect': r3.Δselect,
-  'Δtemplate': r3.Δtemplate,
-  'Δtext': r3.Δtext,
-  'ΔtextBinding': r3.ΔtextBinding,
-  'ΔembeddedViewStart': r3.ΔembeddedViewStart,
-  'ΔembeddedViewEnd': r3.ΔembeddedViewEnd,
-  'Δi18n': r3.Δi18n,
-  'Δi18nAttributes': r3.Δi18nAttributes,
-  'Δi18nExp': r3.Δi18nExp,
-  'Δi18nStart': r3.Δi18nStart,
-  'Δi18nEnd': r3.Δi18nEnd,
-  'Δi18nApply': r3.Δi18nApply,
-  'Δi18nPostprocess': r3.Δi18nPostprocess,
-  'Δi18nLocalize': r3.Δi18nLocalize,
-  'ΔresolveWindow': r3.ΔresolveWindow,
-  'ΔresolveDocument': r3.ΔresolveDocument,
-  'ΔresolveBody': r3.ΔresolveBody,
-  'ΔsetComponentScope': r3.ΔsetComponentScope,
-  'ΔsetNgModuleScope': r3.ΔsetNgModuleScope,
+export const angularCoreEnv: {[name: string]: Function} =
+    (() => ({
+       'ΔdefineBase': r3.ΔdefineBase,
+       'ΔdefineComponent': r3.ΔdefineComponent,
+       'ΔdefineDirective': r3.ΔdefineDirective,
+       'ΔdefineInjectable': ΔdefineInjectable,
+       'ΔdefineInjector': ΔdefineInjector,
+       'ΔdefineNgModule': r3.ΔdefineNgModule,
+       'ΔdefinePipe': r3.ΔdefinePipe,
+       'ΔdirectiveInject': r3.ΔdirectiveInject,
+       'ΔgetFactoryOf': r3.ΔgetFactoryOf,
+       'ΔgetInheritedFactory': r3.ΔgetInheritedFactory,
+       'Δinject': Δinject,
+       'ΔinjectAttribute': r3.ΔinjectAttribute,
+       'ΔtemplateRefExtractor': r3.ΔtemplateRefExtractor,
+       'ΔNgOnChangesFeature': r3.ΔNgOnChangesFeature,
+       'ΔProvidersFeature': r3.ΔProvidersFeature,
+       'ΔInheritDefinitionFeature': r3.ΔInheritDefinitionFeature,
+       'ΔelementAttribute': r3.ΔelementAttribute,
+       'Δbind': r3.Δbind,
+       'Δcontainer': r3.Δcontainer,
+       'ΔnextContext': r3.ΔnextContext,
+       'ΔcontainerRefreshStart': r3.ΔcontainerRefreshStart,
+       'ΔcontainerRefreshEnd': r3.ΔcontainerRefreshEnd,
+       'ΔnamespaceHTML': r3.ΔnamespaceHTML,
+       'ΔnamespaceMathML': r3.ΔnamespaceMathML,
+       'ΔnamespaceSVG': r3.ΔnamespaceSVG,
+       'ΔenableBindings': r3.ΔenableBindings,
+       'ΔdisableBindings': r3.ΔdisableBindings,
+       'ΔallocHostVars': r3.ΔallocHostVars,
+       'ΔelementStart': r3.ΔelementStart,
+       'ΔelementEnd': r3.ΔelementEnd,
+       'Δelement': r3.Δelement,
+       'ΔelementContainerStart': r3.ΔelementContainerStart,
+       'ΔelementContainerEnd': r3.ΔelementContainerEnd,
+       'ΔpureFunction0': r3.ΔpureFunction0,
+       'ΔpureFunction1': r3.ΔpureFunction1,
+       'ΔpureFunction2': r3.ΔpureFunction2,
+       'ΔpureFunction3': r3.ΔpureFunction3,
+       'ΔpureFunction4': r3.ΔpureFunction4,
+       'ΔpureFunction5': r3.ΔpureFunction5,
+       'ΔpureFunction6': r3.ΔpureFunction6,
+       'ΔpureFunction7': r3.ΔpureFunction7,
+       'ΔpureFunction8': r3.ΔpureFunction8,
+       'ΔpureFunctionV': r3.ΔpureFunctionV,
+       'ΔgetCurrentView': r3.ΔgetCurrentView,
+       'ΔrestoreView': r3.ΔrestoreView,
+       'Δinterpolation1': r3.Δinterpolation1,
+       'Δinterpolation2': r3.Δinterpolation2,
+       'Δinterpolation3': r3.Δinterpolation3,
+       'Δinterpolation4': r3.Δinterpolation4,
+       'Δinterpolation5': r3.Δinterpolation5,
+       'Δinterpolation6': r3.Δinterpolation6,
+       'Δinterpolation7': r3.Δinterpolation7,
+       'Δinterpolation8': r3.Δinterpolation8,
+       'ΔinterpolationV': r3.ΔinterpolationV,
+       'Δlistener': r3.Δlistener,
+       'Δload': r3.Δload,
+       'Δprojection': r3.Δprojection,
+       'ΔelementProperty': r3.ΔelementProperty,
+       'ΔcomponentHostSyntheticProperty': r3.ΔcomponentHostSyntheticProperty,
+       'ΔcomponentHostSyntheticListener': r3.ΔcomponentHostSyntheticListener,
+       'ΔpipeBind1': r3.ΔpipeBind1,
+       'ΔpipeBind2': r3.ΔpipeBind2,
+       'ΔpipeBind3': r3.ΔpipeBind3,
+       'ΔpipeBind4': r3.ΔpipeBind4,
+       'ΔpipeBindV': r3.ΔpipeBindV,
+       'ΔprojectionDef': r3.ΔprojectionDef,
+       'Δproperty': r3.Δproperty,
+       'ΔpropertyInterpolate': r3.ΔpropertyInterpolate,
+       'ΔpropertyInterpolate1': r3.ΔpropertyInterpolate1,
+       'ΔpropertyInterpolate2': r3.ΔpropertyInterpolate2,
+       'ΔpropertyInterpolate3': r3.ΔpropertyInterpolate3,
+       'ΔpropertyInterpolate4': r3.ΔpropertyInterpolate4,
+       'ΔpropertyInterpolate5': r3.ΔpropertyInterpolate5,
+       'ΔpropertyInterpolate6': r3.ΔpropertyInterpolate6,
+       'ΔpropertyInterpolate7': r3.ΔpropertyInterpolate7,
+       'ΔpropertyInterpolate8': r3.ΔpropertyInterpolate8,
+       'ΔpropertyInterpolateV': r3.ΔpropertyInterpolateV,
+       'Δpipe': r3.Δpipe,
+       'ΔqueryRefresh': r3.ΔqueryRefresh,
+       'ΔviewQuery': r3.ΔviewQuery,
+       'ΔstaticViewQuery': r3.ΔstaticViewQuery,
+       'ΔstaticContentQuery': r3.ΔstaticContentQuery,
+       'ΔloadViewQuery': r3.ΔloadViewQuery,
+       'ΔcontentQuery': r3.ΔcontentQuery,
+       'ΔloadContentQuery': r3.ΔloadContentQuery,
+       'Δreference': r3.Δreference,
+       'ΔelementHostAttrs': r3.ΔelementHostAttrs,
+       'ΔclassMap': r3.ΔclassMap,
+       'Δstyling': r3.Δstyling,
+       'ΔstyleMap': r3.ΔstyleMap,
+       'ΔstyleProp': r3.ΔstyleProp,
+       'ΔstylingApply': r3.ΔstylingApply,
+       'ΔclassProp': r3.ΔclassProp,
+       'Δselect': r3.Δselect,
+       'Δtemplate': r3.Δtemplate,
+       'Δtext': r3.Δtext,
+       'ΔtextBinding': r3.ΔtextBinding,
+       'ΔembeddedViewStart': r3.ΔembeddedViewStart,
+       'ΔembeddedViewEnd': r3.ΔembeddedViewEnd,
+       'Δi18n': r3.Δi18n,
+       'Δi18nAttributes': r3.Δi18nAttributes,
+       'Δi18nExp': r3.Δi18nExp,
+       'Δi18nStart': r3.Δi18nStart,
+       'Δi18nEnd': r3.Δi18nEnd,
+       'Δi18nApply': r3.Δi18nApply,
+       'Δi18nPostprocess': r3.Δi18nPostprocess,
+       'Δi18nLocalize': r3.Δi18nLocalize,
+       'ΔresolveWindow': r3.ΔresolveWindow,
+       'ΔresolveDocument': r3.ΔresolveDocument,
+       'ΔresolveBody': r3.ΔresolveBody,
+       'ΔsetComponentScope': r3.ΔsetComponentScope,
+       'ΔsetNgModuleScope': r3.ΔsetNgModuleScope,
 
-  'ΔsanitizeHtml': sanitization.ΔsanitizeHtml,
-  'ΔsanitizeStyle': sanitization.ΔsanitizeStyle,
-  'ΔdefaultStyleSanitizer': sanitization.ΔdefaultStyleSanitizer,
-  'ΔsanitizeResourceUrl': sanitization.ΔsanitizeResourceUrl,
-  'ΔsanitizeScript': sanitization.ΔsanitizeScript,
-  'ΔsanitizeUrl': sanitization.ΔsanitizeUrl,
-  'ΔsanitizeUrlOrResourceUrl': sanitization.ΔsanitizeUrlOrResourceUrl,
-};
+       'ΔsanitizeHtml': sanitization.ΔsanitizeHtml,
+       'ΔsanitizeStyle': sanitization.ΔsanitizeStyle,
+       'ΔdefaultStyleSanitizer': sanitization.ΔdefaultStyleSanitizer,
+       'ΔsanitizeResourceUrl': sanitization.ΔsanitizeResourceUrl,
+       'ΔsanitizeScript': sanitization.ΔsanitizeScript,
+       'ΔsanitizeUrl': sanitization.ΔsanitizeUrl,
+       'ΔsanitizeUrlOrResourceUrl': sanitization.ΔsanitizeUrlOrResourceUrl,
+     }))();
diff --git a/packages/core/src/render3/util/misc_utils.ts b/packages/core/src/render3/util/misc_utils.ts
index 0514f1896c..2deedccd18 100644
--- a/packages/core/src/render3/util/misc_utils.ts
+++ b/packages/core/src/render3/util/misc_utils.ts
@@ -48,9 +48,10 @@ export function stringifyForError(value: any) {
 
 
 export const defaultScheduler =
-    (typeof requestAnimationFrame !== 'undefined' && requestAnimationFrame ||  // browser only
-     setTimeout                                                                // everything else
-     ).bind(global);
+    (() =>
+         (typeof requestAnimationFrame !== 'undefined' && requestAnimationFrame ||  // browser only
+          setTimeout  // everything else
+          ).bind(global))();
 
 /**
  *
diff --git a/packages/core/src/util/empty.ts b/packages/core/src/util/empty.ts
index 46dc61bdf6..d1d8ce9a1b 100644
--- a/packages/core/src/util/empty.ts
+++ b/packages/core/src/util/empty.ts
@@ -19,6 +19,10 @@ export const EMPTY_ARRAY: any[] = [];
 
 // freezing the values prevents any code from accidentally inserting new values in
 if (typeof ngDevMode !== 'undefined' && ngDevMode) {
+  // These property accesses can be ignored because ngDevMode will be set to false
+  // when optimizing code and the whole if statement will be dropped.
+  // tslint:disable-next-line:no-toplevel-property-access
   Object.freeze(EMPTY_OBJ);
+  // tslint:disable-next-line:no-toplevel-property-access
   Object.freeze(EMPTY_ARRAY);
 }
diff --git a/packages/core/src/util/microtask.ts b/packages/core/src/util/microtask.ts
index 40edbac49d..fdc8a2b4f6 100644
--- a/packages/core/src/util/microtask.ts
+++ b/packages/core/src/util/microtask.ts
@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
-const promise: Promise<any> = Promise.resolve(0);
+const promise: Promise<any> = (() => Promise.resolve(0))();
 
 declare const Zone: any;
 
diff --git a/packages/core/src/util/ng_i18n_closure_mode.ts b/packages/core/src/util/ng_i18n_closure_mode.ts
index be1231060d..1945dae272 100644
--- a/packages/core/src/util/ng_i18n_closure_mode.ts
+++ b/packages/core/src/util/ng_i18n_closure_mode.ts
@@ -16,8 +16,12 @@ declare global {
  * NOTE: changes to the `ngI18nClosureMode` name must be synced with `compiler-cli/src/tooling.ts`.
  */
 if (typeof ngI18nClosureMode === 'undefined') {
+  // These property accesses can be ignored because ngI18nClosureMode will be set to false
+  // when optimizing code and the whole if statement will be dropped.
   // Make sure to refer to ngI18nClosureMode as ['ngI18nClosureMode'] for closure.
+  // tslint:disable-next-line:no-toplevel-property-access
   global['ngI18nClosureMode'] =
       // TODO(FW-1250): validate that this actually, you know, works.
+      // tslint:disable-next-line:no-toplevel-property-access
       typeof goog !== 'undefined' && typeof goog.getMsg === 'function';
 }
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index adb95aa96c..a57178edd4 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -50,9 +50,6 @@
   {
     "name": "FLAGS"
   },
-  {
-    "name": "FactoryPrototype"
-  },
   {
     "name": "HEADER_OFFSET"
   },
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 7abadbcaf8..414f37283c 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -41,9 +41,6 @@
   {
     "name": "FLAGS"
   },
-  {
-    "name": "FactoryPrototype"
-  },
   {
     "name": "HEADER_OFFSET"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 761b3d1220..1fbcba97b2 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -83,9 +83,6 @@
   {
     "name": "FLAGS"
   },
-  {
-    "name": "FactoryPrototype"
-  },
   {
     "name": "HEADER_OFFSET"
   },
diff --git a/packages/elements/src/utils.ts b/packages/elements/src/utils.ts
index 0491485777..2333eb40b3 100644
--- a/packages/elements/src/utils.ts
+++ b/packages/elements/src/utils.ts
@@ -7,9 +7,11 @@
  */
 import {ComponentFactoryResolver, Injector, Type} from '@angular/core';
 
-const elProto = Element.prototype as any;
-const matches = elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector ||
-    elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
+const matches = (() => {
+  const elProto = Element.prototype as any;
+  return elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector ||
+      elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
+})();
 
 /**
  * Provide methods for scheduling the execution of a callback.
diff --git a/packages/forms/src/directives/ng_form.ts b/packages/forms/src/directives/ng_form.ts
index e7a067bcd5..ba0d59b62e 100644
--- a/packages/forms/src/directives/ng_form.ts
+++ b/packages/forms/src/directives/ng_form.ts
@@ -23,7 +23,7 @@ export const formDirectiveProvider: any = {
   useExisting: forwardRef(() => NgForm)
 };
 
-const resolvedPromise = Promise.resolve(null);
+const resolvedPromise = (() => Promise.resolve(null))();
 
 /**
  * @description
diff --git a/packages/forms/src/directives/ng_model.ts b/packages/forms/src/directives/ng_model.ts
index 15ab847972..b4e252a9cb 100644
--- a/packages/forms/src/directives/ng_model.ts
+++ b/packages/forms/src/directives/ng_model.ts
@@ -43,7 +43,7 @@ export const formControlBinding: any = {
  * - this is just one extra run no matter how many `ngModel` have been changed.
  * - this is a general problem when using `exportAs` for directives!
  */
-const resolvedPromise = Promise.resolve(null);
+const resolvedPromise = (() => Promise.resolve(null))();
 
 /**
  * @description
diff --git a/packages/http/src/static_request.ts b/packages/http/src/static_request.ts
index f55fa8acd0..c48cd252cb 100644
--- a/packages/http/src/static_request.ts
+++ b/packages/http/src/static_request.ts
@@ -185,7 +185,7 @@ function urlEncodeParams(params: {[key: string]: any}): URLSearchParams {
 
 const noop = function() {};
 const w = typeof window == 'object' ? window : noop;
-const FormData = (w as any /** TODO #9100 */)['FormData'] || noop;
-const Blob = (w as any /** TODO #9100 */)['Blob'] || noop;
+const FormData = (() => (w as any /** TODO #9100 */)['FormData'] || noop)();
+const Blob = (() => (w as any /** TODO #9100 */)['Blob'] || noop)();
 export const ArrayBuffer: ArrayBufferConstructor =
-    (w as any /** TODO #9100 */)['ArrayBuffer'] || noop;
+    (() => (w as any /** TODO #9100 */)['ArrayBuffer'] || noop)();
diff --git a/packages/platform-browser/src/browser/browser_adapter.ts b/packages/platform-browser/src/browser/browser_adapter.ts
index dbe7baf085..d40cf891eb 100644
--- a/packages/platform-browser/src/browser/browser_adapter.ts
+++ b/packages/platform-browser/src/browser/browser_adapter.ts
@@ -63,13 +63,15 @@ const _chromeNumKeyPadMap = {
   '\x90': 'NumLock'
 };
 
-let nodeContains: (a: any, b: any) => boolean;
+const nodeContains: (a: any, b: any) => boolean = (() => {
+  if (global['Node']) {
+    return global['Node'].prototype.contains || function(node: any) {
+      return !!(this.compareDocumentPosition(node) & 16);
+    };
+  }
 
-if (global['Node']) {
-  nodeContains = global['Node'].prototype.contains || function(node) {
-    return !!(this.compareDocumentPosition(node) & 16);
-  };
-}
+  return undefined as any;
+})();
 
 /**
  * A `DomAdapter` powered by full browser DOM APIs.
diff --git a/packages/platform-browser/src/dom/debug/ng_probe.ts b/packages/platform-browser/src/dom/debug/ng_probe.ts
index d033a68145..2ed9656c3b 100644
--- a/packages/platform-browser/src/dom/debug/ng_probe.ts
+++ b/packages/platform-browser/src/dom/debug/ng_probe.ts
@@ -6,13 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as core from '@angular/core';
+import {APP_INITIALIZER, ApplicationRef, DebugNode, NgProbeToken, NgZone, Optional, Provider, getDebugNode} from '@angular/core';
+
 import {exportNgVar} from '../util';
 
-const CORE_TOKENS = {
-  'ApplicationRef': core.ApplicationRef,
-  'NgZone': core.NgZone,
-};
+const CORE_TOKENS = (() => ({
+                       'ApplicationRef': ApplicationRef,
+                       'NgZone': NgZone,
+                     }))();
 
 const INSPECT_GLOBAL_NAME = 'probe';
 const CORE_TOKENS_GLOBAL_NAME = 'coreTokens';
@@ -22,17 +23,17 @@ const CORE_TOKENS_GLOBAL_NAME = 'coreTokens';
  * null if the given native element does not have an Angular view associated
  * with it.
  */
-export function inspectNativeElement(element: any): core.DebugNode|null {
-  return core.getDebugNode(element);
+export function inspectNativeElement(element: any): DebugNode|null {
+  return getDebugNode(element);
 }
 
-export function _createNgProbe(coreTokens: core.NgProbeToken[]): any {
+export function _createNgProbe(coreTokens: NgProbeToken[]): any {
   exportNgVar(INSPECT_GLOBAL_NAME, inspectNativeElement);
   exportNgVar(CORE_TOKENS_GLOBAL_NAME, {...CORE_TOKENS, ..._ngProbeTokensToMap(coreTokens || [])});
   return () => inspectNativeElement;
 }
 
-function _ngProbeTokensToMap(tokens: core.NgProbeToken[]): {[name: string]: any} {
+function _ngProbeTokensToMap(tokens: NgProbeToken[]): {[name: string]: any} {
   return tokens.reduce((prev: any, t: any) => (prev[t.name] = t.token, prev), {});
 }
 
@@ -48,12 +49,12 @@ export const ELEMENT_PROBE_PROVIDERS__POST_R3__ = [];
 /**
  * Providers which support debugging Angular applications (e.g. via `ng.probe`).
  */
-export const ELEMENT_PROBE_PROVIDERS__PRE_R3__: core.Provider[] = [
+export const ELEMENT_PROBE_PROVIDERS__PRE_R3__: Provider[] = [
   {
-    provide: core.APP_INITIALIZER,
+    provide: APP_INITIALIZER,
     useFactory: _createNgProbe,
     deps: [
-      [core.NgProbeToken, new core.Optional()],
+      [NgProbeToken, new Optional()],
     ],
     multi: true,
   },
diff --git a/packages/platform-browser/src/dom/dom_renderer.ts b/packages/platform-browser/src/dom/dom_renderer.ts
index 16be147431..ae04ba7aee 100644
--- a/packages/platform-browser/src/dom/dom_renderer.ts
+++ b/packages/platform-browser/src/dom/dom_renderer.ts
@@ -231,7 +231,7 @@ class DefaultDomRenderer2 implements Renderer2 {
   }
 }
 
-const AT_CHARCODE = '@'.charCodeAt(0);
+const AT_CHARCODE = (() => '@'.charCodeAt(0))();
 function checkNoSyntheticProp(name: string, nameKind: string) {
   if (name.charCodeAt(0) === AT_CHARCODE) {
     throw new Error(
diff --git a/packages/platform-browser/src/dom/events/dom_events.ts b/packages/platform-browser/src/dom/events/dom_events.ts
index 9684bcd252..2d3045eb15 100644
--- a/packages/platform-browser/src/dom/events/dom_events.ts
+++ b/packages/platform-browser/src/dom/events/dom_events.ts
@@ -18,9 +18,8 @@ import {EventManagerPlugin} from './event_manager';
  * addEventListener by 3x.
  */
 const __symbol__ =
-    (typeof Zone !== 'undefined') && (Zone as any)['__symbol__'] || function(v: string): string {
-      return '__zone_symbol__' + v;
-    };
+    (() => (typeof Zone !== 'undefined') && (Zone as any)['__symbol__'] ||
+         function(v: string): string { return '__zone_symbol__' + v; })();
 const ADD_EVENT_LISTENER: 'addEventListener' = __symbol__('addEventListener');
 const REMOVE_EVENT_LISTENER: 'removeEventListener' = __symbol__('removeEventListener');
 
@@ -35,13 +34,18 @@ const NATIVE_REMOVE_LISTENER = 'removeEventListener';
 const stopSymbol = '__zone_symbol__propagationStopped';
 const stopMethodSymbol = '__zone_symbol__stopImmediatePropagation';
 
-const blackListedEvents: string[] =
-    (typeof Zone !== 'undefined') && (Zone as any)[__symbol__('BLACK_LISTED_EVENTS')];
-let blackListedMap: {[eventName: string]: string};
-if (blackListedEvents) {
-  blackListedMap = {};
-  blackListedEvents.forEach(eventName => { blackListedMap[eventName] = eventName; });
-}
+
+const blackListedMap = (() => {
+  const blackListedEvents: string[] =
+      (typeof Zone !== 'undefined') && (Zone as any)[__symbol__('BLACK_LISTED_EVENTS')];
+  if (blackListedEvents) {
+    const res: {[eventName: string]: string} = {};
+    blackListedEvents.forEach(eventName => { res[eventName] = eventName; });
+    return res;
+  }
+  return undefined;
+})();
+
 
 const isBlackListedEvent = function(eventName: string) {
   if (!blackListedMap) {
diff --git a/tslint.json b/tslint.json
index d12df37dde..91b52d2fe3 100644
--- a/tslint.json
+++ b/tslint.json
@@ -2,7 +2,8 @@
   "rulesDirectory": [
     "dist/tools/tslint",
     "node_modules/vrsource-tslint-rules/rules",
-    "node_modules/tslint-eslint-rules/dist/rules"
+    "node_modules/tslint-eslint-rules/dist/rules",
+    "node_modules/tslint-no-toplevel-property-access/rules"
   ],
   "rules": {
     "file-header": [
@@ -18,6 +19,18 @@
     "no-jasmine-focus": true,
     "no-var-keyword": true,
     "require-internal-with-underscore": true,
+    "no-toplevel-property-access": [
+      true,
+      "packages/animations/src/",
+      "packages/animations/browser/",
+      "packages/common/src/",
+      "packages/core/src/",
+      "packages/elements/src/",
+      "packages/forms/src/",
+      "packages/http/src/",
+      "packages/platform-browser/src/",
+      "packages/router/src/"
+    ],
     "semicolon": [
       true
     ],
@@ -56,4 +69,4 @@
       "function"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index d7e6cc0af0..7ef946bf05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10977,6 +10977,11 @@ tslint-eslint-rules@4.1.1:
     tslib "^1.0.0"
     tsutils "^1.4.0"
 
+tslint-no-toplevel-property-access@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/tslint-no-toplevel-property-access/-/tslint-no-toplevel-property-access-0.0.2.tgz#c9b19bbd525ea7b8577e5ada601cc8625b4ed004"
+  integrity sha512-Oc+UUurlGLBkgeUSGxMoTpRUpaXsjqzQCEAYrYQyuU8330fi5FKlye5n53y87EJ24AlfdoxMPV7DJfFOADapfg==
+
 tslint@5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"

From 8e201f713a9e8c70db3731af285997443e1c5a96 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:33 +0100
Subject: [PATCH 060/275] test(ivy): ngcc - check the actual file that is
 passed to `renderImports` (#25445)

Previously we were just checking that the object was "any" object but now
we check that it is the file object that we expected.

PR Close #25445
---
 .../ngcc/test/rendering/renderer_spec.ts       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index 9a28d8b01a..3a9d757074 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -80,8 +80,12 @@ function createTestRenderer(
   spyOn(renderer, 'addDefinitions').and.callThrough();
   spyOn(renderer, 'removeDecorators').and.callThrough();
 
-  return {renderer, decorationAnalyses, switchMarkerAnalyses, moduleWithProvidersAnalyses,
-          privateDeclarationsAnalyses};
+  return {renderer,
+          decorationAnalyses,
+          switchMarkerAnalyses,
+          moduleWithProvidersAnalyses,
+          privateDeclarationsAnalyses,
+          bundle};
 }
 
 
@@ -488,8 +492,12 @@ describe('Renderer', () => {
             contents: 'export declare class LibraryModule {}'
           },
         ];
-        const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses} =
+        const {renderer,
+               decorationAnalyses,
+               switchMarkerAnalyses,
+               privateDeclarationsAnalyses,
+               moduleWithProvidersAnalyses,
+               bundle} =
             createTestRenderer(
                 'test-package', MODULE_WITH_PROVIDERS_PROGRAM, MODULE_WITH_PROVIDERS_DTS_PROGRAM);
 
@@ -526,7 +534,7 @@ describe('Renderer', () => {
                   {specifier: '@angular/core', qualifier: 'ɵngcc1'},
                   {specifier: 'some-library', qualifier: 'ɵngcc2'},
                 ],
-                jasmine.anything());
+                bundle.dts !.file);
 
 
         // The following expectation checks that we do not mistake `ModuleWithProviders` types

From 95c5b1a7f620c6be4b9f21ece43176684b9cae74 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:33 +0100
Subject: [PATCH 061/275] refactor(ivy): use a named type for ImportManager
 import structures (#25445)

Previously we were using an anonymous type `{specifier: string; qualifier: string;}`
throughout the code base. This commit gives this type a name and ensures it
is only defined in one place.

PR Close #25445
---
 .../ngcc/src/rendering/esm_renderer.ts        |  5 ++--
 .../ngcc/src/rendering/renderer.ts            |  7 ++---
 packages/compiler-cli/ngcc/test/BUILD.bazel   |  1 +
 .../ngcc/test/rendering/renderer_spec.ts      |  4 +--
 .../src/ngtsc/translator/index.ts             |  2 +-
 .../src/ngtsc/translator/src/translator.ts    | 26 ++++++++++++++++---
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
index 15fe6f61fb..607595449f 100644
--- a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
@@ -9,6 +9,7 @@ import MagicString from 'magic-string';
 import * as ts from 'typescript';
 import {PathSegment, AbsoluteFsPath} from '../../../src/ngtsc/path';
 import {isDtsPath} from '../../../src/ngtsc/util/src/typescript';
+import {Import} from '../../../src/ngtsc/translator';
 import {CompiledClass} from '../analysis/decoration_analyzer';
 import {ExportInfo} from '../analysis/private_declarations_analyzer';
 import {FileSystem} from '../file_system/file_system';
@@ -27,9 +28,7 @@ export class EsmRenderer extends Renderer {
   /**
    *  Add the imports at the top of the file
    */
-  addImports(
-      output: MagicString, imports: {specifier: string; qualifier: string;}[],
-      sf: ts.SourceFile): void {
+  addImports(output: MagicString, imports: Import[], sf: ts.SourceFile): void {
     const insertionPoint = findEndOfImports(sf);
     const renderedImports =
         imports.map(i => `import * as ${i.qualifier} from '${i.specifier}';\n`).join('');
diff --git a/packages/compiler-cli/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
index b1410eed1a..eb69584086 100644
--- a/packages/compiler-cli/ngcc/src/rendering/renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
@@ -14,8 +14,7 @@ import * as ts from 'typescript';
 import {NoopImportRewriter, ImportRewriter, R3SymbolsImportRewriter, NOOP_DEFAULT_IMPORT_RECORDER} from '../../../src/ngtsc/imports';
 import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
 import {CompileResult} from '../../../src/ngtsc/transform';
-import {translateStatement, translateType, ImportManager} from '../../../src/ngtsc/translator';
-
+import {translateStatement, translateType, Import, ImportManager} from '../../../src/ngtsc/translator';
 import {CompiledClass, CompiledFile, DecorationAnalyses} from '../analysis/decoration_analyzer';
 import {ModuleWithProvidersInfo, ModuleWithProvidersAnalyses} from '../analysis/module_with_providers_analyzer';
 import {PrivateDeclarationsAnalyses, ExportInfo} from '../analysis/private_declarations_analyzer';
@@ -250,9 +249,7 @@ export abstract class Renderer {
 
   protected abstract addConstants(output: MagicString, constants: string, file: ts.SourceFile):
       void;
-  protected abstract addImports(
-      output: MagicString, imports: {specifier: string, qualifier: string}[],
-      sf: ts.SourceFile): void;
+  protected abstract addImports(output: MagicString, imports: Import[], sf: ts.SourceFile): void;
   protected abstract addExports(
       output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[]): void;
   protected abstract addDefinitions(
diff --git a/packages/compiler-cli/ngcc/test/BUILD.bazel b/packages/compiler-cli/ngcc/test/BUILD.bazel
index 7aabc69b43..4ed0921b8d 100644
--- a/packages/compiler-cli/ngcc/test/BUILD.bazel
+++ b/packages/compiler-cli/ngcc/test/BUILD.bazel
@@ -18,6 +18,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/reflection",
         "//packages/compiler-cli/src/ngtsc/testing",
         "//packages/compiler-cli/src/ngtsc/transform",
+        "//packages/compiler-cli/src/ngtsc/translator",
         "//packages/compiler-cli/test:test_utils",
         "@npm//@types/convert-source-map",
         "@npm//@types/mock-fs",
diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index 3a9d757074..cac283fccd 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -9,6 +9,7 @@ import MagicString from 'magic-string';
 import * as ts from 'typescript';
 import {fromObject, generateMapFileComment} from 'convert-source-map';
 import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {Import} from '../../../src/ngtsc/translator';
 import {CompiledClass, DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
 import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
 import {ModuleWithProvidersAnalyzer} from '../../src/analysis/module_with_providers_analyzer';
@@ -31,8 +32,7 @@ class TestRenderer extends Renderer {
       bundle: EntryPointBundle) {
     super(fs, logger, host, isCore, bundle);
   }
-  addImports(
-      output: MagicString, imports: {specifier: string, qualifier: string}[], sf: ts.SourceFile) {
+  addImports(output: MagicString, imports: Import[], sf: ts.SourceFile) {
     output.prepend('\n// ADD IMPORTS\n');
   }
   addExports(output: MagicString, baseEntryPointPath: string, exports: {
diff --git a/packages/compiler-cli/src/ngtsc/translator/index.ts b/packages/compiler-cli/src/ngtsc/translator/index.ts
index b71e3e7900..44120dae41 100644
--- a/packages/compiler-cli/src/ngtsc/translator/index.ts
+++ b/packages/compiler-cli/src/ngtsc/translator/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {ImportManager, translateExpression, translateStatement, translateType} from './src/translator';
+export {Import, ImportManager, NamedImport, translateExpression, translateStatement, translateType} from './src/translator';
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
index 94f630ae6b..f1b6e478ff 100644
--- a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
@@ -38,6 +38,27 @@ const BINARY_OPERATORS = new Map<BinaryOperator, ts.BinaryOperator>([
   [BinaryOperator.Plus, ts.SyntaxKind.PlusToken],
 ]);
 
+/**
+ * Information about an import that has been added to a module.
+ */
+export interface Import {
+  /** The name of the module that has been imported. */
+  specifier: string;
+  /** The alias of the imported module. */
+  qualifier: string;
+}
+
+/**
+ * The symbol name and import namespace of an imported symbol,
+ * which has been registered through the ImportManager.
+ */
+export interface NamedImport {
+  /** The import namespace containing this imported symbol. */
+  moduleImport: string|null;
+  /** The (possibly rewritten) name of the imported symbol. */
+  symbol: string;
+}
+
 export class ImportManager {
   private specifierToIdentifier = new Map<string, string>();
   private nextIndex = 0;
@@ -45,8 +66,7 @@ export class ImportManager {
   constructor(protected rewriter: ImportRewriter = new NoopImportRewriter(), private prefix = 'i') {
   }
 
-  generateNamedImport(moduleName: string, originalSymbol: string):
-      {moduleImport: string | null, symbol: string} {
+  generateNamedImport(moduleName: string, originalSymbol: string): NamedImport {
     // First, rewrite the symbol name.
     const symbol = this.rewriter.rewriteSymbol(originalSymbol, moduleName);
 
@@ -67,7 +87,7 @@ export class ImportManager {
     return {moduleImport, symbol};
   }
 
-  getAllImports(contextPath: string): {specifier: string, qualifier: string}[] {
+  getAllImports(contextPath: string): Import[] {
     const imports: {specifier: string, qualifier: string}[] = [];
     this.specifierToIdentifier.forEach((qualifier, specifier) => {
       specifier = this.rewriter.rewriteSpecifier(specifier, contextPath);

From e68490c5e4cf7d7085266fde61183bdb67d864cd Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 062/275] test(ivy): fix ESM5 test code to use `var` rather
 than `const` (#25445)

PR Close #25445
---
 packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
index 657b299b31..9c38c7f4fb 100644
--- a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
@@ -402,7 +402,7 @@ const IMPORTS_FILES = [
   {
     name: '/a.js',
     contents: `
-      export const a = 'a';
+      export var a = 'a';
     `,
   },
   {
@@ -422,7 +422,7 @@ const EXPORTS_FILES = [
   {
     name: '/a.js',
     contents: `
-      export const a = 'a';
+      export var a = 'a';
     `,
   },
   {

From aeec66b657d999d4030d8ce63f2376774fc1a358 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 063/275] test(ivy): enhance the in-memory-typescript helper
 (#25445)

The `getDeclaration()` function now searches down into the AST for
matching nodes, which is needed for UMD testing.

PR Close #25445
---
 .../src/ngtsc/testing/in_memory_typescript.ts | 54 ++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts b/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
index 51bb2be60d..5ceffe4118 100644
--- a/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
+++ b/packages/compiler-cli/src/ngtsc/testing/in_memory_typescript.ts
@@ -117,30 +117,7 @@ export function getDeclaration<T extends ts.Declaration>(
   if (!sf) {
     throw new Error(`No such file: ${fileName}`);
   }
-
-  let chosenDecl: ts.Declaration|null = null;
-
-  sf.statements.forEach(stmt => {
-    if (chosenDecl !== null) {
-      return;
-    } else if (ts.isVariableStatement(stmt)) {
-      stmt.declarationList.declarations.forEach(decl => {
-        if (bindingNameEquals(decl.name, name)) {
-          chosenDecl = decl;
-        }
-      });
-    } else if (ts.isClassDeclaration(stmt) || ts.isFunctionDeclaration(stmt)) {
-      if (stmt.name !== undefined && stmt.name.text === name) {
-        chosenDecl = stmt;
-      }
-    } else if (
-        ts.isImportDeclaration(stmt) && stmt.importClause !== undefined &&
-        stmt.importClause.name !== undefined && stmt.importClause.name.text === name) {
-      chosenDecl = stmt.importClause;
-    }
-  });
-
-  chosenDecl = chosenDecl as ts.Declaration | null;
+  const chosenDecl = walkForDeclaration(sf);
 
   if (chosenDecl === null) {
     throw new Error(`No such symbol: ${name} in ${fileName}`);
@@ -148,6 +125,33 @@ export function getDeclaration<T extends ts.Declaration>(
   if (!assert(chosenDecl)) {
     throw new Error(`Symbol ${name} from ${fileName} is a ${ts.SyntaxKind[chosenDecl.kind]}`);
   }
-
   return chosenDecl;
+
+  // We walk the AST tree looking for a declaration that matches
+  function walkForDeclaration(rootNode: ts.Node): ts.Declaration|null {
+    let chosenDecl: ts.Declaration|null = null;
+    rootNode.forEachChild(node => {
+      if (chosenDecl !== null) {
+        return;
+      }
+      if (ts.isVariableStatement(node)) {
+        node.declarationList.declarations.forEach(decl => {
+          if (bindingNameEquals(decl.name, name)) {
+            chosenDecl = decl;
+          }
+        });
+      } else if (ts.isClassDeclaration(node) || ts.isFunctionDeclaration(node)) {
+        if (node.name !== undefined && node.name.text === name) {
+          chosenDecl = node;
+        }
+      } else if (
+          ts.isImportDeclaration(node) && node.importClause !== undefined &&
+          node.importClause.name !== undefined && node.importClause.name.text === name) {
+        chosenDecl = node.importClause;
+      } else {
+        chosenDecl = walkForDeclaration(node);
+      }
+    });
+    return chosenDecl;
+  }
 }

From 989bfd2e972b19668723a66dd326d50eb9d81629 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 064/275] fix(ivy): ngcc - support namespaced identifiers
 (#25445)

In UMD formats, imports are always namespaced. This commit makes
ngcc more tolerant of such structures.

PR Close #25445
---
 .../ngcc/src/host/esm2015_host.ts             | 84 ++++++++++++-------
 .../ngcc/test/host/esm2015_host_spec.ts       | 39 +++++++++
 .../ngcc/test/host/esm5_host_spec.ts          | 45 ++++++++++
 3 files changed, 137 insertions(+), 31 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
index 3758af6851..e2d666773e 100644
--- a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
@@ -305,19 +305,6 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     return null;
   }
 
-  /**
-   * Determine if an identifier was imported from another module and return `Import` metadata
-   * describing its origin.
-   *
-   * @param id a TypeScript `ts.Identifer` to reflect.
-   *
-   * @returns metadata about the `Import` if the identifier was imported from another module, or
-   * `null` if the identifier doesn't resolve to an import but instead is locally defined.
-   */
-  getImportOfIdentifier(id: ts.Identifier): Import|null {
-    return super.getImportOfIdentifier(id) || this.getImportOfNamespacedIdentifier(id);
-  }
-
   /**
    * Find all the classes that contain decorations in a given file.
    * @param sourceFile The source file to search for decorated classes.
@@ -877,14 +864,20 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
           const decorator = reflectObjectLiteral(node);
 
           // Is the value of the `type` property an identifier?
-          const typeIdentifier = decorator.get('type');
-          if (typeIdentifier && ts.isIdentifier(typeIdentifier)) {
-            decorators.push({
-              name: typeIdentifier.text,
-              identifier: typeIdentifier,
-              import: this.getImportOfIdentifier(typeIdentifier), node,
-              args: getDecoratorArgs(node),
-            });
+          let typeIdentifier = decorator.get('type');
+          if (typeIdentifier) {
+            if (ts.isPropertyAccessExpression(typeIdentifier)) {
+              // the type is in a namespace, e.g. `core.Directive`
+              typeIdentifier = typeIdentifier.name;
+            }
+            if (ts.isIdentifier(typeIdentifier)) {
+              decorators.push({
+                name: typeIdentifier.text,
+                identifier: typeIdentifier,
+                import: this.getImportOfIdentifier(typeIdentifier), node,
+                args: getDecoratorArgs(node),
+              });
+            }
           }
         }
       });
@@ -1327,27 +1320,56 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
                 prop =>
                     !!prop.name && ts.isIdentifier(prop.name) && prop.name.text === 'ngModule') ||
         null;
-    const ngModuleIdentifier = ngModuleProperty && ts.isPropertyAssignment(ngModuleProperty) &&
-            ts.isIdentifier(ngModuleProperty.initializer) && ngModuleProperty.initializer ||
-        null;
 
-    // If no `ngModule` property was found in an object literal return value, return `null` to
-    // indicate that the provided node does not appear to be a `ModuleWithProviders` function.
-    if (ngModuleIdentifier === null) {
+    if (!ngModuleProperty || !ts.isPropertyAssignment(ngModuleProperty)) {
       return null;
     }
 
-    const ngModuleDeclaration = this.getDeclarationOfIdentifier(ngModuleIdentifier);
+    // The ngModuleValue could be of the form `SomeModule` or `namespace_1.SomeModule`
+    const ngModuleValue = ngModuleProperty.initializer;
+    if (!ts.isIdentifier(ngModuleValue) && !ts.isPropertyAccessExpression(ngModuleValue)) {
+      return null;
+    }
+
+    const ngModuleDeclaration = this.getDeclarationOfExpression(ngModuleValue);
     if (!ngModuleDeclaration) {
       throw new Error(
-          `Cannot find a declaration for NgModule ${ngModuleIdentifier.text} referenced in "${declaration!.getText()}"`);
+          `Cannot find a declaration for NgModule ${ngModuleValue.getText()} referenced in "${declaration!.getText()}"`);
     }
     if (!hasNameIdentifier(ngModuleDeclaration.node)) {
       return null;
     }
-    const ngModule = ngModuleDeclaration as Declaration<ClassDeclaration>;
+    return {
+      name,
+      ngModule: ngModuleDeclaration as Declaration<ClassDeclaration>, declaration, container
+    };
+  }
 
-    return {name, ngModule, declaration, container};
+  protected getDeclarationOfExpression(expression: ts.Expression): Declaration|null {
+    if (ts.isIdentifier(expression)) {
+      return this.getDeclarationOfIdentifier(expression);
+    }
+
+    if (!ts.isPropertyAccessExpression(expression) || !ts.isIdentifier(expression.expression)) {
+      return null;
+    }
+
+    const namespaceDecl = this.getDeclarationOfIdentifier(expression.expression);
+    if (!namespaceDecl || !ts.isSourceFile(namespaceDecl.node)) {
+      return null;
+    }
+
+    const namespaceExports = this.getExportsOfModule(namespaceDecl.node);
+    if (namespaceExports === null) {
+      return null;
+    }
+
+    if (!namespaceExports.has(expression.name.text)) {
+      return null;
+    }
+
+    const exportDecl = namespaceExports.get(expression.name.text) !;
+    return {...exportDecl, viaModule: namespaceDecl.viaModule};
   }
 }
 
diff --git a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
index 98e20267ff..1da2f5b0eb 100644
--- a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
@@ -521,6 +521,7 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
     name: '/src/functions.js',
     contents: `
     import {ExternalModule} from './module';
+    import * as mod from './module';
     export class SomeService {}
     export class InternalModule {}
     export function aNumber() { return 42; }
@@ -534,12 +535,14 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
     export function ngModuleString() { return { ngModule: 'foo' }; }
     export function ngModuleObject() { return { ngModule: { foo: 42 } }; }
     export function externalNgModule() { return { ngModule: ExternalModule }; }
+    export function namespacedExternalNgModule() { return { ngModule: mod.ExternalModule }; }
     `
   },
   {
     name: '/src/methods.js',
     contents: `
     import {ExternalModule} from './module';
+    import * as mod from './module';
     export class SomeService {}
     export class InternalModule {
       static aNumber() { return 42; }
@@ -553,11 +556,13 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
       static ngModuleString() { return { ngModule: 'foo' }; }
       static ngModuleObject() { return { ngModule: { foo: 42 } }; }
       static externalNgModule() { return { ngModule: ExternalModule }; }
+      static namespacedExternalNgModule() { return { ngModule: mod.ExternalModule }; }
 
       instanceNgModuleIdentifier() { return { ngModule: InternalModule }; }
       instanceNgModuleWithEmptyProviders() { return { ngModule: InternalModule, providers: [] }; }
       instanceNgModuleWithProviders() { return { ngModule: InternalModule, providers: [SomeService] }; }
       instanceExternalNgModule() { return { ngModule: ExternalModule }; }
+      instanceNamespacedExternalNgModule() { return { ngModule: mod.ExternalModule }; }
     }
     `
   },
@@ -574,6 +579,19 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
   {name: '/src/module.js', contents: 'export class ExternalModule {}'},
 ];
 
+const NAMESPACED_IMPORT_FILE = {
+  name: '/some_directive.js',
+  contents: `
+    import * as core from '@angular/core';
+
+    class SomeDirective {
+    }
+    SomeDirective.decorators = [
+      { type: core.Directive, args: [{ selector: '[someDirective]' },] }
+    ];
+    `
+};
+
 describe('Esm2015ReflectionHost', () => {
 
   describe('getDecoratorsOfDeclaration()', () => {
@@ -1348,6 +1366,25 @@ describe('Esm2015ReflectionHost', () => {
       expect(actualDeclaration !.viaModule).toBe('@angular/core');
     });
 
+    it('should return the source-file of an import namespace', () => {
+      const {program} = makeTestBundleProgram([NAMESPACED_IMPORT_FILE]);
+      const host = new Esm2015ReflectionHost(new MockLogger(), false, program.getTypeChecker());
+      const classNode = getDeclaration(
+          program, NAMESPACED_IMPORT_FILE.name, 'SomeDirective', ts.isClassDeclaration);
+      const classDecorators = host.getDecoratorsOfDeclaration(classNode) !;
+      const identifier = (((classDecorators[0].node as ts.ObjectLiteralExpression)
+                               .properties[0] as ts.PropertyAssignment)
+                              .initializer as ts.PropertyAccessExpression)
+                             .expression as ts.Identifier;
+
+      const expectedDeclarationNode =
+          program.getSourceFile('node_modules/@angular/core/index.d.ts') !;
+      const actualDeclaration = host.getDeclarationOfIdentifier(identifier);
+      expect(actualDeclaration).not.toBe(null);
+      expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
+      expect(actualDeclaration !.viaModule).toBe(null);
+    });
+
     it('should return the original declaration of an aliased class', () => {
       const program = makeTestProgram(CLASS_EXPRESSION_FILE);
       const host = new Esm2015ReflectionHost(new MockLogger(), false, program.getTypeChecker());
@@ -1649,6 +1686,7 @@ describe('Esm2015ReflectionHost', () => {
                ['ngModuleWithEmptyProviders', 'InternalModule'],
                ['ngModuleWithProviders', 'InternalModule'],
                ['externalNgModule', 'ExternalModule'],
+               ['namespacedExternalNgModule', 'ExternalModule'],
              ]);
        });
 
@@ -1665,6 +1703,7 @@ describe('Esm2015ReflectionHost', () => {
                ['ngModuleWithEmptyProviders', 'InternalModule'],
                ['ngModuleWithProviders', 'InternalModule'],
                ['externalNgModule', 'ExternalModule'],
+               ['namespacedExternalNgModule', 'ExternalModule'],
              ]);
        });
 
diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
index 9c38c7f4fb..c4966b9023 100644
--- a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
@@ -643,6 +643,7 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
     name: '/src/functions.js',
     contents: `
     import {ExternalModule} from './module';
+    import * as mod from './module';
 
     var SomeService = (function() {
       function SomeService() {}
@@ -664,6 +665,7 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
     export function ngModuleString() { return { ngModule: 'foo' }; }
     export function ngModuleObject() { return { ngModule: { foo: 42 } }; }
     export function externalNgModule() { return { ngModule: ExternalModule }; }
+    export function namespacedExternalNgModule() { return { ngModule: mod.ExternalModule }; }
     export {SomeService, InternalModule};
     `
   },
@@ -671,6 +673,7 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
     name: '/src/methods.js',
     contents: `
     import {ExternalModule} from './module';
+    import * as mod from './module';
     var SomeService = (function() {
       function SomeService() {}
       return SomeService;
@@ -683,6 +686,7 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
         instanceNgModuleWithEmptyProviders: function() { return { ngModule: InternalModule, providers: [] }; },
         instanceNgModuleWithProviders: function() { return { ngModule: InternalModule, providers: [SomeService] }; },
         instanceExternalNgModule: function() { return { ngModule: ExternalModule }; },
+        namespacedExternalNgModule = function() { return { ngModule: mod.ExternalModule }; },
       };
       InternalModule.aNumber = function() { return 42; };
       InternalModule.aString = function() { return 'foo'; };
@@ -695,6 +699,7 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
       InternalModule.ngModuleString = function() { return { ngModule: 'foo' }; };
       InternalModule.ngModuleObject = function() { return { ngModule: { foo: 42 } }; };
       InternalModule.externalNgModule = function() { return { ngModule: ExternalModule }; };
+      InternalModule.namespacedExternalNgModule = function() { return { ngModule: mod.ExternalModule }; };
       return InternalModule;
     }());
     export {SomeService, InternalModule};
@@ -716,6 +721,22 @@ const MODULE_WITH_PROVIDERS_PROGRAM = [
   {name: '/src/module.js', contents: 'export class ExternalModule {}'},
 ];
 
+const NAMESPACED_IMPORT_FILE = {
+  name: '/some_directive.js',
+  contents: `
+    import * as core from '@angular/core';
+
+    var SomeDirective = (function() {
+      function SomeDirective() {
+      }
+      SomeDirective.decorators = [
+        { type: core.Directive, args: [{ selector: '[someDirective]' },] }
+      ];
+      return SomeDirective;
+    }());
+    `
+};
+
 describe('Esm5ReflectionHost', () => {
 
   describe('getDecoratorsOfDeclaration()', () => {
@@ -1500,6 +1521,25 @@ describe('Esm5ReflectionHost', () => {
       expect(actualDeclaration !.viaModule).toBe('@angular/core');
     });
 
+    it('should return the source-file of an import namespace', () => {
+      const program = makeTestProgram(NAMESPACED_IMPORT_FILE);
+      const host = new Esm5ReflectionHost(new MockLogger(), false, program.getTypeChecker());
+      const classNode = getDeclaration(
+          program, NAMESPACED_IMPORT_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const classDecorators = host.getDecoratorsOfDeclaration(classNode) !;
+      const identifier = (((classDecorators[0].node as ts.ObjectLiteralExpression)
+                               .properties[0] as ts.PropertyAssignment)
+                              .initializer as ts.PropertyAccessExpression)
+                             .expression as ts.Identifier;
+
+      const expectedDeclarationNode =
+          program.getSourceFile('node_modules/@angular/core/index.d.ts') !;
+      const actualDeclaration = host.getDeclarationOfIdentifier(identifier);
+      expect(actualDeclaration).not.toBe(null);
+      expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
+      expect(actualDeclaration !.viaModule).toBe(null);
+    });
+
     it('should return the correct declaration for an inner function identifier inside an ES5 IIFE',
        () => {
          const superGetDeclarationOfIdentifierSpy =
@@ -1851,6 +1891,7 @@ describe('Esm5ReflectionHost', () => {
                ['ngModuleWithEmptyProviders', 'InternalModule'],
                ['ngModuleWithProviders', 'InternalModule'],
                ['externalNgModule', 'ExternalModule'],
+               ['namespacedExternalNgModule', 'ExternalModule'],
              ]);
        });
 
@@ -1877,6 +1918,10 @@ describe('Esm5ReflectionHost', () => {
              'function() { return { ngModule: ExternalModule }; }',
              'ExternalModule',
            ],
+           [
+             'function() { return { ngModule: mod.ExternalModule }; }',
+             'ExternalModule',
+           ],
          ]);
        });
 

From 48b77459efced47ba99d2e567193aaa23e3f257b Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 065/275] refactor(ivy): ngcc - abstract how module statements
 are found (#25445)

This will be important for UMD support.

PR Close #25445
---
 packages/compiler-cli/ngcc/src/host/esm2015_host.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
index e2d666773e..d65a6f32d6 100644
--- a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
@@ -312,7 +312,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    */
   findDecoratedClasses(sourceFile: ts.SourceFile): DecoratedClass[] {
     const classes: DecoratedClass[] = [];
-    sourceFile.statements.map(statement => {
+    this.getModuleStatements(sourceFile).forEach(statement => {
       if (ts.isVariableStatement(statement)) {
         statement.declarationList.declarations.forEach(declaration => {
           const decoratedClass = this.getDecoratedClassFromSymbol(this.getClassSymbol(declaration));
@@ -474,6 +474,16 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     this.aliasedClassDeclarations.set(aliasedDeclaration.node, declaration.name);
   }
 
+  /** Get the top level statements for a module.
+   *
+   * In ES5 and ES2015 this is just the top level statements of the file.
+   * @param sourceFile The module whose statements we want.
+   * @returns An array of top level statements for the given module.
+   */
+  protected getModuleStatements(sourceFile: ts.SourceFile): ts.Statement[] {
+    return Array.from(sourceFile.statements);
+  }
+
   protected getDecoratorsOfSymbol(symbol: ClassSymbol): Decorator[]|null {
     const decoratorsProperty = this.getStaticProperty(symbol, DECORATORS);
     if (decoratorsProperty) {

From 0fa72a8bc83b6b1f02edbc92650ebb1d2baa2c78 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 066/275] refactor(ivy): ngcc - fake core and tslib should be
 typings files (#25445)

Previously these fake files were full TypeScript source
files (`.ts`) but this is not necessary as we only need the
typings not the implementation.

PR Close #25445
---
 .../compiler-cli/ngcc/test/helpers/utils.ts   | 51 ++++++++-----------
 .../host/esm2015_host_import_helper_spec.ts   |  2 +-
 .../ngcc/test/host/esm2015_host_spec.ts       |  7 ++-
 .../test/host/esm5_host_import_helper_spec.ts |  2 +-
 .../ngcc/test/host/esm5_host_spec.ts          |  7 ++-
 5 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/packages/compiler-cli/ngcc/test/helpers/utils.ts b/packages/compiler-cli/ngcc/test/helpers/utils.ts
index f4eae77e54..5463251b46 100644
--- a/packages/compiler-cli/ngcc/test/helpers/utils.ts
+++ b/packages/compiler-cli/ngcc/test/helpers/utils.ts
@@ -64,49 +64,38 @@ export function makeTestProgram(
 // TODO: unify this with the //packages/compiler-cli/test/ngtsc/fake_core package
 export function getFakeCore() {
   return {
-    name: 'node_modules/@angular/core/index.ts',
+    name: 'node_modules/@angular/core/index.d.ts',
     contents: `
       type FnWithArg<T> = (arg?: any) => T;
 
-      function callableClassDecorator(): FnWithArg<(clazz: any) => any> {
-        return null !;
+      export declare const Component: FnWithArg<(clazz: any) => any>;
+      export declare const Directive: FnWithArg<(clazz: any) => any>;
+      export declare const Injectable: FnWithArg<(clazz: any) => any>;
+      export declare const NgModule: FnWithArg<(clazz: any) => any>;
+
+      export declare const Input: any;
+
+      export declare const Inject: FnWithArg<(a: any, b: any, c: any) => void>;
+      export declare const Self: FnWithArg<(a: any, b: any, c: any) => void>;
+      export declare const SkipSelf: FnWithArg<(a: any, b: any, c: any) => void>;
+      export declare const Optional: FnWithArg<(a: any, b: any, c: any) => void>;
+
+      export declare class InjectionToken {
+        constructor(name: string);
       }
 
-      function callableParamDecorator(): FnWithArg<(a: any, b: any, c: any) => void> {
-        return null !;
-      }
-
-      function makePropDecorator(): any {
-      }
-
-      export const Component = callableClassDecorator();
-      export const Directive = callableClassDecorator();
-      export const Injectable = callableClassDecorator();
-      export const NgModule = callableClassDecorator();
-
-      export const Input = makePropDecorator();
-
-      export const Inject = callableParamDecorator();
-      export const Self = callableParamDecorator();
-      export const SkipSelf = callableParamDecorator();
-      export const Optional = callableParamDecorator();
-
-      export class InjectionToken {
-        constructor(name: string) {}
-      }
-
-      export interface ModuleWithProviders<T = any> {}
+      export declare interface ModuleWithProviders<T = any> {}
     `
   };
 }
 
 export function getFakeTslib() {
   return {
-    name: 'node_modules/tslib/index.ts',
+    name: 'node_modules/tslib/index.d.ts',
     contents: `
-    export function __decorate(decorators: any[], target: any, key?: string | symbol, desc?: any) {}
-    export function __param(paramIndex: number, decorator: any) {}
-    export function __metadata(metadataKey: any, metadataValue: any) {}
+    export declare function __decorate(decorators: any[], target: any, key?: string | symbol, desc?: any);
+    export declare function __param(paramIndex: number, decorator: any);
+    export declare function __metadata(metadataKey: any, metadataValue: any);
     `
   };
 }
diff --git a/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts b/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts
index da5834541a..44d6315a52 100644
--- a/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts
@@ -346,7 +346,7 @@ describe('Fesm2015ReflectionHost [import helper style]', () => {
               null;
 
           const expectedDeclarationNode = getDeclaration(
-              program, 'node_modules/@angular/core/index.ts', 'Directive',
+              program, 'node_modules/@angular/core/index.d.ts', 'Directive',
               isNamedVariableDeclaration);
           const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective !);
           expect(actualDeclaration).not.toBe(null);
diff --git a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
index 1da2f5b0eb..75defb0600 100644
--- a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
@@ -1359,7 +1359,8 @@ describe('Esm2015ReflectionHost', () => {
                                         .initializer as ts.Identifier;
 
       const expectedDeclarationNode = getDeclaration(
-          program, 'node_modules/@angular/core/index.ts', 'Directive', isNamedVariableDeclaration);
+          program, 'node_modules/@angular/core/index.d.ts', 'Directive',
+          isNamedVariableDeclaration);
       const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective);
       expect(actualDeclaration).not.toBe(null);
       expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
@@ -1419,9 +1420,7 @@ describe('Esm2015ReflectionHost', () => {
       const values = Array.from(exportDeclarations !.values())
                          .map(declaration => [declaration.node.getText(), declaration.viaModule]);
       expect(values).toEqual([
-        // TODO clarify what is expected here...
-        // [`Directive = callableClassDecorator()`, '@angular/core'],
-        [`Directive = callableClassDecorator()`, null],
+        [`Directive: FnWithArg<(clazz: any) => any>`, null],
         [`a = 'a'`, null],
         [`b = a`, null],
         [`c = foo`, null],
diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts
index bcaadcc8a9..65b02de6ff 100644
--- a/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts
@@ -365,7 +365,7 @@ describe('Esm5ReflectionHost [import helper style]', () => {
               null;
 
           const expectedDeclarationNode = getDeclaration(
-              program, 'node_modules/@angular/core/index.ts', 'Directive',
+              program, 'node_modules/@angular/core/index.d.ts', 'Directive',
               isNamedVariableDeclaration);
           const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective !);
           expect(actualDeclaration).not.toBe(null);
diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
index c4966b9023..76cc48b156 100644
--- a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
@@ -1514,7 +1514,8 @@ describe('Esm5ReflectionHost', () => {
                                         .initializer as ts.Identifier;
 
       const expectedDeclarationNode = getDeclaration(
-          program, 'node_modules/@angular/core/index.ts', 'Directive', isNamedVariableDeclaration);
+          program, 'node_modules/@angular/core/index.d.ts', 'Directive',
+          isNamedVariableDeclaration);
       const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective);
       expect(actualDeclaration).not.toBe(null);
       expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
@@ -1590,9 +1591,7 @@ describe('Esm5ReflectionHost', () => {
       const values = Array.from(exportDeclarations !.values())
                          .map(declaration => [declaration.node.getText(), declaration.viaModule]);
       expect(values).toEqual([
-        // TODO: clarify what is expected here...
-        //[`Directive = callableClassDecorator()`, '@angular/core'],
-        [`Directive = callableClassDecorator()`, null],
+        [`Directive: FnWithArg<(clazz: any) => any>`, null],
         [`a = 'a'`, null],
         [`b = a`, null],
         [`c = foo`, null],

From 37f69eddc788de24430536dd6163b4e86341c3d4 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 067/275] test(ivy): ngcc - remove unnecessary code (#25445)

PR Close #25445
---
 .../compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
index 83c8b253cf..21e0153575 100644
--- a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
@@ -281,7 +281,7 @@ SOME DEFINITION TEXT
        });
 
     it('should error if the compiledClass is not valid', () => {
-      const {renderer, host, sourceFile, program} = setup(PROGRAM);
+      const {renderer, sourceFile, program} = setup(PROGRAM);
       const output = new MagicString(PROGRAM.contents);
 
       const noIifeDeclaration =
@@ -355,9 +355,7 @@ SOME DEFINITION TEXT
          expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[b]' }] }`);
          expect(output.toString()).toContain(`{ type: OtherB }`);
          expect(output.toString()).toContain(`function C() {}\nSOME DEFINITION TEXT\n  return C;`);
-         expect(output.toString()).not.toContain(`C.decorators = [
-  { type: Directive, args: [{ selector: '[c]' }] },
-];`);
+         expect(output.toString()).not.toContain(`C.decorators`);
        });
 
   });

From c9b588b3497c03baa978b1aadd19a99b8885ec8a Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 068/275] feat(ivy): ngtsc - support namespaced `forwardRef`
 calls (#25445)

In some cases the `forwardRef` helper has been imported via a namespace,
e.g. `core.forwardRef(...)`.

This commit adds support for unwrapping such namespaced imports when
ngtsc is statically evaluating code.

PR Close #25445
---
 .../compiler-cli/src/ngtsc/annotations/src/util.ts   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index b8f9bff340..a9866b33e8 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -230,15 +230,21 @@ function expandForwardRef(arg: ts.Expression): ts.Expression|null {
  */
 export function unwrapForwardRef(node: ts.Expression, reflector: ReflectionHost): ts.Expression {
   node = unwrapExpression(node);
-  if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression) ||
-      node.arguments.length !== 1) {
+  if (!ts.isCallExpression(node) || node.arguments.length !== 1) {
     return node;
   }
+
+  const fn =
+      ts.isPropertyAccessExpression(node.expression) ? node.expression.name : node.expression;
+  if (!ts.isIdentifier(fn)) {
+    return node;
+  }
+
   const expr = expandForwardRef(node.arguments[0]);
   if (expr === null) {
     return node;
   }
-  const imp = reflector.getImportOfIdentifier(node.expression);
+  const imp = reflector.getImportOfIdentifier(fn);
   if (imp === null || imp.from !== '@angular/core' || imp.name !== 'forwardRef') {
     return node;
   } else {

From 7fec1771fcc8e053ac0491db967f9d91d1d3899f Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:34 +0100
Subject: [PATCH 069/275] feat(ivy): ngcc - implement `UmdReflectionHost`
 (#25445)

PR Close #25445
---
 .../compiler-cli/ngcc/src/host/umd_host.ts    |  278 +++
 .../ngcc/test/host/umd_host_spec.ts           | 1857 +++++++++++++++++
 2 files changed, 2135 insertions(+)
 create mode 100644 packages/compiler-cli/ngcc/src/host/umd_host.ts
 create mode 100644 packages/compiler-cli/ngcc/test/host/umd_host_spec.ts

diff --git a/packages/compiler-cli/ngcc/src/host/umd_host.ts b/packages/compiler-cli/ngcc/src/host/umd_host.ts
new file mode 100644
index 0000000000..33283a6380
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/host/umd_host.ts
@@ -0,0 +1,278 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+import {Declaration, Import} from '../../../src/ngtsc/reflection';
+import {Logger} from '../logging/logger';
+import {BundleProgram} from '../packages/bundle_program';
+import {Esm5ReflectionHost} from './esm5_host';
+
+export class UmdReflectionHost extends Esm5ReflectionHost {
+  protected umdModules = new Map<ts.SourceFile, UmdModule|null>();
+  protected umdExports = new Map<ts.SourceFile, Map<string, Declaration>|null>();
+  protected umdImportPaths = new Map<ts.ParameterDeclaration, string|null>();
+  constructor(
+      logger: Logger, isCore: boolean, protected program: ts.Program,
+      protected compilerHost: ts.CompilerHost, dts?: BundleProgram|null) {
+    super(logger, isCore, program.getTypeChecker(), dts);
+  }
+
+  getImportOfIdentifier(id: ts.Identifier): Import|null {
+    const importParameter = this.findUmdImportParameter(id);
+    const from = importParameter && this.getUmdImportPath(importParameter);
+    return from !== null ? {from, name: id.text} : null;
+  }
+
+  getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null {
+    return this.getUmdImportedDeclaration(id) || super.getDeclarationOfIdentifier(id);
+  }
+
+  getExportsOfModule(module: ts.Node): Map<string, Declaration>|null {
+    return super.getExportsOfModule(module) || this.getUmdExports(module.getSourceFile());
+  }
+
+  getUmdModule(sourceFile: ts.SourceFile): UmdModule|null {
+    if (sourceFile.isDeclarationFile) {
+      return null;
+    }
+    if (!this.umdModules.has(sourceFile)) {
+      if (sourceFile.statements.length !== 1) {
+        throw new Error(
+            `Expected UMD module file (${sourceFile.fileName}) to contain exactly one statement, but found ${sourceFile.statements}.`);
+      }
+      this.umdModules.set(sourceFile, parseStatementForUmdModule(sourceFile.statements[0]));
+    }
+    return this.umdModules.get(sourceFile) !;
+  }
+
+  getUmdImportPath(importParameter: ts.ParameterDeclaration): string|null {
+    if (this.umdImportPaths.has(importParameter)) {
+      return this.umdImportPaths.get(importParameter) !;
+    }
+
+    const umdModule = this.getUmdModule(importParameter.getSourceFile());
+    if (umdModule === null) {
+      return null;
+    }
+
+    const imports = getImportsOfUmdModule(umdModule);
+    if (imports === null) {
+      return null;
+    }
+
+    for (const i of imports) {
+      this.umdImportPaths.set(i.parameter, i.path);
+      if (i.parameter === importParameter) {
+        return i.path;
+      }
+    }
+
+    return null;
+  }
+
+  getUmdExports(sourceFile: ts.SourceFile): Map<string, Declaration>|null {
+    if (!this.umdExports.has(sourceFile)) {
+      const moduleExports = this.computeExportsOfUmdModule(sourceFile);
+      this.umdExports.set(sourceFile, moduleExports);
+    }
+    return this.umdExports.get(sourceFile) !;
+  }
+
+  /** Get the top level statements for a module.
+   *
+   * In UMD modules these are the body of the UMD factory function.
+   *
+   * @param sourceFile The module whose statements we want.
+   * @returns An array of top level statements for the given module.
+   */
+  protected getModuleStatements(sourceFile: ts.SourceFile): ts.Statement[] {
+    const umdModule = this.getUmdModule(sourceFile);
+    return umdModule !== null ? Array.from(umdModule.factoryFn.body.statements) : [];
+  }
+
+  private computeExportsOfUmdModule(sourceFile: ts.SourceFile): Map<string, Declaration>|null {
+    const moduleMap = new Map<string, Declaration>();
+    const exportStatements = this.getModuleStatements(sourceFile).filter(isUmdExportStatement);
+    const exportDeclarations =
+        exportStatements.map(statement => this.extractUmdExportDeclaration(statement));
+    exportDeclarations.forEach(decl => {
+      if (decl) {
+        moduleMap.set(decl.name, decl.declaration);
+      }
+    });
+    return moduleMap;
+  }
+
+  private extractUmdExportDeclaration(statement: UmdExportStatement): UmdExportDeclaration|null {
+    const exportExpression = statement.expression.right;
+    const name = statement.expression.left.name.text;
+
+    const declaration = this.getDeclarationOfExpression(exportExpression);
+    if (declaration === null) {
+      return null;
+    }
+
+    return {name, declaration};
+  }
+
+  private findUmdImportParameter(id: ts.Identifier): ts.ParameterDeclaration|null {
+    // Is `id` a namespaced property access, e.g. `Directive` in `core.Directive`?
+    // If so capture the symbol of the namespace, e.g. `core`.
+    const nsIdentifier = findNamespaceOfIdentifier(id);
+    const nsSymbol = nsIdentifier && this.checker.getSymbolAtLocation(nsIdentifier) || null;
+
+    // Is the namespace a parameter on a UMD factory function, e.g. `function factory(this, core)`?
+    // If so then return its declaration.
+    const nsDeclaration = nsSymbol && nsSymbol.valueDeclaration;
+    return nsDeclaration && ts.isParameter(nsDeclaration) ? nsDeclaration : null;
+  }
+
+  private getUmdImportedDeclaration(id: ts.Identifier): Declaration|null {
+    const importInfo = this.getImportOfIdentifier(id);
+    if (importInfo === null) {
+      return null;
+    }
+
+    const importedFile = this.resolveModuleName(importInfo.from, id.getSourceFile());
+    if (importedFile === undefined) {
+      return null;
+    }
+
+    // We need to add the `viaModule` because  the `getExportsOfModule()` call
+    // did not know that we were importing the declaration.
+    return {node: importedFile, viaModule: importInfo.from};
+  }
+
+  private resolveModuleName(moduleName: string, containingFile: ts.SourceFile): ts.SourceFile
+      |undefined {
+    if (this.compilerHost.resolveModuleNames) {
+      const moduleInfo =
+          this.compilerHost.resolveModuleNames([moduleName], containingFile.fileName)[0];
+      return moduleInfo && this.program.getSourceFile(moduleInfo.resolvedFileName);
+    } else {
+      const moduleInfo = ts.resolveModuleName(
+          moduleName, containingFile.fileName, this.program.getCompilerOptions(),
+          this.compilerHost);
+      return moduleInfo.resolvedModule &&
+          this.program.getSourceFile(moduleInfo.resolvedModule.resolvedFileName);
+    }
+  }
+}
+
+export function parseStatementForUmdModule(statement: ts.Statement): UmdModule|null {
+  const wrapperCall = getUmdWrapperCall(statement);
+  if (!wrapperCall) return null;
+
+  const wrapperFn = wrapperCall.expression;
+  if (!ts.isFunctionExpression(wrapperFn)) return null;
+
+  const factoryFnParamIndex = wrapperFn.parameters.findIndex(
+      parameter => ts.isIdentifier(parameter.name) && parameter.name.text === 'factory');
+  if (factoryFnParamIndex === -1) return null;
+
+  const factoryFn = stripParentheses(wrapperCall.arguments[factoryFnParamIndex]);
+  if (!factoryFn || !ts.isFunctionExpression(factoryFn)) return null;
+
+  return {wrapperFn, factoryFn};
+}
+
+function getUmdWrapperCall(statement: ts.Statement): ts.CallExpression&
+    {expression: ts.FunctionExpression}|null {
+  if (!ts.isExpressionStatement(statement) || !ts.isParenthesizedExpression(statement.expression) ||
+      !ts.isCallExpression(statement.expression.expression) ||
+      !ts.isFunctionExpression(statement.expression.expression.expression)) {
+    return null;
+  }
+  return statement.expression.expression as ts.CallExpression & {expression: ts.FunctionExpression};
+}
+
+
+export function getImportsOfUmdModule(umdModule: UmdModule):
+    {parameter: ts.ParameterDeclaration, path: string}[] {
+  const imports: {parameter: ts.ParameterDeclaration, path: string}[] = [];
+  for (let i = 1; i < umdModule.factoryFn.parameters.length; i++) {
+    imports.push({
+      parameter: umdModule.factoryFn.parameters[i],
+      path: getRequiredModulePath(umdModule.wrapperFn, i)
+    });
+  }
+  return imports;
+}
+
+interface UmdModule {
+  wrapperFn: ts.FunctionExpression;
+  factoryFn: ts.FunctionExpression;
+}
+
+type UmdExportStatement = ts.ExpressionStatement & {
+  expression:
+      ts.BinaryExpression & {left: ts.PropertyAccessExpression & {expression: ts.Identifier}}
+};
+
+function isUmdExportStatement(s: ts.Statement): s is UmdExportStatement {
+  return ts.isExpressionStatement(s) && ts.isBinaryExpression(s.expression) &&
+      ts.isPropertyAccessExpression(s.expression.left) &&
+      ts.isIdentifier(s.expression.left.expression) &&
+      s.expression.left.expression.text === 'exports';
+}
+
+interface UmdExportDeclaration {
+  name: string;
+  declaration: Declaration;
+}
+
+function getRequiredModulePath(wrapperFn: ts.FunctionExpression, paramIndex: number): string {
+  const statement = wrapperFn.body.statements[0];
+  if (!ts.isExpressionStatement(statement)) {
+    throw new Error(
+        'UMD wrapper body is not an expression statement:\n' + wrapperFn.body.getText());
+  }
+  const modulePaths: string[] = [];
+  findModulePaths(statement.expression);
+
+  // Since we were only interested in the `require()` calls, we miss the `exports` argument, so we
+  // need to subtract 1.
+  // E.g. `function(exports, dep1, dep2)` maps to `function(exports, require('path/to/dep1'),
+  // require('path/to/dep2'))`
+  return modulePaths[paramIndex - 1];
+
+  // Search the statement for calls to `require('...')` and extract the string value of the first
+  // argument
+  function findModulePaths(node: ts.Node) {
+    if (isRequireCall(node)) {
+      const argument = node.arguments[0];
+      if (ts.isStringLiteral(argument)) {
+        modulePaths.push(argument.text);
+      }
+    } else {
+      node.forEachChild(findModulePaths);
+    }
+  }
+}
+
+function isRequireCall(node: ts.Node): node is ts.CallExpression {
+  return ts.isCallExpression(node) && ts.isIdentifier(node.expression) &&
+      node.expression.text === 'require' && node.arguments.length === 1;
+}
+
+/**
+ * If the identifier `id` is the RHS of a property access of the form `namespace.id`
+ * and `namespace` is an identifer then return `namespace`, otherwise `null`.
+ * @param id The identifier whose namespace we want to find.
+ */
+function findNamespaceOfIdentifier(id: ts.Identifier): ts.Identifier|null {
+  return id.parent && ts.isPropertyAccessExpression(id.parent) &&
+          ts.isIdentifier(id.parent.expression) ?
+      id.parent.expression :
+      null;
+}
+
+export function stripParentheses(node: ts.Node): ts.Node {
+  return ts.isParenthesizedExpression(node) ? node.expression : node;
+}
\ No newline at end of file
diff --git a/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts b/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts
new file mode 100644
index 0000000000..bf76f5a5d9
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts
@@ -0,0 +1,1857 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+import {ClassMemberKind, CtorParameter, Import, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
+import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
+import {getIifeBody} from '../../src/host/esm5_host';
+import {UmdReflectionHost} from '../../src/host/umd_host';
+import {MockLogger} from '../helpers/mock_logger';
+import {getDeclaration, makeTestBundleProgram} from '../helpers/utils';
+
+import {expectTypeValueReferencesForParameters} from './util';
+
+const SOME_DIRECTIVE_FILE = {
+  name: '/some_directive.umd.js',
+  contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+  typeof define === 'function' && define.amd ? define('some_directive', ['exports', '@angular/core'], factory) :
+  (factory(global.some_directive,global.ng.core));
+}(this, (function (exports,core) { 'use strict';
+
+  var INJECTED_TOKEN = new InjectionToken('injected');
+  var ViewContainerRef = {};
+  var TemplateRef = {};
+
+  var SomeDirective = (function() {
+    function SomeDirective(_viewContainer, _template, injected) {
+      this.instanceProperty = 'instance';
+    }
+    SomeDirective.prototype = {
+      instanceMethod: function() {},
+    };
+    SomeDirective.staticMethod = function() {};
+    SomeDirective.staticProperty = 'static';
+    SomeDirective.decorators = [
+      { type: core.Directive, args: [{ selector: '[someDirective]' },] }
+    ];
+    SomeDirective.ctorParameters = function() { return [
+      { type: ViewContainerRef, },
+      { type: TemplateRef, },
+      { type: undefined, decorators: [{ type: core.Inject, args: [INJECTED_TOKEN,] },] },
+    ]; };
+    SomeDirective.propDecorators = {
+      "input1": [{ type: core.Input },],
+      "input2": [{ type: core.Input },],
+    };
+    return SomeDirective;
+  }());
+  exports.SomeDirective = SomeDirective;
+})));`,
+};
+
+const SIMPLE_ES2015_CLASS_FILE = {
+  name: '/simple_es2015_class.d.ts',
+  contents: `
+    export class EmptyClass {}
+  `,
+};
+
+const SIMPLE_CLASS_FILE = {
+  name: '/simple_class.js',
+  contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define('simple_class', ['exports'], factory) :
+  (factory(global.simple_class));
+}(this, (function (exports) { 'use strict';
+  var EmptyClass = (function() {
+    function EmptyClass() {
+    }
+    return EmptyClass;
+  }());
+  var NoDecoratorConstructorClass = (function() {
+    function NoDecoratorConstructorClass(foo) {
+    }
+    return NoDecoratorConstructorClass;
+  }());
+  exports.EmptyClass = EmptyClass;
+  exports.NoDecoratorConstructorClass = NoDecoratorConstructorClass;
+})));`,
+};
+
+const FOO_FUNCTION_FILE = {
+  name: '/foo_function.js',
+  contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+  typeof define === 'function' && define.amd ? define('foo_function', ['exports', '@angular/core'], factory) :
+  (factory(global.foo_function,global.ng.core));
+}(this, (function (exports,core) { 'use strict';
+  function foo() {}
+  foo.decorators = [
+    { type: core.Directive, args: [{ selector: '[ignored]' },] }
+  ];
+  exports.foo = foo;
+})));`,
+};
+
+const INVALID_DECORATORS_FILE = {
+  name: '/invalid_decorators.js',
+  contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+  typeof define === 'function' && define.amd ? define('invalid_decorators', ['exports', '@angular/core'], factory) :
+  (factory(global.invalid_decorators, global.ng.core));
+}(this, (function (exports,core) { 'use strict';
+  var NotArrayLiteral = (function() {
+    function NotArrayLiteral() {
+    }
+    NotArrayLiteral.decorators = () => [
+      { type: core.Directive, args: [{ selector: '[ignored]' },] },
+    ];
+    return NotArrayLiteral;
+  }());
+
+  var NotObjectLiteral = (function() {
+    function NotObjectLiteral() {
+    }
+    NotObjectLiteral.decorators = [
+      "This is not an object literal",
+      { type: core.Directive },
+    ];
+    return NotObjectLiteral;
+  }());
+
+  var NoTypeProperty = (function() {
+    function NoTypeProperty() {
+    }
+    NoTypeProperty.decorators = [
+      { notType: core.Directive },
+      { type: core.Directive },
+    ];
+    return NoTypeProperty;
+  }());
+
+  var NotIdentifier = (function() {
+    function NotIdentifier() {
+    }
+    NotIdentifier.decorators = [
+      { type: 'StringsLiteralsAreNotIdentifiers' },
+      { type: core.Directive },
+    ];
+    return NotIdentifier;
+  }());
+})));`,
+};
+
+const INVALID_DECORATOR_ARGS_FILE = {
+  name: '/invalid_decorator_args.js',
+  contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+  typeof define === 'function' && define.amd ? define('invalid_decorator_args', ['exports', '@angular/core'], factory) :
+  (factory(global.invalid_decorator_args, global.ng.core));
+}(this, (function (exports,core) { 'use strict';
+  var NoArgsProperty = (function() {
+    function NoArgsProperty() {
+    }
+    NoArgsProperty.decorators = [
+      { type: core.Directive },
+    ];
+    return NoArgsProperty;
+  }());
+
+  var args = [{ selector: '[ignored]' },];
+  var NoPropertyAssignment = (function() {
+    function NoPropertyAssignment() {
+    }
+    NoPropertyAssignment.decorators = [
+      { type: core.Directive, args },
+    ];
+    return NoPropertyAssignment;
+  }());
+
+  var NotArrayLiteral = (function() {
+    function NotArrayLiteral() {
+    }
+    NotArrayLiteral.decorators = [
+      { type: core.Directive, args: () => [{ selector: '[ignored]' },] },
+    ];
+    return NotArrayLiteral;
+  }());
+})));`,
+};
+
+const INVALID_PROP_DECORATORS_FILE = {
+  name: '/invalid_prop_decorators.js',
+  contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+  typeof define === 'function' && define.amd ? define('invalid_prop_decorators', ['exports', '@angular/core'], factory) :
+  (factory(global.invalid_prop_decorators, global.ng.core));
+}(this, (function (exports,core) { 'use strict';
+  var NotObjectLiteral = (function() {
+    function NotObjectLiteral() {
+    }
+    NotObjectLiteral.propDecorators = () => ({
+      "prop": [{ type: core.Directive },]
+    });
+    return NotObjectLiteral;
+  }());
+
+  var NotObjectLiteralProp = (function() {
+    function NotObjectLiteralProp() {
+    }
+    NotObjectLiteralProp.propDecorators = {
+      "prop": [
+        "This is not an object literal",
+        { type: core.Directive },
+      ]
+    };
+    return NotObjectLiteralProp;
+  }());
+
+  var NoTypeProperty = (function() {
+    function NoTypeProperty() {
+    }
+    NoTypeProperty.propDecorators = {
+      "prop": [
+        { notType: core.Directive },
+        { type: core.Directive },
+      ]
+    };
+    return NoTypeProperty;
+  }());
+
+  var NotIdentifier = (function() {
+    function NotIdentifier() {
+    }
+    NotIdentifier.propDecorators = {
+      "prop": [
+        { type: 'StringsLiteralsAreNotIdentifiers' },
+        { type: core.Directive },
+      ]
+    };
+    return NotIdentifier;
+  }());
+})));`,
+};
+
+const INVALID_PROP_DECORATOR_ARGS_FILE = {
+  name: '/invalid_prop_decorator_args.js',
+  contents: `
+  (function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+    typeof define === 'function' && define.amd ? define('invalid_prop_decorator_args', ['exports', '@angular/core'], factory) :
+    (factory(global.invalid_prop_decorator_args, global.ng.core));
+  }(this, (function (exports,core) { 'use strict';
+  var NoArgsProperty = (function() {
+    function NoArgsProperty() {
+    }
+    NoArgsProperty.propDecorators = {
+      "prop": [{ type: core.Input },]
+    };
+    return NoArgsProperty;
+  }());
+
+  var args = [{ selector: '[ignored]' },];
+  var NoPropertyAssignment = (function() {
+    function NoPropertyAssignment() {
+    }
+    NoPropertyAssignment.propDecorators = {
+      "prop": [{ type: core.Input, args },]
+    };
+    return NoPropertyAssignment;
+  }());
+
+  var NotArrayLiteral = (function() {
+    function NotArrayLiteral() {
+    }
+    NotArrayLiteral.propDecorators = {
+      "prop": [{ type: core.Input, args: () => [{ selector: '[ignored]' },] },],
+    };
+    return NotArrayLiteral;
+  }());
+})));`,
+};
+
+const INVALID_CTOR_DECORATORS_FILE = {
+  name: '/invalid_ctor_decorators.js',
+  contents: `
+  (function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+    typeof define === 'function' && define.amd ? define('invalid_ctor_decorators', ['exports', '@angular/core'], factory) :
+    (factory(global.invalid_ctor_decorators,global.ng.core));
+  }(this, (function (exports,core) { 'use strict';
+    var NoParameters = (function() {
+    function NoParameters() {}
+    return NoParameters;
+  }());
+
+  var ArrowFunction = (function() {
+    function ArrowFunction(arg1) {
+    }
+    ArrowFunction.ctorParameters = () => [
+      { type: 'ParamType', decorators: [{ type: core.Inject },] }
+    ];
+    return ArrowFunction;
+  }());
+
+  var NotArrayLiteral = (function() {
+    function NotArrayLiteral(arg1) {
+    }
+    NotArrayLiteral.ctorParameters = function() { return 'StringsAreNotArrayLiterals'; };
+    return NotArrayLiteral;
+  }());
+
+  var NotObjectLiteral = (function() {
+    function NotObjectLiteral(arg1, arg2) {
+    }
+    NotObjectLiteral.ctorParameters = function() { return [
+      "This is not an object literal",
+      { type: 'ParamType', decorators: [{ type: core.Inject },] },
+    ]; };
+    return NotObjectLiteral;
+  }());
+
+  var NoTypeProperty = (function() {
+    function NoTypeProperty(arg1, arg2) {
+    }
+    NoTypeProperty.ctorParameters = function() { return [
+      {
+        type: 'ParamType',
+        decorators: [
+          { notType: core.Inject },
+          { type: core.Inject },
+        ]
+      },
+    ]; };
+    return NoTypeProperty;
+  }());
+
+  var NotIdentifier = (function() {
+    function NotIdentifier(arg1, arg2) {
+    }
+    NotIdentifier.ctorParameters = function() { return [
+      {
+        type: 'ParamType',
+        decorators: [
+          { type: 'StringsLiteralsAreNotIdentifiers' },
+          { type: core.Inject },
+        ]
+      },
+    ]; };
+    return NotIdentifier;
+  }());
+})));`,
+};
+
+const INVALID_CTOR_DECORATOR_ARGS_FILE = {
+  name: '/invalid_ctor_decorator_args.js',
+  contents: `
+  (function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+    typeof define === 'function' && define.amd ? define('invalid_ctor_decorator_args', ['exports', '@angular/core'], factory) :
+    (factory(global.invalid_ctor_decorator_args,global.ng.core));
+  }(this, (function (exports,core) { 'use strict';
+    var NoArgsProperty = (function() {
+    function NoArgsProperty(arg1) {
+    }
+    NoArgsProperty.ctorParameters = function() { return [
+      { type: 'ParamType', decorators: [{ type: core.Inject },] },
+    ]; };
+    return NoArgsProperty;
+  }());
+
+  var args = [{ selector: '[ignored]' },];
+  var NoPropertyAssignment = (function() {
+    function NoPropertyAssignment(arg1) {
+    }
+    NoPropertyAssignment.ctorParameters = function() { return [
+      { type: 'ParamType', decorators: [{ type: core.Inject, args },] },
+    ]; };
+    return NoPropertyAssignment;
+  }());
+
+  var NotArrayLiteral = (function() {
+    function NotArrayLiteral(arg1) {
+    }
+    NotArrayLiteral.ctorParameters = function() { return [
+      { type: 'ParamType', decorators: [{ type: core.Inject, args: () => [{ selector: '[ignored]' },] },] },
+    ]; };
+    return NotArrayLiteral;
+  }());
+})));`,
+};
+
+const IMPORTS_FILES = [
+  {
+    name: '/file_a.js',
+    contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define('file_a', ['exports'], factory) :
+  (factory(global.file_a));
+}(this, (function (exports) { 'use strict';
+  var a = 'a';
+  exports.a = a;
+})));`,
+  },
+  {
+    name: '/file_b.js',
+    contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./file_a')) :
+  typeof define === 'function' && define.amd ? define('file_b', ['exports', './file_a'], factory) :
+  (factory(global.file_b,global.file_a));
+}(this, (function (exports, file_a) { 'use strict';
+  var b = file_a.a;
+  var c = 'c';
+  var d = c;
+})));`,
+  },
+  {
+    name: '/file_c.js',
+    contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./file_a')) :
+  typeof define === 'function' && define.amd ? define('file_c', ['exports', 'file_a'], factory) :
+  (factory(global.file_c,global.file_a));
+}(this, function (exports, file_a) { 'use strict';
+  var c = file_a.a;
+}));`,
+  },
+];
+
+const EXPORTS_FILES = [
+  {
+    name: '/a_module.js',
+    contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define('a_module', ['exports'], factory) :
+  (factory(global.a_module));
+}(this, (function (exports) { 'use strict';
+  var a = 'a';
+  exports.a = a;
+})));`,
+  },
+  {
+    name: '/b_module.js',
+    contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('/a_module')) :
+  typeof define === 'function' && define.amd ? define('b_module', ['exports', '@angular/core', 'a_module'], factory) :
+  (factory(global.b_module));
+}(this, (function (exports, core, a_module) { 'use strict';
+  var b = a_module.a;
+  var e = 'e';
+  var SomeClass = (function() {
+    function SomeClass() {}
+    return SomeClass;
+  }());
+
+  exports.Directive = core.Directive;
+  exports.a = a_module.a;
+  exports.b = b;
+  exports.c = a_module.a;
+  exports.d = b;
+  exports.e = e;
+  exports.DirectiveX = core.Directive;
+  exports.SomeClass = SomeClass;
+})));`,
+  },
+];
+
+const FUNCTION_BODY_FILE = {
+  name: '/function_body.js',
+  contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define('function_body', ['exports'], factory) :
+  (factory(global.function_body));
+}(this, (function (exports) { 'use strict';
+    function foo(x) {
+    return x;
+  }
+  function bar(x, y) {
+    if (y === void 0) { y = 42; }
+    return x + y;
+  }
+  function complex() {
+    var x = 42;
+    return 42;
+  }
+  function baz(x) {
+    var y;
+    if (x === void 0) { y = 42; }
+    return y;
+  }
+  var y;
+  function qux(x) {
+    if (x === void 0) { y = 42; }
+    return y;
+  }
+  function moo() {
+    var x;
+    if (x === void 0) { x = 42; }
+    return x;
+  }
+  var x;
+  function juu() {
+    if (x === void 0) { x = 42; }
+    return x;
+  }
+})));`
+};
+
+const DECORATED_FILES = [
+  {
+    name: '/primary.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('./secondary')) :
+      typeof define === 'function' && define.amd ? define('primary', ['exports', '@angular/core', './secondary'], factory) :
+      (factory(global.primary,global.ng.core, global.secondary));
+    }(this, (function (exports,core,secondary) { 'use strict';
+    var A = (function() {
+      function A() {}
+      A.decorators = [
+        { type: core.Directive, args: [{ selector: '[a]' }] }
+      ];
+      return A;
+    }());
+     var B = (function() {
+      function B() {}
+      B.decorators = [
+        { type: core.Directive, args: [{ selector: '[b]' }] }
+      ];
+      return B;
+    }());
+     function x() {}
+     function y() {}
+     var C = (function() {
+      function C() {}
+      return C;
+    });
+    exports.A = A;
+    exports.x = x;
+    exports.C = C;
+    })));`
+  },
+  {
+    name: '/secondary.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+      typeof define === 'function' && define.amd ? define('primary', ['exports', '@angular/core'], factory) :
+      (factory(global.primary,global.ng.core));
+    }(this, (function (exports,core) { 'use strict';
+    var D = (function() {
+      function D() {}
+      D.decorators = [
+        { type: core.Directive, args: [{ selector: '[d]' }] }
+      ];
+      return D;
+    }());
+    exports.D = D;
+  })));
+    `
+  }
+];
+
+const TYPINGS_SRC_FILES = [
+  {
+    name: '/src/index.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./internal'), require('./class1'), require('./class2')) :
+      typeof define === 'function' && define.amd ? define('index', ['exports', './internal', './class1', './class2'], factory) :
+      (factory(global.index,global.internal,global.class1,global.class2));
+    }(this, (function (exports,internal,class1,class2) { 'use strict';
+      function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+      }
+      var InternalClass = internal.InternalClass;
+      __export(class1);
+      __export(class2);
+    })));
+    `
+  },
+  {
+    name: '/src/class1.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('class1', ['exports'], factory) :
+      (factory(global.class1));
+    }(this, (function (exports) { 'use strict';
+      var Class1 = (function() {
+        function Class1() {}
+        return Class1;
+      }());
+      var MissingClass1 = (function() {
+        function MissingClass1() {}
+        return MissingClass1;
+      }());
+      exports.Class1 = Class1;
+      exports.MissingClass1 = MissingClass1;
+    })));
+    `
+  },
+  {
+    name: '/src/class2.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('class2', ['exports'], factory) :
+      (factory(global.class2));
+    }(this, (function (exports) { 'use strict';
+      var Class2 = (function() {
+        function Class2() {}
+        return Class2;
+      }());
+      exports.Class2 = Class2;
+    })));
+    `
+  },
+  {name: '/src/func1.js', contents: 'function mooFn() {} export {mooFn}'}, {
+    name: '/src/internal.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('internal', ['exports'], factory) :
+      (factory(global.internal));
+    }(this, (function (exports) { 'use strict';
+      var InternalClass = (function() {
+        function InternalClass() {}
+        return InternalClass;
+      }());
+      var Class2 = (function() {
+        function Class2() {}
+        return Class2;
+      }());
+      exports.InternalClass =InternalClass;
+      exports.Class2 = Class2;
+    })));
+    `
+  },
+  {
+    name: '/src/missing-class.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('missingClass', ['exports'], factory) :
+      (factory(global.missingClass));
+    }(this, (function (exports) { 'use strict';
+      var MissingClass2 = (function() {
+        function MissingClass2() {}
+        return MissingClass2;
+      }());
+      exports. MissingClass2 = MissingClass2;
+    })));
+    `
+  },
+  {
+    name: '/src/flat-file.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('missingClass', ['exports'], factory) :
+      (factory(global.missingClass));
+    }(this, (function (exports) { 'use strict';
+      var Class1 = (function() {
+        function Class1() {}
+        return Class1;
+      }());
+      var MissingClass1 = (function() {
+        function MissingClass1() {}
+        return MissingClass1;
+      }());
+      var MissingClass2 = (function() {
+        function MissingClass2() {}
+        return MissingClass2;
+      }());
+      var Class3 = (function() {
+        function Class3() {}
+        return Class3;
+      }());
+      exports.Class1 = Class1;
+      exports.xClass3 = Class3;
+      exports.MissingClass1 = MissingClass1;
+      exports.MissingClass2 = MissingClass2;
+    })));
+    `
+  }
+];
+
+const TYPINGS_DTS_FILES = [
+  {
+    name: '/typings/index.d.ts',
+    contents:
+        `import {InternalClass} from './internal'; export * from './class1'; export * from './class2';`
+  },
+  {
+    name: '/typings/class1.d.ts',
+    contents: `export declare class Class1 {}\nexport declare class OtherClass {}`
+  },
+  {
+    name: '/typings/class2.d.ts',
+    contents:
+        `export declare class Class2 {}\nexport declare interface SomeInterface {}\nexport {Class3 as xClass3} from './class3';`
+  },
+  {name: '/typings/func1.d.ts', contents: 'export declare function mooFn(): void;'},
+  {
+    name: '/typings/internal.d.ts',
+    contents: `export declare class InternalClass {}\nexport declare class Class2 {}`
+  },
+  {name: '/typings/class3.d.ts', contents: `export declare class Class3 {}`},
+];
+
+const MODULE_WITH_PROVIDERS_PROGRAM = [
+  {
+    name: '/src/functions.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./module')) :
+      typeof define === 'function' && define.amd ? define('functions', ['exports', './module'], factory) :
+      (factory(global.functions,global.module));
+    }(this, (function (exports,module) { 'use strict';
+      var SomeService = (function() {
+        function SomeService() {}
+        return SomeService;
+      }());
+
+      var InternalModule = (function() {
+        function InternalModule() {}
+        return InternalModule;
+      }());
+
+      function aNumber() { return 42; }
+      function aString() { return 'foo'; }
+      function emptyObject() { return {}; }
+      function ngModuleIdentifier() { return { ngModule: InternalModule }; }
+      function ngModuleWithEmptyProviders() { return { ngModule: InternalModule, providers: [] }; }
+      function ngModuleWithProviders() { return { ngModule: InternalModule, providers: [SomeService] }; }
+      function onlyProviders() { return { providers: [SomeService] }; }
+      function ngModuleNumber() { return { ngModule: 42 }; }
+      function ngModuleString() { return { ngModule: 'foo' }; }
+      function ngModuleObject() { return { ngModule: { foo: 42 } }; }
+      function externalNgModule() { return { ngModule: module.ExternalModule }; }
+      // NOTE: We do not include the "namespaced" export tests in UMD as all UMD exports are already namespaced.
+      // function namespacedExternalNgModule() { return { ngModule: mod.ExternalModule }; }
+
+      exports.aNumber = aNumber;
+      exports.aString = aString;
+      exports.emptyObject = emptyObject;
+      exports.ngModuleIdentifier = ngModuleIdentifier;
+      exports.ngModuleWithEmptyProviders = ngModuleWithEmptyProviders;
+      exports.ngModuleWithProviders = ngModuleWithProviders;
+      exports.onlyProviders = onlyProviders;
+      exports.ngModuleNumber = ngModuleNumber;
+      exports.ngModuleString = ngModuleString;
+      exports.ngModuleObject = ngModuleObject;
+      exports.externalNgModule = externalNgModule;
+      exports.SomeService = SomeService;
+      exports.InternalModule = InternalModule;
+    })));
+    `
+  },
+  {
+    name: '/src/methods.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./module')) :
+      typeof define === 'function' && define.amd ? define('methods', ['exports', './module'], factory) :
+      (factory(global.methods,global.module));
+    }(this, (function (exports,module) { 'use strict';
+      var SomeService = (function() {
+        function SomeService() {}
+        return SomeService;
+      }());
+
+      var InternalModule = (function() {
+        function InternalModule() {}
+        InternalModule.prototype = {
+          instanceNgModuleIdentifier: function() { return { ngModule: InternalModule }; },
+          instanceNgModuleWithEmptyProviders: function() { return { ngModule: InternalModule, providers: [] }; },
+          instanceNgModuleWithProviders: function() { return { ngModule: InternalModule, providers: [SomeService] }; },
+          instanceExternalNgModule: function() { return { ngModule: module.ExternalModule }; },
+        };
+        InternalModule.aNumber = function() { return 42; };
+        InternalModule.aString = function() { return 'foo'; };
+        InternalModule.emptyObject = function() { return {}; };
+        InternalModule.ngModuleIdentifier = function() { return { ngModule: InternalModule }; };
+        InternalModule.ngModuleWithEmptyProviders = function() { return { ngModule: InternalModule, providers: [] }; };
+        InternalModule.ngModuleWithProviders = function() { return { ngModule: InternalModule, providers: [SomeService] }; };
+        InternalModule.onlyProviders = function() { return { providers: [SomeService] }; };
+        InternalModule.ngModuleNumber = function() { return { ngModule: 42 }; };
+        InternalModule.ngModuleString = function() { return { ngModule: 'foo' }; };
+        InternalModule.ngModuleObject = function() { return { ngModule: { foo: 42 } }; };
+        InternalModule.externalNgModule = function() { return { ngModule: module.ExternalModule }; };
+        return InternalModule;
+      }());
+
+      exports.SomeService = SomeService;
+      exports.InternalModule = InternalModule;
+    })));
+    `
+  },
+  {
+    name: '/src/aliased_class.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('aliased_class', ['exports'], factory) :
+      (factory(global.aliased_class));
+    }(this, (function (exports,module) { 'use strict';
+      var AliasedModule = (function() {
+        function AliasedModule() {}
+        AliasedModule_1 = AliasedModule;
+        AliasedModule.forRoot = function() { return { ngModule: AliasedModule_1 }; };
+        var AliasedModule_1;
+        return AliasedModule;
+      }());
+      exports.AliasedModule = AliasedModule;
+    })));
+    `
+  },
+  {
+    name: '/src/module.js',
+    contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('module', ['exports'], factory) :
+      (factory(global.module));
+    }(this, (function (exports,module) { 'use strict';
+      var ExternalModule = (function() {
+        function ExternalModule() {}
+        return ExternalModule;
+      }());
+      exports.ExternalModule = ExternalModule;
+    })));
+    `
+  },
+];
+
+
+describe('UmdReflectionHost', () => {
+
+  describe('getDecoratorsOfDeclaration()', () => {
+    it('should find the decorators on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators).toBeDefined();
+      expect(decorators.length).toEqual(1);
+
+      const decorator = decorators[0];
+      expect(decorator.name).toEqual('Directive');
+      expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
+      expect(decorator.args !.map(arg => arg.getText())).toEqual([
+        '{ selector: \'[someDirective]\' }',
+      ]);
+    });
+
+    it('should return null if the symbol is not a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const functionNode =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(functionNode);
+      expect(decorators).toBe(null);
+    });
+
+    it('should return null if there are no decorators', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode);
+      expect(decorators).toBe(null);
+    });
+
+    it('should ignore `decorators` if it is not an array literal', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NotArrayLiteral', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode);
+      expect(decorators).toEqual([]);
+    });
+
+    it('should ignore decorator elements that are not object literals', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NotObjectLiteral', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore decorator elements that have no `type` property', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NoTypeProperty', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore decorator elements whose `type` value is not an identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NotIdentifier', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should use `getImportOfIdentifier()` to retrieve import info', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'};
+      const spy = spyOn(host, 'getImportOfIdentifier').and.returnValue(mockImportInfo);
+
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toEqual(1);
+      expect(decorators[0].import).toBe(mockImportInfo);
+
+      const typeIdentifier = spy.calls.mostRecent().args[0] as ts.Identifier;
+      expect(typeIdentifier.text).toBe('Directive');
+    });
+
+    describe('(returned decorators `args`)', () => {
+      it('should be an empty array if decorator has no `args` property', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+            isNamedVariableDeclaration);
+        const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Directive');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if decorator\'s `args` has no property assignment', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+            isNamedVariableDeclaration);
+        const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Directive');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if `args` property value is not an array literal', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+            isNamedVariableDeclaration);
+        const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Directive');
+        expect(decorators[0].args).toEqual([]);
+      });
+    });
+  });
+
+  describe('getMembersOfClass()', () => {
+    it('should find decorated members on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const input1 = members.find(member => member.name === 'input1') !;
+      expect(input1.kind).toEqual(ClassMemberKind.Property);
+      expect(input1.isStatic).toEqual(false);
+      expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
+
+      const input2 = members.find(member => member.name === 'input2') !;
+      expect(input2.kind).toEqual(ClassMemberKind.Property);
+      expect(input2.isStatic).toEqual(false);
+      expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
+    });
+
+    it('should find non decorated properties on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const instanceProperty = members.find(member => member.name === 'instanceProperty') !;
+      expect(instanceProperty.kind).toEqual(ClassMemberKind.Property);
+      expect(instanceProperty.isStatic).toEqual(false);
+      expect(ts.isBinaryExpression(instanceProperty.implementation !)).toEqual(true);
+      expect(instanceProperty.value !.getText()).toEqual(`'instance'`);
+    });
+
+    it('should find static methods on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const staticMethod = members.find(member => member.name === 'staticMethod') !;
+      expect(staticMethod.kind).toEqual(ClassMemberKind.Method);
+      expect(staticMethod.isStatic).toEqual(true);
+      expect(ts.isFunctionExpression(staticMethod.implementation !)).toEqual(true);
+    });
+
+    it('should find static properties on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const staticProperty = members.find(member => member.name === 'staticProperty') !;
+      expect(staticProperty.kind).toEqual(ClassMemberKind.Property);
+      expect(staticProperty.isStatic).toEqual(true);
+      expect(ts.isPropertyAccessExpression(staticProperty.implementation !)).toEqual(true);
+      expect(staticProperty.value !.getText()).toEqual(`'static'`);
+    });
+
+    it('should throw if the symbol is not a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const functionNode =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      expect(() => {
+        host.getMembersOfClass(functionNode);
+      }).toThrowError(`Attempted to get members of a non-class: "function foo() {}"`);
+    });
+
+    it('should return an empty array if there are no prop decorators', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      expect(members).toEqual([]);
+    });
+
+    it('should not process decorated properties in `propDecorators` if it is not an object literal',
+       () => {
+         const {program, host: compilerHost} =
+             makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+         const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+         const classNode = getDeclaration(
+             program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteral',
+             isNamedVariableDeclaration);
+         const members = host.getMembersOfClass(classNode);
+
+         expect(members.map(member => member.name)).not.toContain('prop');
+       });
+
+    it('should ignore prop decorator elements that are not object literals', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteralProp',
+          isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+      const prop = members.find(m => m.name === 'prop') !;
+      const decorators = prop.decorators !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore prop decorator elements that have no `type` property', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_PROP_DECORATORS_FILE.name, 'NoTypeProperty', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+      const prop = members.find(m => m.name === 'prop') !;
+      const decorators = prop.decorators !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore prop decorator elements whose `type` value is not an identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_PROP_DECORATORS_FILE.name, 'NotIdentifier', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+      const prop = members.find(m => m.name === 'prop') !;
+      const decorators = prop.decorators !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should use `getImportOfIdentifier()` to retrieve import info', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const mockImportInfo = { name: 'mock', from: '@angular/core' } as Import;
+      const spy = spyOn(host, 'getImportOfIdentifier').and.returnValue(mockImportInfo);
+
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toEqual(1);
+      expect(decorators[0].import).toBe(mockImportInfo);
+
+      const typeIdentifier = spy.calls.mostRecent().args[0] as ts.Identifier;
+      expect(typeIdentifier.text).toBe('Directive');
+    });
+
+    describe('(returned prop decorators `args`)', () => {
+      it('should be an empty array if prop decorator has no `args` property', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_PROP_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+            isNamedVariableDeclaration);
+        const members = host.getMembersOfClass(classNode);
+        const prop = members.find(m => m.name === 'prop') !;
+        const decorators = prop.decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Input');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if prop decorator\'s `args` has no property assignment', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_PROP_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+            isNamedVariableDeclaration);
+        const members = host.getMembersOfClass(classNode);
+        const prop = members.find(m => m.name === 'prop') !;
+        const decorators = prop.decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Input');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if `args` property value is not an array literal', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_PROP_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+            isNamedVariableDeclaration);
+        const members = host.getMembersOfClass(classNode);
+        const prop = members.find(m => m.name === 'prop') !;
+        const decorators = prop.decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Input');
+        expect(decorators[0].args).toEqual([]);
+      });
+    });
+  });
+
+  describe('getConstructorParameters', () => {
+    it('should find the decorated constructor parameters', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters).toBeDefined();
+      expect(parameters !.map(parameter => parameter.name)).toEqual([
+        '_viewContainer', '_template', 'injected'
+      ]);
+      expectTypeValueReferencesForParameters(parameters !, [
+        'ViewContainerRef',
+        'TemplateRef',
+        null,
+      ]);
+    });
+
+    it('should throw if the symbol is not a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const functionNode =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      expect(() => { host.getConstructorParameters(functionNode); })
+          .toThrowError(
+              'Attempted to get constructor parameters of a non-class: "function foo() {}"');
+    });
+
+    // In ES5 there is no such thing as a constructor-less class
+    // it('should return `null` if there is no constructor', () => { });
+
+    it('should return an array even if there are no decorators', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SIMPLE_CLASS_FILE.name, 'NoDecoratorConstructorClass',
+          isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters).toEqual(jasmine.any(Array));
+      expect(parameters !.length).toEqual(1);
+      expect(parameters ![0].name).toEqual('foo');
+      expect(parameters ![0].decorators).toBe(null);
+    });
+
+    it('should return an empty array if there are no constructor parameters', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_CTOR_DECORATORS_FILE.name, 'NoParameters', isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters).toEqual([]);
+    });
+
+    // In ES5 there are no arrow functions
+    // it('should ignore `ctorParameters` if it is an arrow function', () => { });
+
+    it('should ignore `ctorParameters` if it does not return an array literal', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_CTOR_DECORATORS_FILE.name, 'NotArrayLiteral',
+          isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters !.length).toBe(1);
+      expect(parameters ![0]).toEqual(jasmine.objectContaining<CtorParameter>({
+        name: 'arg1',
+        decorators: null,
+      }));
+    });
+
+    describe('(returned parameters `decorators`)', () => {
+      it('should ignore param decorator elements that are not object literals', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATORS_FILE.name, 'NotObjectLiteral',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+
+        expect(parameters !.length).toBe(2);
+        expect(parameters ![0]).toEqual(jasmine.objectContaining<CtorParameter>({
+          name: 'arg1',
+          decorators: null,
+        }));
+        expect(parameters ![1]).toEqual(jasmine.objectContaining<CtorParameter>({
+          name: 'arg2',
+          decorators: jasmine.any(Array) as any
+        }));
+      });
+
+      it('should ignore param decorator elements that have no `type` property', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATORS_FILE.name, 'NoTypeProperty',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+      });
+
+      it('should ignore param decorator elements whose `type` value is not an identifier', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATORS_FILE.name, 'NotIdentifier',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+      });
+
+      it('should use `getImportOfIdentifier()` to retrieve import info', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+        const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'};
+        const spy = spyOn(UmdReflectionHost.prototype, 'getImportOfIdentifier')
+                        .and.returnValue(mockImportInfo);
+
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![2].decorators !;
+
+        expect(decorators.length).toEqual(1);
+        expect(decorators[0].import).toBe(mockImportInfo);
+
+        const typeIdentifier = spy.calls.mostRecent().args[0] as ts.Identifier;
+        expect(typeIdentifier.text).toBe('Inject');
+      });
+    });
+
+    describe('(returned parameters `decorators.args`)', () => {
+      it('should be an empty array if param decorator has no `args` property', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        expect(parameters !.length).toBe(1);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Inject');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if param decorator\'s `args` has no property assignment', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Inject');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if `args` property value is not an array literal', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+        const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Inject');
+        expect(decorators[0].args).toEqual([]);
+      });
+    });
+  });
+
+  describe('getDefinitionOfFunction()', () => {
+    it('should return an object describing the function declaration passed as an argument', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FUNCTION_BODY_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+
+      const fooNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'foo', isNamedFunctionDeclaration) !;
+      const fooDef = host.getDefinitionOfFunction(fooNode);
+      expect(fooDef.node).toBe(fooNode);
+      expect(fooDef.body !.length).toEqual(1);
+      expect(fooDef.body ![0].getText()).toEqual(`return x;`);
+      expect(fooDef.parameters.length).toEqual(1);
+      expect(fooDef.parameters[0].name).toEqual('x');
+      expect(fooDef.parameters[0].initializer).toBe(null);
+
+      const barNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'bar', isNamedFunctionDeclaration) !;
+      const barDef = host.getDefinitionOfFunction(barNode);
+      expect(barDef.node).toBe(barNode);
+      expect(barDef.body !.length).toEqual(1);
+      expect(ts.isReturnStatement(barDef.body ![0])).toBeTruthy();
+      expect(barDef.body ![0].getText()).toEqual(`return x + y;`);
+      expect(barDef.parameters.length).toEqual(2);
+      expect(barDef.parameters[0].name).toEqual('x');
+      expect(fooDef.parameters[0].initializer).toBe(null);
+      expect(barDef.parameters[1].name).toEqual('y');
+      expect(barDef.parameters[1].initializer !.getText()).toEqual('42');
+
+      const bazNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'baz', isNamedFunctionDeclaration) !;
+      const bazDef = host.getDefinitionOfFunction(bazNode);
+      expect(bazDef.node).toBe(bazNode);
+      expect(bazDef.body !.length).toEqual(3);
+      expect(bazDef.parameters.length).toEqual(1);
+      expect(bazDef.parameters[0].name).toEqual('x');
+      expect(bazDef.parameters[0].initializer).toBe(null);
+
+      const quxNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'qux', isNamedFunctionDeclaration) !;
+      const quxDef = host.getDefinitionOfFunction(quxNode);
+      expect(quxDef.node).toBe(quxNode);
+      expect(quxDef.body !.length).toEqual(2);
+      expect(quxDef.parameters.length).toEqual(1);
+      expect(quxDef.parameters[0].name).toEqual('x');
+      expect(quxDef.parameters[0].initializer).toBe(null);
+    });
+  });
+
+  describe('getImportOfIdentifier', () => {
+    it('should find the import of an identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(IMPORTS_FILES);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const variableNode = getDeclaration(program, '/file_b.js', 'b', isNamedVariableDeclaration);
+      const identifier =
+          (variableNode.initializer && ts.isPropertyAccessExpression(variableNode.initializer)) ?
+          variableNode.initializer.name :
+          null;
+
+      expect(identifier).not.toBe(null);
+      const importOfIdent = host.getImportOfIdentifier(identifier !);
+      expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
+    });
+
+    it('should return null if the identifier was not imported', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(IMPORTS_FILES);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const variableNode = getDeclaration(program, '/file_b.js', 'd', isNamedVariableDeclaration);
+      const importOfIdent = host.getImportOfIdentifier(variableNode.initializer as ts.Identifier);
+
+      expect(importOfIdent).toBeNull();
+    });
+
+    it('should handle factory functions not wrapped in parentheses', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(IMPORTS_FILES);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const variableNode = getDeclaration(program, '/file_c.js', 'c', isNamedVariableDeclaration);
+      const identifier =
+          (variableNode.initializer && ts.isPropertyAccessExpression(variableNode.initializer)) ?
+          variableNode.initializer.name :
+          null;
+
+      expect(identifier).not.toBe(null);
+      const importOfIdent = host.getImportOfIdentifier(identifier !);
+      expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
+    });
+  });
+
+  describe('getDeclarationOfIdentifier', () => {
+    it('should return the declaration of a locally defined identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const ctrDecorators = host.getConstructorParameters(classNode) !;
+      const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference !as{
+                                             local: true,
+                                             expression: ts.Identifier,
+                                             defaultImportStatement: null,
+                                           }).expression;
+
+      const expectedDeclarationNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'ViewContainerRef', isNamedVariableDeclaration);
+      const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfViewContainerRef);
+      expect(actualDeclaration).not.toBe(null);
+      expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
+      expect(actualDeclaration !.viaModule).toBe(null);
+    });
+
+    it('should return the source-file of an import namespace', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const classDecorators = host.getDecoratorsOfDeclaration(classNode) !;
+      const identifierOfDirective = (((classDecorators[0].node as ts.ObjectLiteralExpression)
+                                          .properties[0] as ts.PropertyAssignment)
+                                         .initializer as ts.PropertyAccessExpression)
+                                        .expression as ts.Identifier;
+
+      const expectedDeclarationNode =
+          program.getSourceFile('node_modules/@angular/core/index.d.ts') !;
+      const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective);
+      expect(actualDeclaration).not.toBe(null);
+      expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
+      expect(actualDeclaration !.viaModule).toBe('@angular/core');
+    });
+  });
+
+  describe('getExportsOfModule()', () => {
+    it('should return a map of all the exports from a given module', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(EXPORTS_FILES);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const file = program.getSourceFile(EXPORTS_FILES[1].name) !;
+      const exportDeclarations = host.getExportsOfModule(file);
+      expect(exportDeclarations).not.toBe(null);
+      expect(Array.from(exportDeclarations !.entries())
+                 .map(entry => [entry[0], entry[1].node.getText(), entry[1].viaModule]))
+          .toEqual([
+            ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
+            ['a', `a = 'a'`, '/a_module'],
+            ['b', `b = a_module.a`, null],
+            ['c', `a = 'a'`, '/a_module'],
+            ['d', `b = a_module.a`, null],
+            ['e', `e = 'e'`, null],
+            ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
+            [
+              'SomeClass', `SomeClass = (function() {
+    function SomeClass() {}
+    return SomeClass;
+  }())`,
+              null
+            ],
+          ]);
+    });
+
+    // Currently we do not support UMD versions of `export * from 'x';`
+    // because it gets compiled to something like:
+    //
+    //     __export(m) {
+    //       for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    //     }
+    //     __export(x);
+    //
+    // So far all UMD formatted entry-points are flat so this should not occur.
+    // If it does later then we should implement parsing.
+  });
+
+  describe('getClassSymbol()', () => {
+    it('should return the class symbol for an ES2015 class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_ES2015_CLASS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const node = getDeclaration(
+          program, SIMPLE_ES2015_CLASS_FILE.name, 'EmptyClass', isNamedClassDeclaration);
+      const classSymbol = host.getClassSymbol(node);
+
+      expect(classSymbol).toBeDefined();
+      expect(classSymbol !.valueDeclaration).toBe(node);
+    });
+
+    it('should return the class symbol for an ES5 class (outer variable declaration)', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const node =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const classSymbol = host.getClassSymbol(node);
+
+      expect(classSymbol).toBeDefined();
+      expect(classSymbol !.valueDeclaration).toBe(node);
+    });
+
+    it('should return the class symbol for an ES5 class (inner function declaration)', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const outerNode =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const innerNode = getIifeBody(outerNode) !.statements.find(isNamedFunctionDeclaration) !;
+      const classSymbol = host.getClassSymbol(innerNode);
+
+      expect(classSymbol).toBeDefined();
+      expect(classSymbol !.valueDeclaration).toBe(outerNode);
+    });
+
+    it('should return the same class symbol (of the outer declaration) for outer and inner declarations',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+         const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+         const outerNode = getDeclaration(
+             program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+         const innerNode = getIifeBody(outerNode) !.statements.find(isNamedFunctionDeclaration) !;
+
+         expect(host.getClassSymbol(innerNode)).toBe(host.getClassSymbol(outerNode));
+       });
+
+    it('should return undefined if node is not an ES5 class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const node =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      const classSymbol = host.getClassSymbol(node);
+
+      expect(classSymbol).toBeUndefined();
+    });
+  });
+
+  describe('isClass()', () => {
+    let host: UmdReflectionHost;
+    let mockNode: ts.Node;
+    let getClassDeclarationSpy: jasmine.Spy;
+    let superGetClassDeclarationSpy: jasmine.Spy;
+
+    beforeEach(() => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      mockNode = {} as any;
+
+      getClassDeclarationSpy = spyOn(UmdReflectionHost.prototype, 'getClassDeclaration');
+      superGetClassDeclarationSpy = spyOn(Esm2015ReflectionHost.prototype, 'getClassDeclaration');
+    });
+
+    it('should return true if superclass returns true', () => {
+      superGetClassDeclarationSpy.and.returnValue(true);
+      getClassDeclarationSpy.and.callThrough();
+
+      expect(host.isClass(mockNode)).toBe(true);
+      expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+      expect(superGetClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+    });
+
+    it('should return true if it can find a declaration for the class', () => {
+      getClassDeclarationSpy.and.returnValue(true);
+
+      expect(host.isClass(mockNode)).toBe(true);
+      expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+    });
+
+    it('should return false if it cannot find a declaration for the class', () => {
+      getClassDeclarationSpy.and.returnValue(false);
+
+      expect(host.isClass(mockNode)).toBe(false);
+      expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+    });
+  });
+
+  describe('hasBaseClass()', () => {
+    function hasBaseClass(source: string) {
+      const file = {
+        name: '/synthesized_constructors.js',
+        contents: source,
+      };
+
+      const {program, host: compilerHost} = makeTestBundleProgram([file]);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(program, file.name, 'TestClass', isNamedVariableDeclaration);
+      return host.hasBaseClass(classNode);
+    }
+
+    it('should consider an IIFE with _super parameter as having a base class', () => {
+      const result = hasBaseClass(`
+        var TestClass = /** @class */ (function (_super) {
+          __extends(TestClass, _super);
+          function TestClass() {}
+          return TestClass;
+        }(null));`);
+      expect(result).toBe(true);
+    });
+
+    it('should consider an IIFE with a unique name generated for the _super parameter as having a base class',
+       () => {
+         const result = hasBaseClass(`
+        var TestClass = /** @class */ (function (_super_1) {
+          __extends(TestClass, _super_1);
+          function TestClass() {}
+          return TestClass;
+        }(null));`);
+         expect(result).toBe(true);
+       });
+
+    it('should not consider an IIFE without parameter as having a base class', () => {
+      const result = hasBaseClass(`
+        var TestClass = /** @class */ (function () {
+          __extends(TestClass, _super);
+          function TestClass() {}
+          return TestClass;
+        }(null));`);
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('findDecoratedClasses()', () => {
+    it('should return an array of all decorated classes in the given source file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(DECORATED_FILES);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const primary = program.getSourceFile(DECORATED_FILES[0].name) !;
+
+      const primaryDecoratedClasses = host.findDecoratedClasses(primary);
+      expect(primaryDecoratedClasses.length).toEqual(2);
+      const classA = primaryDecoratedClasses.find(c => c.name === 'A') !;
+      expect(classA.decorators.map(decorator => decorator.name)).toEqual(['Directive']);
+      // Note that `B` is not exported from `primary.js`
+      const classB = primaryDecoratedClasses.find(c => c.name === 'B') !;
+      expect(classB.decorators.map(decorator => decorator.name)).toEqual(['Directive']);
+
+      const secondary = program.getSourceFile(DECORATED_FILES[1].name) !;
+      const secondaryDecoratedClasses = host.findDecoratedClasses(secondary);
+      expect(secondaryDecoratedClasses.length).toEqual(1);
+      // Note that `D` is exported from `secondary.js` but not exported from `primary.js`
+      const classD = secondaryDecoratedClasses.find(c => c.name === 'D') !;
+      expect(classD.name).toEqual('D');
+      expect(classD.decorators.map(decorator => decorator.name)).toEqual(['Directive']);
+    });
+  });
+
+  describe('getDtsDeclarationsOfClass()', () => {
+    it('should find the dts declaration that has the same relative path to the source file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const class1 = getDeclaration(program, '/src/class1.js', 'Class1', ts.isVariableDeclaration);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      const dtsDeclaration = host.getDtsDeclaration(class1);
+      expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class1.d.ts');
+    });
+
+    it('should find the dts declaration for exported functions', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dtsProgram = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const mooFn = getDeclaration(program, '/src/func1.js', 'mooFn', ts.isFunctionDeclaration);
+      const host =
+          new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dtsProgram);
+
+      const dtsDeclaration = host.getDtsDeclaration(mooFn);
+      expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/func1.d.ts');
+    });
+
+    it('should return null if there is no matching class in the matching dts file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const missingClass =
+          getDeclaration(program, '/src/class1.js', 'MissingClass1', ts.isVariableDeclaration);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      expect(host.getDtsDeclaration(missingClass)).toBe(null);
+    });
+
+    it('should return null if there is no matching dts file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const missingClass = getDeclaration(
+          program, '/src/missing-class.js', 'MissingClass2', ts.isVariableDeclaration);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      expect(host.getDtsDeclaration(missingClass)).toBe(null);
+    });
+
+    it('should find the dts file that contains a matching class declaration, even if the source files do not match',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+         const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+         const class1 =
+             getDeclaration(program, '/src/flat-file.js', 'Class1', ts.isVariableDeclaration);
+         const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+         const dtsDeclaration = host.getDtsDeclaration(class1);
+         expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class1.d.ts');
+       });
+
+    it('should find aliased exports', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const class3 =
+          getDeclaration(program, '/src/flat-file.js', 'Class3', ts.isVariableDeclaration);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      const dtsDeclaration = host.getDtsDeclaration(class3);
+      expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class3.d.ts');
+    });
+
+    it('should find the dts file that contains a matching class declaration, even if the class is not publicly exported',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+         const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+         const internalClass =
+             getDeclaration(program, '/src/internal.js', 'InternalClass', ts.isVariableDeclaration);
+         const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+         const dtsDeclaration = host.getDtsDeclaration(internalClass);
+         expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/internal.d.ts');
+       });
+
+    it('should prefer the publicly exported class if there are multiple classes with the same name',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+         const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+         const class2 =
+             getDeclaration(program, '/src/class2.js', 'Class2', ts.isVariableDeclaration);
+         const internalClass2 =
+             getDeclaration(program, '/src/internal.js', 'Class2', ts.isVariableDeclaration);
+         const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+         const class2DtsDeclaration = host.getDtsDeclaration(class2);
+         expect(class2DtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class2.d.ts');
+
+         const internalClass2DtsDeclaration = host.getDtsDeclaration(internalClass2);
+         expect(internalClass2DtsDeclaration !.getSourceFile().fileName)
+             .toEqual('/typings/class2.d.ts');
+       });
+  });
+
+  describe('getModuleWithProvidersFunctions', () => {
+    it('should find every exported function that returns an object that looks like a ModuleWithProviders object',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(MODULE_WITH_PROVIDERS_PROGRAM);
+         const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+         const file = program.getSourceFile('/src/functions.js') !;
+         const fns = host.getModuleWithProvidersFunctions(file);
+         expect(fns.map(fn => [fn.declaration.name !.getText(), fn.ngModule.node.name.text]))
+             .toEqual([
+               ['ngModuleIdentifier', 'InternalModule'],
+               ['ngModuleWithEmptyProviders', 'InternalModule'],
+               ['ngModuleWithProviders', 'InternalModule'],
+               ['externalNgModule', 'ExternalModule'],
+             ]);
+       });
+
+    it('should find every static method on exported classes that return an object that looks like a ModuleWithProviders object',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(MODULE_WITH_PROVIDERS_PROGRAM);
+         const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+         const file = program.getSourceFile('/src/methods.js') !;
+         const fn = host.getModuleWithProvidersFunctions(file);
+         expect(fn.map(fn => [fn.declaration.getText(), fn.ngModule.node.name.text])).toEqual([
+           [
+             'function() { return { ngModule: InternalModule }; }',
+             'InternalModule',
+           ],
+           [
+             'function() { return { ngModule: InternalModule, providers: [] }; }',
+             'InternalModule',
+           ],
+           [
+             'function() { return { ngModule: InternalModule, providers: [SomeService] }; }',
+             'InternalModule',
+           ],
+           [
+             'function() { return { ngModule: module.ExternalModule }; }',
+             'ExternalModule',
+           ],
+         ]);
+       });
+
+    // https://github.com/angular/angular/issues/29078
+    it('should resolve aliased module references to their original declaration', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(MODULE_WITH_PROVIDERS_PROGRAM);
+      const host = new UmdReflectionHost(new MockLogger(), false, program, compilerHost);
+      const file = program.getSourceFile('/src/aliased_class.js') !;
+      const fn = host.getModuleWithProvidersFunctions(file);
+      expect(fn.map(fn => [fn.declaration.getText(), fn.ngModule.node.name.text])).toEqual([
+        ['function() { return { ngModule: AliasedModule_1 }; }', 'AliasedModule'],
+      ]);
+    });
+  });
+});

From f6aa60c03cc02992b1e63af80b21b10513fe3194 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:35 +0100
Subject: [PATCH 070/275] feat(ivy): ngcc - implement `UmdRenderer` (#25445)

PR Close #25445
---
 .../ngcc/src/rendering/esm_renderer.ts        |   6 +-
 .../ngcc/src/rendering/renderer.ts            |  35 +-
 .../ngcc/src/rendering/umd_renderer.ts        | 207 ++++++++
 .../test/rendering/esm2015_renderer_spec.ts   |  40 +-
 .../ngcc/test/rendering/esm5_renderer_spec.ts |  52 +-
 .../ngcc/test/rendering/renderer_spec.ts      |  44 +-
 .../ngcc/test/rendering/umd_renderer_spec.ts  | 490 ++++++++++++++++++
 7 files changed, 812 insertions(+), 62 deletions(-)
 create mode 100644 packages/compiler-cli/ngcc/src/rendering/umd_renderer.ts
 create mode 100644 packages/compiler-cli/ngcc/test/rendering/umd_renderer_spec.ts

diff --git a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
index 607595449f..3b2be815d3 100644
--- a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
@@ -9,7 +9,7 @@ import MagicString from 'magic-string';
 import * as ts from 'typescript';
 import {PathSegment, AbsoluteFsPath} from '../../../src/ngtsc/path';
 import {isDtsPath} from '../../../src/ngtsc/util/src/typescript';
-import {Import} from '../../../src/ngtsc/translator';
+import {Import, ImportManager} from '../../../src/ngtsc/translator';
 import {CompiledClass} from '../analysis/decoration_analyzer';
 import {ExportInfo} from '../analysis/private_declarations_analyzer';
 import {FileSystem} from '../file_system/file_system';
@@ -35,7 +35,9 @@ export class EsmRenderer extends Renderer {
     output.appendLeft(insertionPoint, renderedImports);
   }
 
-  addExports(output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[]): void {
+  addExports(
+      output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[],
+      importManager: ImportManager, file: ts.SourceFile): void {
     exports.forEach(e => {
       let exportFrom = '';
       const isDtsFile = isDtsPath(entryPointBasePath);
diff --git a/packages/compiler-cli/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
index eb69584086..f2dbf5b276 100644
--- a/packages/compiler-cli/ngcc/src/rendering/renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
@@ -127,6 +127,7 @@ export abstract class Renderer {
       sourceFile: ts.SourceFile, compiledFile: CompiledFile|undefined,
       switchMarkerAnalysis: SwitchMarkerAnalysis|undefined,
       privateDeclarationsAnalyses: PrivateDeclarationsAnalyses): FileInfo[] {
+    const isEntryPoint = sourceFile === this.bundle.src.file;
     const input = this.extractSourceMap(sourceFile);
     const outputText = new MagicString(input.source);
 
@@ -135,11 +136,11 @@ export abstract class Renderer {
           outputText, switchMarkerAnalysis.sourceFile, switchMarkerAnalysis.declarations);
     }
 
-    if (compiledFile) {
-      const importManager = new ImportManager(
-          this.getImportRewriter(this.bundle.src.r3SymbolsFile, this.bundle.isFlatCore),
-          IMPORT_PREFIX);
+    const importManager = new ImportManager(
+        this.getImportRewriter(this.bundle.src.r3SymbolsFile, this.bundle.isFlatCore),
+        IMPORT_PREFIX);
 
+    if (compiledFile) {
       // TODO: remove constructor param metadata and property decorators (we need info from the
       // handlers to do this)
       const decoratorsToRemove = this.computeDecoratorsToRemove(compiledFile.compiledClasses);
@@ -154,19 +155,24 @@ export abstract class Renderer {
           outputText,
           renderConstantPool(compiledFile.sourceFile, compiledFile.constantPool, importManager),
           compiledFile.sourceFile);
-
-      this.addImports(
-          outputText, importManager.getAllImports(compiledFile.sourceFile.fileName),
-          compiledFile.sourceFile);
     }
 
     // Add exports to the entry-point file
-    if (sourceFile === this.bundle.src.file) {
+    if (isEntryPoint) {
       const entryPointBasePath = stripExtension(this.bundle.src.path);
-      this.addExports(outputText, entryPointBasePath, privateDeclarationsAnalyses);
+      this.addExports(
+          outputText, entryPointBasePath, privateDeclarationsAnalyses, importManager, sourceFile);
     }
 
-    return this.renderSourceAndMap(sourceFile, input, outputText);
+    if (isEntryPoint || compiledFile) {
+      this.addImports(outputText, importManager.getAllImports(sourceFile.fileName), sourceFile);
+    }
+
+    if (compiledFile || switchMarkerAnalysis || isEntryPoint) {
+      return this.renderSourceAndMap(sourceFile, input, outputText);
+    } else {
+      return [];
+    }
   }
 
   renderDtsFile(dtsFile: ts.SourceFile, renderInfo: DtsRenderInfo): FileInfo[] {
@@ -189,7 +195,9 @@ export abstract class Renderer {
     this.addModuleWithProvidersParams(outputText, renderInfo.moduleWithProviders, importManager);
     this.addImports(outputText, importManager.getAllImports(dtsFile.fileName), dtsFile);
 
-    this.addExports(outputText, AbsoluteFsPath.fromSourceFile(dtsFile), renderInfo.privateExports);
+    this.addExports(
+        outputText, AbsoluteFsPath.fromSourceFile(dtsFile), renderInfo.privateExports,
+        importManager, dtsFile);
 
 
     return this.renderSourceAndMap(dtsFile, input, outputText);
@@ -251,7 +259,8 @@ export abstract class Renderer {
       void;
   protected abstract addImports(output: MagicString, imports: Import[], sf: ts.SourceFile): void;
   protected abstract addExports(
-      output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[]): void;
+      output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[],
+      importManager: ImportManager, file: ts.SourceFile): void;
   protected abstract addDefinitions(
       output: MagicString, compiledClass: CompiledClass, definitions: string): void;
   protected abstract removeDecorators(
diff --git a/packages/compiler-cli/ngcc/src/rendering/umd_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/umd_renderer.ts
new file mode 100644
index 0000000000..e3ccfff46f
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/rendering/umd_renderer.ts
@@ -0,0 +1,207 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {dirname, relative} from 'canonical-path';
+import * as ts from 'typescript';
+import MagicString from 'magic-string';
+import {Import, ImportManager} from '../../../src/ngtsc/translator';
+import {ExportInfo} from '../analysis/private_declarations_analyzer';
+import {FileSystem} from '../file_system/file_system';
+import {UmdReflectionHost} from '../host/umd_host';
+import {Logger} from '../logging/logger';
+import {EntryPointBundle} from '../packages/entry_point_bundle';
+import {Esm5Renderer} from './esm5_renderer';
+import {stripExtension} from './renderer';
+
+type CommonJsConditional = ts.ConditionalExpression & {whenTrue: ts.CallExpression};
+type AmdConditional = ts.ConditionalExpression & {whenTrue: ts.CallExpression};
+
+export class UmdRenderer extends Esm5Renderer {
+  constructor(
+      fs: FileSystem, logger: Logger, protected umdHost: UmdReflectionHost, isCore: boolean,
+      bundle: EntryPointBundle) {
+    super(fs, logger, umdHost, isCore, bundle);
+  }
+
+  /**
+   *  Add the imports at the top of the file
+   */
+  addImports(output: MagicString, imports: Import[], file: ts.SourceFile): void {
+    // Assume there is only one UMD module in the file
+    const umdModule = this.umdHost.getUmdModule(file);
+    if (!umdModule) {
+      return;
+    }
+
+    const wrapperFunction = umdModule.wrapperFn;
+
+    // We need to add new `require()` calls for each import in the CommonJS initializer
+    renderCommonJsDependencies(output, wrapperFunction, imports);
+    renderAmdDependencies(output, wrapperFunction, imports);
+    renderGlobalDependencies(output, wrapperFunction, imports);
+    renderFactoryParameters(output, wrapperFunction, imports);
+  }
+
+  addExports(
+      output: MagicString, entryPointBasePath: string, exports: ExportInfo[],
+      importManager: ImportManager, file: ts.SourceFile): void {
+    const umdModule = this.umdHost.getUmdModule(file);
+    if (!umdModule) {
+      return;
+    }
+    const factoryFunction = umdModule.factoryFn;
+    const lastStatement =
+        factoryFunction.body.statements[factoryFunction.body.statements.length - 1];
+    const insertionPoint =
+        lastStatement ? lastStatement.getEnd() : factoryFunction.body.getEnd() - 1;
+    exports.forEach(e => {
+      const basePath = stripExtension(e.from);
+      const relativePath = './' + relative(dirname(entryPointBasePath), basePath);
+      const namedImport = entryPointBasePath !== basePath ?
+          importManager.generateNamedImport(relativePath, e.identifier) :
+          {symbol: e.identifier, moduleImport: null};
+      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport}.` : '';
+      const exportStr = `\nexports.${e.identifier} = ${importNamespace}${namedImport.symbol};`;
+      output.appendRight(insertionPoint, exportStr);
+    });
+  }
+
+  addConstants(output: MagicString, constants: string, file: ts.SourceFile): void {
+    if (constants === '') {
+      return;
+    }
+    const umdModule = this.umdHost.getUmdModule(file);
+    if (!umdModule) {
+      return;
+    }
+    const factoryFunction = umdModule.factoryFn;
+    const firstStatement = factoryFunction.body.statements[0];
+    const insertionPoint =
+        firstStatement ? firstStatement.getStart() : factoryFunction.body.getStart() + 1;
+    output.appendLeft(insertionPoint, '\n' + constants + '\n');
+  }
+}
+
+function renderCommonJsDependencies(
+    output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
+  const conditional = find(wrapperFunction.body.statements[0], isCommonJSConditional);
+  if (!conditional) {
+    return;
+  }
+  const factoryCall = conditional.whenTrue;
+  const injectionPoint = factoryCall.getEnd() -
+      1;  // Backup one char to account for the closing parenthesis on the call
+  imports.forEach(i => output.appendLeft(injectionPoint, `,require('${i.specifier}')`));
+}
+
+function renderAmdDependencies(
+    output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
+  const conditional = find(wrapperFunction.body.statements[0], isAmdConditional);
+  if (!conditional) {
+    return;
+  }
+  const dependencyArray = conditional.whenTrue.arguments[1];
+  if (!dependencyArray || !ts.isArrayLiteralExpression(dependencyArray)) {
+    return;
+  }
+  const injectionPoint = dependencyArray.getEnd() -
+      1;  // Backup one char to account for the closing square bracket on the array
+  imports.forEach(i => output.appendLeft(injectionPoint, `,'${i.specifier}'`));
+}
+
+function renderGlobalDependencies(
+    output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
+  const globalFactoryCall = find(wrapperFunction.body.statements[0], isGlobalFactoryCall);
+  if (!globalFactoryCall) {
+    return;
+  }
+  const injectionPoint = globalFactoryCall.getEnd() -
+      1;  // Backup one char to account for the closing parenthesis on the call
+  imports.forEach(i => output.appendLeft(injectionPoint, `,global.${getGlobalIdentifier(i)}`));
+}
+
+function renderFactoryParameters(
+    output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
+  const wrapperCall = wrapperFunction.parent as ts.CallExpression;
+  const secondArgument = wrapperCall.arguments[1];
+  if (!secondArgument) {
+    return;
+  }
+
+  // Be resilient to the factory being inside parentheses
+  const factoryFunction =
+      ts.isParenthesizedExpression(secondArgument) ? secondArgument.expression : secondArgument;
+  if (!ts.isFunctionExpression(factoryFunction)) {
+    return;
+  }
+  const parameters = factoryFunction.parameters;
+  const injectionPoint = parameters[parameters.length - 1].getEnd();
+  imports.forEach(i => output.appendLeft(injectionPoint, `,${i.qualifier}`));
+}
+
+function isCommonJSConditional(value: ts.Node): value is CommonJsConditional {
+  if (!ts.isConditionalExpression(value)) {
+    return false;
+  }
+  if (!ts.isBinaryExpression(value.condition) ||
+      value.condition.operatorToken.kind !== ts.SyntaxKind.AmpersandAmpersandToken) {
+    return false;
+  }
+  if (!oneOfBinaryConditions(value.condition, (exp) => isTypeOf(exp, 'exports', 'module'))) {
+    return false;
+  }
+  if (!ts.isCallExpression(value.whenTrue) || !ts.isIdentifier(value.whenTrue.expression)) {
+    return false;
+  }
+  return value.whenTrue.expression.text === 'factory';
+}
+
+function isAmdConditional(value: ts.Node): value is AmdConditional {
+  if (!ts.isConditionalExpression(value)) {
+    return false;
+  }
+  if (!ts.isBinaryExpression(value.condition) ||
+      value.condition.operatorToken.kind !== ts.SyntaxKind.AmpersandAmpersandToken) {
+    return false;
+  }
+  if (!oneOfBinaryConditions(value.condition, (exp) => isTypeOf(exp, 'define'))) {
+    return false;
+  }
+  if (!ts.isCallExpression(value.whenTrue) || !ts.isIdentifier(value.whenTrue.expression)) {
+    return false;
+  }
+  return value.whenTrue.expression.text === 'define';
+}
+
+function isGlobalFactoryCall(value: ts.Node): value is ts.CallExpression {
+  if (ts.isCallExpression(value) && !!value.parent) {
+    // Be resilient to the value being inside parentheses
+    const expression = ts.isParenthesizedExpression(value.parent) ? value.parent : value;
+    return !!expression.parent && ts.isConditionalExpression(expression.parent) &&
+        expression.parent.whenFalse === expression;
+  } else {
+    return false;
+  }
+}
+
+function getGlobalIdentifier(i: Import) {
+  return i.specifier.replace('@angular/', 'ng.').replace(/^\//, '');
+}
+
+function find<T>(node: ts.Node, test: (node: ts.Node) => node is ts.Node & T): T|undefined {
+  return test(node) ? node : node.forEachChild(child => find<T>(child, test));
+}
+
+function oneOfBinaryConditions(
+    node: ts.BinaryExpression, test: (expression: ts.Expression) => boolean) {
+  return test(node.left) || test(node.right);
+}
+
+function isTypeOf(node: ts.Expression, ...types: string[]): boolean {
+  return ts.isBinaryExpression(node) && ts.isTypeOfExpression(node.left) &&
+      ts.isIdentifier(node.left.expression) && types.indexOf(node.left.expression.text) !== -1;
+}
diff --git a/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts
index 34ba2583bf..df75d709b1 100644
--- a/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts
@@ -7,10 +7,13 @@
  */
 import MagicString from 'magic-string';
 import * as ts from 'typescript';
+import {NoopImportRewriter} from '../../../src/ngtsc/imports';
 import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {ImportManager} from '../../../src/ngtsc/translator';
 import {DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
 import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
+import {IMPORT_PREFIX} from '../../src/constants';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
 import {EsmRenderer} from '../../src/rendering/esm_renderer';
 import {makeTestEntryPointBundle} from '../helpers/utils';
@@ -32,10 +35,11 @@ function setup(file: {name: AbsoluteFsPath, contents: string}) {
                                  .analyzeProgram();
   const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program);
   const renderer = new EsmRenderer(fs, logger, host, false, bundle);
+  const importManager = new ImportManager(new NoopImportRewriter(), IMPORT_PREFIX);
   return {
     host,
     program: bundle.src.program,
-    sourceFile: bundle.src.file, renderer, decorationAnalyses, switchMarkerAnalyses
+    sourceFile: bundle.src.file, renderer, decorationAnalyses, switchMarkerAnalyses, importManager,
   };
 }
 
@@ -136,14 +140,17 @@ import * as i1 from '@angular/common';`);
 
   describe('addExports', () => {
     it('should insert the given exports at the end of the source file', () => {
-      const {renderer} = setup(PROGRAM);
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
       const output = new MagicString(PROGRAM.contents);
-      renderer.addExports(output, _(PROGRAM.name.replace(/\.js$/, '')), [
-        {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA1'},
-        {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA2'},
-        {from: _('/some/foo/b.js'), dtsFrom: _('/some/foo/b.d.ts'), identifier: 'ComponentB'},
-        {from: PROGRAM.name, dtsFrom: PROGRAM.name, identifier: 'TopLevelComponent'},
-      ]);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), dtsFrom: _('/some/foo/b.d.ts'), identifier: 'ComponentB'},
+            {from: PROGRAM.name, dtsFrom: PROGRAM.name, identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
       expect(output.toString()).toContain(`
 // Some other content
 export {ComponentA1} from './a';
@@ -153,14 +160,17 @@ export {TopLevelComponent};`);
     });
 
     it('should not insert alias exports in js output', () => {
-      const {renderer} = setup(PROGRAM);
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
       const output = new MagicString(PROGRAM.contents);
-      renderer.addExports(output, _(PROGRAM.name.replace(/\.js$/, '')), [
-        {from: _('/some/a.js'), alias: 'eComponentA1', identifier: 'ComponentA1'},
-        {from: _('/some/a.js'), alias: 'eComponentA2', identifier: 'ComponentA2'},
-        {from: _('/some/foo/b.js'), alias: 'eComponentB', identifier: 'ComponentB'},
-        {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
-      ]);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), alias: 'eComponentA1', identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), alias: 'eComponentA2', identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), alias: 'eComponentB', identifier: 'ComponentB'},
+            {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
       const outputString = output.toString();
       expect(outputString).not.toContain(`{eComponentA1 as ComponentA1}`);
       expect(outputString).not.toContain(`{eComponentB as ComponentB}`);
diff --git a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
index 21e0153575..fc57b1e653 100644
--- a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
@@ -7,10 +7,13 @@
  */
 import MagicString from 'magic-string';
 import * as ts from 'typescript';
+import {NoopImportRewriter} from '../../../src/ngtsc/imports';
 import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {ImportManager} from '../../../src/ngtsc/translator';
 import {DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
 import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
+import {IMPORT_PREFIX} from '../../src/constants';
 import {Esm5ReflectionHost} from '../../src/host/esm5_host';
 import {Esm5Renderer} from '../../src/rendering/esm5_renderer';
 import {makeTestEntryPointBundle, getDeclaration} from '../helpers/utils';
@@ -33,10 +36,11 @@ function setup(file: {name: AbsoluteFsPath, contents: string}) {
           .analyzeProgram();
   const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program);
   const renderer = new Esm5Renderer(fs, logger, host, false, bundle);
+  const importManager = new ImportManager(new NoopImportRewriter(), IMPORT_PREFIX);
   return {
     host,
     program: bundle.src.program,
-    sourceFile: bundle.src.file, renderer, decorationAnalyses, switchMarkerAnalyses
+    sourceFile: bundle.src.file, renderer, decorationAnalyses, switchMarkerAnalyses, importManager
   };
 }
 
@@ -87,8 +91,8 @@ var BadIife = (function() {
 var compileNgModuleFactory = compileNgModuleFactory__PRE_R3__;
 var badlyFormattedVariable = __PRE_R3__badlyFormattedVariable;
 function compileNgModuleFactory__PRE_R3__(injector, options, moduleType) {
-  const compilerFactory = injector.get(CompilerFactory);
-  const compiler = compilerFactory.createCompiler([options]);
+  var compilerFactory = injector.get(CompilerFactory);
+  var compiler = compilerFactory.createCompiler([options]);
   return compiler.compileModuleAsync(moduleType);
 }
 
@@ -174,14 +178,17 @@ import * as i1 from '@angular/common';`);
 
   describe('addExports', () => {
     it('should insert the given exports at the end of the source file', () => {
-      const {renderer} = setup(PROGRAM);
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
       const output = new MagicString(PROGRAM.contents);
-      renderer.addExports(output, _(PROGRAM.name.replace(/\.js$/, '')), [
-        {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA1'},
-        {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA2'},
-        {from: _('/some/foo/b.js'), dtsFrom: _('/some/foo/b.d.ts'), identifier: 'ComponentB'},
-        {from: PROGRAM.name, dtsFrom: PROGRAM.name, identifier: 'TopLevelComponent'},
-      ]);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), dtsFrom: _('/some/foo/b.d.ts'), identifier: 'ComponentB'},
+            {from: PROGRAM.name, dtsFrom: PROGRAM.name, identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
       expect(output.toString()).toContain(`
 export {A, B, C, NoIife, BadIife};
 export {ComponentA1} from './a';
@@ -191,14 +198,17 @@ export {TopLevelComponent};`);
     });
 
     it('should not insert alias exports in js output', () => {
-      const {renderer} = setup(PROGRAM);
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
       const output = new MagicString(PROGRAM.contents);
-      renderer.addExports(output, _(PROGRAM.name.replace(/\.js$/, '')), [
-        {from: _('/some/a.js'), alias: _('eComponentA1'), identifier: 'ComponentA1'},
-        {from: _('/some/a.js'), alias: _('eComponentA2'), identifier: 'ComponentA2'},
-        {from: _('/some/foo/b.js'), alias: _('eComponentB'), identifier: 'ComponentB'},
-        {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
-      ]);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), alias: _('eComponentA1'), identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), alias: _('eComponentA2'), identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), alias: _('eComponentB'), identifier: 'ComponentB'},
+            {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
       const outputString = output.toString();
       expect(outputString).not.toContain(`{eComponentA1 as ComponentA1}`);
       expect(outputString).not.toContain(`{eComponentB as ComponentB}`);
@@ -214,11 +224,11 @@ export {TopLevelComponent};`);
         throw new Error(`Could not find source file`);
       }
       const output = new MagicString(PROGRAM.contents);
-      renderer.addConstants(output, 'const x = 3;', file);
+      renderer.addConstants(output, 'var x = 3;', file);
       expect(output.toString()).toContain(`
 import {Directive} from '@angular/core';
 
-const x = 3;
+var x = 3;
 var A = (function() {`);
     });
 
@@ -229,13 +239,13 @@ var A = (function() {`);
         throw new Error(`Could not find source file`);
       }
       const output = new MagicString(PROGRAM.contents);
-      renderer.addConstants(output, 'const x = 3;', file);
+      renderer.addConstants(output, 'var x = 3;', file);
       renderer.addImports(output, [{specifier: '@angular/core', qualifier: 'i0'}], file);
       expect(output.toString()).toContain(`
 import {Directive} from '@angular/core';
 import * as i0 from '@angular/core';
 
-const x = 3;
+var x = 3;
 var A = (function() {`);
     });
   });
diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index cac283fccd..81b5f97575 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -13,7 +13,7 @@ import {Import} from '../../../src/ngtsc/translator';
 import {CompiledClass, DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
 import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
 import {ModuleWithProvidersAnalyzer} from '../../src/analysis/module_with_providers_analyzer';
-import {PrivateDeclarationsAnalyzer} from '../../src/analysis/private_declarations_analyzer';
+import {PrivateDeclarationsAnalyzer, ExportInfo} from '../../src/analysis/private_declarations_analyzer';
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
 import {RedundantDecoratorMap, Renderer} from '../../src/rendering/renderer';
@@ -35,10 +35,7 @@ class TestRenderer extends Renderer {
   addImports(output: MagicString, imports: Import[], sf: ts.SourceFile) {
     output.prepend('\n// ADD IMPORTS\n');
   }
-  addExports(output: MagicString, baseEntryPointPath: string, exports: {
-    identifier: string,
-    from: string
-  }[]) {
+  addExports(output: MagicString, baseEntryPointPath: string, exports: ExportInfo[]) {
     output.prepend('\n// ADD EXPORTS\n');
   }
   addConstants(output: MagicString, constants: string, file: ts.SourceFile): void {
@@ -76,8 +73,10 @@ function createTestRenderer(
   const privateDeclarationsAnalyses =
       new PrivateDeclarationsAnalyzer(host, referencesRegistry).analyzeProgram(bundle.src.program);
   const renderer = new TestRenderer(fs, logger, host, isCore, bundle);
+  spyOn(renderer, 'addExports').and.callThrough();
   spyOn(renderer, 'addImports').and.callThrough();
   spyOn(renderer, 'addDefinitions').and.callThrough();
+  spyOn(renderer, 'addConstants').and.callThrough();
   spyOn(renderer, 'removeDecorators').and.callThrough();
 
   return {renderer,
@@ -117,9 +116,17 @@ describe('Renderer', () => {
     'sourcesContent': [INPUT_PROGRAM.contents]
   });
 
-  const RENDERED_CONTENTS =
-      `\n// ADD EXPORTS\n\n// ADD IMPORTS\n\n// ADD CONSTANTS\n\n// ADD DEFINITIONS\n\n// REMOVE DECORATORS\n` +
-      INPUT_PROGRAM.contents;
+  const RENDERED_CONTENTS = `
+// ADD IMPORTS
+
+// ADD EXPORTS
+
+// ADD CONSTANTS
+
+// ADD DEFINITIONS
+
+// REMOVE DECORATORS
+` + INPUT_PROGRAM.contents;
 
   const OUTPUT_PROGRAM_MAP = fromObject({
     'version': 3,
@@ -240,6 +247,22 @@ describe('Renderer', () => {
            expect(values[0][0].getText())
                .toEqual(`{ type: Directive, args: [{ selector: '[a]' }] }`);
          });
+
+      it('should call renderImports after other abstract methods', () => {
+        // This allows the other methods to add additional imports if necessary
+        const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+               moduleWithProvidersAnalyses} = createTestRenderer('test-package', [INPUT_PROGRAM]);
+        const addExportsSpy = renderer.addExports as jasmine.Spy;
+        const addDefinitionsSpy = renderer.addDefinitions as jasmine.Spy;
+        const addConstantsSpy = renderer.addConstants as jasmine.Spy;
+        const addImportsSpy = renderer.addImports as jasmine.Spy;
+        renderer.renderProgram(
+            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+            moduleWithProvidersAnalyses);
+        expect(addExportsSpy).toHaveBeenCalledBefore(addImportsSpy);
+        expect(addDefinitionsSpy).toHaveBeenCalledBefore(addImportsSpy);
+        expect(addConstantsSpy).toHaveBeenCalledBefore(addImportsSpy);
+      });
     });
 
     describe('source map merging', () => {
@@ -355,7 +378,7 @@ describe('Renderer', () => {
             moduleWithProvidersAnalyses);
 
         const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
-        expect(typingsFile.contents).toContain(`// ADD IMPORTS\nexport declare class A`);
+        expect(typingsFile.contents).toContain(`\n// ADD IMPORTS\n`);
       });
 
       it('should render exports into typings files', () => {
@@ -372,8 +395,7 @@ describe('Renderer', () => {
             moduleWithProvidersAnalyses);
 
         const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
-        expect(typingsFile.contents)
-            .toContain(`// ADD EXPORTS\n\n// ADD IMPORTS\nexport declare class A`);
+        expect(typingsFile.contents).toContain(`\n// ADD EXPORTS\n`);
       });
 
       it('should fixup functions/methods that return ModuleWithProviders structures', () => {
diff --git a/packages/compiler-cli/ngcc/test/rendering/umd_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/umd_renderer_spec.ts
new file mode 100644
index 0000000000..e3dd4df9a6
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/rendering/umd_renderer_spec.ts
@@ -0,0 +1,490 @@
+/**
+ * @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 MagicString from 'magic-string';
+import * as ts from 'typescript';
+import {NoopImportRewriter} from '../../../src/ngtsc/imports';
+import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
+import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
+import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
+import {UmdReflectionHost} from '../../src/host/umd_host';
+import {ImportManager} from '../../../src/ngtsc/translator';
+import {UmdRenderer} from '../../src/rendering/umd_renderer';
+import {MockFileSystem} from '../helpers/mock_file_system';
+import {MockLogger} from '../helpers/mock_logger';
+import {getDeclaration, makeTestEntryPointBundle, createFileSystemFromProgramFiles} from '../helpers/utils';
+
+const _ = AbsoluteFsPath.fromUnchecked;
+
+function setup(file: {name: string, contents: string}) {
+  const fs = new MockFileSystem(createFileSystemFromProgramFiles([file]));
+  const logger = new MockLogger();
+  const bundle = makeTestEntryPointBundle('esm5', 'esm5', false, [file]);
+  const src = bundle.src;
+  const typeChecker = src.program.getTypeChecker();
+  const host = new UmdReflectionHost(logger, false, src.program, src.host);
+  const referencesRegistry = new NgccReferencesRegistry(host);
+  const decorationAnalyses = new DecorationAnalyzer(
+                                 fs, src.program, src.options, src.host, typeChecker, host,
+                                 referencesRegistry, [AbsoluteFsPath.fromUnchecked('/')], false)
+                                 .analyzeProgram();
+  const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(src.program);
+  const renderer = new UmdRenderer(fs, logger, host, false, bundle);
+  const importManager = new ImportManager(new NoopImportRewriter(), 'i');
+  return {
+    decorationAnalyses,
+    host,
+    importManager,
+    program: src.program, renderer,
+    sourceFile: src.file, switchMarkerAnalyses
+  };
+}
+
+const PROGRAM = {
+  name: _('/some/file.js'),
+  contents: `
+/* A copyright notice */
+(function (global, factory) {
+typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports,require('some-side-effect'),require('/local-dep'),require('@angular/core')) :
+typeof define === 'function' && define.amd ? define('file', ['exports','some-side-effect','/local-dep','@angular/core'], factory) :
+(factory(global.file,global.someSideEffect,global.localDep,global.ng.core));
+}(this, (function (exports,someSideEffect,localDep,core) {'use strict';
+var A = (function() {
+  function A() {}
+  A.decorators = [
+    { type: core.Directive, args: [{ selector: '[a]' }] },
+    { type: OtherA }
+  ];
+  A.prototype.ngDoCheck = function() {
+    //
+  };
+  return A;
+}());
+
+var B = (function() {
+  function B() {}
+  B.decorators = [
+    { type: OtherB },
+    { type: core.Directive, args: [{ selector: '[b]' }] }
+  ];
+  return B;
+}());
+
+var C = (function() {
+  function C() {}
+  C.decorators = [
+    { type: core.Directive, args: [{ selector: '[c]' }] },
+  ];
+  return C;
+}());
+
+function NoIife() {}
+
+var BadIife = (function() {
+  function BadIife() {}
+  BadIife.decorators = [
+    { type: core.Directive, args: [{ selector: '[c]' }] },
+  ];
+}());
+
+var compileNgModuleFactory = compileNgModuleFactory__PRE_R3__;
+var badlyFormattedVariable = __PRE_R3__badlyFormattedVariable;
+function compileNgModuleFactory__PRE_R3__(injector, options, moduleType) {
+  var compilerFactory = injector.get(CompilerFactory);
+  var compiler = compilerFactory.createCompiler([options]);
+  return compiler.compileModuleAsync(moduleType);
+}
+
+function compileNgModuleFactory__POST_R3__(injector, options, moduleType) {
+  ngDevMode && assertNgModuleType(moduleType);
+  return Promise.resolve(new R3NgModuleFactory(moduleType));
+}
+// Some other content
+exports.A = A;
+exports.B = B;
+exports.C = C;
+exports.NoIife = NoIife;
+exports.BadIife = BadIife;
+})));`,
+};
+
+
+const PROGRAM_DECORATE_HELPER = {
+  name: '/some/file.js',
+  contents: `
+/* A copyright notice */
+(function (global, factory) {
+typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports,require('tslib'),require('@angular/core')) :
+typeof define === 'function' && define.amd ? define('file', ['exports','/tslib','@angular/core'], factory) :
+(factory(global.file,global.tslib,global.ng.core));
+}(this, (function (exports,tslib,core) {'use strict';
+  var OtherA = function () { return function (node) { }; };
+  var OtherB = function () { return function (node) { }; };
+  var A = /** @class */ (function () {
+      function A() {
+      }
+      A = tslib.__decorate([
+          core.Directive({ selector: '[a]' }),
+          OtherA()
+      ], A);
+      return A;
+  }());
+  export { A };
+  var B = /** @class */ (function () {
+      function B() {
+      }
+      B = tslib.__decorate([
+          OtherB(),
+          core.Directive({ selector: '[b]' })
+      ], B);
+      return B;
+  }());
+  export { B };
+  var C = /** @class */ (function () {
+      function C() {
+      }
+      C = tslib.__decorate([
+          core.Directive({ selector: '[c]' })
+      ], C);
+      return C;
+  }());
+  export { C };
+  var D = /** @class */ (function () {
+      function D() {
+      }
+      D_1 = D;
+      var D_1;
+      D = D_1 = tslib.__decorate([
+          core.Directive({ selector: '[d]', providers: [D_1] })
+      ], D);
+      return D;
+  }());
+  exports.D = D;
+  // Some other content
+})));`
+};
+
+describe('UmdRenderer', () => {
+
+  describe('addImports', () => {
+    it('should append the given imports into the CommonJS factory call', () => {
+      const {renderer, program} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js') !;
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addImports(
+          output,
+          [
+            {specifier: '@angular/core', qualifier: 'i0'},
+            {specifier: '@angular/common', qualifier: 'i1'}
+          ],
+          file);
+      expect(output.toString())
+          .toContain(
+              `typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports,require('some-side-effect'),require('/local-dep'),require('@angular/core'),require('@angular/core'),require('@angular/common')) :`);
+    });
+
+    it('should append the given imports into the AMD initialization', () => {
+      const {renderer, program} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js') !;
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addImports(
+          output,
+          [
+            {specifier: '@angular/core', qualifier: 'i0'},
+            {specifier: '@angular/common', qualifier: 'i1'}
+          ],
+          file);
+      expect(output.toString())
+          .toContain(
+              `typeof define === 'function' && define.amd ? define('file', ['exports','some-side-effect','/local-dep','@angular/core','@angular/core','@angular/common'], factory) :`);
+    });
+
+    it('should append the given imports into the global initialization', () => {
+      const {renderer, program} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js') !;
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addImports(
+          output,
+          [
+            {specifier: '@angular/core', qualifier: 'i0'},
+            {specifier: '@angular/common', qualifier: 'i1'}
+          ],
+          file);
+      expect(output.toString())
+          .toContain(
+              `(factory(global.file,global.someSideEffect,global.localDep,global.ng.core,global.ng.core,global.ng.common));`);
+    });
+
+    it('should append the given imports as parameters into the factory function definition', () => {
+      const {renderer, program} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js') !;
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addImports(
+          output,
+          [
+            {specifier: '@angular/core', qualifier: 'i0'},
+            {specifier: '@angular/common', qualifier: 'i1'}
+          ],
+          file);
+      expect(output.toString())
+          .toContain(`(function (exports,someSideEffect,localDep,core,i0,i1) {'use strict';`);
+    });
+  });
+
+  describe('addExports', () => {
+    it('should insert the given exports at the end of the source file', () => {
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+      const generateNamedImportSpy = spyOn(importManager, 'generateNamedImport').and.callThrough();
+      renderer.addExports(
+          output, PROGRAM.name.replace(/\.js$/, ''),
+          [
+            {from: _('/some/a.js'), identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), identifier: 'ComponentB'},
+            {from: PROGRAM.name, identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
+
+      expect(output.toString()).toContain(`
+exports.A = A;
+exports.B = B;
+exports.C = C;
+exports.NoIife = NoIife;
+exports.BadIife = BadIife;
+exports.ComponentA1 = i0.ComponentA1;
+exports.ComponentA2 = i0.ComponentA2;
+exports.ComponentB = i1.ComponentB;
+exports.TopLevelComponent = TopLevelComponent;
+})));`);
+
+      expect(generateNamedImportSpy).toHaveBeenCalledWith('./a', 'ComponentA1');
+      expect(generateNamedImportSpy).toHaveBeenCalledWith('./a', 'ComponentA2');
+      expect(generateNamedImportSpy).toHaveBeenCalledWith('./foo/b', 'ComponentB');
+    });
+
+    it('should not insert alias exports in js output', () => {
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addExports(
+          output, PROGRAM.name.replace(/\.js$/, ''),
+          [
+            {from: _('/some/a.js'), alias: 'eComponentA1', identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), alias: 'eComponentA2', identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), alias: 'eComponentB', identifier: 'ComponentB'},
+            {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
+      const outputString = output.toString();
+      expect(outputString).not.toContain(`eComponentA1`);
+      expect(outputString).not.toContain(`eComponentB`);
+      expect(outputString).not.toContain(`eTopLevelComponent`);
+    });
+  });
+
+  describe('addConstants', () => {
+    it('should insert the given constants after imports in the source file', () => {
+      const {renderer, program} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addConstants(output, 'var x = 3;', file);
+      expect(output.toString()).toContain(`
+}(this, (function (exports,someSideEffect,localDep,core) {
+var x = 3;
+'use strict';
+var A = (function() {`);
+    });
+
+    it('should insert constants after inserted imports',
+       () => {
+           // This test (from ESM5) is not needed as constants go in the body
+           // of the UMD IIFE, so cannot come before imports.
+       });
+  });
+
+  describe('rewriteSwitchableDeclarations', () => {
+    it('should switch marked declaration initializers', () => {
+      const {renderer, program, sourceFile, switchMarkerAnalyses} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.rewriteSwitchableDeclarations(
+          output, file, switchMarkerAnalyses.get(sourceFile) !.declarations);
+      expect(output.toString())
+          .not.toContain(`var compileNgModuleFactory = compileNgModuleFactory__PRE_R3__;`);
+      expect(output.toString())
+          .toContain(`var badlyFormattedVariable = __PRE_R3__badlyFormattedVariable;`);
+      expect(output.toString())
+          .toContain(`var compileNgModuleFactory = compileNgModuleFactory__POST_R3__;`);
+      expect(output.toString())
+          .toContain(`function compileNgModuleFactory__PRE_R3__(injector, options, moduleType) {`);
+      expect(output.toString())
+          .toContain(`function compileNgModuleFactory__POST_R3__(injector, options, moduleType) {`);
+    });
+  });
+
+  describe('addDefinitions', () => {
+    it('should insert the definitions directly before the return statement of the class IIFE',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+         const output = new MagicString(PROGRAM.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+         renderer.addDefinitions(output, compiledClass, 'SOME DEFINITION TEXT');
+         expect(output.toString()).toContain(`
+  A.prototype.ngDoCheck = function() {
+    //
+  };
+SOME DEFINITION TEXT
+  return A;
+`);
+       });
+
+    it('should error if the compiledClass is not valid', () => {
+      const {renderer, sourceFile, program} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+
+      const noIifeDeclaration =
+          getDeclaration(program, sourceFile.fileName, 'NoIife', ts.isFunctionDeclaration);
+      const mockNoIifeClass: any = {declaration: noIifeDeclaration, name: 'NoIife'};
+      expect(() => renderer.addDefinitions(output, mockNoIifeClass, 'SOME DEFINITION TEXT'))
+          .toThrowError(
+              'Compiled class declaration is not inside an IIFE: NoIife in /some/file.js');
+
+      const badIifeDeclaration =
+          getDeclaration(program, sourceFile.fileName, 'BadIife', ts.isVariableDeclaration);
+      const mockBadIifeClass: any = {declaration: badIifeDeclaration, name: 'BadIife'};
+      expect(() => renderer.addDefinitions(output, mockBadIifeClass, 'SOME DEFINITION TEXT'))
+          .toThrowError(
+              'Compiled class wrapper IIFE does not have a return statement: BadIife in /some/file.js');
+    });
+  });
+
+  describe('removeDecorators', () => {
+
+    it('should delete the decorator (and following comma) that was matched in the analysis', () => {
+      const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+      const compiledClass =
+          decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+      const decorator = compiledClass.decorators[0];
+      const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+      decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+      renderer.removeDecorators(output, decoratorsToRemove);
+      expect(output.toString())
+          .not.toContain(`{ type: core.Directive, args: [{ selector: '[a]' }] },`);
+      expect(output.toString()).toContain(`{ type: OtherA }`);
+      expect(output.toString()).toContain(`{ type: core.Directive, args: [{ selector: '[b]' }] }`);
+      expect(output.toString()).toContain(`{ type: OtherB }`);
+      expect(output.toString()).toContain(`{ type: core.Directive, args: [{ selector: '[c]' }] }`);
+    });
+
+
+    it('should delete the decorator (but cope with no trailing comma) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+         const output = new MagicString(PROGRAM.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'B') !;
+         const decorator = compiledClass.decorators[0];
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[a]' }] },`);
+         expect(output.toString()).toContain(`{ type: OtherA }`);
+         expect(output.toString())
+             .not.toContain(`{ type: core.Directive, args: [{ selector: '[b]' }] }`);
+         expect(output.toString()).toContain(`{ type: OtherB }`);
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[c]' }] }`);
+       });
+
+
+    it('should delete the decorator (and its container if there are not other decorators left) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+         const output = new MagicString(PROGRAM.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'C') !;
+         const decorator = compiledClass.decorators[0];
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         renderer.addDefinitions(output, compiledClass, 'SOME DEFINITION TEXT');
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[a]' }] },`);
+         expect(output.toString()).toContain(`{ type: OtherA }`);
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[b]' }] }`);
+         expect(output.toString()).toContain(`{ type: OtherB }`);
+         expect(output.toString()).not.toContain(`C.decorators`);
+       });
+
+  });
+
+  describe('[__decorate declarations]', () => {
+    it('should delete the decorator (and following comma) that was matched in the analysis', () => {
+      const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+      const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
+      const compiledClass =
+          decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+      const decorator = compiledClass.decorators.find(d => d.name === 'Directive') !;
+      const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+      decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+      renderer.removeDecorators(output, decoratorsToRemove);
+      expect(output.toString()).not.toContain(`core.Directive({ selector: '[a]' }),`);
+      expect(output.toString()).toContain(`OtherA()`);
+      expect(output.toString()).toContain(`core.Directive({ selector: '[b]' })`);
+      expect(output.toString()).toContain(`OtherB()`);
+      expect(output.toString()).toContain(`core.Directive({ selector: '[c]' })`);
+    });
+
+    it('should delete the decorator (but cope with no trailing comma) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+         const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'B') !;
+         const decorator = compiledClass.decorators.find(d => d.name === 'Directive') !;
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         expect(output.toString()).toContain(`core.Directive({ selector: '[a]' }),`);
+         expect(output.toString()).toContain(`OtherA()`);
+         expect(output.toString()).not.toContain(`core.Directive({ selector: '[b]' })`);
+         expect(output.toString()).toContain(`OtherB()`);
+         expect(output.toString()).toContain(`core.Directive({ selector: '[c]' })`);
+       });
+
+
+    it('should delete the decorator (and its container if there are no other decorators left) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+         const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'C') !;
+         const decorator = compiledClass.decorators.find(d => d.name === 'Directive') !;
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         expect(output.toString()).toContain(`core.Directive({ selector: '[a]' }),`);
+         expect(output.toString()).toContain(`OtherA()`);
+         expect(output.toString()).toContain(`core.Directive({ selector: '[b]' })`);
+         expect(output.toString()).toContain(`OtherB()`);
+         expect(output.toString()).not.toContain(`core.Directive({ selector: '[c]' })`);
+         expect(output.toString()).not.toContain(`C = tslib_1.__decorate([`);
+         expect(output.toString()).toContain(`function C() {\n      }\n      return C;`);
+       });
+  });
+});

From f4655ea98aa11664bcca7b27014cfa7573c8110e Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:35 +0100
Subject: [PATCH 071/275] feat(ivy): ngcc - turn on UMD processing (#25445)

PR Close #25445
---
 .../ngcc/src/dependencies/dependency_resolver.ts     |  5 +++--
 packages/compiler-cli/ngcc/src/main.ts               |  2 +-
 .../compiler-cli/ngcc/src/packages/transformer.ts    | 10 ++++++++++
 .../test/dependencies/dependency_resolver_spec.ts    |  4 ++--
 .../compiler-cli/ngcc/test/integration/ngcc_spec.ts  | 12 +++++++-----
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts b/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
index d6e344b5b2..a4f5323755 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
@@ -170,12 +170,13 @@ function getEntryPointPath(entryPoint: EntryPoint): AbsoluteFsPath {
     const property = properties[i] as EntryPointJsonProperty;
     const format = getEntryPointFormat(property);
 
-    if (format === 'esm2015' || format === 'esm5') {
+    if (format === 'esm2015' || format === 'esm5' || format === 'umd') {
       const formatPath = entryPoint.packageJson[property] !;
       return AbsoluteFsPath.resolve(entryPoint.path, formatPath);
     }
   }
-  throw new Error(`There is no format with import statements in '${entryPoint.path}' entry-point.`);
+  throw new Error(
+      `There is no appropriate source code format in '${entryPoint.path}' entry-point.`);
 }
 
 interface DependencyGraph extends DependencyDiagnostics {
diff --git a/packages/compiler-cli/ngcc/src/main.ts b/packages/compiler-cli/ngcc/src/main.ts
index 4a760b3e63..85d4adbf25 100644
--- a/packages/compiler-cli/ngcc/src/main.ts
+++ b/packages/compiler-cli/ngcc/src/main.ts
@@ -63,7 +63,7 @@ export interface NgccOptions {
   pathMappings?: PathMappings;
 }
 
-const SUPPORTED_FORMATS: EntryPointFormat[] = ['esm5', 'esm2015'];
+const SUPPORTED_FORMATS: EntryPointFormat[] = ['esm5', 'esm2015', 'umd'];
 
 /**
  * This is the main entry-point into ngcc (aNGular Compatibility Compiler).
diff --git a/packages/compiler-cli/ngcc/src/packages/transformer.ts b/packages/compiler-cli/ngcc/src/packages/transformer.ts
index 3abc7078a3..a17f017294 100644
--- a/packages/compiler-cli/ngcc/src/packages/transformer.ts
+++ b/packages/compiler-cli/ngcc/src/packages/transformer.ts
@@ -16,10 +16,12 @@ import {FileSystem} from '../file_system/file_system';
 import {Esm2015ReflectionHost} from '../host/esm2015_host';
 import {Esm5ReflectionHost} from '../host/esm5_host';
 import {NgccReflectionHost} from '../host/ngcc_host';
+import {UmdReflectionHost} from '../host/umd_host';
 import {Logger} from '../logging/logger';
 import {Esm5Renderer} from '../rendering/esm5_renderer';
 import {EsmRenderer} from '../rendering/esm_renderer';
 import {FileInfo, Renderer} from '../rendering/renderer';
+import {UmdRenderer} from '../rendering/umd_renderer';
 
 import {EntryPointBundle} from './entry_point_bundle';
 
@@ -78,6 +80,9 @@ export class Transformer {
         return new Esm2015ReflectionHost(this.logger, isCore, typeChecker, bundle.dts);
       case 'esm5':
         return new Esm5ReflectionHost(this.logger, isCore, typeChecker, bundle.dts);
+      case 'umd':
+        return new UmdReflectionHost(
+            this.logger, isCore, bundle.src.program, bundle.src.host, bundle.dts);
       default:
         throw new Error(`Reflection host for "${bundle.format}" not yet implemented.`);
     }
@@ -89,6 +94,11 @@ export class Transformer {
         return new EsmRenderer(this.fs, this.logger, host, isCore, bundle);
       case 'esm5':
         return new Esm5Renderer(this.fs, this.logger, host, isCore, bundle);
+      case 'umd':
+        if (!(host instanceof UmdReflectionHost)) {
+          throw new Error('UmdRenderer requires a UmdReflectionHost');
+        }
+        return new UmdRenderer(this.fs, this.logger, host, isCore, bundle);
       default:
         throw new Error(`Renderer for "${bundle.format}" not yet implemented.`);
     }
diff --git a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
index 65e42dcb93..288793fe6c 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
@@ -106,10 +106,10 @@ describe('DependencyResolver', () => {
       ]);
     });
 
-    it('should error if the entry point does not have either the esm5 nor esm2015 formats', () => {
+    it('should error if the entry point does not have a suitable format', () => {
       expect(() => resolver.sortEntryPointsByDependency([
         { path: '/first', packageJson: {}, compiledByAngular: true } as EntryPoint
-      ])).toThrowError(`There is no format with import statements in '/first' entry-point.`);
+      ])).toThrowError(`There is no appropriate source code format in '/first' entry-point.`);
     });
 
     it('should capture any dependencies that were ignored', () => {
diff --git a/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts b/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
index 95e33310f3..b92b7667d0 100644
--- a/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
+++ b/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
@@ -41,6 +41,7 @@ describe('ngcc main()', () => {
   describe('with targetEntryPointPath', () => {
     it('should only compile the given package entry-point (and its dependencies).', () => {
       const STANDARD_MARKERS = {
+        main: '0.0.0-PLACEHOLDER',
         module: '0.0.0-PLACEHOLDER',
         es2015: '0.0.0-PLACEHOLDER',
         esm5: '0.0.0-PLACEHOLDER',
@@ -162,29 +163,31 @@ describe('ngcc main()', () => {
 
          });
 
-         // * the `main` property is UMD, which is not yet supported.
-         // * none of the ES2015 formats are compiled as they are not on the `propertiesToConsider`
-         // list.
+         // The ES2015 formats are not compiled as they are not in `propertiesToConsider`.
          expect(loadPackage('@angular/core').__processed_by_ivy_ngcc__).toEqual({
            esm5: '0.0.0-PLACEHOLDER',
+           main: '0.0.0-PLACEHOLDER',
            module: '0.0.0-PLACEHOLDER',
            fesm5: '0.0.0-PLACEHOLDER',
            typings: '0.0.0-PLACEHOLDER',
          });
          expect(loadPackage('@angular/common').__processed_by_ivy_ngcc__).toEqual({
            esm5: '0.0.0-PLACEHOLDER',
+           main: '0.0.0-PLACEHOLDER',
            module: '0.0.0-PLACEHOLDER',
            fesm5: '0.0.0-PLACEHOLDER',
            typings: '0.0.0-PLACEHOLDER',
          });
          expect(loadPackage('@angular/common/testing').__processed_by_ivy_ngcc__).toEqual({
            esm5: '0.0.0-PLACEHOLDER',
+           main: '0.0.0-PLACEHOLDER',
            module: '0.0.0-PLACEHOLDER',
            fesm5: '0.0.0-PLACEHOLDER',
            typings: '0.0.0-PLACEHOLDER',
          });
          expect(loadPackage('@angular/common/http').__processed_by_ivy_ngcc__).toEqual({
            esm5: '0.0.0-PLACEHOLDER',
+           main: '0.0.0-PLACEHOLDER',
            module: '0.0.0-PLACEHOLDER',
            fesm5: '0.0.0-PLACEHOLDER',
            typings: '0.0.0-PLACEHOLDER',
@@ -196,12 +199,11 @@ describe('ngcc main()', () => {
     it('should only compile the first matching format', () => {
       mainNgcc({
         basePath: '/node_modules',
-        propertiesToConsider: ['main', 'module', 'fesm5', 'esm5'],
+        propertiesToConsider: ['module', 'fesm5', 'esm5'],
         compileAllFormats: false,
         logger: new MockLogger(),
 
       });
-      // * The `main` is UMD, which is not yet supported, and so is not compiled.
       // * In the Angular packages fesm5 and module have the same underlying format,
       //   so both are marked as compiled.
       // * The `esm5` is not compiled because we stopped after the `fesm5` format.

From c61359665809beb8600182666745a0fbc6c2ad6e Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:35 +0100
Subject: [PATCH 072/275] fix(ivy): ngcc - separate typings rendering from src
 rendering (#25445)

Previously the same `Renderer` was used to render typings (.d.ts)
files. But the new `UmdRenderer` is not able to render typings files
correctly.

This commit splits out the typings rendering from the src rendering.
To achieve this the previous renderers have been refactored from
sub-classes of the abstract `Renderer` class to  classes that implement
the `RenderingFormatter` interface, which are then passed to the
`Renderer` and `DtsRenderer` to modify its rendering behaviour.

Along the way a few utility interfaces and classes have been moved
around and renamed for clarity.

PR Close #25445
---
 .../ngcc/src/packages/transformer.ts          |  41 +-
 .../ngcc/src/rendering/dts_renderer.ts        | 161 +++++
 ...enderer.ts => esm5_rendering_formatter.ts} |  20 +-
 .../ngcc/src/rendering/esm_renderer.ts        | 140 -----
 .../src/rendering/esm_rendering_formatter.ts  | 218 +++++++
 .../ngcc/src/rendering/renderer.ts            | 414 +------------
 .../ngcc/src/rendering/rendering_formatter.ts |  42 ++
 .../ngcc/src/rendering/source_maps.ts         | 137 +++++
 ...renderer.ts => umd_rendering_formatter.ts} |  53 +-
 .../compiler-cli/ngcc/src/rendering/utils.ts  |  39 ++
 .../ngcc/src/writing/file_writer.ts           |   5 +-
 .../ngcc/src/writing/in_place_file_writer.ts  |   6 +-
 .../writing/new_entry_point_file_writer.ts    |   6 +-
 .../ngcc/test/rendering/dts_renderer_spec.ts  | 181 ++++++
 ...ec.ts => esm5_rendering_formatter_spec.ts} |   6 +-
 ...pec.ts => esm_rendering_formatter_spec.ts} | 559 +++++++++++-------
 .../ngcc/test/rendering/renderer_spec.ts      | 353 ++---------
 ...pec.ts => umd_rendering_formatter_spec.ts} |   6 +-
 18 files changed, 1307 insertions(+), 1080 deletions(-)
 create mode 100644 packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts
 rename packages/compiler-cli/ngcc/src/rendering/{esm5_renderer.ts => esm5_rendering_formatter.ts} (68%)
 delete mode 100644 packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
 create mode 100644 packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts
 create mode 100644 packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts
 create mode 100644 packages/compiler-cli/ngcc/src/rendering/source_maps.ts
 rename packages/compiler-cli/ngcc/src/rendering/{umd_renderer.ts => umd_rendering_formatter.ts} (83%)
 create mode 100644 packages/compiler-cli/ngcc/src/rendering/utils.ts
 create mode 100644 packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts
 rename packages/compiler-cli/ngcc/test/rendering/{esm5_renderer_spec.ts => esm5_rendering_formatter_spec.ts} (98%)
 rename packages/compiler-cli/ngcc/test/rendering/{esm2015_renderer_spec.ts => esm_rendering_formatter_spec.ts} (65%)
 rename packages/compiler-cli/ngcc/test/rendering/{umd_renderer_spec.ts => umd_rendering_formatter_spec.ts} (99%)

diff --git a/packages/compiler-cli/ngcc/src/packages/transformer.ts b/packages/compiler-cli/ngcc/src/packages/transformer.ts
index a17f017294..4b87430c40 100644
--- a/packages/compiler-cli/ngcc/src/packages/transformer.ts
+++ b/packages/compiler-cli/ngcc/src/packages/transformer.ts
@@ -18,10 +18,13 @@ import {Esm5ReflectionHost} from '../host/esm5_host';
 import {NgccReflectionHost} from '../host/ngcc_host';
 import {UmdReflectionHost} from '../host/umd_host';
 import {Logger} from '../logging/logger';
-import {Esm5Renderer} from '../rendering/esm5_renderer';
-import {EsmRenderer} from '../rendering/esm_renderer';
-import {FileInfo, Renderer} from '../rendering/renderer';
-import {UmdRenderer} from '../rendering/umd_renderer';
+import {DtsRenderer} from '../rendering/dts_renderer';
+import {Esm5RenderingFormatter} from '../rendering/esm5_rendering_formatter';
+import {EsmRenderingFormatter} from '../rendering/esm_rendering_formatter';
+import {Renderer} from '../rendering/renderer';
+import {RenderingFormatter} from '../rendering/rendering_formatter';
+import {UmdRenderingFormatter} from '../rendering/umd_rendering_formatter';
+import {FileToWrite} from '../rendering/utils';
 
 import {EntryPointBundle} from './entry_point_bundle';
 
@@ -56,7 +59,7 @@ export class Transformer {
    * @param bundle the bundle to transform.
    * @returns information about the files that were transformed.
    */
-  transform(bundle: EntryPointBundle): FileInfo[] {
+  transform(bundle: EntryPointBundle): FileToWrite[] {
     const isCore = bundle.isCore;
     const reflectionHost = this.getHost(isCore, bundle);
 
@@ -65,10 +68,21 @@ export class Transformer {
            moduleWithProvidersAnalyses} = this.analyzeProgram(reflectionHost, isCore, bundle);
 
     // Transform the source files and source maps.
-    const renderer = this.getRenderer(reflectionHost, isCore, bundle);
-    const renderedFiles = renderer.renderProgram(
-        decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-        moduleWithProvidersAnalyses);
+    const srcFormatter = this.getRenderingFormatter(reflectionHost, isCore, bundle);
+
+    const renderer =
+        new Renderer(srcFormatter, this.fs, this.logger, reflectionHost, isCore, bundle);
+    let renderedFiles = renderer.renderProgram(
+        decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+
+    if (bundle.dts) {
+      const dtsFormatter = new EsmRenderingFormatter(reflectionHost, isCore);
+      const dtsRenderer =
+          new DtsRenderer(dtsFormatter, this.fs, this.logger, reflectionHost, isCore, bundle);
+      const renderedDtsFiles = dtsRenderer.renderProgram(
+          decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
+      renderedFiles = renderedFiles.concat(renderedDtsFiles);
+    }
 
     return renderedFiles;
   }
@@ -88,17 +102,18 @@ export class Transformer {
     }
   }
 
-  getRenderer(host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle): Renderer {
+  getRenderingFormatter(host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle):
+      RenderingFormatter {
     switch (bundle.format) {
       case 'esm2015':
-        return new EsmRenderer(this.fs, this.logger, host, isCore, bundle);
+        return new EsmRenderingFormatter(host, isCore);
       case 'esm5':
-        return new Esm5Renderer(this.fs, this.logger, host, isCore, bundle);
+        return new Esm5RenderingFormatter(host, isCore);
       case 'umd':
         if (!(host instanceof UmdReflectionHost)) {
           throw new Error('UmdRenderer requires a UmdReflectionHost');
         }
-        return new UmdRenderer(this.fs, this.logger, host, isCore, bundle);
+        return new UmdRenderingFormatter(host, isCore);
       default:
         throw new Error(`Renderer for "${bundle.format}" not yet implemented.`);
     }
diff --git a/packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts
new file mode 100644
index 0000000000..6329506136
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts
@@ -0,0 +1,161 @@
+/**
+ * @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 MagicString from 'magic-string';
+import * as ts from 'typescript';
+
+import {translateType, ImportManager} from '../../../src/ngtsc/translator';
+import {DecorationAnalyses} from '../analysis/decoration_analyzer';
+import {ModuleWithProvidersInfo, ModuleWithProvidersAnalyses} from '../analysis/module_with_providers_analyzer';
+import {PrivateDeclarationsAnalyses, ExportInfo} from '../analysis/private_declarations_analyzer';
+import {IMPORT_PREFIX} from '../constants';
+import {FileSystem} from '../file_system/file_system';
+import {NgccReflectionHost} from '../host/ngcc_host';
+import {EntryPointBundle} from '../packages/entry_point_bundle';
+import {Logger} from '../logging/logger';
+import {FileToWrite, getImportRewriter} from './utils';
+import {RenderingFormatter} from './rendering_formatter';
+import {extractSourceMap, renderSourceAndMap} from './source_maps';
+import {CompileResult} from '@angular/compiler-cli/src/ngtsc/transform';
+
+/**
+ * A structure that captures information about what needs to be rendered
+ * in a typings file.
+ *
+ * It is created as a result of processing the analysis passed to the renderer.
+ *
+ * The `renderDtsFile()` method consumes it when rendering a typings file.
+ */
+class DtsRenderInfo {
+  classInfo: DtsClassInfo[] = [];
+  moduleWithProviders: ModuleWithProvidersInfo[] = [];
+  privateExports: ExportInfo[] = [];
+}
+
+
+/**
+ * Information about a class in a typings file.
+ */
+export interface DtsClassInfo {
+  dtsDeclaration: ts.Declaration;
+  compilation: CompileResult[];
+}
+
+/**
+ * A base-class for rendering an `AnalyzedFile`.
+ *
+ * Package formats have output files that must be rendered differently. Concrete sub-classes must
+ * implement the `addImports`, `addDefinitions` and `removeDecorators` abstract methods.
+ */
+export class DtsRenderer {
+  constructor(
+      private dtsFormatter: RenderingFormatter, private fs: FileSystem, private logger: Logger,
+      private host: NgccReflectionHost, private isCore: boolean, private bundle: EntryPointBundle) {
+  }
+
+  renderProgram(
+      decorationAnalyses: DecorationAnalyses,
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses,
+      moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|null): FileToWrite[] {
+    const renderedFiles: FileToWrite[] = [];
+
+    // Transform the .d.ts files
+    if (this.bundle.dts) {
+      const dtsFiles = this.getTypingsFilesToRender(
+          decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
+
+      // If the dts entry-point is not already there (it did not have compiled classes)
+      // then add it now, to ensure it gets its extra exports rendered.
+      if (!dtsFiles.has(this.bundle.dts.file)) {
+        dtsFiles.set(this.bundle.dts.file, new DtsRenderInfo());
+      }
+      dtsFiles.forEach(
+          (renderInfo, file) => renderedFiles.push(...this.renderDtsFile(file, renderInfo)));
+    }
+
+    return renderedFiles;
+  }
+
+  renderDtsFile(dtsFile: ts.SourceFile, renderInfo: DtsRenderInfo): FileToWrite[] {
+    const input = extractSourceMap(this.fs, this.logger, dtsFile);
+    const outputText = new MagicString(input.source);
+    const printer = ts.createPrinter();
+    const importManager = new ImportManager(
+        getImportRewriter(this.bundle.dts !.r3SymbolsFile, this.isCore, false), IMPORT_PREFIX);
+
+    renderInfo.classInfo.forEach(dtsClass => {
+      const endOfClass = dtsClass.dtsDeclaration.getEnd();
+      dtsClass.compilation.forEach(declaration => {
+        const type = translateType(declaration.type, importManager);
+        const typeStr = printer.printNode(ts.EmitHint.Unspecified, type, dtsFile);
+        const newStatement = `    static ${declaration.name}: ${typeStr};\n`;
+        outputText.appendRight(endOfClass - 1, newStatement);
+      });
+    });
+
+    this.dtsFormatter.addModuleWithProvidersParams(
+        outputText, renderInfo.moduleWithProviders, importManager);
+    this.dtsFormatter.addExports(
+        outputText, dtsFile.fileName, renderInfo.privateExports, importManager, dtsFile);
+    this.dtsFormatter.addImports(
+        outputText, importManager.getAllImports(dtsFile.fileName), dtsFile);
+
+
+
+    return renderSourceAndMap(dtsFile, input, outputText);
+  }
+
+  private getTypingsFilesToRender(
+      decorationAnalyses: DecorationAnalyses,
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses,
+      moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|
+      null): Map<ts.SourceFile, DtsRenderInfo> {
+    const dtsMap = new Map<ts.SourceFile, DtsRenderInfo>();
+
+    // Capture the rendering info from the decoration analyses
+    decorationAnalyses.forEach(compiledFile => {
+      compiledFile.compiledClasses.forEach(compiledClass => {
+        const dtsDeclaration = this.host.getDtsDeclaration(compiledClass.declaration);
+        if (dtsDeclaration) {
+          const dtsFile = dtsDeclaration.getSourceFile();
+          const renderInfo = dtsMap.has(dtsFile) ? dtsMap.get(dtsFile) ! : new DtsRenderInfo();
+          renderInfo.classInfo.push({dtsDeclaration, compilation: compiledClass.compilation});
+          dtsMap.set(dtsFile, renderInfo);
+        }
+      });
+    });
+
+    // Capture the ModuleWithProviders functions/methods that need updating
+    if (moduleWithProvidersAnalyses !== null) {
+      moduleWithProvidersAnalyses.forEach((moduleWithProvidersToFix, dtsFile) => {
+        const renderInfo = dtsMap.has(dtsFile) ? dtsMap.get(dtsFile) ! : new DtsRenderInfo();
+        renderInfo.moduleWithProviders = moduleWithProvidersToFix;
+        dtsMap.set(dtsFile, renderInfo);
+      });
+    }
+
+    // Capture the private declarations that need to be re-exported
+    if (privateDeclarationsAnalyses.length) {
+      privateDeclarationsAnalyses.forEach(e => {
+        if (!e.dtsFrom && !e.alias) {
+          throw new Error(
+              `There is no typings path for ${e.identifier} in ${e.from}.\n` +
+              `We need to add an export for this class to a .d.ts typings file because ` +
+              `Angular compiler needs to be able to reference this class in compiled code, such as templates.\n` +
+              `The simplest fix for this is to ensure that this class is exported from the package's entry-point.`);
+        }
+      });
+      const dtsEntryPoint = this.bundle.dts !.file;
+      const renderInfo =
+          dtsMap.has(dtsEntryPoint) ? dtsMap.get(dtsEntryPoint) ! : new DtsRenderInfo();
+      renderInfo.privateExports = privateDeclarationsAnalyses;
+      dtsMap.set(dtsEntryPoint, renderInfo);
+    }
+
+    return dtsMap;
+  }
+}
diff --git a/packages/compiler-cli/ngcc/src/rendering/esm5_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts
similarity index 68%
rename from packages/compiler-cli/ngcc/src/rendering/esm5_renderer.ts
rename to packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts
index 368c93b44f..8b22f7519f 100644
--- a/packages/compiler-cli/ngcc/src/rendering/esm5_renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts
@@ -8,22 +8,16 @@
 import MagicString from 'magic-string';
 import * as ts from 'typescript';
 import {CompiledClass} from '../analysis/decoration_analyzer';
-import {FileSystem} from '../file_system/file_system';
 import {getIifeBody} from '../host/esm5_host';
-import {NgccReflectionHost} from '../host/ngcc_host';
-import {Logger} from '../logging/logger';
-import {EntryPointBundle} from '../packages/entry_point_bundle';
-import {EsmRenderer} from './esm_renderer';
-
-export class Esm5Renderer extends EsmRenderer {
-  constructor(
-      fs: FileSystem, logger: Logger, host: NgccReflectionHost, isCore: boolean,
-      bundle: EntryPointBundle) {
-    super(fs, logger, host, isCore, bundle);
-  }
+import {EsmRenderingFormatter} from './esm_rendering_formatter';
 
+/**
+ * A RenderingFormatter that works with files that use ECMAScript Module `import` and `export`
+ * statements, but instead of `class` declarations it uses ES5 `function` wrappers for classes.
+ */
+export class Esm5RenderingFormatter extends EsmRenderingFormatter {
   /**
-   * Add the definitions to each decorated class
+   * Add the definitions inside the IIFE of each decorated class
    */
   addDefinitions(output: MagicString, compiledClass: CompiledClass, definitions: string): void {
     const iifeBody = getIifeBody(compiledClass.declaration);
diff --git a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
deleted file mode 100644
index 3b2be815d3..0000000000
--- a/packages/compiler-cli/ngcc/src/rendering/esm_renderer.ts
+++ /dev/null
@@ -1,140 +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 MagicString from 'magic-string';
-import * as ts from 'typescript';
-import {PathSegment, AbsoluteFsPath} from '../../../src/ngtsc/path';
-import {isDtsPath} from '../../../src/ngtsc/util/src/typescript';
-import {Import, ImportManager} from '../../../src/ngtsc/translator';
-import {CompiledClass} from '../analysis/decoration_analyzer';
-import {ExportInfo} from '../analysis/private_declarations_analyzer';
-import {FileSystem} from '../file_system/file_system';
-import {NgccReflectionHost, POST_R3_MARKER, PRE_R3_MARKER, SwitchableVariableDeclaration} from '../host/ngcc_host';
-import {Logger} from '../logging/logger';
-import {EntryPointBundle} from '../packages/entry_point_bundle';
-import {RedundantDecoratorMap, Renderer, stripExtension} from './renderer';
-
-export class EsmRenderer extends Renderer {
-  constructor(
-      fs: FileSystem, logger: Logger, host: NgccReflectionHost, isCore: boolean,
-      bundle: EntryPointBundle) {
-    super(fs, logger, host, isCore, bundle);
-  }
-
-  /**
-   *  Add the imports at the top of the file
-   */
-  addImports(output: MagicString, imports: Import[], sf: ts.SourceFile): void {
-    const insertionPoint = findEndOfImports(sf);
-    const renderedImports =
-        imports.map(i => `import * as ${i.qualifier} from '${i.specifier}';\n`).join('');
-    output.appendLeft(insertionPoint, renderedImports);
-  }
-
-  addExports(
-      output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[],
-      importManager: ImportManager, file: ts.SourceFile): void {
-    exports.forEach(e => {
-      let exportFrom = '';
-      const isDtsFile = isDtsPath(entryPointBasePath);
-      const from = isDtsFile ? e.dtsFrom : e.from;
-
-      if (from) {
-        const basePath = stripExtension(from);
-        const relativePath =
-            './' + PathSegment.relative(AbsoluteFsPath.dirname(entryPointBasePath), basePath);
-        exportFrom = entryPointBasePath !== basePath ? ` from '${relativePath}'` : '';
-      }
-
-      // aliases should only be added in dts files as these are lost when rolling up dts file.
-      const exportStatement = e.alias && isDtsFile ? `${e.alias} as ${e.identifier}` : e.identifier;
-      const exportStr = `\nexport {${exportStatement}}${exportFrom};`;
-      output.append(exportStr);
-    });
-  }
-
-  addConstants(output: MagicString, constants: string, file: ts.SourceFile): void {
-    if (constants === '') {
-      return;
-    }
-    const insertionPoint = findEndOfImports(file);
-
-    // Append the constants to the right of the insertion point, to ensure they get ordered after
-    // added imports (those are appended left to the insertion point).
-    output.appendRight(insertionPoint, '\n' + constants + '\n');
-  }
-
-  /**
-   * Add the definitions to each decorated class
-   */
-  addDefinitions(output: MagicString, compiledClass: CompiledClass, definitions: string): void {
-    const classSymbol = this.host.getClassSymbol(compiledClass.declaration);
-    if (!classSymbol) {
-      throw new Error(`Compiled class does not have a valid symbol: ${compiledClass.name}`);
-    }
-    const insertionPoint = classSymbol.valueDeclaration !.getEnd();
-    output.appendLeft(insertionPoint, '\n' + definitions);
-  }
-
-  /**
-   * Remove static decorator properties from classes
-   */
-  removeDecorators(output: MagicString, decoratorsToRemove: RedundantDecoratorMap): void {
-    decoratorsToRemove.forEach((nodesToRemove, containerNode) => {
-      if (ts.isArrayLiteralExpression(containerNode)) {
-        const items = containerNode.elements;
-        if (items.length === nodesToRemove.length) {
-          // Remove the entire statement
-          const statement = findStatement(containerNode);
-          if (statement) {
-            output.remove(statement.getFullStart(), statement.getEnd());
-          }
-        } else {
-          nodesToRemove.forEach(node => {
-            // remove any trailing comma
-            const end = (output.slice(node.getEnd(), node.getEnd() + 1) === ',') ?
-                node.getEnd() + 1 :
-                node.getEnd();
-            output.remove(node.getFullStart(), end);
-          });
-        }
-      }
-    });
-  }
-
-  rewriteSwitchableDeclarations(
-      outputText: MagicString, sourceFile: ts.SourceFile,
-      declarations: SwitchableVariableDeclaration[]): void {
-    declarations.forEach(declaration => {
-      const start = declaration.initializer.getStart();
-      const end = declaration.initializer.getEnd();
-      const replacement = declaration.initializer.text.replace(PRE_R3_MARKER, POST_R3_MARKER);
-      outputText.overwrite(start, end, replacement);
-    });
-  }
-}
-
-function findEndOfImports(sf: ts.SourceFile): number {
-  for (const stmt of sf.statements) {
-    if (!ts.isImportDeclaration(stmt) && !ts.isImportEqualsDeclaration(stmt) &&
-        !ts.isNamespaceImport(stmt)) {
-      return stmt.getStart();
-    }
-  }
-
-  return 0;
-}
-
-function findStatement(node: ts.Node) {
-  while (node) {
-    if (ts.isExpressionStatement(node)) {
-      return node;
-    }
-    node = node.parent;
-  }
-  return undefined;
-}
diff --git a/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts
new file mode 100644
index 0000000000..579fde535b
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts
@@ -0,0 +1,218 @@
+/**
+ * @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 MagicString from 'magic-string';
+import * as ts from 'typescript';
+import {PathSegment, AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {Import, ImportManager} from '../../../src/ngtsc/translator';
+import {isDtsPath} from '../../../src/ngtsc/util/src/typescript';
+import {CompiledClass} from '../analysis/decoration_analyzer';
+import {NgccReflectionHost, POST_R3_MARKER, PRE_R3_MARKER, SwitchableVariableDeclaration} from '../host/ngcc_host';
+import {ModuleWithProvidersInfo} from '../analysis/module_with_providers_analyzer';
+import {ExportInfo} from '../analysis/private_declarations_analyzer';
+import {RenderingFormatter, RedundantDecoratorMap} from './rendering_formatter';
+import {stripExtension} from './utils';
+
+/**
+ * A RenderingFormatter that works with ECMAScript Module import and export statements.
+ */
+export class EsmRenderingFormatter implements RenderingFormatter {
+  constructor(protected host: NgccReflectionHost, protected isCore: boolean) {}
+
+  /**
+   *  Add the imports at the top of the file, after any imports that are already there.
+   */
+  addImports(output: MagicString, imports: Import[], sf: ts.SourceFile): void {
+    const insertionPoint = this.findEndOfImports(sf);
+    const renderedImports =
+        imports.map(i => `import * as ${i.qualifier} from '${i.specifier}';\n`).join('');
+    output.appendLeft(insertionPoint, renderedImports);
+  }
+
+  /**
+   * Add the exports to the end of the file.
+   */
+  addExports(
+      output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[],
+      importManager: ImportManager, file: ts.SourceFile): void {
+    exports.forEach(e => {
+      let exportFrom = '';
+      const isDtsFile = isDtsPath(entryPointBasePath);
+      const from = isDtsFile ? e.dtsFrom : e.from;
+
+      if (from) {
+        const basePath = stripExtension(from);
+        const relativePath =
+            './' + PathSegment.relative(AbsoluteFsPath.dirname(entryPointBasePath), basePath);
+        exportFrom = entryPointBasePath !== basePath ? ` from '${relativePath}'` : '';
+      }
+
+      // aliases should only be added in dts files as these are lost when rolling up dts file.
+      const exportStatement = e.alias && isDtsFile ? `${e.alias} as ${e.identifier}` : e.identifier;
+      const exportStr = `\nexport {${exportStatement}}${exportFrom};`;
+      output.append(exportStr);
+    });
+  }
+
+  /**
+   * Add the constants directly after the imports.
+   */
+  addConstants(output: MagicString, constants: string, file: ts.SourceFile): void {
+    if (constants === '') {
+      return;
+    }
+    const insertionPoint = this.findEndOfImports(file);
+
+    // Append the constants to the right of the insertion point, to ensure they get ordered after
+    // added imports (those are appended left to the insertion point).
+    output.appendRight(insertionPoint, '\n' + constants + '\n');
+  }
+
+  /**
+   * Add the definitions directly after their decorated class.
+   */
+  addDefinitions(output: MagicString, compiledClass: CompiledClass, definitions: string): void {
+    const classSymbol = this.host.getClassSymbol(compiledClass.declaration);
+    if (!classSymbol) {
+      throw new Error(`Compiled class does not have a valid symbol: ${compiledClass.name}`);
+    }
+    const insertionPoint = classSymbol.valueDeclaration !.getEnd();
+    output.appendLeft(insertionPoint, '\n' + definitions);
+  }
+
+  /**
+   * Remove static decorator properties from classes.
+   */
+  removeDecorators(output: MagicString, decoratorsToRemove: RedundantDecoratorMap): void {
+    decoratorsToRemove.forEach((nodesToRemove, containerNode) => {
+      if (ts.isArrayLiteralExpression(containerNode)) {
+        const items = containerNode.elements;
+        if (items.length === nodesToRemove.length) {
+          // Remove the entire statement
+          const statement = findStatement(containerNode);
+          if (statement) {
+            output.remove(statement.getFullStart(), statement.getEnd());
+          }
+        } else {
+          nodesToRemove.forEach(node => {
+            // remove any trailing comma
+            const end = (output.slice(node.getEnd(), node.getEnd() + 1) === ',') ?
+                node.getEnd() + 1 :
+                node.getEnd();
+            output.remove(node.getFullStart(), end);
+          });
+        }
+      }
+    });
+  }
+
+  /**
+   * Rewrite the the IVY switch markers to indicate we are in IVY mode.
+   */
+  rewriteSwitchableDeclarations(
+      outputText: MagicString, sourceFile: ts.SourceFile,
+      declarations: SwitchableVariableDeclaration[]): void {
+    declarations.forEach(declaration => {
+      const start = declaration.initializer.getStart();
+      const end = declaration.initializer.getEnd();
+      const replacement = declaration.initializer.text.replace(PRE_R3_MARKER, POST_R3_MARKER);
+      outputText.overwrite(start, end, replacement);
+    });
+  }
+
+
+  /**
+   * Add the type parameters to the appropriate functions that return `ModuleWithProviders`
+   * structures.
+   *
+   * This function will only get called on typings files.
+   */
+  addModuleWithProvidersParams(
+      outputText: MagicString, moduleWithProviders: ModuleWithProvidersInfo[],
+      importManager: ImportManager): void {
+    moduleWithProviders.forEach(info => {
+      const ngModuleName = info.ngModule.node.name.text;
+      const declarationFile = AbsoluteFsPath.fromSourceFile(info.declaration.getSourceFile());
+      const ngModuleFile = AbsoluteFsPath.fromSourceFile(info.ngModule.node.getSourceFile());
+      const importPath = info.ngModule.viaModule ||
+          (declarationFile !== ngModuleFile ?
+               stripExtension(
+                   `./${PathSegment.relative(AbsoluteFsPath.dirname(declarationFile), ngModuleFile)}`) :
+               null);
+      const ngModule = generateImportString(importManager, importPath, ngModuleName);
+
+      if (info.declaration.type) {
+        const typeName = info.declaration.type && ts.isTypeReferenceNode(info.declaration.type) ?
+            info.declaration.type.typeName :
+            null;
+        if (this.isCoreModuleWithProvidersType(typeName)) {
+          // The declaration already returns `ModuleWithProvider` but it needs the `NgModule` type
+          // parameter adding.
+          outputText.overwrite(
+              info.declaration.type.getStart(), info.declaration.type.getEnd(),
+              `ModuleWithProviders<${ngModule}>`);
+        } else {
+          // The declaration returns an unknown type so we need to convert it to a union that
+          // includes the ngModule property.
+          const originalTypeString = info.declaration.type.getText();
+          outputText.overwrite(
+              info.declaration.type.getStart(), info.declaration.type.getEnd(),
+              `(${originalTypeString})&{ngModule:${ngModule}}`);
+        }
+      } else {
+        // The declaration has no return type so provide one.
+        const lastToken = info.declaration.getLastToken();
+        const insertPoint = lastToken && lastToken.kind === ts.SyntaxKind.SemicolonToken ?
+            lastToken.getStart() :
+            info.declaration.getEnd();
+        outputText.appendLeft(
+            insertPoint,
+            `: ${generateImportString(importManager, '@angular/core', 'ModuleWithProviders')}<${ngModule}>`);
+      }
+    });
+  }
+
+  protected findEndOfImports(sf: ts.SourceFile): number {
+    for (const stmt of sf.statements) {
+      if (!ts.isImportDeclaration(stmt) && !ts.isImportEqualsDeclaration(stmt) &&
+          !ts.isNamespaceImport(stmt)) {
+        return stmt.getStart();
+      }
+    }
+    return 0;
+  }
+
+
+
+  /**
+   * Check whether the given type is the core Angular `ModuleWithProviders` interface.
+   * @param typeName The type to check.
+   * @returns true if the type is the core Angular `ModuleWithProviders` interface.
+   */
+  private isCoreModuleWithProvidersType(typeName: ts.EntityName|null) {
+    const id =
+        typeName && ts.isIdentifier(typeName) ? this.host.getImportOfIdentifier(typeName) : null;
+    return (
+        id && id.name === 'ModuleWithProviders' && (this.isCore || id.from === '@angular/core'));
+  }
+}
+
+function findStatement(node: ts.Node) {
+  while (node) {
+    if (ts.isExpressionStatement(node)) {
+      return node;
+    }
+    node = node.parent;
+  }
+  return undefined;
+}
+
+function generateImportString(
+    importManager: ImportManager, importPath: string | null, importName: string) {
+  const importAs = importPath ? importManager.generateNamedImport(importPath, importName) : null;
+  return importAs ? `${importAs.moduleImport}.${importAs.symbol}` : `${importName}`;
+}
diff --git a/packages/compiler-cli/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
index f2dbf5b276..136c401fee 100644
--- a/packages/compiler-cli/ngcc/src/rendering/renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
@@ -6,72 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {ConstantPool, Expression, Statement, WrappedNodeExpr, WritePropExpr} from '@angular/compiler';
-import {SourceMapConverter, commentRegex, fromJSON, fromObject, fromSource, generateMapFileComment, mapFileCommentRegex, removeComments, removeMapFileComments} from 'convert-source-map';
 import MagicString from 'magic-string';
-import {SourceMapConsumer, SourceMapGenerator, RawSourceMap} from 'source-map';
 import * as ts from 'typescript';
 
-import {NoopImportRewriter, ImportRewriter, R3SymbolsImportRewriter, NOOP_DEFAULT_IMPORT_RECORDER} from '../../../src/ngtsc/imports';
-import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
-import {CompileResult} from '../../../src/ngtsc/transform';
-import {translateStatement, translateType, Import, ImportManager} from '../../../src/ngtsc/translator';
+import {NOOP_DEFAULT_IMPORT_RECORDER} from '@angular/compiler-cli/src/ngtsc/imports';
+import {translateStatement, ImportManager} from '../../../src/ngtsc/translator';
 import {CompiledClass, CompiledFile, DecorationAnalyses} from '../analysis/decoration_analyzer';
-import {ModuleWithProvidersInfo, ModuleWithProvidersAnalyses} from '../analysis/module_with_providers_analyzer';
-import {PrivateDeclarationsAnalyses, ExportInfo} from '../analysis/private_declarations_analyzer';
+import {PrivateDeclarationsAnalyses} from '../analysis/private_declarations_analyzer';
 import {SwitchMarkerAnalyses, SwitchMarkerAnalysis} from '../analysis/switch_marker_analyzer';
 import {IMPORT_PREFIX} from '../constants';
 import {FileSystem} from '../file_system/file_system';
-import {NgccReflectionHost, SwitchableVariableDeclaration} from '../host/ngcc_host';
-import {Logger} from '../logging/logger';
+import {NgccReflectionHost} from '../host/ngcc_host';
 import {EntryPointBundle} from '../packages/entry_point_bundle';
-import {NgccFlatImportRewriter} from './ngcc_import_rewriter';
-
-interface SourceMapInfo {
-  source: string;
-  map: SourceMapConverter|null;
-  isInline: boolean;
-}
-
-/**
- * Information about a file that has been rendered.
- */
-export interface FileInfo {
-  /**
-   * Path to where the file should be written.
-   */
-  path: AbsoluteFsPath;
-  /**
-   * The contents of the file to be be written.
-   */
-  contents: string;
-}
-
-interface DtsClassInfo {
-  dtsDeclaration: ts.Declaration;
-  compilation: CompileResult[];
-}
-
-/**
- * A structure that captures information about what needs to be rendered
- * in a typings file.
- *
- * It is created as a result of processing the analysis passed to the renderer.
- *
- * The `renderDtsFile()` method consumes it when rendering a typings file.
- */
-class DtsRenderInfo {
-  classInfo: DtsClassInfo[] = [];
-  moduleWithProviders: ModuleWithProvidersInfo[] = [];
-  privateExports: ExportInfo[] = [];
-}
-
-/**
- * The collected decorators that have become redundant after the compilation
- * of Ivy static fields. The map is keyed by the container node, such that we
- * can tell if we should remove the entire decorator property
- */
-export type RedundantDecoratorMap = Map<ts.Node, ts.Node[]>;
-export const RedundantDecoratorMap = Map;
+import {Logger} from '../logging/logger';
+import {FileToWrite, getImportRewriter, stripExtension} from './utils';
+import {RenderingFormatter, RedundantDecoratorMap} from './rendering_formatter';
+import {extractSourceMap, renderSourceAndMap} from './source_maps';
 
 /**
  * A base-class for rendering an `AnalyzedFile`.
@@ -79,42 +29,28 @@ export const RedundantDecoratorMap = Map;
  * Package formats have output files that must be rendered differently. Concrete sub-classes must
  * implement the `addImports`, `addDefinitions` and `removeDecorators` abstract methods.
  */
-export abstract class Renderer {
+export class Renderer {
   constructor(
-      protected fs: FileSystem, protected logger: Logger, protected host: NgccReflectionHost,
-      protected isCore: boolean, protected bundle: EntryPointBundle) {}
+      private srcFormatter: RenderingFormatter, private fs: FileSystem, private logger: Logger,
+      private host: NgccReflectionHost, private isCore: boolean, private bundle: EntryPointBundle) {
+  }
 
   renderProgram(
       decorationAnalyses: DecorationAnalyses, switchMarkerAnalyses: SwitchMarkerAnalyses,
-      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses,
-      moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|null): FileInfo[] {
-    const renderedFiles: FileInfo[] = [];
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses): FileToWrite[] {
+    const renderedFiles: FileToWrite[] = [];
 
     // Transform the source files.
     this.bundle.src.program.getSourceFiles().forEach(sourceFile => {
-      const compiledFile = decorationAnalyses.get(sourceFile);
-      const switchMarkerAnalysis = switchMarkerAnalyses.get(sourceFile);
-
-      if (compiledFile || switchMarkerAnalysis || sourceFile === this.bundle.src.file) {
+      if (decorationAnalyses.has(sourceFile) || switchMarkerAnalyses.has(sourceFile) ||
+          sourceFile === this.bundle.src.file) {
+        const compiledFile = decorationAnalyses.get(sourceFile);
+        const switchMarkerAnalysis = switchMarkerAnalyses.get(sourceFile);
         renderedFiles.push(...this.renderFile(
             sourceFile, compiledFile, switchMarkerAnalysis, privateDeclarationsAnalyses));
       }
     });
 
-    // Transform the .d.ts files
-    if (this.bundle.dts) {
-      const dtsFiles = this.getTypingsFilesToRender(
-          decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
-
-      // If the dts entry-point is not already there (it did not have compiled classes)
-      // then add it now, to ensure it gets its extra exports rendered.
-      if (!dtsFiles.has(this.bundle.dts.file)) {
-        dtsFiles.set(this.bundle.dts.file, new DtsRenderInfo());
-      }
-      dtsFiles.forEach(
-          (renderInfo, file) => renderedFiles.push(...this.renderDtsFile(file, renderInfo)));
-    }
-
     return renderedFiles;
   }
 
@@ -126,32 +62,32 @@ export abstract class Renderer {
   renderFile(
       sourceFile: ts.SourceFile, compiledFile: CompiledFile|undefined,
       switchMarkerAnalysis: SwitchMarkerAnalysis|undefined,
-      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses): FileInfo[] {
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses): FileToWrite[] {
     const isEntryPoint = sourceFile === this.bundle.src.file;
-    const input = this.extractSourceMap(sourceFile);
+    const input = extractSourceMap(this.fs, this.logger, sourceFile);
     const outputText = new MagicString(input.source);
 
     if (switchMarkerAnalysis) {
-      this.rewriteSwitchableDeclarations(
+      this.srcFormatter.rewriteSwitchableDeclarations(
           outputText, switchMarkerAnalysis.sourceFile, switchMarkerAnalysis.declarations);
     }
 
     const importManager = new ImportManager(
-        this.getImportRewriter(this.bundle.src.r3SymbolsFile, this.bundle.isFlatCore),
+        getImportRewriter(this.bundle.src.r3SymbolsFile, this.isCore, this.bundle.isFlatCore),
         IMPORT_PREFIX);
 
     if (compiledFile) {
       // TODO: remove constructor param metadata and property decorators (we need info from the
       // handlers to do this)
       const decoratorsToRemove = this.computeDecoratorsToRemove(compiledFile.compiledClasses);
-      this.removeDecorators(outputText, decoratorsToRemove);
+      this.srcFormatter.removeDecorators(outputText, decoratorsToRemove);
 
       compiledFile.compiledClasses.forEach(clazz => {
         const renderedDefinition = renderDefinitions(compiledFile.sourceFile, clazz, importManager);
-        this.addDefinitions(outputText, clazz, renderedDefinition);
+        this.srcFormatter.addDefinitions(outputText, clazz, renderedDefinition);
       });
 
-      this.addConstants(
+      this.srcFormatter.addConstants(
           outputText,
           renderConstantPool(compiledFile.sourceFile, compiledFile.constantPool, importManager),
           compiledFile.sourceFile);
@@ -160,115 +96,22 @@ export abstract class Renderer {
     // Add exports to the entry-point file
     if (isEntryPoint) {
       const entryPointBasePath = stripExtension(this.bundle.src.path);
-      this.addExports(
+      this.srcFormatter.addExports(
           outputText, entryPointBasePath, privateDeclarationsAnalyses, importManager, sourceFile);
     }
 
     if (isEntryPoint || compiledFile) {
-      this.addImports(outputText, importManager.getAllImports(sourceFile.fileName), sourceFile);
+      this.srcFormatter.addImports(
+          outputText, importManager.getAllImports(sourceFile.fileName), sourceFile);
     }
 
     if (compiledFile || switchMarkerAnalysis || isEntryPoint) {
-      return this.renderSourceAndMap(sourceFile, input, outputText);
+      return renderSourceAndMap(sourceFile, input, outputText);
     } else {
       return [];
     }
   }
 
-  renderDtsFile(dtsFile: ts.SourceFile, renderInfo: DtsRenderInfo): FileInfo[] {
-    const input = this.extractSourceMap(dtsFile);
-    const outputText = new MagicString(input.source);
-    const printer = createPrinter();
-    const importManager = new ImportManager(
-        this.getImportRewriter(this.bundle.dts !.r3SymbolsFile, false), IMPORT_PREFIX);
-
-    renderInfo.classInfo.forEach(dtsClass => {
-      const endOfClass = dtsClass.dtsDeclaration.getEnd();
-      dtsClass.compilation.forEach(declaration => {
-        const type = translateType(declaration.type, importManager);
-        const typeStr = printer.printNode(ts.EmitHint.Unspecified, type, dtsFile);
-        const newStatement = `    static ${declaration.name}: ${typeStr};\n`;
-        outputText.appendRight(endOfClass - 1, newStatement);
-      });
-    });
-
-    this.addModuleWithProvidersParams(outputText, renderInfo.moduleWithProviders, importManager);
-    this.addImports(outputText, importManager.getAllImports(dtsFile.fileName), dtsFile);
-
-    this.addExports(
-        outputText, AbsoluteFsPath.fromSourceFile(dtsFile), renderInfo.privateExports,
-        importManager, dtsFile);
-
-
-    return this.renderSourceAndMap(dtsFile, input, outputText);
-  }
-
-  /**
-   * Add the type parameters to the appropriate functions that return `ModuleWithProviders`
-   * structures.
-   *
-   * This function only gets called on typings files, so it doesn't need different implementations
-   * for each bundle format.
-   */
-  protected addModuleWithProvidersParams(
-      outputText: MagicString, moduleWithProviders: ModuleWithProvidersInfo[],
-      importManager: ImportManager): void {
-    moduleWithProviders.forEach(info => {
-      const ngModuleName = info.ngModule.node.name.text;
-      const declarationFile = AbsoluteFsPath.fromSourceFile(info.declaration.getSourceFile());
-      const ngModuleFile = AbsoluteFsPath.fromSourceFile(info.ngModule.node.getSourceFile());
-      const importPath = info.ngModule.viaModule ||
-          (declarationFile !== ngModuleFile ?
-               stripExtension(
-                   `./${PathSegment.relative(AbsoluteFsPath.dirname(declarationFile), ngModuleFile)}`) :
-               null);
-      const ngModule = getImportString(importManager, importPath, ngModuleName);
-
-      if (info.declaration.type) {
-        const typeName = info.declaration.type && ts.isTypeReferenceNode(info.declaration.type) ?
-            info.declaration.type.typeName :
-            null;
-        if (this.isCoreModuleWithProvidersType(typeName)) {
-          // The declaration already returns `ModuleWithProvider` but it needs the `NgModule` type
-          // parameter adding.
-          outputText.overwrite(
-              info.declaration.type.getStart(), info.declaration.type.getEnd(),
-              `ModuleWithProviders<${ngModule}>`);
-        } else {
-          // The declaration returns an unknown type so we need to convert it to a union that
-          // includes the ngModule property.
-          const originalTypeString = info.declaration.type.getText();
-          outputText.overwrite(
-              info.declaration.type.getStart(), info.declaration.type.getEnd(),
-              `(${originalTypeString})&{ngModule:${ngModule}}`);
-        }
-      } else {
-        // The declaration has no return type so provide one.
-        const lastToken = info.declaration.getLastToken();
-        const insertPoint = lastToken && lastToken.kind === ts.SyntaxKind.SemicolonToken ?
-            lastToken.getStart() :
-            info.declaration.getEnd();
-        outputText.appendLeft(
-            insertPoint,
-            `: ${getImportString(importManager, '@angular/core', 'ModuleWithProviders')}<${ngModule}>`);
-      }
-    });
-  }
-
-  protected abstract addConstants(output: MagicString, constants: string, file: ts.SourceFile):
-      void;
-  protected abstract addImports(output: MagicString, imports: Import[], sf: ts.SourceFile): void;
-  protected abstract addExports(
-      output: MagicString, entryPointBasePath: AbsoluteFsPath, exports: ExportInfo[],
-      importManager: ImportManager, file: ts.SourceFile): void;
-  protected abstract addDefinitions(
-      output: MagicString, compiledClass: CompiledClass, definitions: string): void;
-  protected abstract removeDecorators(
-      output: MagicString, decoratorsToRemove: RedundantDecoratorMap): void;
-  protected abstract rewriteSwitchableDeclarations(
-      outputText: MagicString, sourceFile: ts.SourceFile,
-      declarations: SwitchableVariableDeclaration[]): void;
-
   /**
    * From the given list of classes, computes a map of decorators that should be removed.
    * The decorators to remove are keyed by their container node, such that we can tell if
@@ -276,7 +119,7 @@ export abstract class Renderer {
    * @param classes The list of classes that may have decorators to remove.
    * @returns A map of decorators to remove, keyed by their container node.
    */
-  protected computeDecoratorsToRemove(classes: CompiledClass[]): RedundantDecoratorMap {
+  private computeDecoratorsToRemove(classes: CompiledClass[]): RedundantDecoratorMap {
     const decoratorsToRemove = new RedundantDecoratorMap();
     classes.forEach(clazz => {
       clazz.decorators.forEach(dec => {
@@ -290,191 +133,6 @@ export abstract class Renderer {
     });
     return decoratorsToRemove;
   }
-
-  /**
-   * Get the map from the source (note whether it is inline or external)
-   */
-  protected extractSourceMap(file: ts.SourceFile): SourceMapInfo {
-    const inline = commentRegex.test(file.text);
-    const external = mapFileCommentRegex.exec(file.text);
-
-    if (inline) {
-      const inlineSourceMap = fromSource(file.text);
-      return {
-        source: removeComments(file.text).replace(/\n\n$/, '\n'),
-        map: inlineSourceMap,
-        isInline: true,
-      };
-    } else if (external) {
-      let externalSourceMap: SourceMapConverter|null = null;
-      try {
-        const fileName = external[1] || external[2];
-        const filePath = AbsoluteFsPath.resolve(
-            AbsoluteFsPath.dirname(AbsoluteFsPath.fromSourceFile(file)), fileName);
-        const mappingFile = this.fs.readFile(filePath);
-        externalSourceMap = fromJSON(mappingFile);
-      } catch (e) {
-        if (e.code === 'ENOENT') {
-          this.logger.warn(
-              `The external map file specified in the source code comment "${e.path}" was not found on the file system.`);
-          const mapPath = AbsoluteFsPath.fromUnchecked(file.fileName + '.map');
-          if (PathSegment.basename(e.path) !== PathSegment.basename(mapPath) &&
-              this.fs.stat(mapPath).isFile()) {
-            this.logger.warn(
-                `Guessing the map file name from the source file name: "${PathSegment.basename(mapPath)}"`);
-            try {
-              externalSourceMap = fromObject(JSON.parse(this.fs.readFile(mapPath)));
-            } catch (e) {
-              this.logger.error(e);
-            }
-          }
-        }
-      }
-      return {
-        source: removeMapFileComments(file.text).replace(/\n\n$/, '\n'),
-        map: externalSourceMap,
-        isInline: false,
-      };
-    } else {
-      return {source: file.text, map: null, isInline: false};
-    }
-  }
-
-  /**
-   * Merge the input and output source-maps, replacing the source-map comment in the output file
-   * with an appropriate source-map comment pointing to the merged source-map.
-   */
-  protected renderSourceAndMap(
-      sourceFile: ts.SourceFile, input: SourceMapInfo, output: MagicString): FileInfo[] {
-    const outputPath = AbsoluteFsPath.fromSourceFile(sourceFile);
-    const outputMapPath = AbsoluteFsPath.fromUnchecked(`${outputPath}.map`);
-    const relativeSourcePath = PathSegment.basename(outputPath);
-    const relativeMapPath = `${relativeSourcePath}.map`;
-
-    const outputMap = output.generateMap({
-      source: outputPath,
-      includeContent: true,
-      // hires: true // TODO: This results in accurate but huge sourcemaps. Instead we should fix
-      // the merge algorithm.
-    });
-
-    // we must set this after generation as magic string does "manipulation" on the path
-    outputMap.file = relativeSourcePath;
-
-    const mergedMap =
-        mergeSourceMaps(input.map && input.map.toObject(), JSON.parse(outputMap.toString()));
-
-    const result: FileInfo[] = [];
-    if (input.isInline) {
-      result.push({path: outputPath, contents: `${output.toString()}\n${mergedMap.toComment()}`});
-    } else {
-      result.push({
-        path: outputPath,
-        contents: `${output.toString()}\n${generateMapFileComment(relativeMapPath)}`
-      });
-      result.push({path: outputMapPath, contents: mergedMap.toJSON()});
-    }
-    return result;
-  }
-
-  protected getTypingsFilesToRender(
-      decorationAnalyses: DecorationAnalyses,
-      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses,
-      moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|
-      null): Map<ts.SourceFile, DtsRenderInfo> {
-    const dtsMap = new Map<ts.SourceFile, DtsRenderInfo>();
-
-    // Capture the rendering info from the decoration analyses
-    decorationAnalyses.forEach(compiledFile => {
-      compiledFile.compiledClasses.forEach(compiledClass => {
-        const dtsDeclaration = this.host.getDtsDeclaration(compiledClass.declaration);
-        if (dtsDeclaration) {
-          const dtsFile = dtsDeclaration.getSourceFile();
-          const renderInfo = dtsMap.get(dtsFile) || new DtsRenderInfo();
-          renderInfo.classInfo.push({dtsDeclaration, compilation: compiledClass.compilation});
-          dtsMap.set(dtsFile, renderInfo);
-        }
-      });
-    });
-
-    // Capture the ModuleWithProviders functions/methods that need updating
-    if (moduleWithProvidersAnalyses !== null) {
-      moduleWithProvidersAnalyses.forEach((moduleWithProvidersToFix, dtsFile) => {
-        const renderInfo = dtsMap.get(dtsFile) || new DtsRenderInfo();
-        renderInfo.moduleWithProviders = moduleWithProvidersToFix;
-        dtsMap.set(dtsFile, renderInfo);
-      });
-    }
-
-    // Capture the private declarations that need to be re-exported
-    if (privateDeclarationsAnalyses.length) {
-      privateDeclarationsAnalyses.forEach(e => {
-        if (!e.dtsFrom && !e.alias) {
-          throw new Error(
-              `There is no typings path for ${e.identifier} in ${e.from}.\n` +
-              `We need to add an export for this class to a .d.ts typings file because ` +
-              `Angular compiler needs to be able to reference this class in compiled code, such as templates.\n` +
-              `The simplest fix for this is to ensure that this class is exported from the package's entry-point.`);
-        }
-      });
-      const dtsEntryPoint = this.bundle.dts !.file;
-      const renderInfo = dtsMap.get(dtsEntryPoint) || new DtsRenderInfo();
-      renderInfo.privateExports = privateDeclarationsAnalyses;
-      dtsMap.set(dtsEntryPoint, renderInfo);
-    }
-
-    return dtsMap;
-  }
-
-  /**
-   * Check whether the given type is the core Angular `ModuleWithProviders` interface.
-   * @param typeName The type to check.
-   * @returns true if the type is the core Angular `ModuleWithProviders` interface.
-   */
-  private isCoreModuleWithProvidersType(typeName: ts.EntityName|null) {
-    const id =
-        typeName && ts.isIdentifier(typeName) ? this.host.getImportOfIdentifier(typeName) : null;
-    return (
-        id && id.name === 'ModuleWithProviders' && (this.isCore || id.from === '@angular/core'));
-  }
-
-  private getImportRewriter(r3SymbolsFile: ts.SourceFile|null, isFlat: boolean): ImportRewriter {
-    if (this.isCore && isFlat) {
-      return new NgccFlatImportRewriter();
-    } else if (this.isCore) {
-      return new R3SymbolsImportRewriter(r3SymbolsFile !.fileName);
-    } else {
-      return new NoopImportRewriter();
-    }
-  }
-}
-
-/**
- * Merge the two specified source-maps into a single source-map that hides the intermediate
- * source-map.
- * E.g. Consider these mappings:
- *
- * ```
- * OLD_SRC -> OLD_MAP -> INTERMEDIATE_SRC -> NEW_MAP -> NEW_SRC
- * ```
- *
- * this will be replaced with:
- *
- * ```
- * OLD_SRC -> MERGED_MAP -> NEW_SRC
- * ```
- */
-export function mergeSourceMaps(
-    oldMap: RawSourceMap | null, newMap: RawSourceMap): SourceMapConverter {
-  if (!oldMap) {
-    return fromObject(newMap);
-  }
-  const oldMapConsumer = new SourceMapConsumer(oldMap);
-  const newMapConsumer = new SourceMapConsumer(newMap);
-  const mergedMapGenerator = SourceMapGenerator.fromSourceMap(newMapConsumer);
-  mergedMapGenerator.applySourceMap(oldMapConsumer);
-  const merged = fromJSON(mergedMapGenerator.toString());
-  return merged;
 }
 
 /**
@@ -515,10 +173,6 @@ export function renderDefinitions(
   return definitions;
 }
 
-export function stripExtension<T extends string>(filePath: T): T {
-  return filePath.replace(/\.(js|d\.ts)$/, '') as T;
-}
-
 /**
  * Create an Angular AST statement node that contains the assignment of the
  * compiled decorator to be applied to the class.
@@ -530,12 +184,6 @@ function createAssignmentStatement(
   return new WritePropExpr(receiver, propName, initializer).toStmt();
 }
 
-function getImportString(
-    importManager: ImportManager, importPath: string | null, importName: string) {
-  const importAs = importPath ? importManager.generateNamedImport(importPath, importName) : null;
-  return importAs ? `${importAs.moduleImport}.${importAs.symbol}` : `${importName}`;
-}
-
 function createPrinter(): ts.Printer {
   return ts.createPrinter({newLine: ts.NewLineKind.LineFeed});
-}
\ No newline at end of file
+}
diff --git a/packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts
new file mode 100644
index 0000000000..b2a0ad2ca3
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts
@@ -0,0 +1,42 @@
+/**
+ * @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 MagicString from 'magic-string';
+import * as ts from 'typescript';
+import {Import, ImportManager} from '../../../src/ngtsc/translator';
+import {ExportInfo} from '../analysis/private_declarations_analyzer';
+import {CompiledClass} from '../analysis/decoration_analyzer';
+import {SwitchableVariableDeclaration} from '../host/ngcc_host';
+import {ModuleWithProvidersInfo} from '../analysis/module_with_providers_analyzer';
+
+/**
+ * The collected decorators that have become redundant after the compilation
+ * of Ivy static fields. The map is keyed by the container node, such that we
+ * can tell if we should remove the entire decorator property
+ */
+export type RedundantDecoratorMap = Map<ts.Node, ts.Node[]>;
+export const RedundantDecoratorMap = Map;
+
+/**
+ * Implement this interface with methods that know how to render a specific format,
+ * such as ESM5 or UMD.
+ */
+export interface RenderingFormatter {
+  addConstants(output: MagicString, constants: string, file: ts.SourceFile): void;
+  addImports(output: MagicString, imports: Import[], sf: ts.SourceFile): void;
+  addExports(
+      output: MagicString, entryPointBasePath: string, exports: ExportInfo[],
+      importManager: ImportManager, file: ts.SourceFile): void;
+  addDefinitions(output: MagicString, compiledClass: CompiledClass, definitions: string): void;
+  removeDecorators(output: MagicString, decoratorsToRemove: RedundantDecoratorMap): void;
+  rewriteSwitchableDeclarations(
+      outputText: MagicString, sourceFile: ts.SourceFile,
+      declarations: SwitchableVariableDeclaration[]): void;
+  addModuleWithProvidersParams(
+      outputText: MagicString, moduleWithProviders: ModuleWithProvidersInfo[],
+      importManager: ImportManager): void;
+}
diff --git a/packages/compiler-cli/ngcc/src/rendering/source_maps.ts b/packages/compiler-cli/ngcc/src/rendering/source_maps.ts
new file mode 100644
index 0000000000..23be4392c8
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/rendering/source_maps.ts
@@ -0,0 +1,137 @@
+/**
+ * @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 {SourceMapConverter, commentRegex, fromJSON, fromObject, fromSource, generateMapFileComment, mapFileCommentRegex, removeComments, removeMapFileComments} from 'convert-source-map';
+import MagicString from 'magic-string';
+import {RawSourceMap, SourceMapConsumer, SourceMapGenerator} from 'source-map';
+import * as ts from 'typescript';
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
+import {FileSystem} from '../file_system/file_system';
+import {Logger} from '../logging/logger';
+import {FileToWrite} from './utils';
+
+export interface SourceMapInfo {
+  source: string;
+  map: SourceMapConverter|null;
+  isInline: boolean;
+}
+
+/**
+ * Get the map from the source (note whether it is inline or external)
+ */
+export function extractSourceMap(
+    fs: FileSystem, logger: Logger, file: ts.SourceFile): SourceMapInfo {
+  const inline = commentRegex.test(file.text);
+  const external = mapFileCommentRegex.exec(file.text);
+
+  if (inline) {
+    const inlineSourceMap = fromSource(file.text);
+    return {
+      source: removeComments(file.text).replace(/\n\n$/, '\n'),
+      map: inlineSourceMap,
+      isInline: true,
+    };
+  } else if (external) {
+    let externalSourceMap: SourceMapConverter|null = null;
+    try {
+      const fileName = external[1] || external[2];
+      const filePath = AbsoluteFsPath.resolve(
+          AbsoluteFsPath.dirname(AbsoluteFsPath.fromSourceFile(file)), fileName);
+      const mappingFile = fs.readFile(filePath);
+      externalSourceMap = fromJSON(mappingFile);
+    } catch (e) {
+      if (e.code === 'ENOENT') {
+        logger.warn(
+            `The external map file specified in the source code comment "${e.path}" was not found on the file system.`);
+        const mapPath = AbsoluteFsPath.fromUnchecked(file.fileName + '.map');
+        if (PathSegment.basename(e.path) !== PathSegment.basename(mapPath) && fs.exists(mapPath) &&
+            fs.stat(mapPath).isFile()) {
+          logger.warn(
+              `Guessing the map file name from the source file name: "${PathSegment.basename(mapPath)}"`);
+          try {
+            externalSourceMap = fromObject(JSON.parse(fs.readFile(mapPath)));
+          } catch (e) {
+            logger.error(e);
+          }
+        }
+      }
+    }
+    return {
+      source: removeMapFileComments(file.text).replace(/\n\n$/, '\n'),
+      map: externalSourceMap,
+      isInline: false,
+    };
+  } else {
+    return {source: file.text, map: null, isInline: false};
+  }
+}
+
+/**
+ * Merge the input and output source-maps, replacing the source-map comment in the output file
+ * with an appropriate source-map comment pointing to the merged source-map.
+ */
+export function renderSourceAndMap(
+    sourceFile: ts.SourceFile, input: SourceMapInfo, output: MagicString): FileToWrite[] {
+  const outputPath = AbsoluteFsPath.fromSourceFile(sourceFile);
+  const outputMapPath = AbsoluteFsPath.fromUnchecked(`${outputPath}.map`);
+  const relativeSourcePath = PathSegment.basename(outputPath);
+  const relativeMapPath = `${relativeSourcePath}.map`;
+
+  const outputMap = output.generateMap({
+    source: outputPath,
+    includeContent: true,
+    // hires: true // TODO: This results in accurate but huge sourcemaps. Instead we should fix
+    // the merge algorithm.
+  });
+
+  // we must set this after generation as magic string does "manipulation" on the path
+  outputMap.file = relativeSourcePath;
+
+  const mergedMap =
+      mergeSourceMaps(input.map && input.map.toObject(), JSON.parse(outputMap.toString()));
+
+  const result: FileToWrite[] = [];
+  if (input.isInline) {
+    result.push({path: outputPath, contents: `${output.toString()}\n${mergedMap.toComment()}`});
+  } else {
+    result.push({
+      path: outputPath,
+      contents: `${output.toString()}\n${generateMapFileComment(relativeMapPath)}`
+    });
+    result.push({path: outputMapPath, contents: mergedMap.toJSON()});
+  }
+  return result;
+}
+
+
+/**
+ * Merge the two specified source-maps into a single source-map that hides the intermediate
+ * source-map.
+ * E.g. Consider these mappings:
+ *
+ * ```
+ * OLD_SRC -> OLD_MAP -> INTERMEDIATE_SRC -> NEW_MAP -> NEW_SRC
+ * ```
+ *
+ * this will be replaced with:
+ *
+ * ```
+ * OLD_SRC -> MERGED_MAP -> NEW_SRC
+ * ```
+ */
+export function mergeSourceMaps(
+    oldMap: RawSourceMap | null, newMap: RawSourceMap): SourceMapConverter {
+  if (!oldMap) {
+    return fromObject(newMap);
+  }
+  const oldMapConsumer = new SourceMapConsumer(oldMap);
+  const newMapConsumer = new SourceMapConsumer(newMap);
+  const mergedMapGenerator = SourceMapGenerator.fromSourceMap(newMapConsumer);
+  mergedMapGenerator.applySourceMap(oldMapConsumer);
+  const merged = fromJSON(mergedMapGenerator.toString());
+  return merged;
+}
diff --git a/packages/compiler-cli/ngcc/src/rendering/umd_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts
similarity index 83%
rename from packages/compiler-cli/ngcc/src/rendering/umd_renderer.ts
rename to packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts
index e3ccfff46f..f15e23b581 100644
--- a/packages/compiler-cli/ngcc/src/rendering/umd_renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts
@@ -10,25 +10,23 @@ import * as ts from 'typescript';
 import MagicString from 'magic-string';
 import {Import, ImportManager} from '../../../src/ngtsc/translator';
 import {ExportInfo} from '../analysis/private_declarations_analyzer';
-import {FileSystem} from '../file_system/file_system';
 import {UmdReflectionHost} from '../host/umd_host';
-import {Logger} from '../logging/logger';
-import {EntryPointBundle} from '../packages/entry_point_bundle';
-import {Esm5Renderer} from './esm5_renderer';
-import {stripExtension} from './renderer';
+import {Esm5RenderingFormatter} from './esm5_rendering_formatter';
+import {stripExtension} from './utils';
 
 type CommonJsConditional = ts.ConditionalExpression & {whenTrue: ts.CallExpression};
 type AmdConditional = ts.ConditionalExpression & {whenTrue: ts.CallExpression};
 
-export class UmdRenderer extends Esm5Renderer {
-  constructor(
-      fs: FileSystem, logger: Logger, protected umdHost: UmdReflectionHost, isCore: boolean,
-      bundle: EntryPointBundle) {
-    super(fs, logger, umdHost, isCore, bundle);
-  }
+/**
+ * A RenderingFormatter that works with UMD files, instead of `import` and `export` statements
+ * the module is an IIFE with a factory function call with dependencies, which are defined in a
+ * wrapper function for AMD, CommonJS and global module formats.
+ */
+export class UmdRenderingFormatter extends Esm5RenderingFormatter {
+  constructor(protected umdHost: UmdReflectionHost, isCore: boolean) { super(umdHost, isCore); }
 
   /**
-   *  Add the imports at the top of the file
+   *  Add the imports to the UMD module IIFE.
    */
   addImports(output: MagicString, imports: Import[], file: ts.SourceFile): void {
     // Assume there is only one UMD module in the file
@@ -46,6 +44,9 @@ export class UmdRenderer extends Esm5Renderer {
     renderFactoryParameters(output, wrapperFunction, imports);
   }
 
+  /**
+   * Add the exports to the bottom of the UMD module factory function.
+   */
   addExports(
       output: MagicString, entryPointBasePath: string, exports: ExportInfo[],
       importManager: ImportManager, file: ts.SourceFile): void {
@@ -70,6 +71,9 @@ export class UmdRenderer extends Esm5Renderer {
     });
   }
 
+  /**
+   * Add the constants to the top of the UMD factory function.
+   */
   addConstants(output: MagicString, constants: string, file: ts.SourceFile): void {
     if (constants === '') {
       return;
@@ -86,6 +90,9 @@ export class UmdRenderer extends Esm5Renderer {
   }
 }
 
+/**
+ * Add dependencies to the CommonJS part of the UMD wrapper function.
+ */
 function renderCommonJsDependencies(
     output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
   const conditional = find(wrapperFunction.body.statements[0], isCommonJSConditional);
@@ -98,6 +105,9 @@ function renderCommonJsDependencies(
   imports.forEach(i => output.appendLeft(injectionPoint, `,require('${i.specifier}')`));
 }
 
+/**
+ * Add dependencies to the AMD part of the UMD wrapper function.
+ */
 function renderAmdDependencies(
     output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
   const conditional = find(wrapperFunction.body.statements[0], isAmdConditional);
@@ -113,17 +123,23 @@ function renderAmdDependencies(
   imports.forEach(i => output.appendLeft(injectionPoint, `,'${i.specifier}'`));
 }
 
+/**
+ * Add dependencies to the global part of the UMD wrapper function.
+ */
 function renderGlobalDependencies(
     output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
   const globalFactoryCall = find(wrapperFunction.body.statements[0], isGlobalFactoryCall);
   if (!globalFactoryCall) {
     return;
   }
-  const injectionPoint = globalFactoryCall.getEnd() -
-      1;  // Backup one char to account for the closing parenthesis on the call
+  // Backup one char to account for the closing parenthesis after the argument list of the call.
+  const injectionPoint = globalFactoryCall.getEnd() - 1;
   imports.forEach(i => output.appendLeft(injectionPoint, `,global.${getGlobalIdentifier(i)}`));
 }
 
+/**
+ * Add dependency parameters to the UMD factory function.
+ */
 function renderFactoryParameters(
     output: MagicString, wrapperFunction: ts.FunctionExpression, imports: Import[]) {
   const wrapperCall = wrapperFunction.parent as ts.CallExpression;
@@ -143,6 +159,9 @@ function renderFactoryParameters(
   imports.forEach(i => output.appendLeft(injectionPoint, `,${i.qualifier}`));
 }
 
+/**
+ * Is this node the CommonJS conditional expression in the UMD wrapper?
+ */
 function isCommonJSConditional(value: ts.Node): value is CommonJsConditional {
   if (!ts.isConditionalExpression(value)) {
     return false;
@@ -160,6 +179,9 @@ function isCommonJSConditional(value: ts.Node): value is CommonJsConditional {
   return value.whenTrue.expression.text === 'factory';
 }
 
+/**
+ * Is this node the AMD conditional expression in the UMD wrapper?
+ */
 function isAmdConditional(value: ts.Node): value is AmdConditional {
   if (!ts.isConditionalExpression(value)) {
     return false;
@@ -177,6 +199,9 @@ function isAmdConditional(value: ts.Node): value is AmdConditional {
   return value.whenTrue.expression.text === 'define';
 }
 
+/**
+ * Is this node the call to setup the global dependencies in the UMD wrapper?
+ */
 function isGlobalFactoryCall(value: ts.Node): value is ts.CallExpression {
   if (ts.isCallExpression(value) && !!value.parent) {
     // Be resilient to the value being inside parentheses
diff --git a/packages/compiler-cli/ngcc/src/rendering/utils.ts b/packages/compiler-cli/ngcc/src/rendering/utils.ts
new file mode 100644
index 0000000000..8392a09425
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/rendering/utils.ts
@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+import {ImportRewriter, NoopImportRewriter, R3SymbolsImportRewriter} from '../../../src/ngtsc/imports';
+import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {NgccFlatImportRewriter} from './ngcc_import_rewriter';
+
+/**
+ * Information about a file that has been rendered.
+ */
+export interface FileToWrite {
+  /** Path to where the file should be written. */
+  path: AbsoluteFsPath;
+  /** The contents of the file to be be written. */
+  contents: string;
+}
+
+/**
+ * Create an appropriate ImportRewriter given the parameters.
+ */
+export function getImportRewriter(
+    r3SymbolsFile: ts.SourceFile | null, isCore: boolean, isFlat: boolean): ImportRewriter {
+  if (isCore && isFlat) {
+    return new NgccFlatImportRewriter();
+  } else if (isCore) {
+    return new R3SymbolsImportRewriter(r3SymbolsFile !.fileName);
+  } else {
+    return new NoopImportRewriter();
+  }
+}
+
+export function stripExtension<T extends string>(filePath: T): T {
+  return filePath.replace(/\.(js|d\.ts)$/, '') as T;
+}
diff --git a/packages/compiler-cli/ngcc/src/writing/file_writer.ts b/packages/compiler-cli/ngcc/src/writing/file_writer.ts
index 0d7ee1e8a6..5b178e5355 100644
--- a/packages/compiler-cli/ngcc/src/writing/file_writer.ts
+++ b/packages/compiler-cli/ngcc/src/writing/file_writer.ts
@@ -8,12 +8,13 @@
  */
 import {EntryPoint} from '../packages/entry_point';
 import {EntryPointBundle} from '../packages/entry_point_bundle';
-import {FileInfo} from '../rendering/renderer';
+import {FileToWrite} from '../rendering/utils';
 
 
 /**
  * Responsible for writing out the transformed files to disk.
  */
 export interface FileWriter {
-  writeBundle(entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileInfo[]): void;
+  writeBundle(entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileToWrite[]):
+      void;
 }
diff --git a/packages/compiler-cli/ngcc/src/writing/in_place_file_writer.ts b/packages/compiler-cli/ngcc/src/writing/in_place_file_writer.ts
index 6bf43e94ca..adc7f396c5 100644
--- a/packages/compiler-cli/ngcc/src/writing/in_place_file_writer.ts
+++ b/packages/compiler-cli/ngcc/src/writing/in_place_file_writer.ts
@@ -10,7 +10,7 @@ import {AbsoluteFsPath} from '../../../src/ngtsc/path';
 import {FileSystem} from '../file_system/file_system';
 import {EntryPoint} from '../packages/entry_point';
 import {EntryPointBundle} from '../packages/entry_point_bundle';
-import {FileInfo} from '../rendering/renderer';
+import {FileToWrite} from '../rendering/utils';
 import {FileWriter} from './file_writer';
 
 /**
@@ -20,11 +20,11 @@ import {FileWriter} from './file_writer';
 export class InPlaceFileWriter implements FileWriter {
   constructor(protected fs: FileSystem) {}
 
-  writeBundle(_entryPoint: EntryPoint, _bundle: EntryPointBundle, transformedFiles: FileInfo[]) {
+  writeBundle(_entryPoint: EntryPoint, _bundle: EntryPointBundle, transformedFiles: FileToWrite[]) {
     transformedFiles.forEach(file => this.writeFileAndBackup(file));
   }
 
-  protected writeFileAndBackup(file: FileInfo): void {
+  protected writeFileAndBackup(file: FileToWrite): void {
     this.fs.ensureDir(AbsoluteFsPath.dirname(file.path));
     const backPath = AbsoluteFsPath.fromUnchecked(`${file.path}.__ivy_ngcc_bak`);
     if (this.fs.exists(backPath)) {
diff --git a/packages/compiler-cli/ngcc/src/writing/new_entry_point_file_writer.ts b/packages/compiler-cli/ngcc/src/writing/new_entry_point_file_writer.ts
index 10414ebdfc..59ff4e67c1 100644
--- a/packages/compiler-cli/ngcc/src/writing/new_entry_point_file_writer.ts
+++ b/packages/compiler-cli/ngcc/src/writing/new_entry_point_file_writer.ts
@@ -10,7 +10,7 @@ import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
 import {isDtsPath} from '../../../src/ngtsc/util/src/typescript';
 import {EntryPoint, EntryPointJsonProperty} from '../packages/entry_point';
 import {EntryPointBundle} from '../packages/entry_point_bundle';
-import {FileInfo} from '../rendering/renderer';
+import {FileToWrite} from '../rendering/utils';
 
 import {InPlaceFileWriter} from './in_place_file_writer';
 
@@ -25,7 +25,7 @@ const NGCC_DIRECTORY = '__ivy_ngcc__';
  * `InPlaceFileWriter`).
  */
 export class NewEntryPointFileWriter extends InPlaceFileWriter {
-  writeBundle(entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileInfo[]) {
+  writeBundle(entryPoint: EntryPoint, bundle: EntryPointBundle, transformedFiles: FileToWrite[]) {
     // The new folder is at the root of the overall package
     const ngccFolder = AbsoluteFsPath.join(entryPoint.package, NGCC_DIRECTORY);
     this.copyBundle(bundle, entryPoint.package, ngccFolder);
@@ -47,7 +47,7 @@ export class NewEntryPointFileWriter extends InPlaceFileWriter {
     });
   }
 
-  protected writeFile(file: FileInfo, packagePath: AbsoluteFsPath, ngccFolder: AbsoluteFsPath):
+  protected writeFile(file: FileToWrite, packagePath: AbsoluteFsPath, ngccFolder: AbsoluteFsPath):
       void {
     if (isDtsPath(file.path.replace(/\.map$/, ''))) {
       // This is either `.d.ts` or `.d.ts.map` file
diff --git a/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts
new file mode 100644
index 0000000000..3fea099f44
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts
@@ -0,0 +1,181 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import MagicString from 'magic-string';
+import * as ts from 'typescript';
+import {fromObject} from 'convert-source-map';
+import {Import, ImportManager} from '../../../src/ngtsc/translator';
+import {CompiledClass, DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
+import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
+import {ModuleWithProvidersAnalyzer, ModuleWithProvidersInfo} from '../../src/analysis/module_with_providers_analyzer';
+import {PrivateDeclarationsAnalyzer, ExportInfo} from '../../src/analysis/private_declarations_analyzer';
+import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
+import {DtsRenderer} from '../../src/rendering/dts_renderer';
+import {makeTestEntryPointBundle, createFileSystemFromProgramFiles} from '../helpers/utils';
+import {MockLogger} from '../helpers/mock_logger';
+import {RenderingFormatter, RedundantDecoratorMap} from '../../src/rendering/rendering_formatter';
+import {MockFileSystem} from '../helpers/mock_file_system';
+import {AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/path';
+
+const _ = AbsoluteFsPath.fromUnchecked;
+
+class TestRenderingFormatter implements RenderingFormatter {
+  addImports(output: MagicString, imports: Import[], sf: ts.SourceFile) {
+    output.prepend('\n// ADD IMPORTS\n');
+  }
+  addExports(output: MagicString, baseEntryPointPath: string, exports: ExportInfo[]) {
+    output.prepend('\n// ADD EXPORTS\n');
+  }
+  addConstants(output: MagicString, constants: string, file: ts.SourceFile): void {
+    output.prepend('\n// ADD CONSTANTS\n');
+  }
+  addDefinitions(output: MagicString, compiledClass: CompiledClass, definitions: string) {
+    output.prepend('\n// ADD DEFINITIONS\n');
+  }
+  removeDecorators(output: MagicString, decoratorsToRemove: RedundantDecoratorMap) {
+    output.prepend('\n// REMOVE DECORATORS\n');
+  }
+  rewriteSwitchableDeclarations(output: MagicString, sourceFile: ts.SourceFile): void {
+    output.prepend('\n// REWRITTEN DECLARATIONS\n');
+  }
+  addModuleWithProvidersParams(
+      output: MagicString, moduleWithProviders: ModuleWithProvidersInfo[],
+      importManager: ImportManager): void {
+    output.prepend('\n// ADD MODUlE WITH PROVIDERS PARAMS\n');
+  }
+}
+
+function createTestRenderer(
+    packageName: string, files: {name: string, contents: string}[],
+    dtsFiles?: {name: string, contents: string}[],
+    mappingFiles?: {name: string, contents: string}[]) {
+  const logger = new MockLogger();
+  const fs = new MockFileSystem(createFileSystemFromProgramFiles(files, dtsFiles, mappingFiles));
+  const isCore = packageName === '@angular/core';
+  const bundle = makeTestEntryPointBundle('es2015', 'esm2015', isCore, files, dtsFiles);
+  const typeChecker = bundle.src.program.getTypeChecker();
+  const host = new Esm2015ReflectionHost(logger, isCore, typeChecker, bundle.dts);
+  const referencesRegistry = new NgccReferencesRegistry(host);
+  const decorationAnalyses = new DecorationAnalyzer(
+                                 fs, bundle.src.program, bundle.src.options, bundle.src.host,
+                                 typeChecker, host, referencesRegistry, bundle.rootDirs, isCore)
+                                 .analyzeProgram();
+  const moduleWithProvidersAnalyses =
+      new ModuleWithProvidersAnalyzer(host, referencesRegistry).analyzeProgram(bundle.src.program);
+  const privateDeclarationsAnalyses =
+      new PrivateDeclarationsAnalyzer(host, referencesRegistry).analyzeProgram(bundle.src.program);
+  const testFormatter = new TestRenderingFormatter();
+  spyOn(testFormatter, 'addExports').and.callThrough();
+  spyOn(testFormatter, 'addImports').and.callThrough();
+  spyOn(testFormatter, 'addDefinitions').and.callThrough();
+  spyOn(testFormatter, 'addConstants').and.callThrough();
+  spyOn(testFormatter, 'removeDecorators').and.callThrough();
+  spyOn(testFormatter, 'rewriteSwitchableDeclarations').and.callThrough();
+  spyOn(testFormatter, 'addModuleWithProvidersParams').and.callThrough();
+
+  const renderer = new DtsRenderer(testFormatter, fs, logger, host, isCore, bundle);
+
+  return {renderer,
+          testFormatter,
+          decorationAnalyses,
+          moduleWithProvidersAnalyses,
+          privateDeclarationsAnalyses,
+          bundle};
+}
+
+
+describe('DtsRenderer', () => {
+  const INPUT_PROGRAM = {
+    name: '/src/file.js',
+    contents:
+        `import { Directive } from '@angular/core';\nexport class A {\n    foo(x) {\n        return x;\n    }\n}\nA.decorators = [\n    { type: Directive, args: [{ selector: '[a]' }] }\n];\n`
+  };
+  const INPUT_DTS_PROGRAM = {
+    name: '/typings/file.d.ts',
+    contents: `export declare class A {\nfoo(x: number): number;\n}\n`
+  };
+
+  const INPUT_PROGRAM_MAP = fromObject({
+    'version': 3,
+    'file': '/src/file.js',
+    'sourceRoot': '',
+    'sources': ['/src/file.ts'],
+    'names': [],
+    'mappings':
+        'AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,MAAM;IACF,GAAG,CAAC,CAAS;QACT,OAAO,CAAC,CAAC;IACb,CAAC;;AACM,YAAU,GAAG;IAChB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;CACnD,CAAC',
+    'sourcesContent': [INPUT_PROGRAM.contents]
+  });
+
+  const RENDERED_CONTENTS = `
+// ADD IMPORTS
+
+// ADD EXPORTS
+
+// ADD CONSTANTS
+
+// ADD DEFINITIONS
+
+// REMOVE DECORATORS
+` + INPUT_PROGRAM.contents;
+
+  const MERGED_OUTPUT_PROGRAM_MAP = fromObject({
+    'version': 3,
+    'sources': ['/src/file.ts'],
+    'names': [],
+    'mappings': ';;;;;;;;;;AAAA',
+    'file': 'file.js',
+    'sourcesContent': [INPUT_PROGRAM.contents]
+  });
+
+  it('should render extract types into typings files', () => {
+    const {renderer, decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses} =
+        createTestRenderer('test-package', [INPUT_PROGRAM], [INPUT_DTS_PROGRAM]);
+    const result = renderer.renderProgram(
+        decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
+
+    const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
+    expect(typingsFile.contents)
+        .toContain(
+            'foo(x: number): number;\n    static ngDirectiveDef: ɵngcc0.ΔDirectiveDefWithMeta');
+  });
+
+  it('should render imports into typings files', () => {
+    const {renderer, decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses} =
+        createTestRenderer('test-package', [INPUT_PROGRAM], [INPUT_DTS_PROGRAM]);
+    const result = renderer.renderProgram(
+        decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
+
+    const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
+    expect(typingsFile.contents).toContain(`\n// ADD IMPORTS\n`);
+  });
+
+  it('should render exports into typings files', () => {
+    const {renderer, decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses} =
+        createTestRenderer('test-package', [INPUT_PROGRAM], [INPUT_DTS_PROGRAM]);
+
+    // Add a mock export to trigger export rendering
+    privateDeclarationsAnalyses.push(
+        {identifier: 'ComponentB', from: _('/src/file.js'), dtsFrom: _('/typings/b.d.ts')});
+
+    const result = renderer.renderProgram(
+        decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
+
+    const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
+    expect(typingsFile.contents).toContain(`\n// ADD EXPORTS\n`);
+  });
+
+  it('should render ModuleWithProviders type params', () => {
+    const {renderer, decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses} =
+        createTestRenderer('test-package', [INPUT_PROGRAM], [INPUT_DTS_PROGRAM]);
+
+    const result = renderer.renderProgram(
+        decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
+
+    const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
+    expect(typingsFile.contents).toContain(`\n// ADD MODUlE WITH PROVIDERS PARAMS\n`);
+  });
+});
diff --git a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm5_rendering_formatter_spec.ts
similarity index 98%
rename from packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
rename to packages/compiler-cli/ngcc/test/rendering/esm5_rendering_formatter_spec.ts
index fc57b1e653..4f8e69e5ca 100644
--- a/packages/compiler-cli/ngcc/test/rendering/esm5_renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/esm5_rendering_formatter_spec.ts
@@ -15,7 +15,7 @@ import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registr
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
 import {IMPORT_PREFIX} from '../../src/constants';
 import {Esm5ReflectionHost} from '../../src/host/esm5_host';
-import {Esm5Renderer} from '../../src/rendering/esm5_renderer';
+import {Esm5RenderingFormatter} from '../../src/rendering/esm5_rendering_formatter';
 import {makeTestEntryPointBundle, getDeclaration} from '../helpers/utils';
 import {MockFileSystem} from '../helpers/mock_file_system';
 import {MockLogger} from '../helpers/mock_logger';
@@ -35,7 +35,7 @@ function setup(file: {name: AbsoluteFsPath, contents: string}) {
           referencesRegistry, [AbsoluteFsPath.fromUnchecked('/')], false)
           .analyzeProgram();
   const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program);
-  const renderer = new Esm5Renderer(fs, logger, host, false, bundle);
+  const renderer = new Esm5RenderingFormatter(host, false);
   const importManager = new ImportManager(new NoopImportRewriter(), IMPORT_PREFIX);
   return {
     host,
@@ -155,7 +155,7 @@ export { D };
 // Some other content`
 };
 
-describe('Esm5Renderer', () => {
+describe('Esm5RenderingFormatter', () => {
 
   describe('addImports', () => {
     it('should insert the given imports after existing imports of the source file', () => {
diff --git a/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts
similarity index 65%
rename from packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts
rename to packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts
index df75d709b1..fc68fee711 100644
--- a/packages/compiler-cli/ngcc/test/rendering/esm2015_renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts
@@ -15,29 +15,33 @@ import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registr
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
 import {IMPORT_PREFIX} from '../../src/constants';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
-import {EsmRenderer} from '../../src/rendering/esm_renderer';
+import {EsmRenderingFormatter} from '../../src/rendering/esm_rendering_formatter';
 import {makeTestEntryPointBundle} from '../helpers/utils';
 import {MockFileSystem} from '../helpers/mock_file_system';
 import {MockLogger} from '../helpers/mock_logger';
+import {ModuleWithProvidersAnalyzer} from '../../src/analysis/module_with_providers_analyzer';
 
 const _ = AbsoluteFsPath.fromUnchecked;
 
-function setup(file: {name: AbsoluteFsPath, contents: string}) {
+function setup(
+    files: {name: string, contents: string}[],
+    dtsFiles?: {name: string, contents: string, isRoot?: boolean}[]) {
   const fs = new MockFileSystem();
   const logger = new MockLogger();
-  const bundle = makeTestEntryPointBundle('es2015', 'esm2015', false, [file]) !;
+  const bundle = makeTestEntryPointBundle('es2015', 'esm2015', false, files, dtsFiles) !;
   const typeChecker = bundle.src.program.getTypeChecker();
-  const host = new Esm2015ReflectionHost(logger, false, typeChecker);
+  const host = new Esm2015ReflectionHost(logger, false, typeChecker, bundle.dts);
   const referencesRegistry = new NgccReferencesRegistry(host);
   const decorationAnalyses = new DecorationAnalyzer(
                                  fs, bundle.src.program, bundle.src.options, bundle.src.host,
                                  typeChecker, host, referencesRegistry, [_('/')], false)
                                  .analyzeProgram();
   const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program);
-  const renderer = new EsmRenderer(fs, logger, host, false, bundle);
+  const renderer = new EsmRenderingFormatter(host, false);
   const importManager = new ImportManager(new NoopImportRewriter(), IMPORT_PREFIX);
   return {
     host,
+    bundle,
     program: bundle.src.program,
     sourceFile: bundle.src.file, renderer, decorationAnalyses, switchMarkerAnalyses, importManager,
   };
@@ -79,9 +83,207 @@ function compileNgModuleFactory__POST_R3__(injector, options, moduleType) {
 // Some other content`
 };
 
-const PROGRAM_DECORATE_HELPER = {
-  name: _('/some/file.js'),
-  contents: `
+describe('EsmRenderingFormatter', () => {
+
+  describe('addImports', () => {
+    it('should insert the given imports after existing imports of the source file', () => {
+      const {renderer, sourceFile} = setup([PROGRAM]);
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addImports(
+          output,
+          [
+            {specifier: '@angular/core', qualifier: 'i0'},
+            {specifier: '@angular/common', qualifier: 'i1'}
+          ],
+          sourceFile);
+      expect(output.toString()).toContain(`/* A copyright notice */
+import 'some-side-effect';
+import {Directive} from '@angular/core';
+import * as i0 from '@angular/core';
+import * as i1 from '@angular/common';`);
+    });
+  });
+
+  describe('addExports', () => {
+    it('should insert the given exports at the end of the source file', () => {
+      const {importManager, renderer, sourceFile} = setup([PROGRAM]);
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), dtsFrom: _('/some/foo/b.d.ts'), identifier: 'ComponentB'},
+            {from: PROGRAM.name, dtsFrom: PROGRAM.name, identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
+      expect(output.toString()).toContain(`
+// Some other content
+export {ComponentA1} from './a';
+export {ComponentA2} from './a';
+export {ComponentB} from './foo/b';
+export {TopLevelComponent};`);
+    });
+
+    it('should not insert alias exports in js output', () => {
+      const {importManager, renderer, sourceFile} = setup([PROGRAM]);
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), alias: 'eComponentA1', identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), alias: 'eComponentA2', identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), alias: 'eComponentB', identifier: 'ComponentB'},
+            {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
+      const outputString = output.toString();
+      expect(outputString).not.toContain(`{eComponentA1 as ComponentA1}`);
+      expect(outputString).not.toContain(`{eComponentB as ComponentB}`);
+      expect(outputString).not.toContain(`{eTopLevelComponent as TopLevelComponent}`);
+    });
+  });
+
+  describe('addConstants', () => {
+    it('should insert the given constants after imports in the source file', () => {
+      const {renderer, program} = setup([PROGRAM]);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addConstants(output, 'const x = 3;', file);
+      expect(output.toString()).toContain(`
+import {Directive} from '@angular/core';
+
+const x = 3;
+export class A {}`);
+    });
+
+    it('should insert constants after inserted imports', () => {
+      const {renderer, program} = setup([PROGRAM]);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addConstants(output, 'const x = 3;', file);
+      renderer.addImports(output, [{specifier: '@angular/core', qualifier: 'i0'}], file);
+      expect(output.toString()).toContain(`
+import {Directive} from '@angular/core';
+import * as i0 from '@angular/core';
+
+const x = 3;
+export class A {`);
+    });
+  });
+
+  describe('rewriteSwitchableDeclarations', () => {
+    it('should switch marked declaration initializers', () => {
+      const {renderer, program, switchMarkerAnalyses, sourceFile} = setup([PROGRAM]);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.rewriteSwitchableDeclarations(
+          output, file, switchMarkerAnalyses.get(sourceFile) !.declarations);
+      expect(output.toString())
+          .not.toContain(`let compileNgModuleFactory = compileNgModuleFactory__PRE_R3__;`);
+      expect(output.toString())
+          .toContain(`let badlyFormattedVariable = __PRE_R3__badlyFormattedVariable;`);
+      expect(output.toString())
+          .toContain(`let compileNgModuleFactory = compileNgModuleFactory__POST_R3__;`);
+      expect(output.toString())
+          .toContain(`function compileNgModuleFactory__PRE_R3__(injector, options, moduleType) {`);
+      expect(output.toString())
+          .toContain(`function compileNgModuleFactory__POST_R3__(injector, options, moduleType) {`);
+    });
+  });
+
+  describe('addDefinitions', () => {
+    it('should insert the definitions directly after the class declaration', () => {
+      const {renderer, decorationAnalyses, sourceFile} = setup([PROGRAM]);
+      const output = new MagicString(PROGRAM.contents);
+      const compiledClass =
+          decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+      renderer.addDefinitions(output, compiledClass, 'SOME DEFINITION TEXT');
+      expect(output.toString()).toContain(`
+export class A {}
+SOME DEFINITION TEXT
+A.decorators = [
+`);
+    });
+
+  });
+
+
+  describe('removeDecorators', () => {
+    describe('[static property declaration]', () => {
+      it('should delete the decorator (and following comma) that was matched in the analysis',
+         () => {
+           const {decorationAnalyses, sourceFile, renderer} = setup([PROGRAM]);
+           const output = new MagicString(PROGRAM.contents);
+           const compiledClass =
+               decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+           const decorator = compiledClass.decorators[0];
+           const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+           decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+           renderer.removeDecorators(output, decoratorsToRemove);
+           expect(output.toString())
+               .not.toContain(`{ type: Directive, args: [{ selector: '[a]' }] },`);
+           expect(output.toString()).toContain(`{ type: OtherA }`);
+           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[b]' }] }`);
+           expect(output.toString()).toContain(`{ type: OtherB }`);
+           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[c]' }] }`);
+         });
+
+
+      it('should delete the decorator (but cope with no trailing comma) that was matched in the analysis',
+         () => {
+           const {decorationAnalyses, sourceFile, renderer} = setup([PROGRAM]);
+           const output = new MagicString(PROGRAM.contents);
+           const compiledClass =
+               decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'B') !;
+           const decorator = compiledClass.decorators[0];
+           const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+           decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+           renderer.removeDecorators(output, decoratorsToRemove);
+           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[a]' }] },`);
+           expect(output.toString()).toContain(`{ type: OtherA }`);
+           expect(output.toString())
+               .not.toContain(`{ type: Directive, args: [{ selector: '[b]' }] }`);
+           expect(output.toString()).toContain(`{ type: OtherB }`);
+           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[c]' }] }`);
+         });
+
+
+      it('should delete the decorator (and its container if there are no other decorators left) that was matched in the analysis',
+         () => {
+           const {decorationAnalyses, sourceFile, renderer} = setup([PROGRAM]);
+           const output = new MagicString(PROGRAM.contents);
+           const compiledClass =
+               decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'C') !;
+           const decorator = compiledClass.decorators[0];
+           const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+           decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+           renderer.removeDecorators(output, decoratorsToRemove);
+           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[a]' }] },`);
+           expect(output.toString()).toContain(`{ type: OtherA }`);
+           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[b]' }] }`);
+           expect(output.toString()).toContain(`{ type: OtherB }`);
+           expect(output.toString())
+               .not.toContain(`{ type: Directive, args: [{ selector: '[c]' }] }`);
+           expect(output.toString()).not.toContain(`C.decorators = [`);
+         });
+    });
+  });
+
+  describe('[__decorate declarations]', () => {
+
+    const PROGRAM_DECORATE_HELPER = {
+      name: '/some/file.js',
+      contents: `
 import * as tslib_1 from "tslib";
 var D_1;
 /* A copyright notice */
@@ -115,207 +317,10 @@ D = D_1 = tslib_1.__decorate([
 ], D);
 export { D };
 // Some other content`
-};
+    };
 
-describe('Esm2015Renderer', () => {
-
-  describe('addImports', () => {
-    it('should insert the given imports after existing imports of the source file', () => {
-      const {renderer, sourceFile} = setup(PROGRAM);
-      const output = new MagicString(PROGRAM.contents);
-      renderer.addImports(
-          output,
-          [
-            {specifier: '@angular/core', qualifier: 'i0'},
-            {specifier: '@angular/common', qualifier: 'i1'}
-          ],
-          sourceFile);
-      expect(output.toString()).toContain(`/* A copyright notice */
-import 'some-side-effect';
-import {Directive} from '@angular/core';
-import * as i0 from '@angular/core';
-import * as i1 from '@angular/common';`);
-    });
-  });
-
-  describe('addExports', () => {
-    it('should insert the given exports at the end of the source file', () => {
-      const {importManager, renderer, sourceFile} = setup(PROGRAM);
-      const output = new MagicString(PROGRAM.contents);
-      renderer.addExports(
-          output, _(PROGRAM.name.replace(/\.js$/, '')),
-          [
-            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA1'},
-            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA2'},
-            {from: _('/some/foo/b.js'), dtsFrom: _('/some/foo/b.d.ts'), identifier: 'ComponentB'},
-            {from: PROGRAM.name, dtsFrom: PROGRAM.name, identifier: 'TopLevelComponent'},
-          ],
-          importManager, sourceFile);
-      expect(output.toString()).toContain(`
-// Some other content
-export {ComponentA1} from './a';
-export {ComponentA2} from './a';
-export {ComponentB} from './foo/b';
-export {TopLevelComponent};`);
-    });
-
-    it('should not insert alias exports in js output', () => {
-      const {importManager, renderer, sourceFile} = setup(PROGRAM);
-      const output = new MagicString(PROGRAM.contents);
-      renderer.addExports(
-          output, _(PROGRAM.name.replace(/\.js$/, '')),
-          [
-            {from: _('/some/a.js'), alias: 'eComponentA1', identifier: 'ComponentA1'},
-            {from: _('/some/a.js'), alias: 'eComponentA2', identifier: 'ComponentA2'},
-            {from: _('/some/foo/b.js'), alias: 'eComponentB', identifier: 'ComponentB'},
-            {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
-          ],
-          importManager, sourceFile);
-      const outputString = output.toString();
-      expect(outputString).not.toContain(`{eComponentA1 as ComponentA1}`);
-      expect(outputString).not.toContain(`{eComponentB as ComponentB}`);
-      expect(outputString).not.toContain(`{eTopLevelComponent as TopLevelComponent}`);
-    });
-  });
-
-  describe('addConstants', () => {
-    it('should insert the given constants after imports in the source file', () => {
-      const {renderer, program} = setup(PROGRAM);
-      const file = program.getSourceFile('some/file.js');
-      if (file === undefined) {
-        throw new Error(`Could not find source file`);
-      }
-      const output = new MagicString(PROGRAM.contents);
-      renderer.addConstants(output, 'const x = 3;', file);
-      expect(output.toString()).toContain(`
-import {Directive} from '@angular/core';
-
-const x = 3;
-export class A {}`);
-    });
-
-    it('should insert constants after inserted imports', () => {
-      const {renderer, program} = setup(PROGRAM);
-      const file = program.getSourceFile('some/file.js');
-      if (file === undefined) {
-        throw new Error(`Could not find source file`);
-      }
-      const output = new MagicString(PROGRAM.contents);
-      renderer.addConstants(output, 'const x = 3;', file);
-      renderer.addImports(output, [{specifier: '@angular/core', qualifier: 'i0'}], file);
-      expect(output.toString()).toContain(`
-import {Directive} from '@angular/core';
-import * as i0 from '@angular/core';
-
-const x = 3;
-export class A {`);
-    });
-  });
-
-  describe('rewriteSwitchableDeclarations', () => {
-    it('should switch marked declaration initializers', () => {
-      const {renderer, program, switchMarkerAnalyses, sourceFile} = setup(PROGRAM);
-      const file = program.getSourceFile('some/file.js');
-      if (file === undefined) {
-        throw new Error(`Could not find source file`);
-      }
-      const output = new MagicString(PROGRAM.contents);
-      renderer.rewriteSwitchableDeclarations(
-          output, file, switchMarkerAnalyses.get(sourceFile) !.declarations);
-      expect(output.toString())
-          .not.toContain(`let compileNgModuleFactory = compileNgModuleFactory__PRE_R3__;`);
-      expect(output.toString())
-          .toContain(`let badlyFormattedVariable = __PRE_R3__badlyFormattedVariable;`);
-      expect(output.toString())
-          .toContain(`let compileNgModuleFactory = compileNgModuleFactory__POST_R3__;`);
-      expect(output.toString())
-          .toContain(`function compileNgModuleFactory__PRE_R3__(injector, options, moduleType) {`);
-      expect(output.toString())
-          .toContain(`function compileNgModuleFactory__POST_R3__(injector, options, moduleType) {`);
-    });
-  });
-
-  describe('addDefinitions', () => {
-    it('should insert the definitions directly after the class declaration', () => {
-      const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
-      const output = new MagicString(PROGRAM.contents);
-      const compiledClass =
-          decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
-      renderer.addDefinitions(output, compiledClass, 'SOME DEFINITION TEXT');
-      expect(output.toString()).toContain(`
-export class A {}
-SOME DEFINITION TEXT
-A.decorators = [
-`);
-    });
-
-  });
-
-
-  describe('removeDecorators', () => {
-    describe('[static property declaration]', () => {
-      it('should delete the decorator (and following comma) that was matched in the analysis',
-         () => {
-           const {decorationAnalyses, sourceFile, renderer} = setup(PROGRAM);
-           const output = new MagicString(PROGRAM.contents);
-           const compiledClass =
-               decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
-           const decorator = compiledClass.decorators[0];
-           const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
-           decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
-           renderer.removeDecorators(output, decoratorsToRemove);
-           expect(output.toString())
-               .not.toContain(`{ type: Directive, args: [{ selector: '[a]' }] },`);
-           expect(output.toString()).toContain(`{ type: OtherA }`);
-           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[b]' }] }`);
-           expect(output.toString()).toContain(`{ type: OtherB }`);
-           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[c]' }] }`);
-         });
-
-
-      it('should delete the decorator (but cope with no trailing comma) that was matched in the analysis',
-         () => {
-           const {decorationAnalyses, sourceFile, renderer} = setup(PROGRAM);
-           const output = new MagicString(PROGRAM.contents);
-           const compiledClass =
-               decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'B') !;
-           const decorator = compiledClass.decorators[0];
-           const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
-           decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
-           renderer.removeDecorators(output, decoratorsToRemove);
-           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[a]' }] },`);
-           expect(output.toString()).toContain(`{ type: OtherA }`);
-           expect(output.toString())
-               .not.toContain(`{ type: Directive, args: [{ selector: '[b]' }] }`);
-           expect(output.toString()).toContain(`{ type: OtherB }`);
-           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[c]' }] }`);
-         });
-
-
-      it('should delete the decorator (and its container if there are no other decorators left) that was matched in the analysis',
-         () => {
-           const {decorationAnalyses, sourceFile, renderer} = setup(PROGRAM);
-           const output = new MagicString(PROGRAM.contents);
-           const compiledClass =
-               decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'C') !;
-           const decorator = compiledClass.decorators[0];
-           const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
-           decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
-           renderer.removeDecorators(output, decoratorsToRemove);
-           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[a]' }] },`);
-           expect(output.toString()).toContain(`{ type: OtherA }`);
-           expect(output.toString()).toContain(`{ type: Directive, args: [{ selector: '[b]' }] }`);
-           expect(output.toString()).toContain(`{ type: OtherB }`);
-           expect(output.toString())
-               .not.toContain(`{ type: Directive, args: [{ selector: '[c]' }] }`);
-           expect(output.toString()).not.toContain(`C.decorators = [`);
-         });
-    });
-  });
-
-  describe('[__decorate declarations]', () => {
     it('should delete the decorator (and following comma) that was matched in the analysis', () => {
-      const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+      const {renderer, decorationAnalyses, sourceFile} = setup([PROGRAM_DECORATE_HELPER]);
       const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
       const compiledClass =
           decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
@@ -332,7 +337,7 @@ A.decorators = [
 
     it('should delete the decorator (but cope with no trailing comma) that was matched in the analysis',
        () => {
-         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+         const {renderer, decorationAnalyses, sourceFile} = setup([PROGRAM_DECORATE_HELPER]);
          const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
          const compiledClass =
              decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'B') !;
@@ -350,7 +355,7 @@ A.decorators = [
 
     it('should delete the decorator (and its container if there are not other decorators left) that was matched in the analysis',
        () => {
-         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+         const {renderer, decorationAnalyses, sourceFile} = setup([PROGRAM_DECORATE_HELPER]);
          const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
          const compiledClass =
              decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'C') !;
@@ -367,4 +372,140 @@ A.decorators = [
          expect(output.toString()).toContain(`let C = class C {\n};\nexport { C };`);
        });
   });
+
+  describe('addModuleWithProvidersParams', () => {
+    const MODULE_WITH_PROVIDERS_PROGRAM = [
+      {
+        name: '/src/index.js',
+        contents: `
+        import {ExternalModule} from './module';
+        import {LibraryModule} from 'some-library';
+        export class SomeClass {}
+        export class SomeModule {
+          static withProviders1() { return {ngModule: SomeModule}; }
+          static withProviders2() { return {ngModule: SomeModule}; }
+          static withProviders3() { return {ngModule: SomeClass}; }
+          static withProviders4() { return {ngModule: ExternalModule}; }
+          static withProviders5() { return {ngModule: ExternalModule}; }
+          static withProviders6() { return {ngModule: LibraryModule}; }
+          static withProviders7() { return {ngModule: SomeModule, providers: []}; };
+          static withProviders8() { return {ngModule: SomeModule}; }
+        }
+        export function withProviders1() { return {ngModule: SomeModule}; }
+        export function withProviders2() { return {ngModule: SomeModule}; }
+        export function withProviders3() { return {ngModule: SomeClass}; }
+        export function withProviders4() { return {ngModule: ExternalModule}; }
+        export function withProviders5() { return {ngModule: ExternalModule}; }
+        export function withProviders6() { return {ngModule: LibraryModule}; }
+        export function withProviders7() { return {ngModule: SomeModule, providers: []}; };
+        export function withProviders8() { return {ngModule: SomeModule}; }`,
+      },
+      {
+        name: '/src/module.js',
+        contents: `
+        export class ExternalModule {
+          static withProviders1() { return {ngModule: ExternalModule}; }
+          static withProviders2() { return {ngModule: ExternalModule}; }
+        }`
+      },
+      {
+        name: '/node_modules/some-library/index.d.ts',
+        contents: 'export declare class LibraryModule {}'
+      },
+    ];
+    const MODULE_WITH_PROVIDERS_DTS_PROGRAM = [
+      {
+        name: '/typings/index.d.ts',
+        contents: `
+        import {ModuleWithProviders} from '@angular/core';
+        export declare class SomeClass {}
+        export interface MyModuleWithProviders extends ModuleWithProviders {}
+        export declare class SomeModule {
+          static withProviders1(): ModuleWithProviders;
+          static withProviders2(): ModuleWithProviders<any>;
+          static withProviders3(): ModuleWithProviders<SomeClass>;
+          static withProviders4(): ModuleWithProviders;
+          static withProviders5();
+          static withProviders6(): ModuleWithProviders;
+          static withProviders7(): {ngModule: SomeModule, providers: any[]};
+          static withProviders8(): MyModuleWithProviders;
+        }
+        export declare function withProviders1(): ModuleWithProviders;
+        export declare function withProviders2(): ModuleWithProviders<any>;
+        export declare function withProviders3(): ModuleWithProviders<SomeClass>;
+        export declare function withProviders4(): ModuleWithProviders;
+        export declare function withProviders5();
+        export declare function withProviders6(): ModuleWithProviders;
+        export declare function withProviders7(): {ngModule: SomeModule, providers: any[]};
+        export declare function withProviders8(): MyModuleWithProviders;`
+      },
+      {
+        name: '/typings/module.d.ts',
+        contents: `
+        export interface ModuleWithProviders {}
+        export declare class ExternalModule {
+          static withProviders1(): ModuleWithProviders;
+          static withProviders2(): ModuleWithProviders;
+        }`
+      },
+      {
+        name: '/node_modules/some-library/index.d.ts',
+        contents: 'export declare class LibraryModule {}'
+      },
+    ];
+
+    it('should fixup functions/methods that return ModuleWithProviders structures', () => {
+      const {bundle, renderer, host} =
+          setup(MODULE_WITH_PROVIDERS_PROGRAM, MODULE_WITH_PROVIDERS_DTS_PROGRAM);
+
+      const referencesRegistry = new NgccReferencesRegistry(host);
+      const moduleWithProvidersAnalyses = new ModuleWithProvidersAnalyzer(host, referencesRegistry)
+                                              .analyzeProgram(bundle.src.program);
+      const typingsFile = bundle.dts !.program.getSourceFile('/typings/index.d.ts') !;
+      const moduleWithProvidersInfo = moduleWithProvidersAnalyses.get(typingsFile) !;
+
+      const output = new MagicString(MODULE_WITH_PROVIDERS_DTS_PROGRAM[0].contents);
+      const importManager = new ImportManager(new NoopImportRewriter(), 'i');
+      renderer.addModuleWithProvidersParams(output, moduleWithProvidersInfo, importManager);
+
+      expect(output.toString()).toContain(`
+          static withProviders1(): ModuleWithProviders<SomeModule>;
+          static withProviders2(): ModuleWithProviders<SomeModule>;
+          static withProviders3(): ModuleWithProviders<SomeClass>;
+          static withProviders4(): ModuleWithProviders<i0.ExternalModule>;
+          static withProviders5(): i1.ModuleWithProviders<i0.ExternalModule>;
+          static withProviders6(): ModuleWithProviders<i2.LibraryModule>;
+          static withProviders7(): ({ngModule: SomeModule, providers: any[]})&{ngModule:SomeModule};
+          static withProviders8(): (MyModuleWithProviders)&{ngModule:SomeModule};`);
+      expect(output.toString()).toContain(`
+        export declare function withProviders1(): ModuleWithProviders<SomeModule>;
+        export declare function withProviders2(): ModuleWithProviders<SomeModule>;
+        export declare function withProviders3(): ModuleWithProviders<SomeClass>;
+        export declare function withProviders4(): ModuleWithProviders<i0.ExternalModule>;
+        export declare function withProviders5(): i1.ModuleWithProviders<i0.ExternalModule>;
+        export declare function withProviders6(): ModuleWithProviders<i2.LibraryModule>;
+        export declare function withProviders7(): ({ngModule: SomeModule, providers: any[]})&{ngModule:SomeModule};
+        export declare function withProviders8(): (MyModuleWithProviders)&{ngModule:SomeModule};`);
+    });
+
+    it('should not mistake `ModuleWithProviders` types that are not imported from `@angular/core',
+       () => {
+         const {bundle, renderer, host} =
+             setup(MODULE_WITH_PROVIDERS_PROGRAM, MODULE_WITH_PROVIDERS_DTS_PROGRAM);
+
+         const referencesRegistry = new NgccReferencesRegistry(host);
+         const moduleWithProvidersAnalyses =
+             new ModuleWithProvidersAnalyzer(host, referencesRegistry)
+                 .analyzeProgram(bundle.src.program);
+         const typingsFile = bundle.dts !.program.getSourceFile('/typings/module.d.ts') !;
+         const moduleWithProvidersInfo = moduleWithProvidersAnalyses.get(typingsFile) !;
+
+         const output = new MagicString(MODULE_WITH_PROVIDERS_DTS_PROGRAM[1].contents);
+         const importManager = new ImportManager(new NoopImportRewriter(), 'i');
+         renderer.addModuleWithProvidersParams(output, moduleWithProvidersInfo, importManager);
+         expect(output.toString()).toContain(`
+          static withProviders1(): (ModuleWithProviders)&{ngModule:ExternalModule};
+          static withProviders2(): (ModuleWithProviders)&{ngModule:ExternalModule};`);
+       });
+  });
 });
diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index 81b5f97575..83ff27c7ac 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -9,29 +9,22 @@ import MagicString from 'magic-string';
 import * as ts from 'typescript';
 import {fromObject, generateMapFileComment} from 'convert-source-map';
 import {AbsoluteFsPath} from '../../../src/ngtsc/path';
-import {Import} from '../../../src/ngtsc/translator';
+import {Import, ImportManager} from '../../../src/ngtsc/translator';
 import {CompiledClass, DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
 import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
-import {ModuleWithProvidersAnalyzer} from '../../src/analysis/module_with_providers_analyzer';
+import {ModuleWithProvidersInfo} from '../../src/analysis/module_with_providers_analyzer';
 import {PrivateDeclarationsAnalyzer, ExportInfo} from '../../src/analysis/private_declarations_analyzer';
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
-import {RedundantDecoratorMap, Renderer} from '../../src/rendering/renderer';
-import {EntryPointBundle} from '../../src/packages/entry_point_bundle';
-import {makeTestEntryPointBundle, createFileSystemFromProgramFiles} from '../helpers/utils';
-import {Logger} from '../../src/logging/logger';
-import {MockFileSystem} from '../helpers/mock_file_system';
-import {MockLogger} from '../helpers/mock_logger';
-import {FileSystem} from '../../src/file_system/file_system';
-
 const _ = AbsoluteFsPath.fromUnchecked;
 
-class TestRenderer extends Renderer {
-  constructor(
-      fs: FileSystem, logger: Logger, host: Esm2015ReflectionHost, isCore: boolean,
-      bundle: EntryPointBundle) {
-    super(fs, logger, host, isCore, bundle);
-  }
+import {Renderer} from '../../src/rendering/renderer';
+import {MockLogger} from '../helpers/mock_logger';
+import {RenderingFormatter, RedundantDecoratorMap} from '../../src/rendering/rendering_formatter';
+import {makeTestEntryPointBundle, createFileSystemFromProgramFiles} from '../helpers/utils';
+import {MockFileSystem} from '../helpers/mock_file_system';
+
+class TestRenderingFormatter implements RenderingFormatter {
   addImports(output: MagicString, imports: Import[], sf: ts.SourceFile) {
     output.prepend('\n// ADD IMPORTS\n');
   }
@@ -50,6 +43,11 @@ class TestRenderer extends Renderer {
   rewriteSwitchableDeclarations(output: MagicString, sourceFile: ts.SourceFile): void {
     output.prepend('\n// REWRITTEN DECLARATIONS\n');
   }
+  addModuleWithProvidersParams(
+      output: MagicString, moduleWithProviders: ModuleWithProvidersInfo[],
+      importManager: ImportManager): void {
+    output.prepend('\n// ADD MODUlE WITH PROVIDERS PARAMS\n');
+  }
 }
 
 function createTestRenderer(
@@ -68,21 +66,23 @@ function createTestRenderer(
                                  typeChecker, host, referencesRegistry, bundle.rootDirs, isCore)
                                  .analyzeProgram();
   const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program);
-  const moduleWithProvidersAnalyses =
-      new ModuleWithProvidersAnalyzer(host, referencesRegistry).analyzeProgram(bundle.src.program);
   const privateDeclarationsAnalyses =
       new PrivateDeclarationsAnalyzer(host, referencesRegistry).analyzeProgram(bundle.src.program);
-  const renderer = new TestRenderer(fs, logger, host, isCore, bundle);
-  spyOn(renderer, 'addExports').and.callThrough();
-  spyOn(renderer, 'addImports').and.callThrough();
-  spyOn(renderer, 'addDefinitions').and.callThrough();
-  spyOn(renderer, 'addConstants').and.callThrough();
-  spyOn(renderer, 'removeDecorators').and.callThrough();
+  const testFormatter = new TestRenderingFormatter();
+  spyOn(testFormatter, 'addExports').and.callThrough();
+  spyOn(testFormatter, 'addImports').and.callThrough();
+  spyOn(testFormatter, 'addDefinitions').and.callThrough();
+  spyOn(testFormatter, 'addConstants').and.callThrough();
+  spyOn(testFormatter, 'removeDecorators').and.callThrough();
+  spyOn(testFormatter, 'rewriteSwitchableDeclarations').and.callThrough();
+  spyOn(testFormatter, 'addModuleWithProvidersParams').and.callThrough();
+
+  const renderer = new Renderer(testFormatter, fs, logger, host, isCore, bundle);
 
   return {renderer,
+          testFormatter,
           decorationAnalyses,
           switchMarkerAnalyses,
-          moduleWithProvidersAnalyses,
           privateDeclarationsAnalyses,
           bundle};
 }
@@ -94,10 +94,6 @@ describe('Renderer', () => {
     contents:
         `import { Directive } from '@angular/core';\nexport class A {\n    foo(x) {\n        return x;\n    }\n}\nA.decorators = [\n    { type: Directive, args: [{ selector: '[a]' }] }\n];\n`
   };
-  const INPUT_DTS_PROGRAM = {
-    name: '/typings/file.d.ts',
-    contents: `export declare class A {\nfoo(x: number): number;\n}\n`
-  };
 
   const COMPONENT_PROGRAM = {
     name: '/src/component.js',
@@ -149,11 +145,10 @@ describe('Renderer', () => {
   describe('renderProgram()', () => {
     it('should render the modified contents; and a new map file, if the original provided no map file.',
        () => {
-         const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-                moduleWithProvidersAnalyses} = createTestRenderer('test-package', [INPUT_PROGRAM]);
+         const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses} =
+             createTestRenderer('test-package', [INPUT_PROGRAM]);
          const result = renderer.renderProgram(
-             decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-             moduleWithProvidersAnalyses);
+             decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
          expect(result[0].path).toEqual('/src/file.js');
          expect(result[0].contents)
              .toEqual(RENDERED_CONTENTS + '\n' + generateMapFileComment('file.js.map'));
@@ -164,11 +159,9 @@ describe('Renderer', () => {
 
     it('should render as JavaScript', () => {
       const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-             moduleWithProvidersAnalyses} = createTestRenderer('test-package', [COMPONENT_PROGRAM]);
-      renderer.renderProgram(
-          decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-          moduleWithProvidersAnalyses);
-      const addDefinitionsSpy = renderer.addDefinitions as jasmine.Spy;
+             testFormatter} = createTestRenderer('test-package', [COMPONENT_PROGRAM]);
+      renderer.renderProgram(decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+      const addDefinitionsSpy = testFormatter.addDefinitions as jasmine.Spy;
       expect(addDefinitionsSpy.calls.first().args[2])
           .toEqual(
               `A.ngComponentDef = ɵngcc0.ΔdefineComponent({ type: A, selectors: [["a"]], factory: function A_Factory(t) { return new (t || A)(); }, consts: 1, vars: 1, template: function A_Template(rf, ctx) { if (rf & 1) {
@@ -184,16 +177,14 @@ describe('Renderer', () => {
     });
 
 
-    describe('calling abstract methods', () => {
+    describe('calling RenderingFormatter methods', () => {
       it('should call addImports with the source code and info about the core Angular library.',
          () => {
            const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-                  moduleWithProvidersAnalyses} =
-               createTestRenderer('test-package', [INPUT_PROGRAM]);
+                  testFormatter} = createTestRenderer('test-package', [INPUT_PROGRAM]);
            const result = renderer.renderProgram(
-               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses);
-           const addImportsSpy = renderer.addImports as jasmine.Spy;
+               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+           const addImportsSpy = testFormatter.addImports as jasmine.Spy;
            expect(addImportsSpy.calls.first().args[0].toString()).toEqual(RENDERED_CONTENTS);
            expect(addImportsSpy.calls.first().args[1]).toEqual([
              {specifier: '@angular/core', qualifier: 'ɵngcc0'}
@@ -203,12 +194,10 @@ describe('Renderer', () => {
       it('should call addDefinitions with the source code, the analyzed class and the rendered definitions.',
          () => {
            const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-                  moduleWithProvidersAnalyses} =
-               createTestRenderer('test-package', [INPUT_PROGRAM]);
+                  testFormatter} = createTestRenderer('test-package', [INPUT_PROGRAM]);
            const result = renderer.renderProgram(
-               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses);
-           const addDefinitionsSpy = renderer.addDefinitions as jasmine.Spy;
+               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+           const addDefinitionsSpy = testFormatter.addDefinitions as jasmine.Spy;
            expect(addDefinitionsSpy.calls.first().args[0].toString()).toEqual(RENDERED_CONTENTS);
            expect(addDefinitionsSpy.calls.first().args[1]).toEqual(jasmine.objectContaining({
              name: _('A'),
@@ -226,12 +215,10 @@ describe('Renderer', () => {
       it('should call removeDecorators with the source code, a map of class decorators that have been analyzed',
          () => {
            const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-                  moduleWithProvidersAnalyses} =
-               createTestRenderer('test-package', [INPUT_PROGRAM]);
+                  testFormatter} = createTestRenderer('test-package', [INPUT_PROGRAM]);
            const result = renderer.renderProgram(
-               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses);
-           const removeDecoratorsSpy = renderer.removeDecorators as jasmine.Spy;
+               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+           const removeDecoratorsSpy = testFormatter.removeDecorators as jasmine.Spy;
            expect(removeDecoratorsSpy.calls.first().args[0].toString()).toEqual(RENDERED_CONTENTS);
 
            // Each map key is the TS node of the decorator container
@@ -251,14 +238,13 @@ describe('Renderer', () => {
       it('should call renderImports after other abstract methods', () => {
         // This allows the other methods to add additional imports if necessary
         const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses} = createTestRenderer('test-package', [INPUT_PROGRAM]);
-        const addExportsSpy = renderer.addExports as jasmine.Spy;
-        const addDefinitionsSpy = renderer.addDefinitions as jasmine.Spy;
-        const addConstantsSpy = renderer.addConstants as jasmine.Spy;
-        const addImportsSpy = renderer.addImports as jasmine.Spy;
+               testFormatter} = createTestRenderer('test-package', [INPUT_PROGRAM]);
+        const addExportsSpy = testFormatter.addExports as jasmine.Spy;
+        const addDefinitionsSpy = testFormatter.addDefinitions as jasmine.Spy;
+        const addConstantsSpy = testFormatter.addConstants as jasmine.Spy;
+        const addImportsSpy = testFormatter.addImports as jasmine.Spy;
         renderer.renderProgram(
-            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-            moduleWithProvidersAnalyses);
+            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
         expect(addExportsSpy).toHaveBeenCalledBefore(addImportsSpy);
         expect(addDefinitionsSpy).toHaveBeenCalledBefore(addImportsSpy);
         expect(addConstantsSpy).toHaveBeenCalledBefore(addImportsSpy);
@@ -268,16 +254,14 @@ describe('Renderer', () => {
     describe('source map merging', () => {
       it('should merge any inline source map from the original file and write the output as an inline source map',
          () => {
-           const {decorationAnalyses, renderer, switchMarkerAnalyses, privateDeclarationsAnalyses,
-                  moduleWithProvidersAnalyses} =
+           const {decorationAnalyses, renderer, switchMarkerAnalyses, privateDeclarationsAnalyses} =
                createTestRenderer(
                    'test-package', [{
                      ...INPUT_PROGRAM,
                      contents: INPUT_PROGRAM.contents + '\n' + INPUT_PROGRAM_MAP.toComment()
                    }]);
            const result = renderer.renderProgram(
-               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses);
+               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
            expect(result[0].path).toEqual('/src/file.js');
            expect(result[0].contents)
                .toEqual(RENDERED_CONTENTS + '\n' + MERGED_OUTPUT_PROGRAM_MAP.toComment());
@@ -292,12 +276,10 @@ describe('Renderer', () => {
            }];
            const mappingFiles =
                [{name: INPUT_PROGRAM.name + '.map', contents: INPUT_PROGRAM_MAP.toJSON()}];
-           const {decorationAnalyses, renderer, switchMarkerAnalyses, privateDeclarationsAnalyses,
-                  moduleWithProvidersAnalyses} =
+           const {decorationAnalyses, renderer, switchMarkerAnalyses, privateDeclarationsAnalyses} =
                createTestRenderer('test-package', sourceFiles, undefined, mappingFiles);
            const result = renderer.renderProgram(
-               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses);
+               decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
            expect(result[0].path).toEqual('/src/file.js');
            expect(result[0].contents)
                .toEqual(RENDERED_CONTENTS + '\n' + generateMapFileComment('file.js.map'));
@@ -320,15 +302,13 @@ describe('Renderer', () => {
         };
         // The package name of `@angular/core` indicates that we are compiling the core library.
         const {decorationAnalyses, renderer, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses} =
-            createTestRenderer('@angular/core', [CORE_FILE, R3_SYMBOLS_FILE]);
+               testFormatter} = createTestRenderer('@angular/core', [CORE_FILE, R3_SYMBOLS_FILE]);
         renderer.renderProgram(
-            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-            moduleWithProvidersAnalyses);
-        const addDefinitionsSpy = renderer.addDefinitions as jasmine.Spy;
+            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+        const addDefinitionsSpy = testFormatter.addDefinitions as jasmine.Spy;
         expect(addDefinitionsSpy.calls.first().args[2])
             .toContain(`/*@__PURE__*/ ɵngcc0.setClassMetadata(`);
-        const addImportsSpy = renderer.addImports as jasmine.Spy;
+        const addImportsSpy = testFormatter.addImports as jasmine.Spy;
         expect(addImportsSpy.calls.first().args[1]).toEqual([
           {specifier: './r3_symbols', qualifier: 'ɵngcc0'}
         ]);
@@ -342,230 +322,15 @@ describe('Renderer', () => {
         };
 
         const {decorationAnalyses, renderer, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses} = createTestRenderer('@angular/core', [CORE_FILE]);
+               testFormatter} = createTestRenderer('@angular/core', [CORE_FILE]);
         renderer.renderProgram(
-            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-            moduleWithProvidersAnalyses);
-        const addDefinitionsSpy = renderer.addDefinitions as jasmine.Spy;
+            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+        const addDefinitionsSpy = testFormatter.addDefinitions as jasmine.Spy;
         expect(addDefinitionsSpy.calls.first().args[2])
             .toContain(`/*@__PURE__*/ setClassMetadata(`);
-        const addImportsSpy = renderer.addImports as jasmine.Spy;
+        const addImportsSpy = testFormatter.addImports as jasmine.Spy;
         expect(addImportsSpy.calls.first().args[1]).toEqual([]);
       });
     });
-
-    describe('rendering typings', () => {
-      it('should render extract types into typings files', () => {
-        const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses} =
-            createTestRenderer('test-package', [INPUT_PROGRAM], [INPUT_DTS_PROGRAM]);
-        const result = renderer.renderProgram(
-            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-            moduleWithProvidersAnalyses);
-
-        const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
-        expect(typingsFile.contents)
-            .toContain(
-                'foo(x: number): number;\n    static ngDirectiveDef: ɵngcc0.ΔDirectiveDefWithMeta');
-      });
-
-      it('should render imports into typings files', () => {
-        const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses} =
-            createTestRenderer('test-package', [INPUT_PROGRAM], [INPUT_DTS_PROGRAM]);
-        const result = renderer.renderProgram(
-            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-            moduleWithProvidersAnalyses);
-
-        const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
-        expect(typingsFile.contents).toContain(`\n// ADD IMPORTS\n`);
-      });
-
-      it('should render exports into typings files', () => {
-        const {renderer, decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses} =
-            createTestRenderer('test-package', [INPUT_PROGRAM], [INPUT_DTS_PROGRAM]);
-
-        // Add a mock export to trigger export rendering
-        privateDeclarationsAnalyses.push(
-            {identifier: 'ComponentB', from: _('/src/file.js'), dtsFrom: _('/typings/b.d.ts')});
-
-        const result = renderer.renderProgram(
-            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-            moduleWithProvidersAnalyses);
-
-        const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
-        expect(typingsFile.contents).toContain(`\n// ADD EXPORTS\n`);
-      });
-
-      it('should fixup functions/methods that return ModuleWithProviders structures', () => {
-        const MODULE_WITH_PROVIDERS_PROGRAM = [
-          {
-            name: '/src/index.js',
-            contents: `
-            import {ExternalModule} from './module';
-            import {LibraryModule} from 'some-library';
-            export class SomeClass {}
-            export class SomeModule {
-              static withProviders1() {
-                return {ngModule: SomeModule};
-              }
-              static withProviders2() {
-                return {ngModule: SomeModule};
-              }
-              static withProviders3() {
-                return {ngModule: SomeClass};
-              }
-              static withProviders4() {
-                return {ngModule: ExternalModule};
-              }
-              static withProviders5() {
-                return {ngModule: ExternalModule};
-              }
-              static withProviders6() {
-                return {ngModule: LibraryModule};
-              }
-              static withProviders7() {
-                return {ngModule: SomeModule, providers: []};
-              };
-              static withProviders8() {
-                return {ngModule: SomeModule};
-              }
-            }
-            export function withProviders1() {
-              return {ngModule: SomeModule};
-            }
-            export function withProviders2() {
-              return {ngModule: SomeModule};
-            }
-            export function withProviders3() {
-              return {ngModule: SomeClass};
-            }
-            export function withProviders4() {
-              return {ngModule: ExternalModule};
-            }
-            export function withProviders5() {
-              return {ngModule: ExternalModule};
-            }
-            export function withProviders6() {
-              return {ngModule: LibraryModule};
-            }
-            export function withProviders7() {
-              return {ngModule: SomeModule, providers: []};
-            };
-            export function withProviders8() {
-              return {ngModule: SomeModule};
-            }`,
-          },
-          {
-            name: '/src/module.js',
-            contents: `
-            export class ExternalModule {
-              static withProviders1() {
-                return {ngModule: ExternalModule};
-              }
-              static withProviders2() {
-                return {ngModule: ExternalModule};
-              }
-            }`
-          },
-          {
-            name: '/node_modules/some-library/index.d.ts',
-            contents: 'export declare class LibraryModule {}'
-          },
-        ];
-        const MODULE_WITH_PROVIDERS_DTS_PROGRAM = [
-          {
-            name: '/typings/index.d.ts',
-            contents: `
-            import {ModuleWithProviders} from '@angular/core';
-            export declare class SomeClass {}
-            export interface MyModuleWithProviders extends ModuleWithProviders {}
-            export declare class SomeModule {
-              static withProviders1(): ModuleWithProviders;
-              static withProviders2(): ModuleWithProviders<any>;
-              static withProviders3(): ModuleWithProviders<SomeClass>;
-              static withProviders4(): ModuleWithProviders;
-              static withProviders5();
-              static withProviders6(): ModuleWithProviders;
-              static withProviders7(): {ngModule: SomeModule, providers: any[]};
-              static withProviders8(): MyModuleWithProviders;
-            }
-            export declare function withProviders1(): ModuleWithProviders;
-            export declare function withProviders2(): ModuleWithProviders<any>;
-            export declare function withProviders3(): ModuleWithProviders<SomeClass>;
-            export declare function withProviders4(): ModuleWithProviders;
-            export declare function withProviders5();
-            export declare function withProviders6(): ModuleWithProviders;
-            export declare function withProviders7(): {ngModule: SomeModule, providers: any[]};
-            export declare function withProviders8(): MyModuleWithProviders;`
-          },
-          {
-            name: '/typings/module.d.ts',
-            contents: `
-            export interface ModuleWithProviders {}
-            export declare class ExternalModule {
-              static withProviders1(): ModuleWithProviders;
-              static withProviders2(): ModuleWithProviders;
-            }`
-          },
-          {
-            name: '/node_modules/some-library/index.d.ts',
-            contents: 'export declare class LibraryModule {}'
-          },
-        ];
-        const {renderer,
-               decorationAnalyses,
-               switchMarkerAnalyses,
-               privateDeclarationsAnalyses,
-               moduleWithProvidersAnalyses,
-               bundle} =
-            createTestRenderer(
-                'test-package', MODULE_WITH_PROVIDERS_PROGRAM, MODULE_WITH_PROVIDERS_DTS_PROGRAM);
-
-        const result = renderer.renderProgram(
-            decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
-            moduleWithProvidersAnalyses);
-
-        const typingsFile = result.find(f => f.path === '/typings/index.d.ts') !;
-
-        expect(typingsFile.contents).toContain(`
-              static withProviders1(): ModuleWithProviders<SomeModule>;
-              static withProviders2(): ModuleWithProviders<SomeModule>;
-              static withProviders3(): ModuleWithProviders<SomeClass>;
-              static withProviders4(): ModuleWithProviders<ɵngcc0.ExternalModule>;
-              static withProviders5(): ɵngcc1.ModuleWithProviders<ɵngcc0.ExternalModule>;
-              static withProviders6(): ModuleWithProviders<ɵngcc2.LibraryModule>;
-              static withProviders7(): ({ngModule: SomeModule, providers: any[]})&{ngModule:SomeModule};
-              static withProviders8(): (MyModuleWithProviders)&{ngModule:SomeModule};`);
-        expect(typingsFile.contents).toContain(`
-            export declare function withProviders1(): ModuleWithProviders<SomeModule>;
-            export declare function withProviders2(): ModuleWithProviders<SomeModule>;
-            export declare function withProviders3(): ModuleWithProviders<SomeClass>;
-            export declare function withProviders4(): ModuleWithProviders<ɵngcc0.ExternalModule>;
-            export declare function withProviders5(): ɵngcc1.ModuleWithProviders<ɵngcc0.ExternalModule>;
-            export declare function withProviders6(): ModuleWithProviders<ɵngcc2.LibraryModule>;
-            export declare function withProviders7(): ({ngModule: SomeModule, providers: any[]})&{ngModule:SomeModule};
-            export declare function withProviders8(): (MyModuleWithProviders)&{ngModule:SomeModule};`);
-
-        expect(renderer.addImports)
-            .toHaveBeenCalledWith(
-                jasmine.any(MagicString),
-                [
-                  {specifier: './module', qualifier: 'ɵngcc0'},
-                  {specifier: '@angular/core', qualifier: 'ɵngcc1'},
-                  {specifier: 'some-library', qualifier: 'ɵngcc2'},
-                ],
-                bundle.dts !.file);
-
-
-        // The following expectation checks that we do not mistake `ModuleWithProviders` types
-        // that are not imported from `@angular/core`.
-        const typingsFile2 = result.find(f => f.path === '/typings/module.d.ts') !;
-        expect(typingsFile2.contents).toContain(`
-              static withProviders1(): (ModuleWithProviders)&{ngModule:ExternalModule};
-              static withProviders2(): (ModuleWithProviders)&{ngModule:ExternalModule};`);
-      });
-    });
   });
 });
diff --git a/packages/compiler-cli/ngcc/test/rendering/umd_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/umd_rendering_formatter_spec.ts
similarity index 99%
rename from packages/compiler-cli/ngcc/test/rendering/umd_renderer_spec.ts
rename to packages/compiler-cli/ngcc/test/rendering/umd_rendering_formatter_spec.ts
index e3dd4df9a6..8d6e09d6b1 100644
--- a/packages/compiler-cli/ngcc/test/rendering/umd_renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/umd_rendering_formatter_spec.ts
@@ -14,8 +14,8 @@ import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registr
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
 import {UmdReflectionHost} from '../../src/host/umd_host';
 import {ImportManager} from '../../../src/ngtsc/translator';
-import {UmdRenderer} from '../../src/rendering/umd_renderer';
 import {MockFileSystem} from '../helpers/mock_file_system';
+import {UmdRenderingFormatter} from '../../src/rendering/umd_rendering_formatter';
 import {MockLogger} from '../helpers/mock_logger';
 import {getDeclaration, makeTestEntryPointBundle, createFileSystemFromProgramFiles} from '../helpers/utils';
 
@@ -34,7 +34,7 @@ function setup(file: {name: string, contents: string}) {
                                  referencesRegistry, [AbsoluteFsPath.fromUnchecked('/')], false)
                                  .analyzeProgram();
   const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(src.program);
-  const renderer = new UmdRenderer(fs, logger, host, false, bundle);
+  const renderer = new UmdRenderingFormatter(host, false);
   const importManager = new ImportManager(new NoopImportRewriter(), 'i');
   return {
     decorationAnalyses,
@@ -169,7 +169,7 @@ typeof define === 'function' && define.amd ? define('file', ['exports','/tslib',
 })));`
 };
 
-describe('UmdRenderer', () => {
+describe('UmdRenderingFormatter', () => {
 
   describe('addImports', () => {
     it('should append the given imports into the CommonJS factory call', () => {

From edd775eabccebf92821e4c657811b22bfba7367a Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Sun, 28 Apr 2019 20:48:35 +0100
Subject: [PATCH 073/275] feat(ivy): ngcc - implement UmdDependencyHost
 (#25445)

The dependency resolution that works out the order in which
to process entry-points must also understand UMD formats.

PR Close #25445
---
 .../src/dependencies/dependency_resolver.ts   |  23 ++-
 .../src/dependencies/umd_dependency_host.ts   | 111 ++++++++++
 packages/compiler-cli/ngcc/src/main.ts        |   7 +-
 .../dependencies/dependency_resolver_spec.ts  |  40 +++-
 .../dependencies/esm_dependency_host_spec.ts  |   2 +-
 .../dependencies/umd_dependency_host_spec.ts  | 192 ++++++++++++++++++
 .../test/packages/entry_point_finder_spec.ts  |   4 +-
 7 files changed, 361 insertions(+), 18 deletions(-)
 create mode 100644 packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts
 create mode 100644 packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts

diff --git a/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts b/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
index a4f5323755..d4338b5d7e 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
@@ -7,15 +7,11 @@
  */
 
 import {DepGraph} from 'dependency-graph';
-
 import {AbsoluteFsPath} from '../../../src/ngtsc/path';
 import {Logger} from '../logging/logger';
-import {EntryPoint, EntryPointJsonProperty, getEntryPointFormat} from '../packages/entry_point';
-
+import {EntryPoint, EntryPointFormat, EntryPointJsonProperty, getEntryPointFormat} from '../packages/entry_point';
 import {DependencyHost} from './dependency_host';
 
-
-
 /**
  * Holds information about entry points that are removed because
  * they have dependencies that are missing (directly or transitively).
@@ -68,7 +64,8 @@ export interface SortedEntryPointsInfo extends DependencyDiagnostics { entryPoin
  * A class that resolves dependencies between entry-points.
  */
 export class DependencyResolver {
-  constructor(private logger: Logger, private host: DependencyHost) {}
+  constructor(
+      private logger: Logger, private hosts: Partial<Record<EntryPointFormat, DependencyHost>>) {}
   /**
    * Sort the array of entry points so that the dependant entry points always come later than
    * their dependencies in the array.
@@ -118,8 +115,13 @@ export class DependencyResolver {
 
     // Now add the dependencies between them
     angularEntryPoints.forEach(entryPoint => {
-      const entryPointPath = getEntryPointPath(entryPoint);
-      const {dependencies, missing, deepImports} = this.host.findDependencies(entryPointPath);
+      const formatInfo = getEntryPointFormatInfo(entryPoint);
+      const host = this.hosts[formatInfo.format];
+      if (!host) {
+        throw new Error(
+            `Could not find a suitable format for computing dependencies of entry-point: '${entryPoint.path}'.`);
+      }
+      const {dependencies, missing, deepImports} = host.findDependencies(formatInfo.path);
 
       if (missing.size > 0) {
         // This entry point has dependencies that are missing
@@ -164,7 +166,8 @@ export class DependencyResolver {
   }
 }
 
-function getEntryPointPath(entryPoint: EntryPoint): AbsoluteFsPath {
+function getEntryPointFormatInfo(entryPoint: EntryPoint):
+    {format: EntryPointFormat, path: AbsoluteFsPath} {
   const properties = Object.keys(entryPoint.packageJson);
   for (let i = 0; i < properties.length; i++) {
     const property = properties[i] as EntryPointJsonProperty;
@@ -172,7 +175,7 @@ function getEntryPointPath(entryPoint: EntryPoint): AbsoluteFsPath {
 
     if (format === 'esm2015' || format === 'esm5' || format === 'umd') {
       const formatPath = entryPoint.packageJson[property] !;
-      return AbsoluteFsPath.resolve(entryPoint.path, formatPath);
+      return {format, path: AbsoluteFsPath.resolve(entryPoint.path, formatPath)};
     }
   }
   throw new Error(
diff --git a/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts
new file mode 100644
index 0000000000..f8ad0ae9d6
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts
@@ -0,0 +1,111 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+
+import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {FileSystem} from '../file_system/file_system';
+import {getImportsOfUmdModule, parseStatementForUmdModule} from '../host/umd_host';
+
+import {DependencyHost, DependencyInfo} from './dependency_host';
+import {ModuleResolver, ResolvedDeepImport, ResolvedRelativeModule} from './module_resolver';
+
+
+
+/**
+ * Helper functions for computing dependencies.
+ */
+export class UmdDependencyHost implements DependencyHost {
+  constructor(private fs: FileSystem, private moduleResolver: ModuleResolver) {}
+
+  /**
+   * Find all the dependencies for the entry-point at the given path.
+   *
+   * @param entryPointPath The absolute path to the JavaScript file that represents an entry-point.
+   * @returns Information about the dependencies of the entry-point, including those that were
+   * missing or deep imports into other entry-points.
+   */
+  findDependencies(entryPointPath: AbsoluteFsPath): DependencyInfo {
+    const dependencies = new Set<AbsoluteFsPath>();
+    const missing = new Set<string>();
+    const deepImports = new Set<string>();
+    const alreadySeen = new Set<AbsoluteFsPath>();
+    this.recursivelyFindDependencies(
+        entryPointPath, dependencies, missing, deepImports, alreadySeen);
+    return {dependencies, missing, deepImports};
+  }
+
+  /**
+   * Compute the dependencies of the given file.
+   *
+   * @param file An absolute path to the file whose dependencies we want to get.
+   * @param dependencies A set that will have the absolute paths of resolved entry points added to
+   * it.
+   * @param missing A set that will have the dependencies that could not be found added to it.
+   * @param deepImports A set that will have the import paths that exist but cannot be mapped to
+   * entry-points, i.e. deep-imports.
+   * @param alreadySeen A set that is used to track internal dependencies to prevent getting stuck
+   * in a
+   * circular dependency loop.
+   */
+  private recursivelyFindDependencies(
+      file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>, missing: Set<string>,
+      deepImports: Set<string>, alreadySeen: Set<AbsoluteFsPath>): void {
+    const fromContents = this.fs.readFile(file);
+    if (!this.hasRequireCalls(fromContents)) {
+      // Avoid parsing the source file as there are no require calls.
+      return;
+    }
+
+    // Parse the source into a TypeScript AST and then walk it looking for imports and re-exports.
+    const sf =
+        ts.createSourceFile(file, fromContents, ts.ScriptTarget.ES2015, false, ts.ScriptKind.JS);
+    if (sf.statements.length !== 1) {
+      return;
+    }
+
+    const umdModule = parseStatementForUmdModule(sf.statements[0]);
+    const umdImports = umdModule && getImportsOfUmdModule(umdModule);
+    if (umdImports === null) {
+      return;
+    }
+
+    umdImports.forEach(umdImport => {
+      const resolvedModule = this.moduleResolver.resolveModuleImport(umdImport.path, file);
+      if (resolvedModule) {
+        if (resolvedModule instanceof ResolvedRelativeModule) {
+          const internalDependency = resolvedModule.modulePath;
+          if (!alreadySeen.has(internalDependency)) {
+            alreadySeen.add(internalDependency);
+            this.recursivelyFindDependencies(
+                internalDependency, dependencies, missing, deepImports, alreadySeen);
+          }
+        } else {
+          if (resolvedModule instanceof ResolvedDeepImport) {
+            deepImports.add(resolvedModule.importPath);
+          } else {
+            dependencies.add(resolvedModule.entryPointPath);
+          }
+        }
+      } else {
+        missing.add(umdImport.path);
+      }
+    });
+  }
+
+  /**
+   * Check whether a source file needs to be parsed for imports.
+   * This is a performance short-circuit, which saves us from creating
+   * a TypeScript AST unnecessarily.
+   *
+   * @param source The content of the source file to check.
+   *
+   * @returns false if there are definitely no require calls
+   * in this file, true otherwise.
+   */
+  hasRequireCalls(source: string): boolean { return /require\(['"]/.test(source); }
+}
diff --git a/packages/compiler-cli/ngcc/src/main.ts b/packages/compiler-cli/ngcc/src/main.ts
index 85d4adbf25..bf98e04b1c 100644
--- a/packages/compiler-cli/ngcc/src/main.ts
+++ b/packages/compiler-cli/ngcc/src/main.ts
@@ -10,6 +10,7 @@ import {AbsoluteFsPath} from '../../src/ngtsc/path';
 import {DependencyResolver} from './dependencies/dependency_resolver';
 import {EsmDependencyHost} from './dependencies/esm_dependency_host';
 import {ModuleResolver} from './dependencies/module_resolver';
+import {UmdDependencyHost} from './dependencies/umd_dependency_host';
 import {FileSystem} from './file_system/file_system';
 import {NodeJSFileSystem} from './file_system/node_js_file_system';
 import {ConsoleLogger, LogLevel} from './logging/console_logger';
@@ -80,8 +81,10 @@ export function mainNgcc(
   const fs = new NodeJSFileSystem();
   const transformer = new Transformer(fs, logger);
   const moduleResolver = new ModuleResolver(fs, pathMappings);
-  const host = new EsmDependencyHost(fs, moduleResolver);
-  const resolver = new DependencyResolver(logger, host);
+  const esmDependencyHost = new EsmDependencyHost(fs, moduleResolver);
+  const umdDependencyHost = new UmdDependencyHost(fs, moduleResolver);
+  const resolver = new DependencyResolver(
+      logger, {esm5: esmDependencyHost, esm2015: esmDependencyHost, umd: umdDependencyHost});
   const finder = new EntryPointFinder(fs, logger, resolver);
   const fileWriter = getFileWriter(fs, createNewEntryPointFormats);
 
diff --git a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
index 288793fe6c..89538b7169 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
@@ -9,6 +9,7 @@ import {AbsoluteFsPath} from '../../../src/ngtsc/path';
 import {DependencyResolver, SortedEntryPointsInfo} from '../../src/dependencies/dependency_resolver';
 import {EsmDependencyHost} from '../../src/dependencies/esm_dependency_host';
 import {ModuleResolver} from '../../src/dependencies/module_resolver';
+import {FileSystem} from '../../src/file_system/file_system';
 import {EntryPoint} from '../../src/packages/entry_point';
 import {MockFileSystem} from '../helpers/mock_file_system';
 import {MockLogger} from '../helpers/mock_logger';
@@ -18,10 +19,13 @@ const _ = AbsoluteFsPath.from;
 describe('DependencyResolver', () => {
   let host: EsmDependencyHost;
   let resolver: DependencyResolver;
+  let fs: FileSystem;
+  let moduleResolver: ModuleResolver;
   beforeEach(() => {
-    const fs = new MockFileSystem();
-    host = new EsmDependencyHost(fs, new ModuleResolver(fs));
-    resolver = new DependencyResolver(new MockLogger(), host);
+    fs = new MockFileSystem();
+    moduleResolver = new ModuleResolver(fs);
+    host = new EsmDependencyHost(fs, moduleResolver);
+    resolver = new DependencyResolver(new MockLogger(), {esm5: host, esm2015: host});
   });
   describe('sortEntryPointsByDependency()', () => {
     const first = {
@@ -112,6 +116,13 @@ describe('DependencyResolver', () => {
       ])).toThrowError(`There is no appropriate source code format in '/first' entry-point.`);
     });
 
+    it('should error if there is no appropriate DependencyHost for the given formats', () => {
+      resolver = new DependencyResolver(new MockLogger(), {esm2015: host});
+      expect(() => resolver.sortEntryPointsByDependency([first]))
+          .toThrowError(
+              `Could not find a suitable format for computing dependencies of entry-point: '/first'.`);
+    });
+
     it('should capture any dependencies that were ignored', () => {
       spyOn(host, 'findDependencies').and.callFake(createFakeComputeDependencies(dependencies));
       const result = resolver.sortEntryPointsByDependency([fifth, first, fourth, second, third]);
@@ -138,6 +149,29 @@ describe('DependencyResolver', () => {
       expect(sorted.entryPoints).toEqual([fifth]);
     });
 
+    it('should use the appropriate DependencyHost for each entry-point', () => {
+      const esm5Host = new EsmDependencyHost(fs, moduleResolver);
+      const esm2015Host = new EsmDependencyHost(fs, moduleResolver);
+      resolver = new DependencyResolver(new MockLogger(), {esm5: esm5Host, esm2015: esm2015Host});
+      spyOn(esm5Host, 'findDependencies').and.callFake(createFakeComputeDependencies(dependencies));
+      spyOn(esm2015Host, 'findDependencies')
+          .and.callFake(createFakeComputeDependencies(dependencies));
+      const result = resolver.sortEntryPointsByDependency([fifth, first, fourth, second, third]);
+      expect(result.entryPoints).toEqual([fifth, fourth, third, second, first]);
+
+      expect(esm5Host.findDependencies).toHaveBeenCalledWith('/first/index.js');
+      expect(esm5Host.findDependencies).not.toHaveBeenCalledWith('/second/sub/index.js');
+      expect(esm5Host.findDependencies).toHaveBeenCalledWith('/third/index.js');
+      expect(esm5Host.findDependencies).not.toHaveBeenCalledWith('/fourth/sub2/index.js');
+      expect(esm5Host.findDependencies).toHaveBeenCalledWith('/fifth/index.js');
+
+      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith('/first/index.js');
+      expect(esm2015Host.findDependencies).toHaveBeenCalledWith('/second/sub/index.js');
+      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith('/third/index.js');
+      expect(esm2015Host.findDependencies).toHaveBeenCalledWith('/fourth/sub2/index.js');
+      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith('/fifth/index.js');
+    });
+
     interface DepMap {
       [path: string]: {resolved: string[], missing: string[]};
     }
diff --git a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
index 0d10e82da0..69ec54d5a5 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
@@ -14,7 +14,7 @@ import {MockFileSystem} from '../helpers/mock_file_system';
 
 const _ = AbsoluteFsPath.from;
 
-describe('DependencyHost', () => {
+describe('EsmDependencyHost', () => {
   let host: EsmDependencyHost;
   beforeEach(() => {
     const fs = createMockFileSystem();
diff --git a/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
new file mode 100644
index 0000000000..5423506e20
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
@@ -0,0 +1,192 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+
+import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {ModuleResolver} from '../../src/dependencies/module_resolver';
+import {UmdDependencyHost} from '../../src/dependencies/umd_dependency_host';
+import {MockFileSystem} from '../helpers/mock_file_system';
+
+const _ = AbsoluteFsPath.from;
+
+describe('UmdDependencyHost', () => {
+  let host: UmdDependencyHost;
+  beforeEach(() => {
+    const fs = createMockFileSystem();
+    host = new UmdDependencyHost(fs, new ModuleResolver(fs));
+  });
+
+  describe('getDependencies()', () => {
+    it('should not generate a TS AST if the source does not contain any require calls', () => {
+      spyOn(ts, 'createSourceFile');
+      host.findDependencies(_('/no/imports/or/re-exports/index.js'));
+      expect(ts.createSourceFile).not.toHaveBeenCalled();
+    });
+
+    it('should resolve all the external imports of the source file', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/imports/index.js'));
+      expect(dependencies.size).toBe(2);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+    });
+
+    it('should resolve all the external re-exports of the source file', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/re-exports/index.js'));
+      expect(dependencies.size).toBe(2);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+    });
+
+    it('should capture missing external imports', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/imports-missing/index.js'));
+
+      expect(dependencies.size).toBe(1);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(missing.size).toBe(1);
+      expect(missing.has('missing')).toBe(true);
+      expect(deepImports.size).toBe(0);
+    });
+
+    it('should not register deep imports as missing', () => {
+      // This scenario verifies the behavior of the dependency analysis when an external import
+      // is found that does not map to an entry-point but still exists on disk, i.e. a deep import.
+      // Such deep imports are captured for diagnostics purposes.
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/deep-import/index.js'));
+
+      expect(dependencies.size).toBe(0);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(1);
+      expect(deepImports.has('/node_modules/lib_1/deep/import')).toBe(true);
+    });
+
+    it('should recurse into internal dependencies', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/internal/outer/index.js'));
+
+      expect(dependencies.size).toBe(1);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+    });
+
+    it('should handle circular internal dependencies', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/internal/circular_a/index.js'));
+      expect(dependencies.size).toBe(2);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+    });
+
+    it('should support `paths` alias mappings when resolving modules', () => {
+      const fs = createMockFileSystem();
+      host = new UmdDependencyHost(fs, new ModuleResolver(fs, {
+                                     baseUrl: '/dist',
+                                     paths: {
+                                       '@app/*': ['*'],
+                                       '@lib/*/test': ['lib/*/test'],
+                                     }
+                                   }));
+      const {dependencies, missing, deepImports} = host.findDependencies(_('/path-alias/index.js'));
+      expect(dependencies.size).toBe(4);
+      expect(dependencies.has(_('/dist/components'))).toBe(true);
+      expect(dependencies.has(_('/dist/shared'))).toBe(true);
+      expect(dependencies.has(_('/dist/lib/shared/test'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+    });
+  });
+
+  function createMockFileSystem() {
+    return new MockFileSystem({
+      '/no/imports/or/re-exports/index.js': '// some text but no import-like statements',
+      '/no/imports/or/re-exports/package.json': '{"esm2015": "./index.js"}',
+      '/no/imports/or/re-exports/index.metadata.json': 'MOCK METADATA',
+      '/external/imports/index.js': umd('imports_index', ['lib_1', 'lib_1/sub_1']),
+      '/external/imports/package.json': '{"esm2015": "./index.js"}',
+      '/external/imports/index.metadata.json': 'MOCK METADATA',
+      '/external/re-exports/index.js':
+          umd('imports_index', ['lib_1', 'lib_1/sub_1'], ['lib_1.X', 'lib_1sub_1.Y']),
+      '/external/re-exports/package.json': '{"esm2015": "./index.js"}',
+      '/external/re-exports/index.metadata.json': 'MOCK METADATA',
+      '/external/imports-missing/index.js': umd('imports_missing', ['lib_1', 'missing']),
+      '/external/imports-missing/package.json': '{"esm2015": "./index.js"}',
+      '/external/imports-missing/index.metadata.json': 'MOCK METADATA',
+      '/external/deep-import/index.js': umd('deep_import', ['lib_1/deep/import']),
+      '/external/deep-import/package.json': '{"esm2015": "./index.js"}',
+      '/external/deep-import/index.metadata.json': 'MOCK METADATA',
+      '/internal/outer/index.js': umd('outer', ['../inner']),
+      '/internal/outer/package.json': '{"esm2015": "./index.js"}',
+      '/internal/outer/index.metadata.json': 'MOCK METADATA',
+      '/internal/inner/index.js': umd('inner', ['lib_1/sub_1'], ['X']),
+      '/internal/circular_a/index.js': umd('circular_a', ['../circular_b', 'lib_1/sub_1'], ['Y']),
+      '/internal/circular_b/index.js': umd('circular_b', ['../circular_a', 'lib_1'], ['X']),
+      '/internal/circular_a/package.json': '{"esm2015": "./index.js"}',
+      '/internal/circular_a/index.metadata.json': 'MOCK METADATA',
+      '/re-directed/index.js': umd('re_directed', ['lib_1/sub_2']),
+      '/re-directed/package.json': '{"esm2015": "./index.js"}',
+      '/re-directed/index.metadata.json': 'MOCK METADATA',
+      '/path-alias/index.js':
+          umd('path_alias', ['@app/components', '@app/shared', '@lib/shared/test', 'lib_1']),
+      '/path-alias/package.json': '{"esm2015": "./index.js"}',
+      '/path-alias/index.metadata.json': 'MOCK METADATA',
+      '/node_modules/lib_1/index.d.ts': 'export declare class X {}',
+      '/node_modules/lib_1/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/node_modules/lib_1/index.metadata.json': 'MOCK METADATA',
+      '/node_modules/lib_1/deep/import/index.js': 'export class DeepImport {}',
+      '/node_modules/lib_1/sub_1/index.d.ts': 'export declare class Y {}',
+      '/node_modules/lib_1/sub_1/package.json':
+          '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/node_modules/lib_1/sub_1/index.metadata.json': 'MOCK METADATA',
+      '/node_modules/lib_1/sub_2.d.ts': `export * from './sub_2/sub_2';`,
+      '/node_modules/lib_1/sub_2/sub_2.d.ts': `export declare class Z {}';`,
+      '/node_modules/lib_1/sub_2/package.json':
+          '{"esm2015": "./sub_2.js", "typings": "./sub_2.d.ts"}',
+      '/node_modules/lib_1/sub_2/sub_2.metadata.json': 'MOCK METADATA',
+      '/dist/components/index.d.ts': `export declare class MyComponent {};`,
+      '/dist/components/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/dist/components/index.metadata.json': 'MOCK METADATA',
+      '/dist/shared/index.d.ts': `import {X} from 'lib_1';\nexport declare class Service {}`,
+      '/dist/shared/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/dist/shared/index.metadata.json': 'MOCK METADATA',
+      '/dist/lib/shared/test/index.d.ts': `export class TestHelper {}`,
+      '/dist/lib/shared/test/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/dist/lib/shared/test/index.metadata.json': 'MOCK METADATA',
+    });
+  }
+});
+
+function umd(moduleName: string, importPaths: string[], exportNames: string[] = []) {
+  const commonJsRequires = importPaths.map(p => `,require('${p}')`).join('');
+  const amdDeps = importPaths.map(p => `,'${p}'`).join('');
+  const globalParams =
+      importPaths.map(p => `,global.${p.replace('@angular/', 'ng.').replace(/\//g, '')}`).join('');
+  const params =
+      importPaths.map(p => `,${p.replace('@angular/', '').replace(/\.?\.?\//g, '')}`).join('');
+  const exportStatements =
+      exportNames.map(e => `  exports.${e.replace(/.+\./, '')} = ${e};`).join('\n');
+  return `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports${commonJsRequires}) :
+  typeof define === 'function' && define.amd ? define('${moduleName}', ['exports'${amdDeps}], factory) :
+  (factory(global.${moduleName}${globalParams}));
+}(this, (function (exports${params}) { 'use strict';
+${exportStatements}
+})));
+  `;
+}
diff --git a/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts b/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts
index e93af39185..4669e206c3 100644
--- a/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts
+++ b/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts
@@ -22,8 +22,8 @@ describe('findEntryPoints()', () => {
   let finder: EntryPointFinder;
   beforeEach(() => {
     const fs = createMockFileSystem();
-    resolver =
-        new DependencyResolver(new MockLogger(), new EsmDependencyHost(fs, new ModuleResolver(fs)));
+    resolver = new DependencyResolver(
+        new MockLogger(), {esm2015: new EsmDependencyHost(fs, new ModuleResolver(fs))});
     spyOn(resolver, 'sortEntryPointsByDependency').and.callFake((entryPoints: EntryPoint[]) => {
       return {entryPoints, ignoredEntryPoints: [], ignoredDependencies: []};
     });

From 757d4c33df83d3ec32619b982950ff59ac123886 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Tue, 14 May 2019 08:36:57 +0100
Subject: [PATCH 074/275] refactor(ivy): ngcc - use `.has()` to check Map
 membership (#25445)

Previously we were relying upon the `.get()` method to return `undefined`
but it is clearer and safer to always check with `.has()` first.

PR Close #25445
---
 .../module_with_providers_analyzer.ts         |  2 +-
 .../analysis/private_declarations_analyzer.ts |  6 ++--
 .../ngcc/src/host/esm2015_host.ts             | 28 ++++++++++++-------
 .../compiler-cli/ngcc/src/host/esm5_host.ts   |  5 ++--
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts
index 11894f9d13..6de29258cf 100644
--- a/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts
@@ -63,7 +63,7 @@ export class ModuleWithProvidersAnalyzer {
             ngModule = {node: dtsNgModule, viaModule: null};
           }
           const dtsFile = dtsFn.getSourceFile();
-          const analysis = analyses.get(dtsFile) || [];
+          const analysis = analyses.has(dtsFile) ? analyses.get(dtsFile) : [];
           analysis.push({declaration: dtsFn, ngModule});
           analyses.set(dtsFile, analysis);
         }
diff --git a/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts
index 72698b5582..8ca9d7ed3b 100644
--- a/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts
@@ -49,8 +49,8 @@ export class PrivateDeclarationsAnalyzer {
       if (exports) {
         exports.forEach((declaration, exportedName) => {
           if (hasNameIdentifier(declaration.node)) {
-            const privateDeclaration = privateDeclarations.get(declaration.node.name);
-            if (privateDeclaration) {
+            if (privateDeclarations.has(declaration.node.name)) {
+              const privateDeclaration = privateDeclarations.get(declaration.node.name) !;
               if (privateDeclaration.node !== declaration.node) {
                 throw new Error(`${declaration.node.name.text} is declared multiple times.`);
               }
@@ -96,7 +96,7 @@ export class PrivateDeclarationsAnalyzer {
     return Array.from(privateDeclarations.keys()).map(id => {
       const from = AbsoluteFsPath.fromSourceFile(id.getSourceFile());
       const declaration = privateDeclarations.get(id) !;
-      const alias = exportAliasDeclarations.get(id) || null;
+      const alias = exportAliasDeclarations.has(id) ? exportAliasDeclarations.get(id) ! : null;
       const dtsDeclaration = this.host.getDtsDeclaration(declaration.node);
       const dtsFrom =
           dtsDeclaration && AbsoluteFsPath.fromSourceFile(dtsDeclaration.getSourceFile());
diff --git a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
index d65a6f32d6..b30074c49e 100644
--- a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
@@ -366,7 +366,9 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
       throw new Error(
           `Cannot get the dts file for a declaration that has no name: ${declaration.getText()} in ${declaration.getSourceFile().fileName}`);
     }
-    return this.dtsDeclarationMap.get(declaration.name.text) || null;
+    return this.dtsDeclarationMap.has(declaration.name.text) ?
+        this.dtsDeclarationMap.get(declaration.name.text) ! :
+        null;
   }
 
   /**
@@ -419,7 +421,9 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    */
   protected resolveAliasedClassIdentifier(declaration: ts.Declaration): ts.Identifier|null {
     this.ensurePreprocessed(declaration.getSourceFile());
-    return this.aliasedClassDeclarations.get(declaration) || null;
+    return this.aliasedClassDeclarations.has(declaration) ?
+        this.aliasedClassDeclarations.get(declaration) ! :
+        null;
   }
 
   /**
@@ -738,7 +742,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
           helperCall, makeMemberTargetFilter(classSymbol.name));
       memberDecorators.forEach((decorators, memberName) => {
         if (memberName) {
-          const memberDecorators = memberDecoratorMap.get(memberName) || [];
+          const memberDecorators =
+              memberDecoratorMap.has(memberName) ? memberDecoratorMap.get(memberName) ! : [];
           const coreDecorators = decorators.filter(decorator => this.isFromCore(decorator));
           memberDecoratorMap.set(memberName, memberDecorators.concat(coreDecorators));
         }
@@ -775,7 +780,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
               if (keyName === undefined) {
                 classDecorators.push(decorator);
               } else {
-                const decorators = memberDecorators.get(keyName) || [];
+                const decorators =
+                    memberDecorators.has(keyName) ? memberDecorators.get(keyName) ! : [];
                 decorators.push(decorator);
                 memberDecorators.set(keyName, decorators);
               }
@@ -874,8 +880,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
           const decorator = reflectObjectLiteral(node);
 
           // Is the value of the `type` property an identifier?
-          let typeIdentifier = decorator.get('type');
-          if (typeIdentifier) {
+          if (decorator.has('type')) {
+            let typeIdentifier = decorator.get('type') !;
             if (ts.isPropertyAccessExpression(typeIdentifier)) {
               // the type is in a namespace, e.g. `core.Directive`
               typeIdentifier = typeIdentifier.name;
@@ -1036,8 +1042,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    */
   protected getConstructorParameterDeclarations(classSymbol: ClassSymbol):
       ts.ParameterDeclaration[]|null {
-    const constructorSymbol = classSymbol.members && classSymbol.members.get(CONSTRUCTOR);
-    if (constructorSymbol) {
+    if (classSymbol.members && classSymbol.members.has(CONSTRUCTOR)) {
+      const constructorSymbol = classSymbol.members.get(CONSTRUCTOR) !;
       // For some reason the constructor does not have a `valueDeclaration` ?!?
       const constructor = constructorSymbol.declarations &&
           constructorSymbol.declarations[0] as ts.ConstructorDeclaration | undefined;
@@ -1113,8 +1119,10 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
                 element =>
                     ts.isObjectLiteralExpression(element) ? reflectObjectLiteral(element) : null)
             .map(paramInfo => {
-              const typeExpression = paramInfo && paramInfo.get('type') || null;
-              const decoratorInfo = paramInfo && paramInfo.get('decorators') || null;
+              const typeExpression =
+                  paramInfo && paramInfo.has('type') ? paramInfo.get('type') ! : null;
+              const decoratorInfo =
+                  paramInfo && paramInfo.has('decorators') ? paramInfo.get('decorators') ! : null;
               const decorators = decoratorInfo &&
                   this.reflectDecorators(decoratorInfo)
                       .filter(decorator => this.isFromCore(decorator));
diff --git a/packages/compiler-cli/ngcc/src/host/esm5_host.ts b/packages/compiler-cli/ngcc/src/host/esm5_host.ts
index a2354a40db..6fcfb09baa 100644
--- a/packages/compiler-cli/ngcc/src/host/esm5_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/esm5_host.ts
@@ -339,8 +339,9 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
     if (expression && ts.isArrayLiteralExpression(expression)) {
       const elements = expression.elements;
       return elements.map(reflectArrayElement).map(paramInfo => {
-        const typeExpression = paramInfo && paramInfo.get('type') || null;
-        const decoratorInfo = paramInfo && paramInfo.get('decorators') || null;
+        const typeExpression = paramInfo && paramInfo.has('type') ? paramInfo.get('type') ! : null;
+        const decoratorInfo =
+            paramInfo && paramInfo.has('decorators') ? paramInfo.get('decorators') ! : null;
         const decorators = decoratorInfo && this.reflectDecorators(decoratorInfo);
         return {typeExpression, decorators};
       });

From 73e3f565e07698983facd0ffd8350c96d4674212 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 16 May 2019 20:30:03 +0100
Subject: [PATCH 075/275] test(ivy): ngcc - fix tests to work on Windows
 (#30520)

PR Close #30520
---
 .../dependencies/dependency_resolver_spec.ts  | 22 +++++++++----------
 .../dependencies/umd_dependency_host_spec.ts  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
index 89538b7169..1faf99947d 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
@@ -120,7 +120,7 @@ describe('DependencyResolver', () => {
       resolver = new DependencyResolver(new MockLogger(), {esm2015: host});
       expect(() => resolver.sortEntryPointsByDependency([first]))
           .toThrowError(
-              `Could not find a suitable format for computing dependencies of entry-point: '/first'.`);
+              `Could not find a suitable format for computing dependencies of entry-point: '${first.path}'.`);
     });
 
     it('should capture any dependencies that were ignored', () => {
@@ -159,17 +159,17 @@ describe('DependencyResolver', () => {
       const result = resolver.sortEntryPointsByDependency([fifth, first, fourth, second, third]);
       expect(result.entryPoints).toEqual([fifth, fourth, third, second, first]);
 
-      expect(esm5Host.findDependencies).toHaveBeenCalledWith('/first/index.js');
-      expect(esm5Host.findDependencies).not.toHaveBeenCalledWith('/second/sub/index.js');
-      expect(esm5Host.findDependencies).toHaveBeenCalledWith('/third/index.js');
-      expect(esm5Host.findDependencies).not.toHaveBeenCalledWith('/fourth/sub2/index.js');
-      expect(esm5Host.findDependencies).toHaveBeenCalledWith('/fifth/index.js');
+      expect(esm5Host.findDependencies).toHaveBeenCalledWith(`${first.path}/index.js`);
+      expect(esm5Host.findDependencies).not.toHaveBeenCalledWith(`${second.path}/sub/index.js`);
+      expect(esm5Host.findDependencies).toHaveBeenCalledWith(`${third.path}/index.js`);
+      expect(esm5Host.findDependencies).not.toHaveBeenCalledWith(`${fourth.path}/sub2/index.js`);
+      expect(esm5Host.findDependencies).toHaveBeenCalledWith(`${fifth.path}/index.js`);
 
-      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith('/first/index.js');
-      expect(esm2015Host.findDependencies).toHaveBeenCalledWith('/second/sub/index.js');
-      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith('/third/index.js');
-      expect(esm2015Host.findDependencies).toHaveBeenCalledWith('/fourth/sub2/index.js');
-      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith('/fifth/index.js');
+      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith(`${first.path}/index.js`);
+      expect(esm2015Host.findDependencies).toHaveBeenCalledWith(`${second.path}/sub/index.js`);
+      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith(`${third.path}/index.js`);
+      expect(esm2015Host.findDependencies).toHaveBeenCalledWith(`${fourth.path}/sub2/index.js`);
+      expect(esm2015Host.findDependencies).not.toHaveBeenCalledWith(`${fifth.path}/index.js`);
     });
 
     interface DepMap {
diff --git a/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
index 5423506e20..5f348c4566 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
@@ -69,7 +69,7 @@ describe('UmdDependencyHost', () => {
       expect(dependencies.size).toBe(0);
       expect(missing.size).toBe(0);
       expect(deepImports.size).toBe(1);
-      expect(deepImports.has('/node_modules/lib_1/deep/import')).toBe(true);
+      expect(deepImports.has(_('/node_modules/lib_1/deep/import'))).toBe(true);
     });
 
     it('should recurse into internal dependencies', () => {

From b4014e9a39cb964fe0a79038c4b43ef2d5f0365b Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 15 May 2019 20:01:50 -0700
Subject: [PATCH 076/275] build(bazel): update to latest stable chromium 74 on
 osx and linux for karma under bazel (#30502)

We were on 69 for both of these platforms which is fairly old. This update also requires a temporary patch to the @bazel/karma npm package to disable chrome sandboxing on OSX as it is broken under Bazel as of chromium 73. Windows is still on Chromium 66 but updating this will require upstream changes to rules_webtesting as the archive name & executable name has changed as of 72 for Windows and hard-coded paths in rules_webtesting break things.

PR Close #30502
---
 WORKSPACE                    |   2 +-
 browser_repositories.bzl     | 114 +++++++++++++++++++++++++++++++++++
 tools/postinstall-patches.js |  39 +++++++-----
 3 files changed, 138 insertions(+), 17 deletions(-)
 create mode 100644 browser_repositories.bzl

diff --git a/WORKSPACE b/WORKSPACE
index 0e652c0c25..2335aacb34 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -96,7 +96,7 @@ web_test_repositories()
 
 # Temporary work-around for https://github.com/angular/angular/issues/28681
 # TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
-load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
+load("//:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 
diff --git a/browser_repositories.bzl b/browser_repositories.bzl
new file mode 100644
index 0000000000..8c7b04462d
--- /dev/null
+++ b/browser_repositories.bzl
@@ -0,0 +1,114 @@
+# Copyright 2018 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Pinned browser versions for karma testing
+"""
+
+load("@io_bazel_rules_webtesting//web/internal:platform_http_file.bzl", "platform_http_file")
+
+def browser_repositories():
+    """Load pinned rules_webtesting browser versions."""
+
+    platform_http_file(
+        name = "org_chromium_chromium",
+        amd64_sha256 =
+            "eb6754c7918da5eab42a42bbda7efdf7f1661eaa3802b8940841f0c2c312299f",
+        amd64_urls = [
+            # Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
+            # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/638880/
+            # Current linux stable as of 2019-05-15
+            # https://www.chromium.org/developers/calendar
+            "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/638880/chrome-linux.zip",
+        ],
+        licenses = ["notice"],  # BSD 3-clause (maybe more?)
+        macos_sha256 =
+            "c48bdffac6a91c85c17a848012b1a45fbf36e3a2d4aaac5b6ded8ac65b1d96e3",
+        macos_urls = [
+            # Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
+            # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Mac/638880/
+            # Current mac stable as of 2019-05-15
+            # https://www.chromium.org/developers/calendar
+            "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/638880/chrome-mac.zip",
+        ],
+        windows_sha256 =
+            "d1bb728118c12ea436d8ea07dba980789e7d860aa664dd1fad78bc20e8d9391c",
+        windows_urls = [
+            # Chromium 66.0.3359.0 (2018-03-01 snaphot 540270)
+            # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/612439/
+            # NOTE: There is an issue with chromium 68-71 with Windows: https://bugs.chromium.org/p/chromium/issues/detail?id=540270
+            #       and pinning to 72 is not possible as the archive name has changed to chrome-win.zip which breaks
+            #       as the executable path the hard-coded in rules_webtesting and includes the archive name.
+            "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/540270/chrome-win32.zip",
+        ],
+    )
+
+    platform_http_file(
+        name = "org_chromium_chromedriver",
+        amd64_sha256 =
+            "ec9dbe021338f0befaecca702abc576cb7cc31a2f5a852c2c41e94721af5d3ad",
+        amd64_urls = [
+            # ChromeDriver 74.0.3729.6 supports Chrome 74
+            # http://chromedriver.chromium.org/downloads
+            "https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip",
+        ],
+        licenses = ["reciprocal"],  # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
+        macos_sha256 =
+            "b4b73681404d231d81a9b7ab9d4f0cb090f3e69240296eca2eb46e2629519152",
+        macos_urls = [
+            # ChromeDriver 74.0.3729.6 supports Chrome 74
+            # http://chromedriver.chromium.org/downloads
+            "https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_mac64.zip",
+        ],
+        windows_sha256 =
+            "a8fa028acebef7b931ef9cb093f02865f9f7495e49351f556e919f7be77f072e",
+        windows_urls = [
+            # ChromeDriver 2.38 supports Chrome v65-67
+            # http://chromedriver.chromium.org/downloads
+            "https://chromedriver.storage.googleapis.com/2.38/chromedriver_win32.zip",
+        ],
+    )
+
+    platform_http_file(
+        name = "org_mozilla_firefox",
+        amd64_sha256 =
+            "3a729ddcb1e0f5d63933177a35177ac6172f12edbf9fbbbf45305f49333608de",
+        amd64_urls = [
+            "https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
+            "https://ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
+        ],
+        licenses = ["reciprocal"],  # MPL 2.0
+        macos_sha256 =
+            "bf23f659ae34832605dd0576affcca060d1077b7bf7395bc9874f62b84936dc5",
+        macos_urls = [
+            "https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
+            "https://ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
+        ],
+    )
+
+    platform_http_file(
+        name = "org_mozilla_geckodriver",
+        amd64_sha256 =
+            "c9ae92348cf00aa719be6337a608fae8304691a95668e8e338d92623ba9e0ec6",
+        amd64_urls = [
+            "https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
+            "https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
+        ],
+        licenses = ["reciprocal"],  # MPL 2.0
+        macos_sha256 =
+            "ce4a3e9d706db94e8760988de1ad562630412fa8cf898819572522be584f01ce",
+        macos_urls = [
+            "https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
+            "https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
+        ],
+    )
diff --git a/tools/postinstall-patches.js b/tools/postinstall-patches.js
index 82e9eb5a29..04c8e9171f 100644
--- a/tools/postinstall-patches.js
+++ b/tools/postinstall-patches.js
@@ -27,21 +27,28 @@ const log = console.log;
 // COMMENTED OUT BECAUSE WE CURRENTLY REQUIRE NO PATCHES
 // UNCOMMENT TO REENABLE PATCHING AND LOG OUTPUT
 //
-// log('===== about to run the postinstall-patches.js script     =====');
-// // fail on first error
-// set('-e');
-// // print commands as being executed
-// set('-v');
-// // jump to project root
-// cd(path.join(__dirname, '../'));
+log('===== about to run the postinstall-patches.js script     =====');
+// fail on first error
+set('-e');
+// print commands as being executed
+set('-v');
+// jump to project root
+cd(path.join(__dirname, '../'));
 
-// /* EXAMPLE PATCH:
-// // https://github.com/ReactiveX/rxjs/pull/3302
-// // make node_modules/rxjs compilable with Typescript 2.7
-// // remove when we update to rxjs v6
-// log('\n# patch: reactivex/rxjs#3302 make node_modules/rxjs compilable with Typescript 2.7');
-// sed('-i', '(\'response\' in xhr)', '(\'response\' in (xhr as any))',
-//     'node_modules/rxjs/src/observable/dom/AjaxObservable.ts');
-// */
+/* EXAMPLE PATCH:
+// https://github.com/ReactiveX/rxjs/pull/3302
+// make node_modules/rxjs compilable with Typescript 2.7
+// remove when we update to rxjs v6
+log('\n# patch: reactivex/rxjs#3302 make node_modules/rxjs compilable with Typescript 2.7');
+sed('-i', '(\'response\' in xhr)', '(\'response\' in (xhr as any))',
+    'node_modules/rxjs/src/observable/dom/AjaxObservable.ts');
+*/
 
-// log('===== finished running the postinstall-patches.js script =====');
+// make chrome 74 work on OSX with karma under bazel
+// remove when we update to the next @bazel/karma release
+log('\n# patch: @bazel/karma 0.29.0 to disable chrome sandbox for OSX');
+sed('-i', 'process.platform !== \'linux\'',
+    'process.platform !== \'linux\' && process.platform !== \'darwin\'',
+    'node_modules/@bazel/karma/karma.conf.js');
+
+log('===== finished running the postinstall-patches.js script =====');

From 07ebe9624ff036a2732bf6362e1ef29329c1e6ac Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Wed, 15 May 2019 16:13:59 +0200
Subject: [PATCH 077/275] docs(ivy): document rules for the global state access
 (#30485)

PR Close #30485
---
 packages/core/src/render3/PERF_NOTES.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/render3/PERF_NOTES.md b/packages/core/src/render3/PERF_NOTES.md
index fc94cb2266..625b37a2ac 100644
--- a/packages/core/src/render3/PERF_NOTES.md
+++ b/packages/core/src/render3/PERF_NOTES.md
@@ -104,8 +104,18 @@ export function i18nStartFirstTemplatePass(tView: TView, index: number, message:
 }
 ```
 
-
-
 ## Loops
 Don't use `forEach`, it can cause megamorphic function calls (depending on the browser) and function allocations.
 It is [a lot slower than regular `for` loops](https://jsperf.com/for-vs-foreach-misko)
+
+## Limit global state access
+
+Ivy implementation uses some variables in `packages/core/src/render3/state.ts` that could be considered "global state" (those are not truly global variables exposed on `window` but still those variables are easily accessible from anywhere in the ivy codebase). Usage of this global state should be limited to avoid unnecessary function calls (state getters) and improve code readability. 
+
+As a rule, the global state should be accessed _only_ from instructions (functions invoked from the generated code). 
+
+## Instructions should be only called from the generated code
+
+Instruction functions should be called only from the generated template code. As a consequence of this rule, instructions shouldn't call other instructions.
+
+Calling instructions from other instructions (or any part of the ivy codebase) multiplies global state access (see previous rule) and makes reasoning about code more difficult.
\ No newline at end of file

From 6ec621b72d1ccabb625efdc0626b3eeb03017d4a Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 13 May 2019 18:54:14 -0700
Subject: [PATCH 078/275] test(ivy): onInit lifecycle acceptance tests (#30445)

Ports render3 lifecycle onInit tests to acceptance tests

PR Close #30445
---
 .../core/test/acceptance/lifecycle_spec.ts    | 495 +++++++++++++++++-
 packages/core/test/render3/lifecycle_spec.ts  | 302 -----------
 2 files changed, 494 insertions(+), 303 deletions(-)

diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index f5ce6fd7d8..55330ec033 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, Input, OnChanges, SimpleChanges} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {Component, ComponentFactoryResolver, Directive, Input, NgModule, OnChanges, SimpleChanges, ViewChild, ViewContainerRef} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
 
 describe('ngOnChanges', () => {
   it('should correctly support updating one Input among many', () => {
@@ -169,3 +171,494 @@ it('should call hooks after setting directives inputs', () => {
   fixture.detectChanges();
   expect(log).toEqual(['doCheckB1', 'doCheckC1', 'doCheckB1', 'doCheckC1']);
 });
+
+describe('onInit', () => {
+  it('should call onInit after inputs are the first time', () => {
+    const input1Values: string[] = [];
+    const input2Values: string[] = [];
+
+    @Component({
+      selector: 'my-comp',
+      template: `<p>test</p>`,
+    })
+    class MyComponent {
+      @Input()
+      input1 = '';
+
+      @Input()
+      input2 = '';
+
+      ngOnInit() {
+        input1Values.push(this.input1);
+        input2Values.push(this.input2);
+      }
+    }
+
+    @Component({
+      template: `
+        <my-comp [input1]="value1" [input2]="value2"></my-comp>
+      `,
+    })
+    class App {
+      value1 = 'a';
+      value2 = 'b';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, MyComponent],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(input1Values).toEqual(['a']);
+    expect(input2Values).toEqual(['b']);
+
+    fixture.componentInstance.value1 = 'c';
+    fixture.componentInstance.value2 = 'd';
+    fixture.detectChanges();
+
+    // Shouldn't be called again just because change detection ran.
+    expect(input1Values).toEqual(['a']);
+    expect(input2Values).toEqual(['b']);
+  });
+
+  it('should be called on root component', () => {
+    let onInitCalled = 0;
+
+    @Component({template: ``})
+    class App {
+      ngOnInit() { onInitCalled++; }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(onInitCalled).toBe(1);
+  });
+
+  it('should call parent onInit before it calls child onInit', () => {
+    const initCalls: string[] = [];
+
+    @Component({
+      selector: `child-comp`,
+      template: `<p>child</p>`,
+    })
+    class ChildComp {
+      ngOnInit() { initCalls.push('child'); }
+    }
+
+    @Component({
+      template: `<child-comp></child-comp>`,
+    })
+    class ParentComp {
+      ngOnInit() { initCalls.push('parent'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [ParentComp, ChildComp],
+    });
+    const fixture = TestBed.createComponent(ParentComp);
+    fixture.detectChanges();
+
+    expect(initCalls).toEqual(['parent', 'child']);
+  });
+
+  it('should call all parent onInits across view before calling children onInits', () => {
+    const initCalls: string[] = [];
+
+    @Component({
+      selector: `child-comp`,
+      template: `<p>child</p>`,
+    })
+    class ChildComp {
+      @Input()
+      name = '';
+
+      ngOnInit() { initCalls.push(`child of parent ${this.name}`); }
+    }
+
+    @Component({
+      selector: 'parent-comp',
+      template: `<child-comp [name]="name"></child-comp>`,
+    })
+    class ParentComp {
+      @Input()
+      name = '';
+
+      ngOnInit() { initCalls.push(`parent ${this.name}`); }
+    }
+
+    @Component({
+      template: `
+        <parent-comp name="1"></parent-comp>
+        <parent-comp name="2"></parent-comp>
+      `
+    })
+    class App {
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, ParentComp, ChildComp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(initCalls).toEqual(['parent 1', 'parent 2', 'child of parent 1', 'child of parent 2']);
+  });
+
+  it('should call onInit every time a new view is created (if block)', () => {
+    let onInitCalls = 0;
+
+    @Component({selector: 'my-comp', template: '<p>test</p>'})
+    class MyComp {
+      ngOnInit() { onInitCalls++; }
+    }
+
+    @Component({
+      template: `
+        <div *ngIf="show"><my-comp></my-comp></div>
+      `
+    })
+    class App {
+      show = true;
+    }
+    TestBed.configureTestingModule({
+      declarations: [App, MyComp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(onInitCalls).toBe(1);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(onInitCalls).toBe(1);
+
+    fixture.componentInstance.show = true;
+    fixture.detectChanges();
+
+    expect(onInitCalls).toBe(2);
+  });
+
+  it('should call onInit for children of dynamically created components', () => {
+    @Component({selector: 'my-comp', template: '<p>test</p>'})
+    class MyComp {
+      onInitCalled = false;
+
+      ngOnInit() { this.onInitCalled = true; }
+    }
+
+    @Component({
+      selector: 'dynamic-comp',
+      template: `
+        <my-comp></my-comp>
+      `,
+    })
+    class DynamicComp {
+    }
+
+    @Component({
+      template: `
+        <div #container></div>
+      `,
+    })
+    class App {
+      @ViewChild('container', {read: ViewContainerRef})
+      viewContainerRef !: ViewContainerRef;
+
+      constructor(public compFactoryResolver: ComponentFactoryResolver) {}
+
+      createDynamicView() {
+        const dynamicCompFactory = this.compFactoryResolver.resolveComponentFactory(DynamicComp);
+        this.viewContainerRef.createComponent(dynamicCompFactory);
+      }
+    }
+
+    // View Engine requires that DynamicComp be in entryComponents.
+    @NgModule({
+      declarations: [App, MyComp, DynamicComp],
+      entryComponents: [DynamicComp, App],
+    })
+    class AppModule {
+    }
+
+    TestBed.configureTestingModule({imports: [AppModule]});
+
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    fixture.componentInstance.createDynamicView();
+    fixture.detectChanges();
+
+    const myComp = fixture.debugElement.query(By.directive(MyComp)).componentInstance;
+    expect(myComp.onInitCalled).toBe(true);
+  });
+
+  it('should call onInit in hosts before their content children', () => {
+    const initialized: string[] = [];
+
+    @Component({
+      selector: 'projected',
+      template: '',
+    })
+    class Projected {
+      ngOnInit() { initialized.push('projected'); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<ng-content></ng-content>`,
+    })
+    class Comp {
+      ngOnInit() { initialized.push('comp'); }
+    }
+
+    @Component({
+      template: `
+        <comp>
+          <projected></projected>
+        </comp>
+      `
+    })
+    class App {
+      ngOnInit() { initialized.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(initialized).toEqual(['app', 'comp', 'projected']);
+  });
+
+
+  it('should call onInit in host and its content children before next host', () => {
+    const initialized: string[] = [];
+
+    @Component({
+      selector: 'projected',
+      template: '',
+    })
+    class Projected {
+      @Input()
+      name = '';
+
+      ngOnInit() { initialized.push('projected ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<ng-content></ng-content>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngOnInit() { initialized.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1">
+          <projected name="1"></projected>
+        </comp>
+        <comp name="2">
+          <projected name="2"></projected>
+        </comp>
+      `
+    })
+    class App {
+      ngOnInit() { initialized.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(initialized).toEqual(['app', 'comp 1', 'projected 1', 'comp 2', 'projected 2']);
+  });
+
+  it('should be called on directives after component', () => {
+    const initialized: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir-name')
+      name = '';
+
+      ngOnInit() { initialized.push('dir ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<p></p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngOnInit() { initialized.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1" dir dir-name="1"></comp>
+        <comp name="2" dir dir-name="2"></comp>
+      `
+    })
+    class App {
+      ngOnInit() { initialized.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(initialized).toEqual(['app', 'comp 1', 'dir 1', 'comp 2', 'dir 2']);
+  });
+
+  it('should be called on directives on an element', () => {
+    const initialized: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir-name')
+      name = '';
+
+      ngOnInit() { initialized.push('dir ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <p name="1" dir dir-name="1"></p>
+        <p name="2" dir dir-name="2"></p>
+      `
+    })
+    class App {
+      ngOnInit() { initialized.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(initialized).toEqual(['app', 'dir 1', 'dir 2']);
+  });
+
+
+  it('should call onInit properly in for loop', () => {
+    const initialized: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p></p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngOnInit() { initialized.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="0"></comp>
+        <comp *ngFor="let number of numbers" [name]="number"></comp>
+        <comp name="1"></comp>
+      `
+    })
+    class App {
+      numbers = [2, 3, 4, 5, 6];
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(initialized).toEqual([
+      'comp 0', 'comp 1', 'comp 2', 'comp 3', 'comp 4', 'comp 5', 'comp 6'
+    ]);
+  });
+
+  it('should call onInit properly in for loop with children', () => {
+    const initialized: string[] = [];
+
+    @Component({
+      selector: 'child',
+      template: `<p></p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngOnInit() { initialized.push('child of parent ' + this.name); }
+    }
+
+    @Component({selector: 'parent', template: '<child [name]="name"></child>'})
+    class Parent {
+      @Input()
+      name = '';
+
+      ngOnInit() { initialized.push('parent ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <parent name="0"></parent>
+        <parent *ngFor="let number of numbers" [name]="number"></parent>
+        <parent name="1"></parent>
+      `
+    })
+    class App {
+      numbers = [2, 3, 4, 5, 6];
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Child, Parent],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(initialized).toEqual([
+      // First the two root level components
+      'parent 0',
+      'parent 1',
+
+      // Then our 5 embedded views
+      'parent 2',
+      'child of parent 2',
+      'parent 3',
+      'child of parent 3',
+      'parent 4',
+      'child of parent 4',
+      'parent 5',
+      'child of parent 5',
+      'parent 6',
+      'child of parent 6',
+
+      // Then the children of the root level components
+      'child of parent 0',
+      'child of parent 1',
+    ]);
+  });
+});
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index c7c9c465c4..868f185bb0 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -78,75 +78,6 @@ describe('lifecycles', () => {
 
     const directives = [Comp, Parent, ProjectedComp, Directive, NgIf];
 
-    it('should call onInit method after inputs are set in creation mode (and not in update mode)',
-       () => {
-         /** <comp [val]="val"></comp> */
-         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-           if (rf & RenderFlags.Create) {
-             Δelement(0, 'comp');
-           }
-           if (rf & RenderFlags.Update) {
-             ΔelementProperty(0, 'val', Δbind(ctx.val));
-           }
-         }, 1, 1, directives);
-
-         const fixture = new ComponentFixture(App);
-         fixture.update();
-         expect(events).toEqual(['comp']);
-
-         fixture.component.val = '2';
-         fixture.update();
-         expect(events).toEqual(['comp']);
-       });
-
-    it('should be called on root component in creation mode', () => {
-      const comp = renderComponent(Comp, {hostFeatures: [LifecycleHooksFeature]});
-      expect(events).toEqual(['comp']);
-
-      markDirty(comp);
-      requestAnimationFrame.flush();
-      expect(events).toEqual(['comp']);
-    });
-
-    it('should call parent onInit before child onInit', () => {
-      /**
-       * <parent></parent>
-       * parent temp: <comp></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['parent', 'comp']);
-    });
-
-    it('should call all parent onInits across view before calling children onInits', () => {
-      /**
-       * <parent [val]="1"></parent>
-       * <parent [val]="2"></parent>
-       *
-       * parent temp: <comp [val]="val"></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δelement(1, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 2);
-        }
-      }, 2, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['parent1', 'parent2', 'comp1', 'comp2']);
-    });
-
-
     it('should call onInit every time a new view is created (if block)', () => {
       /**
        * % if (!skip) {
@@ -183,239 +114,6 @@ describe('lifecycles', () => {
       fixture.update();
       expect(events).toEqual(['comp', 'comp']);
     });
-
-
-    it('should call onInit every time a new view is created (ngIf)', () => {
-
-      function IfTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-      }
-
-      /** <comp *ngIf="showing"></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, IfTemplate, 1, 0, 'comp', [AttributeMarker.Template, 'ngIf']);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'ngIf', Δbind(ctx.showing));
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-
-      fixture.component.showing = true;
-      fixture.update();
-      expect(events).toEqual(['comp']);
-
-      fixture.component.showing = false;
-      fixture.update();
-      expect(events).toEqual(['comp']);
-
-      fixture.component.showing = true;
-      fixture.update();
-      expect(events).toEqual(['comp', 'comp']);
-    });
-
-    it('should call onInit for children of dynamically created components', () => {
-      let viewContainerComp !: ViewContainerComp;
-
-      class ViewContainerComp {
-        constructor(public vcr: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
-
-        static ngComponentDef = ΔdefineComponent({
-          type: ViewContainerComp,
-          selectors: [['view-container-comp']],
-          factory: () => viewContainerComp = new ViewContainerComp(
-                       ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
-          consts: 0,
-          vars: 0,
-          template: (rf: RenderFlags, ctx: ViewContainerComp) => {}
-        });
-      }
-
-      const DynamicComp = createComponent('dynamic-comp', (rf: RenderFlags, ctx: any) => {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-      }, 1, 0, [Comp]);
-
-      const fixture = new ComponentFixture(ViewContainerComp);
-      expect(events).toEqual([]);
-
-      viewContainerComp.vcr.createComponent(
-          viewContainerComp.cfr.resolveComponentFactory(DynamicComp));
-      fixture.update();
-      expect(events).toEqual(['comp']);
-    });
-
-    it('should call onInit in hosts before their content children', () => {
-      /**
-       * <comp>
-       *   <projected></projected>
-       * </comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { ΔelementStart(1, 'projected'); }
-          ΔelementEnd();
-        }
-      }, 2, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp', 'projected']);
-    });
-
-    it('should call onInit in host and its content children before next host', () => {
-      /**
-       * <comp [val]="1">
-       *   <projected [val]="1"></projected>
-       * </comp>
-       * <comp [val]="2">
-       *   <projected [val]="1"></projected>
-       * </comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { ΔelementStart(1, 'projected'); }
-          ΔelementEnd();
-          ΔelementStart(2, 'comp');
-          { ΔelementStart(3, 'projected'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 1);
-          Δselect(2);
-          ΔelementProperty(2, 'val', 2);
-          Δselect(3);
-          ΔelementProperty(3, 'val', 2);
-        }
-      }, 4, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp1', 'projected1', 'comp2', 'projected2']);
-    });
-
-    it('should be called on directives after component', () => {
-      /** <comp directive></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp', ['dir', '']);
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp', 'dir']);
-
-      fixture.update();
-      expect(events).toEqual(['comp', 'dir']);
-    });
-
-    it('should be called on directives on an element', () => {
-      /** <div directive></div> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'div', ['dir', '']);
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['dir']);
-
-      fixture.update();
-      expect(events).toEqual(['dir']);
-    });
-
-    it('should call onInit properly in for loop', () => {
-      /**
-       *  <comp [val]="1"></comp>
-       * % for (let j = 2; j < 5; j++) {
-       *   <comp [val]="j"></comp>
-       * % }
-       *  <comp [val]="5"></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-          Δcontainer(1);
-          Δelement(2, 'comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(2);
-          ΔelementProperty(2, 'val', 5);
-          ΔcontainerRefreshStart(1);
-          {
-            for (let j = 2; j < 5; j++) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', j);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 3, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      // onInit is called top to bottom, so top level comps (1 and 5) are called
-      // before the comps inside the for loop's embedded view (2, 3, and 4)
-      expect(events).toEqual(['comp1', 'comp5', 'comp2', 'comp3', 'comp4']);
-    });
-
-    it('should call onInit properly in for loop with children', () => {
-      /**
-       *  <parent [val]="1"></parent>
-       * % for (let j = 2; j < 5; j++) {
-       *   <parent [val]="j"></parent>
-       * % }
-       *  <parent [val]="5"></parent>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δcontainer(1);
-          Δelement(2, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(2);
-          ΔelementProperty(2, 'val', 5);
-          ΔcontainerRefreshStart(1);
-          {
-            for (let j = 2; j < 5; j++) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'parent');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', j);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 3, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      // onInit is called top to bottom, so top level comps (1 and 5) are called
-      // before the comps inside the for loop's embedded view (2, 3, and 4)
-      expect(events).toEqual([
-        'parent1', 'parent5', 'parent2', 'comp2', 'parent3', 'comp3', 'parent4', 'comp4', 'comp1',
-        'comp5'
-      ]);
-    });
-
   });
 
   describe('doCheck', () => {

From 9a6d298ca7d5a811edabd1a6bc4f698c794beaf1 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 13 May 2019 19:33:32 -0700
Subject: [PATCH 079/275] test(ivy): doCheck lifecycle acceptance tests
 (#30445)

- ports render3 doCheck tests to acceptance tests

PR Close #30445
---
 .../core/test/acceptance/lifecycle_spec.ts    | 148 ++++++++++++++++++
 packages/core/test/render3/lifecycle_spec.ts  |   3 +
 2 files changed, 151 insertions(+)

diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index 55330ec033..264f75e59d 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -662,3 +662,151 @@ describe('onInit', () => {
     ]);
   });
 });
+
+describe('doCheck', () => {
+  it('should call doCheck on every refresh', () => {
+    let doCheckCalled = 0;
+
+    @Component({template: ``})
+    class App {
+      ngDoCheck() { doCheckCalled++; }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(doCheckCalled).toBe(1);
+
+    fixture.detectChanges();
+
+    expect(doCheckCalled).toBe(2);
+  });
+
+  it('should call parent doCheck before child doCheck', () => {
+    const doChecks: string[] = [];
+
+    @Component({
+      selector: 'parent',
+      template: `<child></child>`,
+    })
+    class Parent {
+      ngDoCheck() { doChecks.push('parent'); }
+    }
+
+    @Component({
+      selector: 'child',
+      template: ``,
+    })
+    class Child {
+      ngDoCheck() { doChecks.push('child'); }
+    }
+
+    @Component({template: `<parent></parent>`})
+    class App {
+      ngDoCheck() { doChecks.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Child],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(doChecks).toEqual(['app', 'parent', 'child']);
+  });
+
+  it('should call ngOnInit before ngDoCheck if creation mode', () => {
+    const events: string[] = [];
+    @Component({template: ``})
+    class App {
+      ngOnInit() { events.push('onInit'); }
+
+      ngDoCheck() { events.push('doCheck'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual(['onInit', 'doCheck']);
+  });
+
+  it('should be called on directives after component', () => {
+    const doChecks: string[] = [];
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir')
+      name = '';
+
+      ngDoCheck() { doChecks.push('dir ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngDoCheck() { doChecks.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+      <comp name="1" dir="1"></comp>
+      <comp name="2" dir="2"></comp>
+    `
+    })
+    class App {
+      ngDoCheck() { doChecks.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(doChecks).toEqual(['app', 'comp 1', 'dir 1', 'comp 2', 'dir 2']);
+  });
+
+  it('should be called on directives on an element', () => {
+    const doChecks: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir')
+      name = '';
+
+      ngDoCheck() { doChecks.push('dir ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <p dir="1"></p>
+        <p dir="2"></p>
+      `
+    })
+    class App {
+      ngDoCheck() { doChecks.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(doChecks).toEqual(['app', 'dir 1', 'dir 2']);
+  });
+});
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 868f185bb0..9b20c9bdf6 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -116,6 +116,7 @@ describe('lifecycles', () => {
     });
   });
 
+<<<<<<< HEAD
   describe('doCheck', () => {
     let events: string[];
     let allEvents: string[];
@@ -246,6 +247,8 @@ describe('lifecycles', () => {
 
   });
 
+=======
+>>>>>>> test(ivy): doCheck lifecycle acceptance tests
   describe('afterContentInit', () => {
     let events: string[];
     let allEvents: string[];

From a5e06ba6299d437ae38133ff6262f1e5693b6e2e Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 13 May 2019 20:13:07 -0700
Subject: [PATCH 080/275] test(ivy): onAfterContentInit acceptance tests
 (#30445)

- Ports onAfterContentInit tests from render3 to acceptance tests

PR Close #30445
---
 .../core/test/acceptance/lifecycle_spec.ts    | 399 ++++++++++++++++++
 packages/core/test/render3/lifecycle_spec.ts  | 133 ------
 2 files changed, 399 insertions(+), 133 deletions(-)

diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index 264f75e59d..7c94c95435 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -810,3 +810,402 @@ describe('doCheck', () => {
     expect(doChecks).toEqual(['app', 'dir 1', 'dir 2']);
   });
 });
+
+describe('afterContentinit', () => {
+  it('should be called only in creation mode', () => {
+    let afterContentInitCalls = 0;
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngAfterContentInit() { afterContentInitCalls++; }
+    }
+    @Component({template: `<comp></comp>`})
+    class App {
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    // two updates
+    fixture.detectChanges();
+    fixture.detectChanges();
+
+    expect(afterContentInitCalls).toBe(1);
+  });
+
+  it('should be called on root component in creation mode', () => {
+    let afterContentInitCalls = 0;
+
+    @Component({template: `<p>test</p>`})
+    class App {
+      ngAfterContentInit() { afterContentInitCalls++; }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    // two updates
+    fixture.detectChanges();
+    fixture.detectChanges();
+
+    expect(afterContentInitCalls).toBe(1);
+  });
+
+  it('should be called on every create ngIf', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngAfterContentInit() { events.push('comp afterContentInit'); }
+    }
+
+    @Component({template: `<comp *ngIf="show"></comp>`})
+    class App {
+      show = true;
+
+      ngAfterContentInit() { events.push('app afterContentInit'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual(['app afterContentInit', 'comp afterContentInit']);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual(['app afterContentInit', 'comp afterContentInit']);
+
+    fixture.componentInstance.show = true;
+    fixture.detectChanges();
+
+
+    expect(events).toEqual(
+        ['app afterContentInit', 'comp afterContentInit', 'comp afterContentInit']);
+  });
+
+  it('should be called in parents before children', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]="name"></child>`,
+    })
+    class Parent {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('parent ' + this.name); }
+    }
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('child of parent ' + this.name); }
+    }
+
+    @Component({
+      template: `
+      <parent name="1"></parent>
+      <parent name="2"></parent>
+      `
+    })
+    class App {
+      ngAfterContentInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Child],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual(
+        ['app', 'parent 1', 'parent 2', 'child of parent 1', 'child of parent 2']);
+  });
+
+  it('should be called in projected components before their hosts', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'projected-child',
+      template: `<p>test</p>`,
+    })
+    class ProjectedChild {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('projected child ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<div><ng-content></ng-content></div>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      selector: 'projected',
+      template: `<projected-child [name]=name></projected-child>`,
+    })
+    class Projected {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('projected ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1">
+          <projected name="1"></projected>
+          <projected name="2"></projected>
+        </comp>
+        <comp name="2">
+          <projected name="3"></projected>
+          <projected name="4"></projected>
+        </comp>
+      `
+    })
+    class App {
+      ngAfterContentInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected, ProjectedChild],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      // root
+      'app',
+      // projections of comp 1
+      'projected 1',
+      'projected 2',
+      // comp 1
+      'comp 1',
+      // projections of comp 2
+      'projected 3',
+      'projected 4',
+      // comp 2
+      'comp 2',
+      // children of projections
+      'projected child 1',
+      'projected child 2',
+      'projected child 3',
+      'projected child 4',
+    ]);
+  });
+
+  it('should be called in correct order in a for loop', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="4"></comp>
+        <comp *ngFor="let number of numbers" [name]="number"></comp>
+        <comp name="5"></comp>
+      `
+    })
+    class App {
+      numbers = [0, 1, 2, 3];
+
+      ngAfterContentInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual(['app', 'comp 0', 'comp 1', 'comp 2', 'comp 3', 'comp 4', 'comp 5']);
+  });
+
+  it('should be called in correct order in a for loop with children', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]=name></child>`,
+    })
+    class Parent {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('parent ' + this.name); }
+    }
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('child of parent ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <parent name="4"></parent>
+        <parent *ngFor="let number of numbers" [name]="number"></parent>
+        <parent name="5"></parent>
+      `
+    })
+    class App {
+      numbers = [0, 1, 2, 3];
+      ngAfterContentInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Child],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      // root
+      'app',
+      // 4 embedded views
+      'parent 0',
+      'child of parent 0',
+      'parent 1',
+      'child of parent 1',
+      'parent 2',
+      'child of parent 2',
+      'parent 3',
+      'child of parent 3',
+      // root children
+      'parent 4',
+      'parent 5',
+      // children of root children
+      'child of parent 4',
+      'child of parent 5',
+    ]);
+  });
+
+  it('should be called on directives after component', () => {
+    const events: string[] = [];
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir')
+      name = '';
+
+      ngAfterContentInit() { events.push('dir ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterContentInit() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1" dir="1"></comp>
+        <comp name="2" dir="2"></comp>
+      `
+    })
+    class App {
+      ngAfterContentInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'app',
+      'comp 1',
+      'dir 1',
+      'comp 2',
+      'dir 2',
+    ]);
+  });
+});
+
+describe('afterContentChecked', () => {
+  it('should be called every change detection run after afterContentInit', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngAfterContentInit() { events.push('comp afterContentInit'); }
+
+      ngAfterContentChecked() { events.push('comp afterContentChecked'); }
+    }
+
+    @Component({template: `<comp></comp>`})
+    class App {
+      ngAfterContentInit() { events.push('app afterContentInit'); }
+
+      ngAfterContentChecked() { events.push('app afterContentChecked'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'app afterContentInit',
+      'app afterContentChecked',
+      'comp afterContentInit',
+      'comp afterContentChecked',
+    ]);
+  });
+});
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 9b20c9bdf6..7cd4f67d2b 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -116,139 +116,6 @@ describe('lifecycles', () => {
     });
   });
 
-<<<<<<< HEAD
-  describe('doCheck', () => {
-    let events: string[];
-    let allEvents: string[];
-
-    beforeEach(() => {
-      events = [];
-      allEvents = [];
-    });
-
-    let Comp = createDoCheckComponent('comp', (rf: RenderFlags, ctx: any) => {});
-    let Parent = createDoCheckComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
-
-    function createDoCheckComponent(
-        name: string, template: ComponentTemplate<any>, consts: number = 0, vars: number = 0,
-        directives: any[] = []) {
-      return class Component {
-        ngDoCheck() {
-          events.push(name);
-          allEvents.push('check ' + name);
-        }
-
-        ngOnInit() { allEvents.push('init ' + name); }
-
-        static ngComponentDef = ΔdefineComponent({
-          type: Component,
-          selectors: [[name]],
-          factory: () => new Component(), template,
-          consts: consts,
-          vars: vars,
-          directives: directives,
-          inputs: {val: 'val'}
-        });
-      };
-    }
-
-    class Directive {
-      ngDoCheck() { events.push('dir'); }
-
-      static ngDirectiveDef = ΔdefineDirective(
-          {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
-    }
-
-    const directives = [Comp, Parent, Directive];
-
-    it('should call doCheck on every refresh', () => {
-      /** <comp></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp']);
-
-      fixture.update();
-      expect(events).toEqual(['comp', 'comp']);
-    });
-
-    it('should be called on root component', () => {
-      const comp = renderComponent(Comp, {hostFeatures: [LifecycleHooksFeature]});
-      expect(events).toEqual(['comp']);
-
-      markDirty(comp);
-      requestAnimationFrame.flush();
-      expect(events).toEqual(['comp', 'comp']);
-    });
-
-    it('should call parent doCheck before child doCheck', () => {
-      /**
-       * <parent></parent>
-       * parent temp: <comp></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['parent', 'comp']);
-    });
-
-    it('should call ngOnInit before ngDoCheck if creation mode', () => {
-      /** <comp></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(allEvents).toEqual(['init comp', 'check comp']);
-
-      fixture.update();
-      expect(allEvents).toEqual(['init comp', 'check comp', 'check comp']);
-    });
-
-    it('should be called on directives after component', () => {
-      /** <comp directive></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp', ['dir', '']);
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp', 'dir']);
-
-      fixture.update();
-      expect(events).toEqual(['comp', 'dir', 'comp', 'dir']);
-    });
-
-    it('should be called on directives on an element', () => {
-      /** <div directive></div> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'div', ['dir', '']);
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['dir']);
-
-      fixture.update();
-      expect(events).toEqual(['dir', 'dir']);
-    });
-
-  });
-
-=======
->>>>>>> test(ivy): doCheck lifecycle acceptance tests
   describe('afterContentInit', () => {
     let events: string[];
     let allEvents: string[];

From 257e9646d0985dd1cb253d049cb312f00bae73d1 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 13 May 2019 21:52:00 -0700
Subject: [PATCH 081/275] test(ivy): add afterViewInit acceptance tests
 (#30445)

Migrates afterViewInit and afterViewChecked render3 tests to acceptance tests

PR Close #30445
---
 .../core/test/acceptance/lifecycle_spec.ts    | 678 ++++++++++++++
 packages/core/test/render3/lifecycle_spec.ts  | 852 ------------------
 2 files changed, 678 insertions(+), 852 deletions(-)

diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index 7c94c95435..a99d80120a 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -1209,3 +1209,681 @@ describe('afterContentChecked', () => {
     ]);
   });
 });
+
+describe('afterViewInit', () => {
+  it('should be called on creation and not in update mode', () => {
+    let afterViewInitCalls = 0;
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngAfterViewInit() { afterViewInitCalls++; }
+    }
+
+    @Component({template: `<comp></comp>`})
+    class App {
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    // two updates
+    fixture.detectChanges();
+    fixture.detectChanges();
+
+    expect(afterViewInitCalls).toBe(1);
+
+  });
+
+  it('should be called on root component in creation mode', () => {
+    let afterViewInitCalls = 0;
+
+    @Component({template: `<p>test</p>`})
+    class App {
+      ngAfterViewInit() { afterViewInitCalls++; }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    // two updates
+    fixture.detectChanges();
+    fixture.detectChanges();
+
+    expect(afterViewInitCalls).toBe(1);
+  });
+
+  it('should be called every time a view is initialized with ngIf', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngAfterViewInit() { events.push('comp'); }
+    }
+
+    @Component({
+      template: `<comp *ngIf="show"></comp>`,
+    })
+    class App {
+      show = true;
+
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual(['comp', 'app']);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual(['comp', 'app']);
+
+    fixture.componentInstance.show = true;
+    fixture.detectChanges();
+
+    expect(events).toEqual(['comp', 'app', 'comp']);
+  });
+
+  it('should be called in children before parents', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]=name></child>`,
+    })
+    class Parent {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('parent ' + this.name); }
+    }
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('child of parent ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <parent name="1"></parent>
+        <parent name="2"></parent>
+      `
+    })
+    class App {
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Child],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child of parent 1',
+      'child of parent 2',
+      'parent 1',
+      'parent 2',
+      'app',
+    ]);
+  });
+
+  it('should be called in projected components before their hosts', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'projected',
+      template: `<p>test</p>`,
+    })
+    class Projected {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('projected ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<ng-content></ng-content>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1"><projected name="1"></projected></comp>
+        <comp name="2"><projected name="2"></projected></comp>
+      `
+    })
+    class App {
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+
+    expect(events).toEqual([
+      'projected 1',
+      'comp 1',
+      'projected 2',
+      'comp 2',
+      'app',
+    ]);
+  });
+
+  it('should call afterViewInit in content children and host before next host', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'projected-child',
+      template: `<p>test</p>`,
+    })
+    class ProjectedChild {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('child of projected ' + this.name); }
+    }
+
+    @Component({
+      selector: 'projected',
+      template: `<projected-child [name]="name"></projected-child>`,
+    })
+    class Projected {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('projected ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<div><ng-content></ng-content></div>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1"><projected name="1"></projected></comp>
+        <comp name="2"><projected name="2"></projected></comp>
+      `
+    })
+    class App {
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected, ProjectedChild],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child of projected 1',
+      'child of projected 2',
+      'projected 1',
+      'comp 1',
+      'projected 2',
+      'comp 2',
+      'app',
+    ]);
+  });
+
+  it('should be called in correct order with ngFor', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="4"></comp>
+        <comp *ngFor="let number of numbers" [name]="number"></comp>
+        <comp name="5"></comp>
+      `
+    })
+    class App {
+      numbers = [0, 1, 2, 3];
+
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'comp 0',
+      'comp 1',
+      'comp 2',
+      'comp 3',
+      'comp 4',
+      'comp 5',
+      'app',
+    ]);
+  });
+
+  it('should be called in correct order with for loops with children', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('child of parent ' + this.name); }
+    }
+    @Component({
+      selector: 'parent',
+      template: `<child [name]="name"></child>`,
+    })
+    class Parent {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('parent ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <parent name="4"></parent>
+        <parent *ngFor="let number of numbers" [name]="number"></parent>
+        <parent name="5"></parent>
+      `
+    })
+    class App {
+      numbers = [0, 1, 2, 3];
+
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Child],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child of parent 0',
+      'parent 0',
+      'child of parent 1',
+      'parent 1',
+      'child of parent 2',
+      'parent 2',
+      'child of parent 3',
+      'parent 3',
+      'child of parent 4',
+      'child of parent 5',
+      'parent 4',
+      'parent 5',
+      'app',
+    ]);
+  });
+
+  it('should be called on directives after component', () => {
+    const events: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir')
+      name = '';
+
+      ngAfterViewInit() { events.push('dir ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterViewInit() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1" dir="1"></comp>
+        <comp name="2" dir="2"></comp>
+      `
+    })
+    class App {
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'comp 1',
+      'dir 1',
+      'comp 2',
+      'dir 2',
+      'app',
+    ]);
+  });
+
+  it('should be called on directives on an element', () => {
+    const events: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir')
+      name = '';
+
+      ngAfterViewInit() { events.push('dir ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <div dir="1"></div>
+        <div dir="2"></div>
+      `
+    })
+    class App {
+      ngAfterViewInit() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'dir 1',
+      'dir 2',
+      'app',
+    ]);
+  });
+});
+
+describe('ngAfterViewChecked', () => {
+  it('should call ngAfterViewChecked every update', () => {
+    let afterViewCheckedCalls = 0;
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngAfterViewChecked() { afterViewCheckedCalls++; }
+    }
+
+    @Component({template: `<comp></comp>`})
+    class App {
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(1);
+
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(2);
+
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(3);
+  });
+
+  it('should be called on root component', () => {
+    let afterViewCheckedCalls = 0;
+
+    @Component({template: `<p>test</p>`})
+    class App {
+      ngAfterViewChecked() { afterViewCheckedCalls++; }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(1);
+
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(2);
+
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(3);
+  });
+
+  it('should call ngAfterViewChecked with bindings', () => {
+    let afterViewCheckedCalls = 0;
+
+    @Component({
+      selector: 'comp',
+      template: `<p>{{value}}</p>`,
+    })
+    class Comp {
+      @Input()
+      value = '';
+      ngAfterViewChecked() { afterViewCheckedCalls++; }
+    }
+
+    @Component({template: `<comp [value]="value"></comp>`})
+    class App {
+      value = 1;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(1);
+
+    fixture.componentInstance.value = 1337;
+    fixture.detectChanges();
+    expect(afterViewCheckedCalls).toBe(2);
+  });
+
+  it('should be called in correct order with for loops with children', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngAfterViewChecked() { events.push('child of parent ' + this.name); }
+    }
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]="name"></child>`,
+    })
+    class Parent {
+      @Input()
+      name = '';
+
+      ngAfterViewChecked() { events.push('parent ' + this.name); }
+    }
+
+    @Component({
+      template: `
+      <parent name="4"></parent>
+      <parent *ngFor="let number of numbers" [name]="number"></parent>
+      <parent name="5"></parent>
+      `
+    })
+    class App {
+      numbers = [0, 1, 2, 3];
+
+      ngAfterViewChecked() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Child],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child of parent 0',
+      'parent 0',
+      'child of parent 1',
+      'parent 1',
+      'child of parent 2',
+      'parent 2',
+      'child of parent 3',
+      'parent 3',
+      'child of parent 4',
+      'child of parent 5',
+      'parent 4',
+      'parent 5',
+      'app',
+    ]);
+  });
+
+  it('should be called on directives after component', () => {
+    const events: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir')
+      name = '';
+
+      ngAfterViewChecked() { events.push('dir ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngAfterViewChecked() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+      <comp name="1" dir="1"></comp>
+      <comp name="2" dir="2"></comp>
+    `
+    })
+    class App {
+      ngAfterViewChecked() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'comp 1',
+      'dir 1',
+      'comp 2',
+      'dir 2',
+      'app',
+    ]);
+  });
+
+  it('should be called on directives on an element', () => {
+    const events: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input('dir')
+      name = '';
+
+      ngAfterViewChecked() { events.push('dir ' + this.name); }
+    }
+
+    @Component({
+      template: `
+      <div dir="1"></div>
+      <div dir="2"></div>
+    `
+    })
+    class App {
+      ngAfterViewChecked() { events.push('app'); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'dir 1',
+      'dir 2',
+      'app',
+    ]);
+  });
+
+});
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 7cd4f67d2b..0989f3db3a 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -116,858 +116,6 @@ describe('lifecycles', () => {
     });
   });
 
-  describe('afterContentInit', () => {
-    let events: string[];
-    let allEvents: string[];
-
-    beforeEach(() => {
-      events = [];
-      allEvents = [];
-    });
-
-    let Comp = createAfterContentInitComp('comp', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δprojection(0);
-      }
-    }, 1);
-
-    let Parent = createAfterContentInitComp('parent', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'comp');
-        { Δprojection(1); }
-        ΔelementEnd();
-      }
-      if (rf & RenderFlags.Update) {
-        ΔelementProperty(0, 'val', Δbind(ctx.val));
-      }
-    }, 2, 1, [Comp]);
-
-    let ProjectedComp = createAfterContentInitComp('projected', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δprojection(0);
-      }
-    }, 1);
-
-    function createAfterContentInitComp(
-        name: string, template: ComponentTemplate<any>, consts: number = 0, vars: number = 0,
-        directives: any[] = []) {
-      return class Component {
-        val: string = '';
-        ngAfterContentInit() {
-          events.push(`${name}${this.val}`);
-          allEvents.push(`${name}${this.val} init`);
-        }
-        ngAfterContentChecked() { allEvents.push(`${name}${this.val} check`); }
-
-        static ngComponentDef = ΔdefineComponent({
-          type: Component,
-          selectors: [[name]],
-          factory: () => new Component(),
-          consts: consts,
-          vars: vars,
-          inputs: {val: 'val'},
-          template: template,
-          directives: directives
-        });
-      };
-    }
-
-    class Directive {
-      ngAfterContentInit() { events.push('init'); }
-      ngAfterContentChecked() { events.push('check'); }
-
-      static ngDirectiveDef = ΔdefineDirective(
-          {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
-    }
-
-    function ForLoopWithChildrenTemplate(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'parent');
-        { Δtext(1, 'content'); }
-        ΔelementEnd();
-        Δcontainer(2);
-        ΔelementStart(3, 'parent');
-        { Δtext(4, 'content'); }
-        ΔelementEnd();
-      }
-      if (rf & RenderFlags.Update) {
-        ΔelementProperty(0, 'val', 1);
-        Δselect(3);
-        ΔelementProperty(3, 'val', 4);
-        ΔcontainerRefreshStart(2);
-        {
-          for (let i = 2; i < 4; i++) {
-            let rf1 = ΔembeddedViewStart(0, 2, 0);
-            if (rf1 & RenderFlags.Create) {
-              ΔelementStart(0, 'parent');
-              { Δtext(1, 'content'); }
-              ΔelementEnd();
-            }
-            if (rf1 & RenderFlags.Update) {
-              ΔelementProperty(0, 'val', i);
-            }
-            ΔembeddedViewEnd();
-          }
-        }
-        ΔcontainerRefreshEnd();
-      }
-    }
-
-    const directives = [Comp, Parent, ProjectedComp, Directive];
-
-    it('should be called only in creation mode', () => {
-      /** <comp>content</comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { Δtext(1, 'content'); }
-          ΔelementEnd();
-        }
-      }, 2, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp']);
-
-      fixture.update();
-      expect(events).toEqual(['comp']);
-    });
-
-    it('should be called on root component in creation mode', () => {
-      const comp = renderComponent(Comp, {hostFeatures: [LifecycleHooksFeature]});
-      expect(events).toEqual(['comp']);
-
-      markDirty(comp);
-      requestAnimationFrame.flush();
-      expect(events).toEqual(['comp']);
-    });
-
-    it('should be called on every init (if blocks)', () => {
-      /**
-       * % if (!skip) {
-       *   <comp>content</comp>
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 2, 0);
-              if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'comp');
-                { Δtext(1, 'content'); }
-                ΔelementEnd();
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp']);
-
-      fixture.component.skip = true;
-      fixture.update();
-      expect(events).toEqual(['comp']);
-
-      fixture.component.skip = false;
-      fixture.update();
-      expect(events).toEqual(['comp', 'comp']);
-    });
-
-    it('should be called in parents before children', () => {
-      /**
-       * <parent>content</parent>
-       *
-       * parent template: <comp><ng-content></ng-content></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'parent');
-          { Δtext(1, 'content'); }
-          ΔelementEnd();
-        }
-      }, 2, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['parent', 'comp']);
-    });
-
-    it('should be called breadth-first in entire parent subtree before any children', () => {
-      /**
-       * <parent [val]="1">content</parent>
-       * <parent [val]="2">content</parent>
-       *
-       * parent template: <comp [val]="val"><ng-content></ng-content></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'parent');
-          { Δtext(1, 'content'); }
-          ΔelementEnd();
-          ΔelementStart(2, 'parent');
-          { Δtext(3, 'content'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(2);
-          ΔelementProperty(2, 'val', 2);
-        }
-      }, 4, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['parent1', 'parent2', 'comp1', 'comp2']);
-    });
-
-    it('should be called in projected components before their hosts', () => {
-      /**
-       * <parent>
-       *   <projected>content</projected>
-       * </parent>
-       *
-       * parent template:
-       * <comp><ng-content></ng-content></comp>
-       *
-       * projected comp: <ng-content></ng-content>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'parent');
-          {
-            ΔelementStart(1, 'projected');
-            { Δtext(2, 'content'); }
-            ΔelementEnd();
-          }
-          ΔelementEnd();
-        }
-      }, 3, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['projected', 'parent', 'comp']);
-    });
-
-    it('should be called in projected components and hosts before children', () => {
-      /**
-       * <parent [val]="1">
-       *   <projected [val]="1">content</projected>
-       * </parent>
-       * * <parent [val]="2">
-       *   <projected [val]="2">content</projected>
-       * </parent>
-       *
-       * parent template:
-       * <comp [val]="val"><ng-content></ng-content></comp>
-       *
-       * projected comp: <ng-content></ng-content>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'parent');
-          {
-            ΔelementStart(1, 'projected');
-            { Δtext(2, 'content'); }
-            ΔelementEnd();
-          }
-          ΔelementEnd();
-          ΔelementStart(3, 'parent');
-          {
-            ΔelementStart(4, 'projected');
-            { Δtext(5, 'content'); }
-            ΔelementEnd();
-          }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 1);
-          Δselect(3);
-          ΔelementProperty(3, 'val', 2);
-          Δselect(4);
-          ΔelementProperty(4, 'val', 2);
-        }
-      }, 6, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['projected1', 'parent1', 'projected2', 'parent2', 'comp1', 'comp2']);
-    });
-
-    it('should be called in correct order in a for loop', () => {
-      /**
-       * <comp [val]="1">content</comp>
-       * % for(let i = 2; i < 4; i++) {
-       *   <comp [val]="i">content</comp>
-       * % }
-       * <comp [val]="4">content</comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { Δtext(1, 'content'); }
-          ΔelementEnd();
-          Δcontainer(2);
-          ΔelementStart(3, 'comp');
-          { Δtext(4, 'content'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(3);
-          ΔelementProperty(3, 'val', 4);
-          ΔcontainerRefreshStart(2);
-          {
-            for (let i = 2; i < 4; i++) {
-              let rf1 = ΔembeddedViewStart(0, 2, 0);
-              if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'comp');
-                { Δtext(1, 'content'); }
-                ΔelementEnd();
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', i);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 5, 0, directives);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp2', 'comp3', 'comp1', 'comp4']);
-    });
-
-    it('should be called in correct order in a for loop with children', () => {
-      /**
-       * <parent [val]="1">content</parent>
-       * % for(let i = 2; i < 4; i++) {
-       *   <parent [val]="i">content</parent>
-       * % }
-       * <parent [val]="4">content</parent>
-       */
-
-      renderToHtml(ForLoopWithChildrenTemplate, {}, 5, 0, directives);
-      expect(events).toEqual(
-          ['parent2', 'comp2', 'parent3', 'comp3', 'parent1', 'parent4', 'comp1', 'comp4']);
-    });
-
-    describe('ngAfterContentChecked', () => {
-
-      it('should be called every change detection run after afterContentInit', () => {
-        /** <comp>content</comp> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'comp');
-            { Δtext(1, 'content'); }
-            ΔelementEnd();
-          }
-        }, 2, 0, directives);
-
-        const fixture = new ComponentFixture(App);
-        expect(allEvents).toEqual(['comp init', 'comp check']);
-
-        fixture.update();
-        expect(allEvents).toEqual(['comp init', 'comp check', 'comp check']);
-      });
-
-      it('should be called on root component', () => {
-        const comp = renderComponent(Comp, {hostFeatures: [LifecycleHooksFeature]});
-        expect(allEvents).toEqual(['comp init', 'comp check']);
-
-        markDirty(comp);
-        requestAnimationFrame.flush();
-        expect(allEvents).toEqual(['comp init', 'comp check', 'comp check']);
-      });
-
-    });
-
-    describe('directives', () => {
-      it('should be called on directives after component', () => {
-        /** <comp directive></comp> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'comp', ['dir', '']);
-          }
-        }, 1, 0, directives);
-
-        const fixture = new ComponentFixture(App);
-        expect(events).toEqual(['comp', 'init', 'check']);
-      });
-
-      it('should be called on directives on an element', () => {
-        /** <div directive></div> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'div', ['dir', '']);
-          }
-        }, 1, 0, directives);
-
-        const fixture = new ComponentFixture(App);
-        expect(events).toEqual(['init', 'check']);
-      });
-    });
-  });
-
-  describe('afterViewInit', () => {
-    let events: string[];
-    let allEvents: string[];
-
-    beforeEach(() => {
-      events = [];
-      allEvents = [];
-    });
-
-    let Comp = createAfterViewInitComponent('comp', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δprojection(1); }
-        ΔelementEnd();
-      }
-    }, 2);
-    let Parent = createAfterViewInitComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
-
-    let ProjectedComp = createAfterViewInitComponent('projected', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        Δtext(0, 'content');
-      }
-    }, 1);
-
-    function createAfterViewInitComponent(
-        name: string, template: ComponentTemplate<any>, consts: number, vars: number = 0,
-        directives: any[] = []) {
-      return class Component {
-        val: string = '';
-        ngAfterViewInit() {
-          if (!this.val) this.val = '';
-          events.push(`${name}${this.val}`);
-          allEvents.push(`${name}${this.val} init`);
-        }
-        ngAfterViewChecked() { allEvents.push(`${name}${this.val} check`); }
-
-        static ngComponentDef = ΔdefineComponent({
-          type: Component,
-          selectors: [[name]],
-          consts: consts,
-          vars: vars,
-          factory: () => new Component(),
-          inputs: {val: 'val'},
-          template: template,
-          directives: directives
-        });
-      };
-    }
-
-    class Directive {
-      ngAfterViewInit() { events.push('init'); }
-      ngAfterViewChecked() { events.push('check'); }
-
-      static ngDirectiveDef = ΔdefineDirective(
-          {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
-    }
-
-    const defs = [Comp, Parent, ProjectedComp, Directive];
-
-    it('should be called on init and not in update mode', () => {
-      /** <comp></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp']);
-
-      fixture.update();
-      expect(events).toEqual(['comp']);
-    });
-
-    it('should be called on root component in creation mode', () => {
-      const comp = renderComponent(Comp, {hostFeatures: [LifecycleHooksFeature]});
-      expect(events).toEqual(['comp']);
-
-      markDirty(comp);
-      requestAnimationFrame.flush();
-      expect(events).toEqual(['comp']);
-    });
-
-    it('should be called every time a view is initialized (if block)', () => {
-      /*
-      * % if (!skip) {
-      *   <comp></comp>
-      * % }
-      */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp']);
-
-      fixture.component.skip = true;
-      fixture.update();
-      expect(events).toEqual(['comp']);
-
-      fixture.component.skip = false;
-      fixture.update();
-      expect(events).toEqual(['comp', 'comp']);
-
-    });
-
-    it('should be called in children before parents', () => {
-      /**
-       * <parent></parent>
-       *
-       * parent temp: <comp></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp', 'parent']);
-    });
-
-    it('should be called for entire subtree before being called in any parent view comps', () => {
-      /**
-       * <parent [val]="1"></parent>
-       * <parent [val]="2"></parent>
-       *
-       *  parent temp: <comp [val]="val"></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δelement(1, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 2);
-        }
-      }, 2, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp1', 'comp2', 'parent1', 'parent2']);
-
-    });
-
-    it('should be called in projected components before their hosts', () => {
-      /**
-       * <comp>
-       *   <projected></projected>
-       * </comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { Δelement(1, 'projected'); }
-          ΔelementEnd();
-        }
-      }, 2, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['projected', 'comp']);
-    });
-
-    it('should call afterViewInit in content children and host before next host', () => {
-      /**
-       * <comp [val]="1">
-       *   <projected [val]="1"></projected>
-       * </comp>
-       * <comp [val]="2">
-       *   <projected [val]="2"></projected>
-       * </comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { Δelement(1, 'projected'); }
-          ΔelementEnd();
-          ΔelementStart(2, 'comp');
-          { Δelement(3, 'projected'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 1);
-          Δselect(2);
-          ΔelementProperty(2, 'val', 2);
-          Δselect(3);
-          ΔelementProperty(3, 'val', 2);
-        }
-      }, 4, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['projected1', 'comp1', 'projected2', 'comp2']);
-    });
-
-    it('should call afterViewInit in content children and hosts before parents', () => {
-      /*
-       * <comp [val]="val">
-       *   <projected [val]="val"></projected>
-       * </comp>
-       */
-      const ParentComp = createAfterViewInitComponent('parent', (rf: RenderFlags, ctx: any) => {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { Δelement(1, 'projected'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', Δbind(ctx.val));
-          Δselect(1);
-          ΔelementProperty(1, 'val', Δbind(ctx.val));
-        }
-      }, 2, 2, [Comp, ProjectedComp]);
-
-      /**
-       * <parent [val]="1"></parent>
-       * <parent [val]="2"></parent>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δelement(1, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 2);
-        }
-      }, 2, 0, [ParentComp]);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['projected1', 'comp1', 'projected2', 'comp2', 'parent1', 'parent2']);
-    });
-
-    it('should be called in correct order with for loops', () => {
-      /**
-       * <comp [val]="1"></comp>
-       * % for (let i = 0; i < 4; i++) {
-       *  <comp [val]="i"></comp>
-       * % }
-       * <comp [val]="4"></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-          Δcontainer(1);
-          Δelement(2, 'comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(2);
-          ΔelementProperty(2, 'val', 4);
-          ΔcontainerRefreshStart(1);
-          {
-            for (let i = 2; i < 4; i++) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', i);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 3, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(['comp2', 'comp3', 'comp1', 'comp4']);
-
-    });
-
-    it('should be called in correct order with for loops with children', () => {
-      /**
-       * <parent [val]="1"></parent>
-       * % for(let i = 0; i < 4; i++) {
-       *  <parent [val]="i"></parent>
-       * % }
-       * <parent [val]="4"></parent>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δcontainer(1);
-          Δelement(2, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(2);
-          ΔelementProperty(2, 'val', 4);
-          ΔcontainerRefreshStart(1);
-          {
-            for (let i = 2; i < 4; i++) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'parent');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', i);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 3, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual(
-          ['comp2', 'parent2', 'comp3', 'parent3', 'comp1', 'comp4', 'parent1', 'parent4']);
-
-    });
-
-    describe('ngAfterViewChecked', () => {
-
-      it('should call ngAfterViewChecked every update', () => {
-        /** <comp></comp> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'comp');
-          }
-        }, 1, 0, defs);
-
-        const fixture = new ComponentFixture(App);
-        expect(allEvents).toEqual(['comp init', 'comp check']);
-
-        fixture.update();
-        expect(allEvents).toEqual(['comp init', 'comp check', 'comp check']);
-      });
-
-      it('should be called on root component', () => {
-        const comp = renderComponent(Comp, {hostFeatures: [LifecycleHooksFeature]});
-        expect(allEvents).toEqual(['comp init', 'comp check']);
-
-        markDirty(comp);
-        requestAnimationFrame.flush();
-        expect(allEvents).toEqual(['comp init', 'comp check', 'comp check']);
-      });
-
-      it('should call ngAfterViewChecked with bindings', () => {
-        /** <comp [val]="myVal"></comp> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'comp');
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementProperty(0, 'val', Δbind(ctx.myVal));
-          }
-        }, 1, 1, defs);
-
-        const fixture = new ComponentFixture(App);
-        expect(allEvents).toEqual(['comp init', 'comp check']);
-
-        fixture.component.myVal = 2;
-        fixture.update();
-        expect(allEvents).toEqual(['comp init', 'comp check', 'comp2 check']);
-      });
-
-      it('should be called in correct order with for loops with children', () => {
-        /**
-         * <parent [val]="1"></parent>
-         * % for(let i = 0; i < 4; i++) {
-       *  <parent [val]="i"></parent>
-       * % }
-         * <parent [val]="4"></parent>
-         */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'parent');
-            Δcontainer(1);
-            Δelement(2, 'parent');
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementProperty(0, 'val', 1);
-            Δselect(2);
-            ΔelementProperty(2, 'val', 4);
-            ΔcontainerRefreshStart(1);
-            {
-              for (let i = 2; i < 4; i++) {
-                let rf1 = ΔembeddedViewStart(0, 1, 0);
-                if (rf1 & RenderFlags.Create) {
-                  Δelement(0, 'parent');
-                }
-                if (rf1 & RenderFlags.Update) {
-                  ΔelementProperty(0, 'val', i);
-                }
-                ΔembeddedViewEnd();
-              }
-            }
-            ΔcontainerRefreshEnd();
-          }
-        }, 3, 0, defs);
-
-        const fixture = new ComponentFixture(App);
-        expect(allEvents).toEqual([
-          'comp2 init', 'comp2 check', 'parent2 init', 'parent2 check', 'comp3 init', 'comp3 check',
-          'parent3 init', 'parent3 check', 'comp1 init', 'comp1 check', 'comp4 init', 'comp4 check',
-          'parent1 init', 'parent1 check', 'parent4 init', 'parent4 check'
-        ]);
-
-      });
-
-    });
-
-    describe('directives', () => {
-      it('should be called on directives after component', () => {
-        /** <comp directive></comp> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'comp', ['dir', '']);
-          }
-        }, 1, 0, defs);
-
-        const fixture = new ComponentFixture(App);
-        expect(events).toEqual(['comp', 'init', 'check']);
-      });
-
-      it('should be called on directives on an element', () => {
-        /** <div directive></div> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'div', ['dir', '']);
-          }
-        }, 1, 0, defs);
-
-        const fixture = new ComponentFixture(App);
-        expect(events).toEqual(['init', 'check']);
-      });
-    });
-  });
-
   describe('onDestroy', () => {
     let events: string[];
 

From 222dde129d5f7f8b84a03a0c6bb7c3bb2b6bc39d Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Mon, 13 May 2019 22:52:52 -0700
Subject: [PATCH 082/275] test(ivy): add onDestroy acceptance tests (#30445)

Ports render3 onDestroy tests over to be acceptance tests. Removes old render3 tests if possible.

Note the onlyInIvy test for one area where Ivy has a different behavior than ViewEngine

PR Close #30445
---
 .../core/test/acceptance/lifecycle_spec.ts    | 566 ++++++++++++++++-
 packages/core/test/render3/lifecycle_spec.ts  | 567 ------------------
 2 files changed, 565 insertions(+), 568 deletions(-)

diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index a99d80120a..ba58110df6 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -10,6 +10,7 @@ import {CommonModule} from '@angular/common';
 import {Component, ComponentFactoryResolver, Directive, Input, NgModule, OnChanges, SimpleChanges, ViewChild, ViewContainerRef} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
+import {onlyInIvy} from '@angular/private/testing';
 
 describe('ngOnChanges', () => {
   it('should correctly support updating one Input among many', () => {
@@ -1656,7 +1657,7 @@ describe('afterViewInit', () => {
   });
 });
 
-describe('ngAfterViewChecked', () => {
+describe('afterViewChecked', () => {
   it('should call ngAfterViewChecked every update', () => {
     let afterViewCheckedCalls = 0;
 
@@ -1887,3 +1888,566 @@ describe('ngAfterViewChecked', () => {
   });
 
 });
+
+describe('onDestroy', () => {
+
+
+  it('should call destroy when view is removed', () => {
+    let destroyCalled = 0;
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngOnDestroy() { destroyCalled++; }
+    }
+
+    @Component({
+      template: `<comp *ngIf="show"></comp>`,
+    })
+    class App {
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(destroyCalled).toBe(0);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(destroyCalled).toBe(1);
+
+    fixture.componentInstance.show = true;
+    fixture.detectChanges();
+
+    expect(destroyCalled).toBe(1);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(destroyCalled).toBe(2);
+  });
+
+  it('should call destroy when multiple views are removed', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <comp name="1"></comp>
+          <comp name="2"></comp>
+        </div>
+      `
+    })
+    class App {
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual(['comp 1', 'comp 2']);
+  });
+
+  it('should be called in child components before parent components', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('child of parent ' + this.name); }
+    }
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]="name"></child>`,
+    })
+    class Parent {
+      @Input()
+      name = '';
+      ngOnDestroy() { events.push('parent ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <parent name="1"></parent>
+          <parent name="2"></parent>
+        </div>
+      `
+    })
+    class App {
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Child],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child of parent 1',
+      'child of parent 2',
+      'parent 1',
+      'parent 2',
+    ]);
+  });
+
+  it('should be called bottom up with children nested 2 levels deep', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('child ' + this.name); }
+    }
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]="name"></child>`,
+    })
+    class Parent {
+      @Input()
+      name = '';
+      ngOnDestroy() { events.push('parent ' + this.name); }
+    }
+
+    @Component({
+      selector: 'grandparent',
+      template: `<parent [name]="name"></parent>`,
+    })
+    class Grandparent {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('grandparent ' + this.name); }
+    }
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <grandparent name="1"></grandparent>
+          <grandparent name="2"></grandparent>
+        </div>
+      `
+    })
+    class App {
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Grandparent, Parent, Child],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child 1',
+      'parent 1',
+      'child 2',
+      'parent 2',
+      'grandparent 1',
+      'grandparent 2',
+    ]);
+  });
+
+  it('should be called in projected components before their hosts', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'projected',
+      template: `<p>test</p>`,
+    })
+    class Projected {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('projected ' + this.name); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<div><ng-content></ng-content></div>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <comp name="1">
+            <projected name="1"></projected>
+          </comp>
+          <comp name="2">
+            <projected name="2"></projected>
+          </comp>
+        </div>
+      `
+    })
+    class App {
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'projected 1',
+      'comp 1',
+      'projected 2',
+      'comp 2',
+    ]);
+  });
+
+
+  it('should be called in consistent order if views are removed and re-added', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+      <div *ngIf="showAll">
+        <comp name="1"></comp>
+        <comp *ngIf="showMiddle" name="2"></comp>
+        <comp name="3"></comp>
+      </div>
+      `
+    })
+    class App {
+      showAll = true;
+      showMiddle = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.showMiddle = false;
+    fixture.detectChanges();
+    expect(events).toEqual(['comp 2']);
+
+    fixture.componentInstance.showAll = false;
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp 2',
+      'comp 1',
+      'comp 3',
+    ]);
+
+    fixture.componentInstance.showAll = true;
+    fixture.componentInstance.showMiddle = true;
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp 2',
+      'comp 1',
+      'comp 3',
+    ]);
+
+    fixture.componentInstance.showAll = false;
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp 2',
+      'comp 1',
+      'comp 3',
+      'comp 2',
+      'comp 1',
+      'comp 3',
+    ]);
+  });
+
+  it('should be called on every iteration of a destroyed for loop', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      name = '';
+
+      ngOnDestroy() { events.push('comp ' + this.name); }
+    }
+
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <comp *ngFor="let number of numbers" [name]="number"></comp>
+        </div>
+      `
+    })
+    class App {
+      show = true;
+      numbers = [0, 1, 2, 3];
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'comp 0',
+      'comp 1',
+      'comp 2',
+      'comp 3',
+    ]);
+
+    fixture.componentInstance.show = true;
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'comp 0',
+      'comp 1',
+      'comp 2',
+      'comp 3',
+    ]);
+
+    fixture.componentInstance.numbers.splice(1, 1);
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp 0',
+      'comp 1',
+      'comp 2',
+      'comp 3',
+      'comp 1',
+    ]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp 0',
+      'comp 1',
+      'comp 2',
+      'comp 3',
+      'comp 1',
+      'comp 0',
+      'comp 2',
+      'comp 3',
+    ]);
+  });
+
+  it('should call destroy properly if view also has listeners', () => {
+    const events: string[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      ngOnDestroy() { events.push('comp'); }
+    }
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <button (click)="handleClick1()">test 1</button>
+          <comp></comp>
+          <button (click)="handleClick2()">test 2</button>
+        </div>
+      `
+    })
+    class App {
+      show = true;
+
+      clicksToButton1 = 0;
+
+      clicksToButton2 = 0;
+
+      handleClick1() { this.clicksToButton1++; }
+
+      handleClick2() { this.clicksToButton2++; }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    const buttons = fixture.debugElement.queryAll(By.css('button'));
+    buttons.forEach(button => button.nativeElement.click());
+
+    expect(fixture.componentInstance.clicksToButton1).toBe(1);
+    expect(fixture.componentInstance.clicksToButton2).toBe(1);
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    buttons.forEach(button => button.nativeElement.click());
+    expect(fixture.componentInstance.clicksToButton1).toBe(1);
+    expect(fixture.componentInstance.clicksToButton2).toBe(1);
+
+    expect(events).toEqual(['comp']);
+  });
+
+  onlyInIvy(
+      'View Engine has the opposite behavior, where it calls destroy on the directives first, then the components')
+      .it('should be called on directives after component', () => {
+        const events: string[] = [];
+
+        @Directive({
+          selector: '[dir]',
+        })
+        class Dir {
+          @Input('dir')
+          name = '';
+
+          ngOnDestroy() { events.push('dir ' + this.name); }
+        }
+
+        @Component({
+          selector: 'comp',
+          template: `<p>test</p>`,
+        })
+        class Comp {
+          @Input()
+          name = '';
+
+          ngOnDestroy() { events.push('comp ' + this.name); }
+        }
+
+        @Component({
+          template: `
+        <div *ngIf="show">
+          <comp name="1" dir="1"></comp>
+          <comp name="2" dir="2"></comp>
+        </div>
+      `
+        })
+        class App {
+          show = true;
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, Dir, Comp],
+          imports: [CommonModule],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(events).toEqual([]);
+
+        fixture.componentInstance.show = false;
+        fixture.detectChanges();
+
+        expect(events).toEqual([
+          'comp 1',
+          'dir 1',
+          'comp 2',
+          'dir 2',
+        ]);
+      });
+
+  it('should be called on directives on an element', () => {
+    const events: string[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      ngOnDestroy() { events.push('dir'); }
+    }
+
+    @Component({template: `<p *ngIf="show" dir></p>`})
+    class App {
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Dir],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual(['dir']);
+  });
+});
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 0989f3db3a..858dc5a269 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -116,573 +116,6 @@ describe('lifecycles', () => {
     });
   });
 
-  describe('onDestroy', () => {
-    let events: string[];
-
-    beforeEach(() => { events = []; });
-
-    let Comp = createOnDestroyComponent('comp', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δprojection(0);
-      }
-    }, 1);
-    let Parent = createOnDestroyComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
-
-    function createOnDestroyComponent(
-        name: string, template: ComponentTemplate<any>, consts: number = 0, vars: number = 0,
-        directives: any[] = []) {
-      return class Component {
-        val: string = '';
-        ngOnDestroy() { events.push(`${name}${this.val}`); }
-
-        static ngComponentDef = ΔdefineComponent({
-          type: Component,
-          selectors: [[name]],
-          factory: () => new Component(),
-          consts: consts,
-          vars: vars,
-          inputs: {val: 'val'},
-          template: template,
-          directives: directives
-        });
-      };
-    }
-
-    let Grandparent = createOnDestroyComponent('grandparent', function(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        Δelement(0, 'parent');
-      }
-    }, 1, 0, [Parent]);
-
-    const ProjectedComp = createOnDestroyComponent('projected', (rf: RenderFlags, ctx: any) => {});
-
-    class Directive {
-      ngOnDestroy() { events.push('dir'); }
-
-      static ngDirectiveDef = ΔdefineDirective(
-          {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
-    }
-
-    const defs = [Comp, Parent, Grandparent, ProjectedComp, Directive];
-
-    it('should call destroy when view is removed', () => {
-      /**
-       * % if (!skip) {
-       *   <comp></comp>
-       * % }
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      fixture.component.skip = true;
-      fixture.update();
-      expect(events).toEqual(['comp']);
-    });
-
-    it('should call destroy when multiple views are removed', () => {
-      /**
-       * % if (!skip) {
-       *   <comp [val]="1"></comp>
-       *   <comp [val]="2"></comp>
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 2, 2);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-                Δelement(1, 'comp');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', Δbind('1'));
-                Δselect(1);
-                ΔelementProperty(1, 'val', Δbind('2'));
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      fixture.component.skip = true;
-      fixture.update();
-      expect(events).toEqual(['comp1', 'comp2']);
-    });
-
-    it('should be called in child components before parent components', () => {
-      /**
-       * % if (!skip) {
-       *   <parent></parent>
-       * % }
-       *
-       * parent template: <comp></comp>
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'parent');
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      fixture.component.skip = true;
-      fixture.update();
-      expect(events).toEqual(['comp', 'parent']);
-    });
-
-    it('should be called bottom up with children nested 2 levels deep', () => {
-      /**
-       * % if (!skip) {
-       *   <grandparent></grandparent>
-       * % }
-       *
-       * grandparent template: <parent></parent>
-       * parent template: <comp></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'grandparent');
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      fixture.component.skip = true;
-      fixture.update();
-      expect(events).toEqual(['comp', 'parent', 'grandparent']);
-    });
-
-    it('should be called in projected components before their hosts', () => {
-      /**
-       * % if (!skip) {
-       *   <comp [val]="1">
-       *     <projected [val]="1"></projected>
-       *   </comp>
-       *   <comp [val]="2">
-       *     <projected [val]="2"></projected>
-       *   </comp>
-       * }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 4, 0);
-              if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'comp');
-                { Δelement(1, 'projected'); }
-                ΔelementEnd();
-                ΔelementStart(2, 'comp');
-                { Δelement(3, 'projected'); }
-                ΔelementEnd();
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', 1);
-                Δselect(1);
-                ΔelementProperty(1, 'val', 1);
-                Δselect(2);
-                ΔelementProperty(2, 'val', 2);
-                Δselect(3);
-                ΔelementProperty(3, 'val', 2);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      fixture.component.skip = true;
-      fixture.update();
-      expect(events).toEqual(['projected1', 'comp1', 'projected2', 'comp2']);
-    });
-
-
-    it('should be called in consistent order if views are removed and re-added', () => {
-      /**
-       * % if (condition) {
-       *   <comp [val]="1"></comp>
-       *   % if (condition2) {
-       *     <comp [val]="2"></comp>
-       *   % }
-       *   <comp [val]="3"></comp>
-       * % }
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (ctx.condition) {
-              let rf1 = ΔembeddedViewStart(0, 3, 2);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-                Δcontainer(1);
-                Δelement(2, 'comp');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', Δbind('1'));
-                Δselect(2);
-                ΔelementProperty(2, 'val', Δbind('3'));
-                ΔcontainerRefreshStart(1);
-                {
-                  if (ctx.condition2) {
-                    let rf2 = ΔembeddedViewStart(0, 1, 1);
-                    if (rf2 & RenderFlags.Create) {
-                      Δelement(0, 'comp');
-                    }
-                    if (rf2 & RenderFlags.Update) {
-                      ΔelementProperty(0, 'val', Δbind('2'));
-                    }
-                    ΔembeddedViewEnd();
-                  }
-                }
-                ΔcontainerRefreshEnd();
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.condition = true;
-      fixture.component.condition2 = true;
-      fixture.update();
-
-      // remove all views
-      fixture.component.condition = false;
-      fixture.update();
-
-      /**
-       * Current angular will process in this same order (root is the top-level removed view):
-       *
-       * root.child (comp1 view) onDestroy: null
-       * root.child.next (container) -> embeddedView
-       * embeddedView.child (comp2 view) onDestroy: null
-       * embeddedView onDestroy: [comp2]
-       * root.child.next.next (comp3 view) onDestroy: null
-       * root onDestroy: [comp1, comp3]
-       */
-      expect(events).toEqual(['comp2', 'comp1', 'comp3']);
-
-      events = [];
-      // remove inner view
-      fixture.component.condition = true;
-      fixture.component.condition2 = false;
-      fixture.update();
-
-      // remove outer view
-      fixture.component.condition = false;
-      fixture.update();
-      expect(events).toEqual(['comp1', 'comp3']);
-
-      events = [];
-      // restore both views
-      fixture.component.condition = true;
-      fixture.component.condition2 = true;
-      fixture.update();
-
-      // remove both views
-      fixture.component.condition = false;
-      fixture.update();
-      expect(events).toEqual(['comp2', 'comp1', 'comp3']);
-    });
-
-    it('should be called in every iteration of a destroyed for loop', () => {
-      /**
-       * % if (condition) {
-       *   <comp [val]="1"></comp>
-       *   % for (let i = 2; i < len; i++) {
-       *       <comp [val]="i"></comp>
-       *   % }
-       *   <comp [val]="5"></comp>
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (ctx.condition) {
-              let rf1 = ΔembeddedViewStart(0, 3, 2);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-                Δcontainer(1);
-                Δelement(2, 'comp');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val', Δbind('1'));
-                Δselect(2);
-                ΔelementProperty(2, 'val', Δbind('5'));
-                ΔcontainerRefreshStart(1);
-                {
-                  for (let j = 2; j < ctx.len; j++) {
-                    let rf2 = ΔembeddedViewStart(0, 1, 1);
-                    if (rf2 & RenderFlags.Create) {
-                      Δelement(0, 'comp');
-                    }
-                    if (rf2 & RenderFlags.Update) {
-                      ΔelementProperty(0, 'val', Δbind(j));
-                    }
-                    ΔembeddedViewEnd();
-                  }
-                }
-                ΔcontainerRefreshEnd();
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.condition = true;
-      fixture.component.len = 5;
-      fixture.update();
-
-      fixture.component.condition = false;
-      fixture.update();
-
-      /**
-       * Current angular will process in this same order (root is the top-level removed view):
-       *
-       * root.child (comp1 view) onDestroy: null
-       * root.child.next (container) -> embeddedView (children[0].data)
-       * embeddedView.child (comp2 view) onDestroy: null
-       * embeddedView onDestroy: [comp2]
-       * embeddedView.next.child (comp3 view) onDestroy: null
-       * embeddedView.next onDestroy: [comp3]
-       * embeddedView.next.next.child (comp4 view) onDestroy: null
-       * embeddedView.next.next onDestroy: [comp4]
-       * embeddedView.next.next -> container -> root
-       * root onDestroy: [comp1, comp5]
-       */
-      expect(events).toEqual(['comp2', 'comp3', 'comp4', 'comp1', 'comp5']);
-
-      events = [];
-      fixture.component.condition = true;
-      fixture.component.len = 4;
-      fixture.update();
-
-      fixture.component.condition = false;
-      fixture.update();
-      expect(events).toEqual(['comp2', 'comp3', 'comp1', 'comp5']);
-
-      events = [];
-      fixture.component.condition = true;
-      fixture.component.len = 5;
-      fixture.update();
-
-      fixture.component.condition = false;
-      fixture.update();
-      expect(events).toEqual(['comp2', 'comp3', 'comp4', 'comp1', 'comp5']);
-    });
-
-    it('should call destroy properly if view also has listeners', () => {
-      /**
-       * % if (condition) {
-       *   <button (click)="onClick()">Click me</button>
-       *   <comp></comp>
-       *   <button (click)="onClick()">Click me</button>
-       * % }
-       */
-      function Template(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (ctx.condition) {
-              let rf1 = ΔembeddedViewStart(0, 5, 0);
-              if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'button');
-                {
-                  Δlistener('click', ctx.onClick.bind(ctx));
-                  Δtext(1, 'Click me');
-                }
-                ΔelementEnd();
-                Δelement(2, 'comp');
-                ΔelementStart(3, 'button');
-                {
-                  Δlistener('click', ctx.onClick.bind(ctx));
-                  Δtext(4, 'Click me');
-                }
-                ΔelementEnd();
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }
-
-      class App {
-        counter = 0;
-        condition = true;
-        onClick() { this.counter++; }
-      }
-
-      const ctx: {counter: number} = new App();
-      renderToHtml(Template, ctx, 1, 0, defs);
-
-      const buttons = containerEl.querySelectorAll('button') !;
-      buttons[0].click();
-      expect(ctx.counter).toEqual(1);
-      buttons[1].click();
-      expect(ctx.counter).toEqual(2);
-
-      renderToHtml(Template, {condition: false}, 1, 0, defs);
-
-      buttons[0].click();
-      buttons[1].click();
-      expect(events).toEqual(['comp']);
-      expect(ctx.counter).toEqual(2);
-    });
-
-    it('should be called on directives after component', () => {
-      /**
-       * % if (condition) {
-       *   <comp></comp>
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (ctx.condition) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp', ['dir', '']);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.condition = true;
-      fixture.update();
-      expect(events).toEqual([]);
-
-      fixture.component.condition = false;
-      fixture.update();
-      expect(events).toEqual(['comp', 'dir']);
-
-    });
-
-    it('should be called on directives on an element', () => {
-      /**
-       * % if (condition) {
-       *   <div directive></div>
-       * % }
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (ctx.condition) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'div', ['dir', '']);
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.condition = true;
-      fixture.update();
-      expect(events).toEqual([]);
-
-      fixture.component.condition = false;
-      fixture.update();
-      expect(events).toEqual(['dir']);
-    });
-
-  });
-
   describe('onChanges', () => {
     let events: ({type: string, name: string, [key: string]: any})[];
 

From d18c58816fc2b6ac9e46045be80a76f4c6a96982 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Tue, 14 May 2019 15:23:16 -0700
Subject: [PATCH 083/275] test(ivy): add onChanges acceptance tests (#30445)

- moves render3 tests to acceptance tests.

PR Close #30445
---
 .../core/test/acceptance/lifecycle_spec.ts    | 927 +++++++++++++++++-
 packages/core/test/render3/lifecycle_spec.ts  | 768 ---------------
 2 files changed, 926 insertions(+), 769 deletions(-)

diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index ba58110df6..611876f0fd 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -8,11 +8,12 @@
 
 import {CommonModule} from '@angular/common';
 import {Component, ComponentFactoryResolver, Directive, Input, NgModule, OnChanges, SimpleChanges, ViewChild, ViewContainerRef} from '@angular/core';
+import {SimpleChange} from '@angular/core/src/core';
 import {TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {onlyInIvy} from '@angular/private/testing';
 
-describe('ngOnChanges', () => {
+describe('onChanges', () => {
   it('should correctly support updating one Input among many', () => {
     let log: string[] = [];
 
@@ -59,6 +60,930 @@ describe('ngOnChanges', () => {
     fixture.detectChanges();
     expect(log).toEqual(['c: 0 -> 3']);
   });
+
+  it('should call onChanges method after inputs are set in creation and update mode', () => {
+    const events: any[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>test</p>`,
+    })
+    class Comp {
+      @Input()
+      val1 = 'a';
+
+      @Input('publicVal2')
+      val2 = 'b';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'comp', changes}); }
+    }
+
+    @Component({template: `<comp [val1]="val1" [publicVal2]="val2"></comp>`})
+    class App {
+      val1 = 'a2';
+
+      val2 = 'b2';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([{
+      name: 'comp',
+      changes: {
+        val1: new SimpleChange(undefined, 'a2', true),
+        val2: new SimpleChange(undefined, 'b2', true),
+      }
+    }]);
+
+    events.length = 0;
+    fixture.componentInstance.val1 = 'a3';
+    fixture.componentInstance.val2 = 'b3';
+    fixture.detectChanges();
+
+
+    expect(events).toEqual([{
+      name: 'comp',
+      changes: {
+        val1: new SimpleChange('a2', 'a3', false),
+        val2: new SimpleChange('b2', 'b3', false),
+      }
+    }]);
+  });
+
+  it('should call parent onChanges before child onChanges', () => {
+    const events: any[] = [];
+
+    @Component({
+      selector: 'parent',
+      template: `<child [val]="val"></child>`,
+    })
+    class Parent {
+      @Input()
+      val = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'parent', changes}); }
+    }
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      val = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'child', changes}); }
+    }
+
+    @Component({template: `<parent [val]="val"></parent>`})
+    class App {
+      val = 'foo';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Child, Parent],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'parent',
+        changes: {
+          val: new SimpleChange(undefined, 'foo', true),
+        }
+      },
+      {
+        name: 'child',
+        changes: {
+          val: new SimpleChange(undefined, 'foo', true),
+        }
+      }
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.val = 'bar';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'parent',
+        changes: {
+          val: new SimpleChange('foo', 'bar', false),
+        }
+      },
+      {
+        name: 'child',
+        changes: {
+          val: new SimpleChange('foo', 'bar', false),
+        }
+      }
+    ]);
+  });
+
+  it('should call all parent onChanges across view before calling children onChanges', () => {
+    const events: any[] = [];
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]="name" [val]="val"></child>`,
+    })
+    class Parent {
+      @Input()
+      val = '';
+
+      @Input()
+      name = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'parent ' + this.name, changes}); }
+    }
+
+    @Component({
+      selector: 'child',
+      template: `<p>test</p>`,
+    })
+    class Child {
+      @Input()
+      val = '';
+
+      @Input()
+      name = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'child ' + this.name, changes}); }
+    }
+
+    @Component({
+      template: `
+        <parent name="1" [val]="val"></parent>
+        <parent name="2" [val]="val"></parent>
+      `
+    })
+    class App {
+      val = 'foo';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Child, Parent],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'parent 1',
+        changes: {
+          name: new SimpleChange(undefined, '1', true),
+          val: new SimpleChange(undefined, 'foo', true),
+        }
+      },
+      {
+        name: 'parent 2',
+        changes: {
+          name: new SimpleChange(undefined, '2', true),
+          val: new SimpleChange(undefined, 'foo', true),
+        }
+      },
+      {
+        name: 'child 1',
+        changes: {
+          name: new SimpleChange(undefined, '1', true),
+          val: new SimpleChange(undefined, 'foo', true),
+        }
+      },
+      {
+        name: 'child 2',
+        changes: {
+          name: new SimpleChange(undefined, '2', true),
+          val: new SimpleChange(undefined, 'foo', true),
+        }
+      },
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.val = 'bar';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'parent 1',
+        changes: {
+          val: new SimpleChange('foo', 'bar', false),
+        }
+      },
+      {
+        name: 'parent 2',
+        changes: {
+          val: new SimpleChange('foo', 'bar', false),
+        }
+      },
+      {
+        name: 'child 1',
+        changes: {
+          val: new SimpleChange('foo', 'bar', false),
+        }
+      },
+      {
+        name: 'child 2',
+        changes: {
+          val: new SimpleChange('foo', 'bar', false),
+        }
+      },
+    ]);
+  });
+
+  it('should call onChanges every time a new view is created with ngIf', () => {
+    const events: any[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>{{val}}</p>`,
+    })
+    class Comp {
+      @Input()
+      val = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'comp', changes}); }
+    }
+
+    @Component({template: `<comp *ngIf="show" [val]="val"></comp>`})
+    class App {
+      show = true;
+
+      val = 'a';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([{
+      name: 'comp',
+      changes: {
+        val: new SimpleChange(undefined, 'a', true),
+      }
+    }]);
+
+    events.length = 0;
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.val = 'b';
+    fixture.componentInstance.show = true;
+    fixture.detectChanges();
+
+    expect(events).toEqual([{
+      name: 'comp',
+      changes: {
+        val: new SimpleChange(undefined, 'b', true),
+      }
+    }]);
+  });
+
+  it('should call onChanges in hosts before their content children', () => {
+    const events: any[] = [];
+    @Component({
+      selector: 'projected',
+      template: `<p>{{val}}</p>`,
+    })
+    class Projected {
+      @Input()
+      val = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'projected', changes}); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<div><ng-content></ng-content></div>`,
+    })
+    class Comp {
+      @Input()
+      val = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'comp', changes}); }
+    }
+
+    @Component({
+      template: `<comp [val]="val"><projected [val]="val"></projected></comp>`,
+    })
+    class App {
+      val = 'a';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp',
+        changes: {
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'projected',
+        changes: {
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.val = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'projected',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+    ]);
+  });
+
+  it('should call onChanges in host and its content children before next host', () => {
+    const events: any[] = [];
+    @Component({
+      selector: 'projected',
+      template: `<p>{{val}}</p>`,
+    })
+    class Projected {
+      @Input()
+      val = '';
+
+      @Input()
+      name = '';
+
+      ngOnChanges(changes: SimpleChanges) {
+        events.push({name: 'projected ' + this.name, changes});
+      }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<div><ng-content></ng-content></div>`,
+    })
+    class Comp {
+      @Input()
+      val = '';
+
+      @Input()
+      name = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'comp ' + this.name, changes}); }
+    }
+
+    @Component({
+      template: `
+        <comp name="1" [val]="val">
+          <projected name="1" [val]="val"></projected>
+        </comp>
+        <comp name="2" [val]="val">
+          <projected name="2" [val]="val"></projected>
+        </comp>
+      `,
+    })
+    class App {
+      val = 'a';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Projected],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp 1',
+        changes: {
+          name: new SimpleChange(undefined, '1', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'projected 1',
+        changes: {
+          name: new SimpleChange(undefined, '1', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'comp 2',
+        changes: {
+          name: new SimpleChange(undefined, '2', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'projected 2',
+        changes: {
+          name: new SimpleChange(undefined, '2', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.val = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp 1',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'projected 1',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'comp 2',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'projected 2',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+    ]);
+  });
+
+  it('should be called on directives after component', () => {
+    const events: any[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input()
+      dir = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'dir', changes}); }
+    }
+
+    @Component({
+      selector: 'comp',
+      template: `<p>{{val}}</p>`,
+    })
+    class Comp {
+      @Input()
+      val = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'comp', changes}); }
+    }
+
+    @Component({
+      template: `<comp [dir]="val" [val]="val"></comp>`,
+    })
+    class App {
+      val = 'a';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp',
+        changes: {
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'dir',
+        changes: {
+          dir: new SimpleChange(undefined, 'a', true),
+        }
+      }
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.val = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'dir',
+        changes: {
+          dir: new SimpleChange('a', 'b', false),
+        }
+      }
+    ]);
+  });
+
+  it('should be called on directives on an element', () => {
+    const events: any[] = [];
+
+    @Directive({
+      selector: '[dir]',
+    })
+    class Dir {
+      @Input()
+      dir = '';
+
+      @Input('dir-val')
+      val = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'dir', changes}); }
+    }
+
+    @Component({template: `<div [dir]="val1" [dir-val]="val2"></div>`})
+    class App {
+      val1 = 'a';
+      val2 = 'b';
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Dir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([{
+      name: 'dir',
+      changes: {
+        dir: new SimpleChange(undefined, 'a', true),
+        val: new SimpleChange(undefined, 'b', true),
+      }
+    }]);
+
+    events.length = 0;
+    fixture.componentInstance.val1 = 'a1';
+    fixture.componentInstance.val2 = 'b1';
+    fixture.detectChanges();
+    expect(events).toEqual([{
+      name: 'dir',
+      changes: {
+        dir: new SimpleChange('a', 'a1', false),
+        val: new SimpleChange('b', 'b1', false),
+      }
+    }]);
+  });
+
+  it('should call onChanges properly in for loop', () => {
+    const events: any[] = [];
+
+    @Component({
+      selector: 'comp',
+      template: `<p>{{val}}</p>`,
+    })
+    class Comp {
+      @Input()
+      val = '';
+
+      @Input()
+      name = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'comp ' + this.name, changes}); }
+    }
+
+    @Component({
+      template: `
+      <comp name="0" [val]="val"></comp>
+      <comp *ngFor="let number of numbers" [name]="number" [val]="val"></comp>
+      <comp name="1" [val]="val"></comp>
+      `
+    })
+    class App {
+      val = 'a';
+
+      numbers = ['2', '3', '4'];
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp 0',
+        changes: {
+          name: new SimpleChange(undefined, '0', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'comp 1',
+        changes: {
+          name: new SimpleChange(undefined, '1', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'comp 2',
+        changes: {
+          name: new SimpleChange(undefined, '2', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'comp 3',
+        changes: {
+          name: new SimpleChange(undefined, '3', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'comp 4',
+        changes: {
+          name: new SimpleChange(undefined, '4', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      }
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.val = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'comp 0',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'comp 1',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'comp 2',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'comp 3',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'comp 4',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      }
+    ]);
+  });
+
+  it('should call onChanges properly in for loop with children', () => {
+    const events: any[] = [];
+
+    @Component({
+      selector: 'child',
+      template: `<p>{{val}}</p>`,
+    })
+    class Child {
+      @Input()
+      val = '';
+
+      @Input()
+      name = '';
+
+      ngOnChanges(changes: SimpleChanges) {
+        events.push({name: 'child of parent ' + this.name, changes});
+      }
+    }
+
+    @Component({
+      selector: 'parent',
+      template: `<child [name]="name" [val]="val"></child>`,
+    })
+    class Parent {
+      @Input()
+      val = '';
+
+      @Input()
+      name = '';
+
+      ngOnChanges(changes: SimpleChanges) { events.push({name: 'parent ' + this.name, changes}); }
+    }
+
+    @Component({
+      template: `
+        <parent name="0" [val]="val"></parent>
+        <parent *ngFor="let number of numbers" [name]="number" [val]="val"></parent>
+        <parent name="1" [val]="val"></parent>
+      `
+    })
+    class App {
+      val = 'a';
+      numbers = ['2', '3', '4'];
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Child, Parent],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'parent 0',
+        changes: {
+          name: new SimpleChange(undefined, '0', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'parent 1',
+        changes: {
+          name: new SimpleChange(undefined, '1', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'parent 2',
+        changes: {
+          name: new SimpleChange(undefined, '2', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'child of parent 2',
+        changes: {
+          name: new SimpleChange(undefined, '2', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'parent 3',
+        changes: {
+          name: new SimpleChange(undefined, '3', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'child of parent 3',
+        changes: {
+          name: new SimpleChange(undefined, '3', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'parent 4',
+        changes: {
+          name: new SimpleChange(undefined, '4', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'child of parent 4',
+        changes: {
+          name: new SimpleChange(undefined, '4', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'child of parent 0',
+        changes: {
+          name: new SimpleChange(undefined, '0', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+      {
+        name: 'child of parent 1',
+        changes: {
+          name: new SimpleChange(undefined, '1', true),
+          val: new SimpleChange(undefined, 'a', true),
+        }
+      },
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.val = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      {
+        name: 'parent 0',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'parent 1',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'parent 2',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'child of parent 2',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'parent 3',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'child of parent 3',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'parent 4',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'child of parent 4',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'child of parent 0',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+      {
+        name: 'child of parent 1',
+        changes: {
+          val: new SimpleChange('a', 'b', false),
+        }
+      },
+    ]);
+  });
+
+  it('should not call onChanges if props are set directly', () => {
+    const events: any[] = [];
+
+    @Component({template: `<p>{{value}}</p>`})
+    class App {
+      value = 'a';
+      ngOnChanges(changes: SimpleChanges) { events.push(changes); }
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+
+    fixture.componentInstance.value = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([]);
+  });
 });
 
 it('should call all hooks in correct order when several directives on same node', () => {
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 858dc5a269..0c3c35edca 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -116,774 +116,6 @@ describe('lifecycles', () => {
     });
   });
 
-  describe('onChanges', () => {
-    let events: ({type: string, name: string, [key: string]: any})[];
-
-    beforeEach(() => { events = []; });
-
-    /**
-     * <div>
-     *  <ng-content/>
-     * </div>
-     */
-    const Comp = createOnChangesComponent('comp', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δprojection(1); }
-        ΔelementEnd();
-      }
-    }, 2);
-
-    /**
-     * <comp [val1]="a" [publicVal2]="b"/>
-     */
-    const Parent = createOnChangesComponent('parent', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        Δelement(0, 'comp');
-      }
-      if (rf & RenderFlags.Update) {
-        ΔelementProperty(0, 'val1', Δbind(ctx.a));
-        ΔelementProperty(0, 'publicVal2', Δbind(ctx.b));
-      }
-    }, 1, 2, [Comp]);
-
-    const ProjectedComp = createOnChangesComponent('projected', (rf: RenderFlags, ctx: any) => {
-      if (rf & RenderFlags.Create) {
-        Δtext(0, 'content');
-      }
-    }, 1);
-
-
-    function createOnChangesComponent(
-        name: string, template: ComponentTemplate<any>, consts: number = 0, vars: number = 0,
-        directives: any[] = []) {
-      return class Component {
-        // @Input() val1: string;
-        // @Input('publicVal2') val2: string;
-        a: string = 'wasVal1BeforeMinification';
-        b: string = 'wasVal2BeforeMinification';
-        ngOnChanges(changes: SimpleChanges) {
-          if (changes.a && this.a !== changes.a.currentValue) {
-            throw Error(
-                `SimpleChanges invalid expected this.a ${this.a} to equal currentValue ${changes.a.currentValue}`);
-          }
-          if (changes.b && this.b !== changes.b.currentValue) {
-            throw Error(
-                `SimpleChanges invalid expected this.b ${this.b} to equal currentValue ${changes.b.currentValue}`);
-          }
-          events.push({type: 'onChanges', name: 'comp - ' + name, changes});
-        }
-
-        static ngComponentDef = ΔdefineComponent({
-          type: Component,
-          selectors: [[name]],
-          factory: () => new Component(),
-          consts: consts,
-          vars: vars,
-          inputs: {a: 'val1', b: ['publicVal2', 'val2']}, template,
-          directives: directives,
-          features: [ΔNgOnChangesFeature()],
-        });
-      };
-    }
-
-    class Directive {
-      // @Input() val1: string;
-      // @Input('publicVal2') val2: string;
-      a: string = 'wasVal1BeforeMinification';
-      b: string = 'wasVal2BeforeMinification';
-      ngOnChanges(changes: SimpleChanges) {
-        events.push({type: 'onChanges', name: 'dir - dir', changes});
-      }
-
-      static ngDirectiveDef = ΔdefineDirective({
-        type: Directive,
-        selectors: [['', 'dir', '']],
-        factory: () => new Directive(),
-        inputs: {a: 'val1', b: ['publicVal2', 'val2']},
-        features: [ΔNgOnChangesFeature()],
-      });
-    }
-
-    const defs = [Comp, Parent, Directive, ProjectedComp];
-
-    it('should call onChanges method after inputs are set in creation and update mode', () => {
-      /** <comp [val1]="val1" [publicVal2]="val2"></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(ctx.val1));
-          ΔelementProperty(0, 'publicVal2', Δbind(ctx.val2));
-        }
-      }, 1, 2, defs);
-
-      // First changes happen here.
-      const fixture = new ComponentFixture(App);
-
-      events = [];
-      fixture.component.val1 = '1';
-      fixture.component.val2 = 'a';
-      fixture.update();
-      expect(events).toEqual([{
-        type: 'onChanges',
-        name: 'comp - comp',
-        changes: {
-          'val1': new SimpleChange(
-              undefined, '1', false),  // we cleared `events` above, this is the second change
-          'val2': new SimpleChange(undefined, 'a', false),
-        }
-      }]);
-
-      events = [];
-      fixture.component.val1 = '2';
-      fixture.component.val2 = 'b';
-      fixture.update();
-      expect(events).toEqual([{
-        type: 'onChanges',
-        name: 'comp - comp',
-        changes: {
-          'val1': new SimpleChange('1', '2', false),
-          'val2': new SimpleChange('a', 'b', false),
-        }
-      }]);
-    });
-
-    it('should call parent onChanges before child onChanges', () => {
-      /**
-       * <parent></parent>
-       * parent temp: <comp></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(ctx.val1));
-          ΔelementProperty(0, 'publicVal2', Δbind(ctx.val2));
-        }
-      }, 1, 2, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      // We're clearing events after the first change here
-      events = [];
-      fixture.component.val1 = '1';
-      fixture.component.val2 = 'a';
-      fixture.update();
-
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, '1', false),
-            'val2': new SimpleChange(undefined, 'a', false),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, '1', false),
-            'val2': new SimpleChange(undefined, 'a', false),
-          }
-        },
-      ]);
-    });
-
-    it('should call all parent onChanges across view before calling children onChanges', () => {
-      /**
-       * <parent [val1]="1"></parent>
-       * <parent [val1]="2"></parent>
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δelement(1, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(1));
-          ΔelementProperty(0, 'publicVal2', Δbind(1));
-          Δselect(1);
-          ΔelementProperty(1, 'val1', Δbind(2));
-          ΔelementProperty(1, 'publicVal2', Δbind(2));
-        }
-      }, 2, 4, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, 2, true),
-            'val2': new SimpleChange(undefined, 2, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 2, true),
-            'val2': new SimpleChange(undefined, 2, true),
-          }
-        },
-      ]);
-    });
-
-
-    it('should call onChanges every time a new view is created (if block)', () => {
-      /**
-       * % if (condition) {
-       *   <comp></comp>
-       * % }
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          {
-            if (ctx.condition) {
-              let rf1 = ΔembeddedViewStart(0, 1, 2);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val1', Δbind(1));
-                ΔelementProperty(0, 'publicVal2', Δbind(1));
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      // Show the `comp` component, causing it to initialize. (first change is true)
-      fixture.component.condition = true;
-      fixture.update();
-      expect(events).toEqual([{
-        type: 'onChanges',
-        name: 'comp - comp',
-        changes: {
-          'val1': new SimpleChange(undefined, 1, true),
-          'val2': new SimpleChange(undefined, 1, true),
-        }
-      }]);
-
-      // Hide the `comp` component, no onChanges should fire
-      fixture.component.condition = false;
-      fixture.update();
-      expect(events).toEqual([{
-        type: 'onChanges',
-        name: 'comp - comp',
-        changes: {
-          'val1': new SimpleChange(undefined, 1, true),
-          'val2': new SimpleChange(undefined, 1, true),
-        }
-      }]);
-
-      // Show the `comp` component, it initializes again. (first change is true)
-      fixture.component.condition = true;
-      fixture.update();
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        }
-      ]);
-    });
-
-    it('should call onChanges in hosts before their content children', () => {
-      /**
-       * <comp>
-       *   <projected></projected>
-       * </comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { ΔelementStart(1, 'projected'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(1));
-          ΔelementProperty(0, 'publicVal2', Δbind(1));
-          Δselect(1);
-          ΔelementProperty(1, 'val1', Δbind(2));
-          ΔelementProperty(1, 'publicVal2', Δbind(2));
-        }
-      }, 2, 4, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - projected',
-          changes: {
-            'val1': new SimpleChange(undefined, 2, true),
-            'val2': new SimpleChange(undefined, 2, true),
-          }
-        },
-      ]);
-    });
-
-    it('should call onChanges in host and its content children before next host', () => {
-      /**
-       * <comp [val1]="1" [publicVal2]="1">
-       *   <projected [val1]="2" [publicVal2]="2"></projected>
-       * </comp>
-       * <comp [val1]="3" [publicVal2]="3">
-       *   <projected [val1]="4" [publicVal2]="4"></projected>
-       * </comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'comp');
-          { ΔelementStart(1, 'projected'); }
-          ΔelementEnd();
-          ΔelementStart(2, 'comp');
-          { ΔelementStart(3, 'projected'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(1));
-          ΔelementProperty(0, 'publicVal2', Δbind(1));
-          Δselect(1);
-          ΔelementProperty(1, 'val1', Δbind(2));
-          ΔelementProperty(1, 'publicVal2', Δbind(2));
-          Δselect(2);
-          ΔelementProperty(2, 'val1', Δbind(3));
-          ΔelementProperty(2, 'publicVal2', Δbind(3));
-          Δselect(3);
-          ΔelementProperty(3, 'val1', Δbind(4));
-          ΔelementProperty(3, 'publicVal2', Δbind(4));
-        }
-      }, 4, 8, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - projected',
-          changes: {
-            'val1': new SimpleChange(undefined, 2, true),
-            'val2': new SimpleChange(undefined, 2, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 3, true),
-            'val2': new SimpleChange(undefined, 3, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - projected',
-          changes: {
-            'val1': new SimpleChange(undefined, 4, true),
-            'val2': new SimpleChange(undefined, 4, true),
-          }
-        },
-      ]);
-    });
-
-    it('should be called on directives after component', () => {
-      /**
-       * <comp dir [val1]="1" [publicVal2]="1"></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp', ['dir', '']);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(1));
-          ΔelementProperty(0, 'publicVal2', Δbind(1));
-        }
-      }, 1, 2, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'dir - dir',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-      ]);
-
-      // Update causes no changes to be fired, since the bindings didn't change.
-      events = [];
-      fixture.update();
-      expect(events).toEqual([]);
-
-    });
-
-    it('should be called on directives on an element', () => {
-      /**
-       * <div dir [val]="1" [publicVal2]="1"></div>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'div', ['dir', '']);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(1));
-          ΔelementProperty(0, 'publicVal2', Δbind(1));
-        }
-      }, 1, 2, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([{
-        type: 'onChanges',
-        name: 'dir - dir',
-        changes: {
-          'val1': new SimpleChange(undefined, 1, true),
-          'val2': new SimpleChange(undefined, 1, true),
-        }
-      }]);
-
-      events = [];
-      fixture.update();
-      expect(events).toEqual([]);
-    });
-
-    it('should call onChanges properly in for loop', () => {
-      /**
-       *  <comp [val1]="1" [publicVal2]="1"></comp>
-       * % for (let j = 2; j < 5; j++) {
-       *   <comp [val1]="j" [publicVal2]="j"></comp>
-       * % }
-       *  <comp [val1]="5" [publicVal2]="5"></comp>
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-          Δcontainer(1);
-          Δelement(2, 'comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(1));
-          ΔelementProperty(0, 'publicVal2', Δbind(1));
-          Δselect(2);
-          ΔelementProperty(2, 'val1', Δbind(5));
-          ΔelementProperty(2, 'publicVal2', Δbind(5));
-          ΔcontainerRefreshStart(1);
-          {
-            for (let j = 2; j < 5; j++) {
-              let rf1 = ΔembeddedViewStart(0, 1, 2);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val1', Δbind(j));
-                ΔelementProperty(0, 'publicVal2', Δbind(j));
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 3, 4, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      // onChanges is called top to bottom, so top level comps (1 and 5) are called
-      // before the comps inside the for loop's embedded view (2, 3, and 4)
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 5, true),
-            'val2': new SimpleChange(undefined, 5, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 2, true),
-            'val2': new SimpleChange(undefined, 2, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 3, true),
-            'val2': new SimpleChange(undefined, 3, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 4, true),
-            'val2': new SimpleChange(undefined, 4, true),
-          }
-        },
-      ]);
-    });
-
-    it('should call onChanges properly in for loop with children', () => {
-      /**
-       *  <parent [val1]="1" [publicVal2]="1"></parent>
-       * % for (let j = 2; j < 5; j++) {
-       *   <parent [val1]="j" [publicVal2]="j"></parent>
-       * % }
-       *  <parent [val1]="5" [publicVal2]="5"></parent>
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δcontainer(1);
-          Δelement(2, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val1', Δbind(1));
-          ΔelementProperty(0, 'publicVal2', Δbind(1));
-          Δselect(2);
-          ΔelementProperty(2, 'val1', Δbind(5));
-          ΔelementProperty(2, 'publicVal2', Δbind(5));
-          ΔcontainerRefreshStart(1);
-          {
-            for (let j = 2; j < 5; j++) {
-              let rf1 = ΔembeddedViewStart(0, 1, 2);
-              if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'parent');
-              }
-              if (rf1 & RenderFlags.Update) {
-                ΔelementProperty(0, 'val1', Δbind(j));
-                ΔelementProperty(0, 'publicVal2', Δbind(j));
-              }
-              ΔembeddedViewEnd();
-            }
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 3, 4, defs);
-
-      const fixture = new ComponentFixture(App);
-
-      // onChanges is called top to bottom, so top level comps (1 and 5) are called
-      // before the comps inside the for loop's embedded view (2, 3, and 4)
-      expect(events).toEqual([
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, 5, true),
-            'val2': new SimpleChange(undefined, 5, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, 2, true),
-            'val2': new SimpleChange(undefined, 2, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 2, true),
-            'val2': new SimpleChange(undefined, 2, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, 3, true),
-            'val2': new SimpleChange(undefined, 3, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 3, true),
-            'val2': new SimpleChange(undefined, 3, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - parent',
-          changes: {
-            'val1': new SimpleChange(undefined, 4, true),
-            'val2': new SimpleChange(undefined, 4, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 4, true),
-            'val2': new SimpleChange(undefined, 4, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 1, true),
-            'val2': new SimpleChange(undefined, 1, true),
-          }
-        },
-        {
-          type: 'onChanges',
-          name: 'comp - comp',
-          changes: {
-            'val1': new SimpleChange(undefined, 5, true),
-            'val2': new SimpleChange(undefined, 5, true),
-          }
-        },
-      ]);
-    });
-
-    it('should not call onChanges if props are set directly', () => {
-      let events: SimpleChanges[] = [];
-      let compInstance: MyComp;
-      class MyComp {
-        value = 0;
-
-        ngOnChanges(changes: SimpleChanges) { events.push(changes); }
-
-        static ngComponentDef = ΔdefineComponent({
-          type: MyComp,
-          factory: () => {
-            // Capture the instance so we can test setting the property directly
-            compInstance = new MyComp();
-            return compInstance;
-          },
-          template: (rf: RenderFlags, ctx: any) => {
-            if (rf & RenderFlags.Create) {
-              Δelement(0, 'div');
-            }
-            if (rf & RenderFlags.Update) {
-              ΔelementProperty(0, 'id', Δbind(ctx.a));
-            }
-          },
-          selectors: [['my-comp']],
-          inputs: {
-            value: 'value',
-          },
-          consts: 1,
-          vars: 1,
-        });
-      }
-
-      /**
-       *  <my-comp [value]="1"></my-comp>
-       */
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'my-comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'value', Δbind(1));
-        }
-      }, 1, 1, [MyComp]);
-
-      const fixture = new ComponentFixture(App);
-      events = [];
-
-      // Try setting the property directly
-      compInstance !.value = 2;
-
-      fixture.update();
-      expect(events).toEqual([]);
-    });
-
-  });
-
   describe('hook order', () => {
     let events: string[];
 

From 60235b5aef59c0ded3b59264f4863bcbee7a9bd6 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 15 May 2019 11:52:38 -0700
Subject: [PATCH 084/275] test(ivy): add additional lifecycle hook acceptance
 tests (#30445)

Moves additional lifecycle hook tests from render3 to acceptance

PR Close #30445
---
 .../core/test/acceptance/lifecycle_spec.ts    | 332 ++++++++++++++++++
 packages/core/test/render3/lifecycle_spec.ts  | 285 +--------------
 2 files changed, 338 insertions(+), 279 deletions(-)

diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index 611876f0fd..5175d3dd7d 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -3376,3 +3376,335 @@ describe('onDestroy', () => {
     expect(events).toEqual(['dir']);
   });
 });
+
+describe('hook order', () => {
+  let events: string[] = [];
+
+  beforeEach(() => events = []);
+
+  @Component({
+    selector: 'comp',
+    template: `{{value}}<div><ng-content></ng-content></div>`,
+  })
+  class Comp {
+    @Input()
+    value = '';
+
+    @Input()
+    name = '';
+
+    ngOnInit() { events.push(`${this.name} onInit`); }
+
+    ngDoCheck() { events.push(`${this.name} doCheck`); }
+
+    ngOnChanges() { events.push(`${this.name} onChanges`); }
+
+    ngAfterContentInit() { events.push(`${this.name} afterContentInit`); }
+
+    ngAfterContentChecked() { events.push(`${this.name} afterContentChecked`); }
+
+    ngAfterViewInit() { events.push(`${this.name} afterViewInit`); }
+
+    ngAfterViewChecked() { events.push(`${this.name} afterViewChecked`); }
+
+    ngOnDestroy() { events.push(`${this.name} onDestroy`); }
+  }
+
+  @Component({
+    selector: 'parent',
+    template:
+        `<comp [name]="'child of ' + this.name" [value]="value"><ng-content></ng-content></comp>`,
+  })
+  class Parent extends Comp {
+  }
+
+  it('should call all hooks in correct order', () => {
+    @Component({template: `<comp *ngIf="show" name="comp" [value]="value"></comp>`})
+    class App {
+      value = 'a';
+
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'comp onChanges',
+      'comp onInit',
+      'comp doCheck',
+      'comp afterContentInit',
+      'comp afterContentChecked',
+      'comp afterViewInit',
+      'comp afterViewChecked',
+    ]);
+
+    events.length = 0;
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp doCheck',
+      'comp afterContentChecked',
+      'comp afterViewChecked',
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.value = 'b';
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp onChanges',
+      'comp doCheck',
+      'comp afterContentChecked',
+      'comp afterViewChecked',
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+    expect(events).toEqual([
+      'comp onDestroy',
+    ]);
+  });
+
+  it('should call all hooks in correct order with children', () => {
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <parent name="parent1" [value]="value"></parent>
+          <parent name="parent2" [value]="value"></parent>
+        </div>
+      `
+    })
+    class App {
+      value = 'a';
+
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'parent1 onChanges',
+      'parent1 onInit',
+      'parent1 doCheck',
+      'parent2 onChanges',
+      'parent2 onInit',
+      'parent2 doCheck',
+      'parent1 afterContentInit',
+      'parent1 afterContentChecked',
+      'parent2 afterContentInit',
+      'parent2 afterContentChecked',
+      'child of parent1 onChanges',
+      'child of parent1 onInit',
+      'child of parent1 doCheck',
+      'child of parent1 afterContentInit',
+      'child of parent1 afterContentChecked',
+      'child of parent1 afterViewInit',
+      'child of parent1 afterViewChecked',
+      'child of parent2 onChanges',
+      'child of parent2 onInit',
+      'child of parent2 doCheck',
+      'child of parent2 afterContentInit',
+      'child of parent2 afterContentChecked',
+      'child of parent2 afterViewInit',
+      'child of parent2 afterViewChecked',
+      'parent1 afterViewInit',
+      'parent1 afterViewChecked',
+      'parent2 afterViewInit',
+      'parent2 afterViewChecked',
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.value = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'parent1 onChanges',
+      'parent1 doCheck',
+      'parent2 onChanges',
+      'parent2 doCheck',
+      'parent1 afterContentChecked',
+      'parent2 afterContentChecked',
+      'child of parent1 onChanges',
+      'child of parent1 doCheck',
+      'child of parent1 afterContentChecked',
+      'child of parent1 afterViewChecked',
+      'child of parent2 onChanges',
+      'child of parent2 doCheck',
+      'child of parent2 afterContentChecked',
+      'child of parent2 afterViewChecked',
+      'parent1 afterViewChecked',
+      'parent2 afterViewChecked',
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child of parent1 onDestroy',
+      'child of parent2 onDestroy',
+      'parent1 onDestroy',
+      'parent2 onDestroy',
+    ]);
+  });
+
+  // Angular 5 reference: https://stackblitz.com/edit/lifecycle-hooks-ng
+  it('should call all hooks in correct order with view and content', () => {
+    @Component({
+      template: `
+        <div *ngIf="show">
+          <parent name="parent1" [value]="value">
+            <comp name="projected1" [value]="value"></comp>
+          </parent>
+          <parent name="parent2" [value]="value">
+            <comp name="projected2" [value]="value"></comp>
+          </parent>
+        </div>
+      `
+    })
+    class App {
+      value = 'a';
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, Parent, Comp],
+      imports: [CommonModule],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'parent1 onChanges',
+      'parent1 onInit',
+      'parent1 doCheck',
+      'projected1 onChanges',
+      'projected1 onInit',
+      'projected1 doCheck',
+      'parent2 onChanges',
+      'parent2 onInit',
+      'parent2 doCheck',
+      'projected2 onChanges',
+      'projected2 onInit',
+      'projected2 doCheck',
+      'projected1 afterContentInit',
+      'projected1 afterContentChecked',
+      'parent1 afterContentInit',
+      'parent1 afterContentChecked',
+      'projected2 afterContentInit',
+      'projected2 afterContentChecked',
+      'parent2 afterContentInit',
+      'parent2 afterContentChecked',
+      'child of parent1 onChanges',
+      'child of parent1 onInit',
+      'child of parent1 doCheck',
+      'child of parent1 afterContentInit',
+      'child of parent1 afterContentChecked',
+      'child of parent1 afterViewInit',
+      'child of parent1 afterViewChecked',
+      'child of parent2 onChanges',
+      'child of parent2 onInit',
+      'child of parent2 doCheck',
+      'child of parent2 afterContentInit',
+      'child of parent2 afterContentChecked',
+      'child of parent2 afterViewInit',
+      'child of parent2 afterViewChecked',
+      'projected1 afterViewInit',
+      'projected1 afterViewChecked',
+      'parent1 afterViewInit',
+      'parent1 afterViewChecked',
+      'projected2 afterViewInit',
+      'projected2 afterViewChecked',
+      'parent2 afterViewInit',
+      'parent2 afterViewChecked',
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.value = 'b';
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'parent1 onChanges',
+      'parent1 doCheck',
+      'projected1 onChanges',
+      'projected1 doCheck',
+      'parent2 onChanges',
+      'parent2 doCheck',
+      'projected2 onChanges',
+      'projected2 doCheck',
+      'projected1 afterContentChecked',
+      'parent1 afterContentChecked',
+      'projected2 afterContentChecked',
+      'parent2 afterContentChecked',
+      'child of parent1 onChanges',
+      'child of parent1 doCheck',
+      'child of parent1 afterContentChecked',
+      'child of parent1 afterViewChecked',
+      'child of parent2 onChanges',
+      'child of parent2 doCheck',
+      'child of parent2 afterContentChecked',
+      'child of parent2 afterViewChecked',
+      'projected1 afterViewChecked',
+      'parent1 afterViewChecked',
+      'projected2 afterViewChecked',
+      'parent2 afterViewChecked',
+    ]);
+
+    events.length = 0;
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(events).toEqual([
+      'child of parent1 onDestroy',
+      'child of parent2 onDestroy',
+      'projected1 onDestroy',
+      'parent1 onDestroy',
+      'projected2 onDestroy',
+      'parent2 onDestroy',
+    ]);
+  });
+});
+
+describe('non-regression', () => {
+  it('should call lifecycle hooks for directives active on <ng-template>', () => {
+    let destroyed = false;
+
+    @Directive({
+      selector: '[onDestroyDir]',
+    })
+    class OnDestroyDir {
+      ngOnDestroy() { destroyed = true; }
+    }
+
+    @Component({
+      template: `<ng-template [ngIf]="show">
+        <ng-template onDestroyDir>content</ng-template>
+      </ng-template>`
+    })
+    class App {
+      show = true;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App, OnDestroyDir],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    expect(destroyed).toBeFalsy();
+
+    fixture.componentInstance.show = false;
+    fixture.detectChanges();
+
+    expect(destroyed).toBeTruthy();
+  });
+});
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 0c3c35edca..b0883302c2 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentFactoryResolver, OnDestroy, SimpleChange, SimpleChanges, ViewContainerRef} from '../../src/core';
-import {AttributeMarker, ComponentTemplate, LifecycleHooksFeature, injectComponentFactoryResolver, ΔNgOnChangesFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
-import {markDirty, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δlistener, Δprojection, ΔprojectionDef, Δselect, Δtemplate, Δtext} from '../../src/render3/instructions/all';
+import {OnDestroy} from '../../src/core';
+import {AttributeMarker, ComponentTemplate, ΔNgOnChangesFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
+import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δprojection, ΔprojectionDef, Δselect, Δtemplate, Δtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {NgIf} from './common_with_def';
-import {ComponentFixture, containerEl, createComponent, renderComponent, renderToHtml, requestAnimationFrame} from './render_util';
+import {ComponentFixture, createComponent} from './render_util';
 
 describe('lifecycles', () => {
 
@@ -32,7 +32,7 @@ describe('lifecycles', () => {
 
     beforeEach(() => { events = []; });
 
-    let Comp = createOnInitComponent('comp', (rf: RenderFlags, ctx: any) => {
+    let Comp = createOnInitComponent('comp', (rf: RenderFlags) => {
       if (rf & RenderFlags.Create) {
         ΔprojectionDef();
         ΔelementStart(0, 'div');
@@ -41,7 +41,7 @@ describe('lifecycles', () => {
       }
     }, 2);
     let Parent = createOnInitComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
-    let ProjectedComp = createOnInitComponent('projected', (rf: RenderFlags, ctx: any) => {
+    let ProjectedComp = createOnInitComponent('projected', (rf: RenderFlags) => {
       if (rf & RenderFlags.Create) {
         Δtext(0, 'content');
       }
@@ -115,277 +115,4 @@ describe('lifecycles', () => {
       expect(events).toEqual(['comp', 'comp']);
     });
   });
-
-  describe('hook order', () => {
-    let events: string[];
-
-    beforeEach(() => { events = []; });
-
-    function createAllHooksComponent(
-        name: string, template: ComponentTemplate<any>, consts: number = 0, vars: number = 0,
-        directives: any[] = []) {
-      return class Component {
-        val: string = '';
-
-        ngOnChanges() { events.push(`changes ${name}${this.val}`); }
-
-        ngOnInit() { events.push(`init ${name}${this.val}`); }
-        ngDoCheck() { events.push(`check ${name}${this.val}`); }
-
-        ngAfterContentInit() { events.push(`contentInit ${name}${this.val}`); }
-        ngAfterContentChecked() { events.push(`contentCheck ${name}${this.val}`); }
-
-        ngAfterViewInit() { events.push(`viewInit ${name}${this.val}`); }
-        ngAfterViewChecked() { events.push(`viewCheck ${name}${this.val}`); }
-
-        static ngComponentDef = ΔdefineComponent({
-          type: Component,
-          selectors: [[name]],
-          factory: () => new Component(),
-          consts: consts,
-          vars: vars,
-          inputs: {val: 'val'}, template,
-          directives: directives,
-          features: [ΔNgOnChangesFeature()],
-        });
-      };
-    }
-
-    it('should call all hooks in correct order', () => {
-      const Comp = createAllHooksComponent('comp', (rf: RenderFlags, ctx: any) => {});
-
-      /**
-       * <comp [val]="1"></comp>
-       * <comp [val]="2"></comp>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-          Δelement(1, 'comp');
-        }
-        // This template function is a little weird in that the `elementProperty` calls
-        // below are directly setting values `1` and `2`, where normally there would be
-        // a call to `bind()` that would do the work of seeing if something changed.
-        // This means when `fixture.update()` is called below, ngOnChanges should fire,
-        // even though the *value* itself never changed.
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 2);
-        }
-      }, 2, 0, [Comp]);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([
-        'changes comp1', 'init comp1', 'check comp1', 'changes comp2', 'init comp2', 'check comp2',
-        'contentInit comp1', 'contentCheck comp1', 'contentInit comp2', 'contentCheck comp2',
-        'viewInit comp1', 'viewCheck comp1', 'viewInit comp2', 'viewCheck comp2'
-      ]);
-
-      events = [];
-      fixture.update();  // Changes are made due to lack of `bind()` call in template fn.
-      expect(events).toEqual([
-        'changes comp1', 'check comp1', 'changes comp2', 'check comp2', 'contentCheck comp1',
-        'contentCheck comp2', 'viewCheck comp1', 'viewCheck comp2'
-      ]);
-    });
-
-    it('should call all hooks in correct order with children', () => {
-      const Comp = createAllHooksComponent('comp', (rf: RenderFlags, ctx: any) => {});
-
-      /** <comp [val]="val"></comp> */
-      const Parent = createAllHooksComponent('parent', (rf: RenderFlags, ctx: any) => {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', Δbind(ctx.val));
-        }
-      }, 1, 1, [Comp]);
-
-      /**
-       * <parent [val]="1"></parent>
-       * <parent [val]="2"></parent>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'parent');
-          Δelement(1, 'parent');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', 1);
-          Δselect(1);
-          ΔelementProperty(1, 'val', 2);
-        }
-      }, 2, 0, [Parent]);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([
-        'changes parent1',      'init parent1',         'check parent1',
-        'changes parent2',      'init parent2',         'check parent2',
-        'contentInit parent1',  'contentCheck parent1', 'contentInit parent2',
-        'contentCheck parent2', 'changes comp1',        'init comp1',
-        'check comp1',          'contentInit comp1',    'contentCheck comp1',
-        'viewInit comp1',       'viewCheck comp1',      'changes comp2',
-        'init comp2',           'check comp2',          'contentInit comp2',
-        'contentCheck comp2',   'viewInit comp2',       'viewCheck comp2',
-        'viewInit parent1',     'viewCheck parent1',    'viewInit parent2',
-        'viewCheck parent2'
-      ]);
-
-      events = [];
-      fixture.update();
-      expect(events).toEqual([
-        'changes parent1', 'check parent1', 'changes parent2', 'check parent2',
-        'contentCheck parent1', 'contentCheck parent2', 'check comp1', 'contentCheck comp1',
-        'viewCheck comp1', 'check comp2', 'contentCheck comp2', 'viewCheck comp2',
-        'viewCheck parent1', 'viewCheck parent2'
-      ]);
-
-    });
-
-    // Angular 5 reference: https://stackblitz.com/edit/lifecycle-hooks-ng
-    it('should call all hooks in correct order with view and content', () => {
-      const Content = createAllHooksComponent('content', (rf: RenderFlags, ctx: any) => {});
-
-      const View = createAllHooksComponent('view', (rf: RenderFlags, ctx: any) => {});
-
-      /** <ng-content></ng-content><view [val]="val"></view> */
-      const Parent = createAllHooksComponent('parent', (rf: RenderFlags, ctx: any) => {
-        if (rf & RenderFlags.Create) {
-          ΔprojectionDef();
-          Δprojection(0);
-          Δelement(1, 'view');
-        }
-        if (rf & RenderFlags.Update) {
-          Δselect(1);
-          ΔelementProperty(1, 'val', Δbind(ctx.val));
-        }
-      }, 2, 1, [View]);
-
-      /**
-       * <parent [val]="1">
-       *   <content [val]="1"></content>
-       * </parent>
-       * <parent [val]="2">
-       *   <content [val]="2"></content>
-       * </parent>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'parent');
-          { Δelement(1, 'content'); }
-          ΔelementEnd();
-          ΔelementStart(2, 'parent');
-          { Δelement(3, 'content'); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'val', Δbind(1));
-          Δselect(1);
-          ΔelementProperty(1, 'val', Δbind(1));
-          Δselect(2);
-          ΔelementProperty(2, 'val', Δbind(2));
-          Δselect(3);
-          ΔelementProperty(3, 'val', Δbind(2));
-        }
-      }, 4, 4, [Parent, Content]);
-
-      const fixture = new ComponentFixture(App);
-      expect(events).toEqual([
-        'changes parent1',      'init parent1',
-        'check parent1',        'changes content1',
-        'init content1',        'check content1',
-        'changes parent2',      'init parent2',
-        'check parent2',        'changes content2',
-        'init content2',        'check content2',
-        'contentInit content1', 'contentCheck content1',
-        'contentInit parent1',  'contentCheck parent1',
-        'contentInit content2', 'contentCheck content2',
-        'contentInit parent2',  'contentCheck parent2',
-        'changes view1',        'init view1',
-        'check view1',          'contentInit view1',
-        'contentCheck view1',   'viewInit view1',
-        'viewCheck view1',      'changes view2',
-        'init view2',           'check view2',
-        'contentInit view2',    'contentCheck view2',
-        'viewInit view2',       'viewCheck view2',
-        'viewInit content1',    'viewCheck content1',
-        'viewInit parent1',     'viewCheck parent1',
-        'viewInit content2',    'viewCheck content2',
-        'viewInit parent2',     'viewCheck parent2'
-      ]);
-
-      events = [];
-      fixture.update();
-      expect(events).toEqual([
-        'check parent1', 'check content1', 'check parent2', 'check content2',
-        'contentCheck content1', 'contentCheck parent1', 'contentCheck content2',
-        'contentCheck parent2', 'check view1', 'contentCheck view1', 'viewCheck view1',
-        'check view2', 'contentCheck view2', 'viewCheck view2', 'viewCheck content1',
-        'viewCheck parent1', 'viewCheck content2', 'viewCheck parent2'
-      ]);
-
-    });
-
-  });
-
-  describe('non-regression', () => {
-
-    it('should call lifecycle hooks for directives active on <ng-template>', () => {
-      let destroyed = false;
-
-      class OnDestroyDirective implements OnDestroy {
-        ngOnDestroy() { destroyed = true; }
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: OnDestroyDirective,
-          selectors: [['', 'onDestroyDirective', '']],
-          factory: () => new OnDestroyDirective()
-        });
-      }
-
-
-      function conditionTpl(rf: RenderFlags, ctx: Cmpt) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, null, 0, 1, 'ng-template', [AttributeMarker.Bindings, 'onDestroyDirective']);
-        }
-      }
-
-      /**
-       * <ng-template [ngIf]="condition">
-       *  <ng-template onDestroyDirective></ng-template>
-       * </ng-template>
-       */
-      function cmptTpl(rf: RenderFlags, cmpt: Cmpt) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(0, conditionTpl, 1, 1, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'ngIf', Δbind(cmpt.showing));
-        }
-      }
-
-      class Cmpt {
-        showing = true;
-        static ngComponentDef = ΔdefineComponent({
-          type: Cmpt,
-          factory: () => new Cmpt(),
-          selectors: [['cmpt']],
-          consts: 1,
-          vars: 1,
-          template: cmptTpl,
-          directives: [NgIf, OnDestroyDirective]
-        });
-      }
-
-      const fixture = new ComponentFixture(Cmpt);
-      expect(destroyed).toBeFalsy();
-
-      fixture.component.showing = false;
-      fixture.update();
-      expect(destroyed).toBeTruthy();
-    });
-  });
-
 });

From 1f6fcb6cd316dc2820f91993dfaa3076f35071dd Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Wed, 15 May 2019 20:24:55 +0200
Subject: [PATCH 085/275] fix(ivy): unable to bind SafeValue to clip-path
 (#30491)

Fixes not being able to pass in a `SafeValue` to a `clip-path` binding, because `clip-path` wasn't in the list of exceptions.

PR Close #30491
---
 .../src/render3/view/styling_builder.ts       |  2 +-
 .../core/src/sanitization/sanitization.ts     |  3 ++-
 packages/core/test/acceptance/styling_spec.ts | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/compiler/src/render3/view/styling_builder.ts b/packages/compiler/src/render3/view/styling_builder.ts
index 3bbaf8640e..0260b29f1f 100644
--- a/packages/compiler/src/render3/view/styling_builder.ts
+++ b/packages/compiler/src/render3/view/styling_builder.ts
@@ -477,7 +477,7 @@ function isStyleSanitizable(prop: string): boolean {
   return prop === 'background-image' || prop === 'backgroundImage' || prop === 'background' ||
       prop === 'border-image' || prop === 'borderImage' || prop === 'filter' ||
       prop === 'list-style' || prop === 'listStyle' || prop === 'list-style-image' ||
-      prop === 'listStyleImage';
+      prop === 'listStyleImage' || prop === 'clip-path' || prop === 'clipPath';
 }
 
 /**
diff --git a/packages/core/src/sanitization/sanitization.ts b/packages/core/src/sanitization/sanitization.ts
index 5d5b4a3a5c..85150b3af1 100644
--- a/packages/core/src/sanitization/sanitization.ts
+++ b/packages/core/src/sanitization/sanitization.ts
@@ -186,7 +186,8 @@ export function ΔsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: st
 export const ΔdefaultStyleSanitizer = (function(prop: string, value?: string): string | boolean {
   if (value === undefined) {
     return prop === 'background-image' || prop === 'background' || prop === 'border-image' ||
-        prop === 'filter' || prop === 'list-style' || prop === 'list-style-image';
+        prop === 'filter' || prop === 'list-style' || prop === 'list-style-image' ||
+        prop === 'clip-path';
   }
 
   return ΔsanitizeStyle(value);
diff --git a/packages/core/test/acceptance/styling_spec.ts b/packages/core/test/acceptance/styling_spec.ts
index 66a53b619d..4b66286004 100644
--- a/packages/core/test/acceptance/styling_spec.ts
+++ b/packages/core/test/acceptance/styling_spec.ts
@@ -180,4 +180,24 @@ describe('styling', () => {
       fixture.detectChanges();
     }).not.toThrow();
   });
+
+  it('should be able to bind a SafeValue to clip-path', () => {
+    @Component({template: '<div [style.clip-path]="path"></div>'})
+    class Cmp {
+      path !: SafeStyle;
+    }
+
+    TestBed.configureTestingModule({declarations: [Cmp]});
+    const fixture = TestBed.createComponent(Cmp);
+    const sanitizer: DomSanitizer = TestBed.get(DomSanitizer);
+
+    fixture.componentInstance.path = sanitizer.bypassSecurityTrustStyle('url("#test")');
+    fixture.detectChanges();
+
+    const html = fixture.nativeElement.innerHTML;
+
+    // Note that check the raw HTML, because (at the time of writing) the Node-based renderer
+    // that we use to run tests doesn't support `clip-path` in `CSSStyleDeclaration`.
+    expect(html).toMatch(/style=["|']clip-path:\s*url\(.*#test.*\)/);
+  });
 });

From 1714451a6dff853460e6925730619fc140598a11 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@abv.bg>
Date: Wed, 15 May 2019 20:55:33 +0200
Subject: [PATCH 086/275] test(ivy): move integration tests into acceptance
 (#30461)

Moves most of the tests from `render3/integration_spec` into `acceptance`. Note that there are still a handful of tests left in render3, because we don't have a way of moving all of them to go through `TestBed` since they either have r3-specific assertions or we don't have access to the same APIs as the raw instructions.

PR Close #30461
---
 .../core/test/acceptance/integration_spec.ts  | 1370 +++++++++++-
 .../core/test/render3/integration_spec.ts     | 1986 +----------------
 2 files changed, 1386 insertions(+), 1970 deletions(-)

diff --git a/packages/core/test/acceptance/integration_spec.ts b/packages/core/test/acceptance/integration_spec.ts
index 900a5a2bb2..f211d2ce18 100644
--- a/packages/core/test/acceptance/integration_spec.ts
+++ b/packages/core/test/acceptance/integration_spec.ts
@@ -5,12 +5,1380 @@
  * 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 {Component, ContentChild, Directive, EventEmitter, HostBinding, HostListener, Input, Output, QueryList, TemplateRef, ViewChildren} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {Component, ContentChild, Directive, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnInit, Output, QueryList, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
+import {onlyInIvy} from '@angular/private/testing';
 
 describe('acceptance integration tests', () => {
+  function stripHtmlComments(str: string) { return str.replace(/<!--[\s\S]*?-->/g, ''); }
+
+  describe('render', () => {
+
+    it('should render basic template', () => {
+      @Component({template: '<span title="Hello">Greetings</span>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<span title="Hello">Greetings</span>');
+    });
+
+    it('should render and update basic "Hello, World" template', () => {
+      @Component({template: '<h1>Hello, {{name}}!</h1>'})
+      class App {
+        name = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      fixture.componentInstance.name = 'World';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<h1>Hello, World!</h1>');
+
+      fixture.componentInstance.name = 'New World';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<h1>Hello, New World!</h1>');
+    });
+  });
+
+  describe('ng-container', () => {
+
+    it('should insert as a child of a regular element', () => {
+      @Component(
+          {template: '<div>before|<ng-container>Greetings<span></span></ng-container>|after</div>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      // Strip comments since VE and Ivy put them in different places.
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML))
+          .toBe('<div>before|Greetings<span></span>|after</div>');
+    });
+
+    it('should add and remove DOM nodes when ng-container is a child of a regular element', () => {
+      @Component({
+        template:
+            '<ng-template [ngIf]="render"><div><ng-container>content</ng-container></div></ng-template>'
+      })
+      class App {
+        render = false;
+      }
+
+      TestBed.configureTestingModule({declarations: [App], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(App);
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+
+      fixture.componentInstance.render = true;
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('<div>content</div>');
+
+      fixture.componentInstance.render = false;
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+    });
+
+    it('should add and remove DOM nodes when ng-container is a child of an embedded view', () => {
+
+      @Component({template: '<ng-container *ngIf="render">content</ng-container>'})
+      class App {
+        render = false;
+      }
+
+      TestBed.configureTestingModule({declarations: [App], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(App);
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+
+      fixture.componentInstance.render = true;
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('content');
+
+      fixture.componentInstance.render = false;
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+    });
+
+    // https://stackblitz.com/edit/angular-tfhcz1?file=src%2Fapp%2Fapp.component.ts
+    it('should add and remove DOM nodes when ng-container is a child of a delayed embedded view',
+       () => {
+
+         @Directive({selector: '[testDirective]'})
+         class TestDirective {
+           constructor(private _tplRef: TemplateRef<any>, private _vcRef: ViewContainerRef) {}
+
+           createAndInsert() { this._vcRef.insert(this._tplRef.createEmbeddedView({})); }
+
+           clear() { this._vcRef.clear(); }
+         }
+
+         @Component({
+           template: '<ng-template testDirective><ng-container>content</ng-container></ng-template>'
+         })
+         class App {
+           @ViewChild(TestDirective) testDirective !: TestDirective;
+         }
+
+         TestBed.configureTestingModule({declarations: [App, TestDirective]});
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toBe('');
+
+         fixture.componentInstance.testDirective.createAndInsert();
+         fixture.detectChanges();
+         expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toBe('content');
+
+         fixture.componentInstance.testDirective.clear();
+         fixture.detectChanges();
+         expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toBe('');
+       });
+
+    it('should render at the component view root', () => {
+      @Component(
+          {selector: 'test-cmpt', template: '<ng-container>component template</ng-container>'})
+      class TestCmpt {
+      }
+
+      @Component({template: '<test-cmpt></test-cmpt>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestCmpt]});
+      const fixture = TestBed.createComponent(App);
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML))
+          .toBe('<test-cmpt>component template</test-cmpt>');
+    });
+
+    it('should render inside another ng-container', () => {
+      @Component({
+        selector: 'test-cmpt',
+        template:
+            '<ng-container><ng-container><ng-container>content</ng-container></ng-container></ng-container>'
+      })
+      class TestCmpt {
+      }
+
+      @Component({template: '<test-cmpt></test-cmpt>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestCmpt]});
+      const fixture = TestBed.createComponent(App);
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML))
+          .toBe('<test-cmpt>content</test-cmpt>');
+    });
+
+    it('should render inside another ng-container at the root of a delayed view', () => {
+      @Directive({selector: '[testDirective]'})
+      class TestDirective {
+        constructor(private _tplRef: TemplateRef<any>, private _vcRef: ViewContainerRef) {}
+
+        createAndInsert() { this._vcRef.insert(this._tplRef.createEmbeddedView({})); }
+
+        clear() { this._vcRef.clear(); }
+      }
+
+      @Component({
+        template:
+            '<ng-template testDirective><ng-container><ng-container><ng-container>content</ng-container></ng-container></ng-container></ng-template>'
+      })
+      class App {
+        @ViewChild(TestDirective) testDirective !: TestDirective;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toBe('');
+
+      fixture.componentInstance.testDirective.createAndInsert();
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toBe('content');
+
+      fixture.componentInstance.testDirective.createAndInsert();
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toBe('contentcontent');
+
+      fixture.componentInstance.testDirective.clear();
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toBe('');
+    });
+
+    it('should support directives and inject ElementRef', () => {
+      @Directive({selector: '[dir]'})
+      class TestDirective {
+        constructor(public elRef: ElementRef) {}
+      }
+
+      @Component({template: '<div><ng-container dir></ng-container></div>'})
+      class App {
+        @ViewChild(TestDirective) testDirective !: TestDirective;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('<div></div>');
+      expect(fixture.componentInstance.testDirective.elRef.nativeElement.nodeType)
+          .toBe(Node.COMMENT_NODE);
+    });
+
+    it('should support ViewContainerRef when ng-container is at the root of a view', () => {
+      @Directive({selector: '[dir]'})
+      class TestDirective {
+        @Input()
+        contentTpl: TemplateRef<{}>|null = null;
+
+        constructor(private _vcRef: ViewContainerRef) {}
+
+        insertView() { this._vcRef.createEmbeddedView(this.contentTpl as TemplateRef<{}>); }
+
+        clear() { this._vcRef.clear(); }
+      }
+
+      @Component({
+        template:
+            '<ng-container dir [contentTpl]="content"><ng-template #content>Content</ng-template></ng-container>'
+      })
+      class App {
+        @ViewChild(TestDirective) testDirective !: TestDirective;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+
+      fixture.componentInstance.testDirective.insertView();
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('Content');
+
+      fixture.componentInstance.testDirective.clear();
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+    });
+
+    it('should support ViewContainerRef on <ng-template> inside <ng-container>', () => {
+      @Directive({selector: '[dir]'})
+      class TestDirective {
+        constructor(private _tplRef: TemplateRef<{}>, private _vcRef: ViewContainerRef) {}
+
+        insertView() { this._vcRef.createEmbeddedView(this._tplRef); }
+
+        clear() { this._vcRef.clear(); }
+      }
+
+      @Component({template: '<ng-container><ng-template dir>Content</ng-template></ng-container>'})
+      class App {
+        @ViewChild(TestDirective) testDirective !: TestDirective;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+
+      fixture.componentInstance.testDirective.insertView();
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('Content');
+
+      fixture.componentInstance.testDirective.clear();
+      fixture.detectChanges();
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('');
+    });
+
+    it('should not set any attributes', () => {
+      @Component({template: '<div><ng-container id="foo"></ng-container></div>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripHtmlComments(fixture.nativeElement.innerHTML)).toEqual('<div></div>');
+    });
+
+  });
+
+  describe('text bindings', () => {
+    it('should render "undefined" as ""', () => {
+      @Component({template: '{{name}}'})
+      class App {
+        name: string|undefined = 'benoit';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('benoit');
+
+      fixture.componentInstance.name = undefined;
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('');
+    });
+
+    it('should render "null" as ""', () => {
+      @Component({template: '{{name}}'})
+      class App {
+        name: string|null = 'benoit';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('benoit');
+
+      fixture.componentInstance.name = null;
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('');
+    });
+
+  });
+
+  describe('ngNonBindable handling', () => {
+    function stripNgNonBindable(str: string) { return str.replace(/ ngnonbindable=""/i, ''); }
+
+    it('should keep local ref for host element', () => {
+      @Component({
+        template: `
+          <b ngNonBindable #myRef id="my-id">
+            <i>Hello {{ name }}!</i>
+          </b>
+          {{ myRef.id }}
+        `
+      })
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripNgNonBindable(fixture.nativeElement.innerHTML))
+          .toEqual('<b id="my-id"><i>Hello {{ name }}!</i></b> my-id ');
+    });
+
+    it('should invoke directives for host element', () => {
+      let directiveInvoked: boolean = false;
+
+      @Directive({selector: '[directive]'})
+      class TestDirective implements OnInit {
+        ngOnInit() { directiveInvoked = true; }
+      }
+
+      @Component({
+        template: `
+          <b ngNonBindable directive>
+            <i>Hello {{ name }}!</i>
+          </b>
+        `
+      })
+      class App {
+        name = 'World';
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripNgNonBindable(fixture.nativeElement.innerHTML))
+          .toEqual('<b directive=""><i>Hello {{ name }}!</i></b>');
+      expect(directiveInvoked).toEqual(true);
+    });
+
+    it('should not invoke directives for nested elements', () => {
+      let directiveInvoked: boolean = false;
+
+      @Directive({selector: '[directive]'})
+      class TestDirective implements OnInit {
+        ngOnInit() { directiveInvoked = true; }
+      }
+
+      @Component({
+        template: `
+          <b ngNonBindable>
+            <i directive>Hello {{ name }}!</i>
+          </b>
+        `
+      })
+      class App {
+        name = 'World';
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TestDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(stripNgNonBindable(fixture.nativeElement.innerHTML))
+          .toEqual('<b><i directive="">Hello {{ name }}!</i></b>');
+      expect(directiveInvoked).toEqual(false);
+    });
+  });
+
+  describe('Siblings update', () => {
+    it('should handle a flat list of static/bound text nodes', () => {
+      @Component({template: 'Hello {{name}}!'})
+      class App {
+        name = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      fixture.componentInstance.name = 'world';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('Hello world!');
+
+      fixture.componentInstance.name = 'monde';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('Hello monde!');
+    });
+
+    it('should handle a list of static/bound text nodes as element children', () => {
+      @Component({template: '<b>Hello {{name}}!</b>'})
+      class App {
+        name = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      fixture.componentInstance.name = 'world';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<b>Hello world!</b>');
+
+      fixture.componentInstance.name = 'mundo';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<b>Hello mundo!</b>');
+    });
+
+    it('should render/update text node as a child of a deep list of elements', () => {
+      @Component({template: '<b><b><b><b>Hello {{name}}!</b></b></b></b>'})
+      class App {
+        name = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      fixture.componentInstance.name = 'world';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<b><b><b><b>Hello world!</b></b></b></b>');
+
+      fixture.componentInstance.name = 'mundo';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<b><b><b><b>Hello mundo!</b></b></b></b>');
+    });
+
+    it('should update 2 sibling elements', () => {
+      @Component({template: '<b><span></span><span class="foo" [id]="id"></span></b>'})
+      class App {
+        id = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      fixture.componentInstance.id = 'foo';
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual('<b><span></span><span class="foo" id="foo"></span></b>');
+
+      fixture.componentInstance.id = 'bar';
+      fixture.detectChanges();
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual('<b><span></span><span class="foo" id="bar"></span></b>');
+    });
+
+    it('should handle sibling text node after element with child text node', () => {
+      @Component({template: '<p>hello</p>{{name}}'})
+      class App {
+        name = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+
+      fixture.componentInstance.name = 'world';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<p>hello</p>world');
+
+      fixture.componentInstance.name = 'mundo';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<p>hello</p>mundo');
+    });
+  });
+
+  describe('basic components', () => {
+    @Component({selector: 'todo', template: '<p>Todo{{value}}</p>'})
+    class TodoComponent {
+      value = ' one';
+    }
+
+    it('should support a basic component template', () => {
+      @Component({template: '<todo></todo>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TodoComponent]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<todo><p>Todo one</p></todo>');
+    });
+
+    it('should support a component template with sibling', () => {
+      @Component({template: '<todo></todo>two'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TodoComponent]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<todo><p>Todo one</p></todo>two');
+    });
+
+    it('should support a component template with component sibling', () => {
+      @Component({template: '<todo></todo><todo></todo>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TodoComponent]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual('<todo><p>Todo one</p></todo><todo><p>Todo one</p></todo>');
+    });
+
+    it('should support a component with binding on host element', () => {
+      @Component({selector: 'todo', template: '{{title}}'})
+      class TodoComponentHostBinding {
+        @HostBinding()
+        title = 'one';
+      }
+
+      @Component({template: '<todo></todo>'})
+      class App {
+        @ViewChild(TodoComponentHostBinding) todoComponentHostBinding !: TodoComponentHostBinding;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TodoComponentHostBinding]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<todo title="one">one</todo>');
+
+      fixture.componentInstance.todoComponentHostBinding.title = 'two';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<todo title="two">two</todo>');
+    });
+
+    it('should support root component with host attribute', () => {
+      @Component({selector: 'host-attr-comp', template: '', host: {'role': 'button'}})
+      class HostAttributeComp {
+      }
+
+      TestBed.configureTestingModule({declarations: [HostAttributeComp]});
+      const fixture = TestBed.createComponent(HostAttributeComp);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.getAttribute('role')).toEqual('button');
+    });
+
+    it('should support component with bindings in template', () => {
+      @Component({selector: 'comp', template: '<p>{{ name }}</p>'})
+      class MyComp {
+        name = 'Bess';
+      }
+
+      @Component({template: '<comp></comp>'})
+      class App {
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyComp]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toEqual('<comp><p>Bess</p></comp>');
+    });
+
+    it('should support a component with sub-views', () => {
+      @Component({selector: 'comp', template: '<div *ngIf="condition">text</div>'})
+      class MyComp {
+        @Input()
+        condition !: boolean;
+      }
+
+      @Component({template: '<comp [condition]="condition"></comp>'})
+      class App {
+        condition = false;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyComp], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      const compElement = fixture.nativeElement.querySelector('comp');
+
+      fixture.componentInstance.condition = true;
+      fixture.detectChanges();
+      expect(stripHtmlComments(compElement.innerHTML)).toEqual('<div>text</div>');
+
+      fixture.componentInstance.condition = false;
+      fixture.detectChanges();
+      expect(stripHtmlComments(compElement.innerHTML)).toEqual('');
+    });
+
+  });
+
+  describe('element bindings', () => {
+    describe('elementAttribute', () => {
+      it('should support attribute bindings', () => {
+        @Component({template: '<button [attr.title]="title"></button>'})
+        class App {
+          title: string|null = '';
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.title = 'Hello';
+        fixture.detectChanges();
+        // initial binding
+        expect(fixture.nativeElement.innerHTML).toEqual('<button title="Hello"></button>');
+
+        // update binding
+        fixture.componentInstance.title = 'Hi!';
+        fixture.detectChanges();
+        expect(fixture.nativeElement.innerHTML).toEqual('<button title="Hi!"></button>');
+
+        // remove attribute
+        fixture.componentInstance.title = null;
+        fixture.detectChanges();
+        expect(fixture.nativeElement.innerHTML).toEqual('<button></button>');
+      });
+
+      it('should stringify values used attribute bindings', () => {
+        @Component({template: '<button [attr.title]="title"></button>'})
+        class App {
+          title: any;
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.title = NaN;
+        fixture.detectChanges();
+        expect(fixture.nativeElement.innerHTML).toEqual('<button title="NaN"></button>');
+
+        fixture.componentInstance.title = {toString: () => 'Custom toString'};
+        fixture.detectChanges();
+        expect(fixture.nativeElement.innerHTML)
+            .toEqual('<button title="Custom toString"></button>');
+      });
+
+      it('should update bindings', () => {
+        @Component({
+          template: [
+            'a:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[4]}}{{c[5]}}{{c[6]}}{{c[7]}}{{c[8]}}{{c[9]}}{{c[10]}}{{c[11]}}{{c[12]}}{{c[13]}}{{c[14]}}{{c[15]}}{{c[16]}}',
+            'a0:{{c[1]}}',
+            'a1:{{c[0]}}{{c[1]}}{{c[16]}}',
+            'a2:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[16]}}',
+            'a3:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[4]}}{{c[5]}}{{c[16]}}',
+            'a4:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[4]}}{{c[5]}}{{c[6]}}{{c[7]}}{{c[16]}}',
+            'a5:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[4]}}{{c[5]}}{{c[6]}}{{c[7]}}{{c[8]}}{{c[9]}}{{c[16]}}',
+            'a6:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[4]}}{{c[5]}}{{c[6]}}{{c[7]}}{{c[8]}}{{c[9]}}{{c[10]}}{{c[11]}}{{c[16]}}',
+            'a7:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[4]}}{{c[5]}}{{c[6]}}{{c[7]}}{{c[8]}}{{c[9]}}{{c[10]}}{{c[11]}}{{c[12]}}{{c[13]}}{{c[16]}}',
+            'a8:{{c[0]}}{{c[1]}}{{c[2]}}{{c[3]}}{{c[4]}}{{c[5]}}{{c[6]}}{{c[7]}}{{c[8]}}{{c[9]}}{{c[10]}}{{c[11]}}{{c[12]}}{{c[13]}}{{c[14]}}{{c[15]}}{{c[16]}}',
+          ].join('\n')
+        })
+        class App {
+          c = ['(', 0, 'a', 1, 'b', 2, 'c', 3, 'd', 4, 'e', 5, 'f', 6, 'g', 7, ')'];
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent.trim()).toEqual([
+          'a:(0a1b2c3d4e5f6g7)',
+          'a0:0',
+          'a1:(0)',
+          'a2:(0a1)',
+          'a3:(0a1b2)',
+          'a4:(0a1b2c3)',
+          'a5:(0a1b2c3d4)',
+          'a6:(0a1b2c3d4e5)',
+          'a7:(0a1b2c3d4e5f6)',
+          'a8:(0a1b2c3d4e5f6g7)',
+        ].join('\n'));
+
+        fixture.componentInstance.c.reverse();
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent.trim()).toEqual([
+          'a:)7g6f5e4d3c2b1a0(',
+          'a0:7',
+          'a1:)7(',
+          'a2:)7g6(',
+          'a3:)7g6f5(',
+          'a4:)7g6f5e4(',
+          'a5:)7g6f5e4d3(',
+          'a6:)7g6f5e4d3c2(',
+          'a7:)7g6f5e4d3c2b1(',
+          'a8:)7g6f5e4d3c2b1a0(',
+        ].join('\n'));
+
+        fixture.componentInstance.c.reverse();
+        fixture.detectChanges();
+
+        expect(fixture.nativeElement.textContent.trim()).toEqual([
+          'a:(0a1b2c3d4e5f6g7)',
+          'a0:0',
+          'a1:(0)',
+          'a2:(0a1)',
+          'a3:(0a1b2)',
+          'a4:(0a1b2c3)',
+          'a5:(0a1b2c3d4)',
+          'a6:(0a1b2c3d4e5)',
+          'a7:(0a1b2c3d4e5f6)',
+          'a8:(0a1b2c3d4e5f6g7)',
+        ].join('\n'));
+      });
+
+      it('should not update DOM if context has not changed', () => {
+        @Component({
+          template: `
+            <span [attr.title]="title">
+              <b [attr.title]="title" *ngIf="shouldRender"></b>
+            </span>
+          `
+        })
+        class App {
+          title: string|null = '';
+          shouldRender = true;
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const span: HTMLSpanElement = fixture.nativeElement.querySelector('span');
+        const bold: HTMLElement = span.querySelector('b') !;
+
+        fixture.componentInstance.title = 'Hello';
+        fixture.detectChanges();
+
+        // initial binding
+        expect(span.getAttribute('title')).toBe('Hello');
+        expect(bold.getAttribute('title')).toBe('Hello');
+
+        // update DOM manually
+        bold.setAttribute('title', 'Goodbye');
+
+        // refresh with same binding
+        fixture.detectChanges();
+        expect(span.getAttribute('title')).toBe('Hello');
+        expect(bold.getAttribute('title')).toBe('Goodbye');
+
+        // refresh again with same binding
+        fixture.detectChanges();
+        expect(span.getAttribute('title')).toBe('Hello');
+        expect(bold.getAttribute('title')).toBe('Goodbye');
+      });
+
+      it('should support host attribute bindings', () => {
+        @Directive({selector: '[hostBindingDir]'})
+        class HostBindingDir {
+          @HostBinding('attr.aria-label')
+          label = 'some label';
+        }
+
+        @Component({template: '<div hostBindingDir></div>'})
+        class App {
+          @ViewChild(HostBindingDir) hostBindingDir !: HostBindingDir;
+        }
+
+        TestBed.configureTestingModule({declarations: [App, HostBindingDir]});
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const hostBindingEl = fixture.nativeElement.querySelector('div');
+
+        // Needs `toLowerCase`, because different browsers produce
+        // attributes either in camel case or lower case.
+        expect(hostBindingEl.getAttribute('aria-label')).toBe('some label');
+
+        fixture.componentInstance.hostBindingDir.label = 'other label';
+        fixture.detectChanges();
+
+        expect(hostBindingEl.getAttribute('aria-label')).toBe('other label');
+      });
+    });
+
+    describe('elementStyle', () => {
+      it('should support binding to styles', () => {
+        @Component({template: '<span [style.font-size]="size"></span>'})
+        class App {
+          size: string|null = '';
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.size = '10px';
+        fixture.detectChanges();
+        const span: HTMLElement = fixture.nativeElement.querySelector('span');
+
+        expect(span.style.fontSize).toBe('10px');
+
+        fixture.componentInstance.size = '16px';
+        fixture.detectChanges();
+        expect(span.style.fontSize).toBe('16px');
+
+        fixture.componentInstance.size = null;
+        fixture.detectChanges();
+        expect(span.style.fontSize).toBeFalsy();
+      });
+
+      it('should support binding to styles with suffix', () => {
+        @Component({template: '<span [style.font-size.px]="size"></span>'})
+        class App {
+          size: string|number|null = '';
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.size = '100';
+        fixture.detectChanges();
+        const span: HTMLElement = fixture.nativeElement.querySelector('span');
+
+        expect(span.style.fontSize).toEqual('100px');
+
+        fixture.componentInstance.size = 200;
+        fixture.detectChanges();
+        expect(span.style.fontSize).toEqual('200px');
+
+        fixture.componentInstance.size = 0;
+        fixture.detectChanges();
+        expect(span.style.fontSize).toEqual('0px');
+
+        fixture.componentInstance.size = null;
+        fixture.detectChanges();
+        expect(span.style.fontSize).toBeFalsy();
+      });
+    });
+
+    describe('class-based styling', () => {
+      it('should support CSS class toggle', () => {
+        @Component({template: '<span [class.active]="value"></span>'})
+        class App {
+          value: any;
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.value = true;
+        fixture.detectChanges();
+        const span = fixture.nativeElement.querySelector('span');
+
+        expect(span.getAttribute('class')).toEqual('active');
+
+        fixture.componentInstance.value = false;
+        fixture.detectChanges();
+        expect(span.getAttribute('class')).toBeFalsy();
+
+        // truthy values
+        fixture.componentInstance.value = 'a_string';
+        fixture.detectChanges();
+        expect(span.getAttribute('class')).toEqual('active');
+
+        fixture.componentInstance.value = 10;
+        fixture.detectChanges();
+        expect(span.getAttribute('class')).toEqual('active');
+
+        // falsy values
+        fixture.componentInstance.value = '';
+        fixture.detectChanges();
+        expect(span.getAttribute('class')).toBeFalsy();
+
+        fixture.componentInstance.value = 0;
+        fixture.detectChanges();
+        expect(span.getAttribute('class')).toBeFalsy();
+      });
+
+      it('should work correctly with existing static classes', () => {
+        @Component({template: '<span class="existing" [class.active]="value"></span>'})
+        class App {
+          value: any;
+        }
+
+        TestBed.configureTestingModule({declarations: [App]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.value = true;
+        fixture.detectChanges();
+        expect(fixture.nativeElement.innerHTML).toEqual('<span class="existing active"></span>');
+
+        fixture.componentInstance.value = false;
+        fixture.detectChanges();
+        expect(fixture.nativeElement.innerHTML).toEqual('<span class="existing"></span>');
+      });
+
+      it('should apply classes properly when nodes are components', () => {
+        @Component({selector: 'my-comp', template: 'Comp Content'})
+        class MyComp {
+        }
+
+        @Component({template: '<my-comp [class.active]="value"></my-comp>'})
+        class App {
+          value: any;
+        }
+
+        TestBed.configureTestingModule({declarations: [App, MyComp]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.value = true;
+        fixture.detectChanges();
+        const compElement = fixture.nativeElement.querySelector('my-comp');
+
+        expect(fixture.nativeElement.textContent).toContain('Comp Content');
+        expect(compElement.getAttribute('class')).toBe('active');
+
+        fixture.componentInstance.value = false;
+        fixture.detectChanges();
+        expect(compElement.getAttribute('class')).toBeFalsy();
+      });
+
+      it('should apply classes properly when nodes have containers', () => {
+        @Component({selector: 'structural-comp', template: 'Comp Content'})
+        class StructuralComp {
+          @Input()
+          tmp !: TemplateRef<any>;
+
+          constructor(public vcr: ViewContainerRef) {}
+
+          create() { this.vcr.createEmbeddedView(this.tmp); }
+        }
+
+        @Component({
+          template: `
+            <ng-template #foo>Temp Content</ng-template>
+            <structural-comp [class.active]="value" [tmp]="foo"></structural-comp>
+          `
+        })
+        class App {
+          @ViewChild(StructuralComp) structuralComp !: StructuralComp;
+          value: any;
+        }
+
+        TestBed.configureTestingModule({declarations: [App, StructuralComp]});
+        const fixture = TestBed.createComponent(App);
+        fixture.componentInstance.value = true;
+        fixture.detectChanges();
+        const structuralCompEl = fixture.nativeElement.querySelector('structural-comp');
+
+        expect(structuralCompEl.getAttribute('class')).toEqual('active');
+
+        fixture.componentInstance.structuralComp.create();
+        fixture.detectChanges();
+        expect(structuralCompEl.getAttribute('class')).toEqual('active');
+
+        fixture.componentInstance.value = false;
+        fixture.detectChanges();
+        expect(structuralCompEl.getAttribute('class')).toEqual('');
+      });
+
+      @Directive({selector: '[DirWithClass]'})
+      class DirWithClassDirective {
+        public classesVal: string = '';
+
+        @Input('class')
+        set klass(value: string) { this.classesVal = value; }
+      }
+
+      @Directive({selector: '[DirWithStyle]'})
+      class DirWithStyleDirective {
+        public stylesVal: string = '';
+
+        @Input()
+        set style(value: string) { this.stylesVal = value; }
+      }
+
+      it('should delegate initial classes to a [class] input binding if present on a directive on the same element',
+         () => {
+           @Component({template: '<div class="apple orange banana" DirWithClass></div>'})
+           class App {
+             @ViewChild(DirWithClassDirective) mockClassDirective !: DirWithClassDirective;
+           }
+
+           TestBed.configureTestingModule({declarations: [App, DirWithClassDirective]});
+           const fixture = TestBed.createComponent(App);
+           fixture.detectChanges();
+
+           expect(fixture.componentInstance.mockClassDirective.classesVal)
+               .toEqual('apple orange banana');
+         });
+
+      it('should delegate initial styles to a [style] input binding if present on a directive on the same element',
+         () => {
+           @Component({template: '<div style="width:100px;height:200px" DirWithStyle></div>'})
+           class App {
+             @ViewChild(DirWithStyleDirective) mockStyleDirective !: DirWithStyleDirective;
+           }
+
+           TestBed.configureTestingModule({declarations: [App, DirWithStyleDirective]});
+           const fixture = TestBed.createComponent(App);
+           fixture.detectChanges();
+
+           const styles = fixture.componentInstance.mockStyleDirective.stylesVal;
+
+           // Use `toContain` since Ivy and ViewEngine have some slight differences in formatting.
+           expect(styles).toContain('width:100px');
+           expect(styles).toContain('height:200px');
+         });
+
+      it('should update `[class]` and bindings in the provided directive if the input is matched',
+         () => {
+           @Component({template: '<div DirWithClass [class]="value"></div>'})
+           class App {
+             @ViewChild(DirWithClassDirective) mockClassDirective !: DirWithClassDirective;
+             value = '';
+           }
+
+           TestBed.configureTestingModule({declarations: [App, DirWithClassDirective]});
+           const fixture = TestBed.createComponent(App);
+           fixture.componentInstance.value = 'cucumber grape';
+           fixture.detectChanges();
+
+           expect(fixture.componentInstance.mockClassDirective.classesVal)
+               .toEqual('cucumber grape');
+         });
+
+      onlyInIvy('Passing an object into [style] works differently')
+          .it('should update `[style]` and bindings in the provided directive if the input is matched',
+              () => {
+                @Component({template: '<div DirWithStyle [style]="value"></div>'})
+                class App {
+                  @ViewChild(DirWithStyleDirective) mockStyleDirective !: DirWithStyleDirective;
+                  value !: {[key: string]: string};
+                }
+
+                TestBed.configureTestingModule({declarations: [App, DirWithStyleDirective]});
+                const fixture = TestBed.createComponent(App);
+                fixture.componentInstance.value = {width: '200px', height: '500px'};
+                fixture.detectChanges();
+
+                expect(fixture.componentInstance.mockStyleDirective.stylesVal)
+                    .toEqual('width:200px;height:500px');
+              });
+
+      onlyInIvy('Style binding merging works differently in Ivy')
+          .it('should apply initial styling to the element that contains the directive with host styling',
+              () => {
+                @Directive({
+                  selector: '[DirWithInitialStyling]',
+                  host: {
+                    'title': 'foo',
+                    'class': 'heavy golden',
+                    'style': 'color: purple',
+                    '[style.font-weight]': '"bold"'
+                  }
+                })
+                class DirWithInitialStyling {
+                }
+
+                @Component({
+                  template: `
+                <div DirWithInitialStyling
+                  class="big"
+                  style="color:black; font-size:200px"></div>
+             `
+                })
+                class App {
+                }
+
+                TestBed.configureTestingModule({declarations: [App, DirWithInitialStyling]});
+                const fixture = TestBed.createComponent(App);
+                fixture.detectChanges();
+
+                const target: HTMLDivElement = fixture.nativeElement.querySelector('div');
+                const classes = target.getAttribute('class') !.split(/\s+/).sort();
+                expect(classes).toEqual(['big', 'golden', 'heavy']);
+
+                expect(target.getAttribute('title')).toEqual('foo');
+                expect(target.style.getPropertyValue('color')).toEqual('black');
+                expect(target.style.getPropertyValue('font-size')).toEqual('200px');
+                expect(target.style.getPropertyValue('font-weight')).toEqual('bold');
+              });
+
+      onlyInIvy('Style binding merging works differently in Ivy')
+          .it('should apply single styling bindings present within a directive onto the same element and defer the element\'s initial styling values when missing',
+              () => {
+                @Directive({
+                  selector: '[DirWithSingleStylingBindings]',
+                  host: {
+                    'class': 'def',
+                    '[class.xyz]': 'activateXYZClass',
+                    '[style.width]': 'width',
+                    '[style.height]': 'height'
+                  }
+                })
+                class DirWithSingleStylingBindings {
+                  width: null|string = null;
+                  height: null|string = null;
+                  activateXYZClass: boolean = false;
+                }
+
+                @Component({
+                  template: `
+              <div DirWithSingleStylingBindings class="abc" style="width:100px; height:200px"></div>
+            `
+                })
+                class App {
+                  @ViewChild(DirWithSingleStylingBindings)
+                  dirInstance !: DirWithSingleStylingBindings;
+                }
+
+                TestBed.configureTestingModule({declarations: [App, DirWithSingleStylingBindings]});
+                const fixture = TestBed.createComponent(App);
+                fixture.detectChanges();
+                const dirInstance = fixture.componentInstance.dirInstance;
+                const target: HTMLDivElement = fixture.nativeElement.querySelector('div');
+                expect(target.style.getPropertyValue('width')).toEqual('100px');
+                expect(target.style.getPropertyValue('height')).toEqual('200px');
+                expect(target.classList.contains('abc')).toBeTruthy();
+                expect(target.classList.contains('def')).toBeTruthy();
+                expect(target.classList.contains('xyz')).toBeFalsy();
+
+                dirInstance.width = '444px';
+                dirInstance.height = '999px';
+                dirInstance.activateXYZClass = true;
+                fixture.detectChanges();
+
+                expect(target.style.getPropertyValue('width')).toEqual('444px');
+                expect(target.style.getPropertyValue('height')).toEqual('999px');
+                expect(target.classList.contains('abc')).toBeTruthy();
+                expect(target.classList.contains('def')).toBeTruthy();
+                expect(target.classList.contains('xyz')).toBeTruthy();
+
+                dirInstance.width = null;
+                dirInstance.height = null;
+                fixture.detectChanges();
+
+                expect(target.style.getPropertyValue('width')).toEqual('100px');
+                expect(target.style.getPropertyValue('height')).toEqual('200px');
+                expect(target.classList.contains('abc')).toBeTruthy();
+                expect(target.classList.contains('def')).toBeTruthy();
+                expect(target.classList.contains('xyz')).toBeTruthy();
+              });
+
+      onlyInIvy('Style binding merging works differently in Ivy')
+          .it('should properly prioritize single style binding collisions when they exist on multiple directives',
+              () => {
+                @Directive({selector: '[Dir1WithStyle]', host: {'[style.width]': 'width'}})
+                class Dir1WithStyle {
+                  width: null|string = null;
+                }
+
+                @Directive({
+                  selector: '[Dir2WithStyle]',
+                  host: {'style': 'width: 111px', '[style.width]': 'width'}
+                })
+                class Dir2WithStyle {
+                  width: null|string = null;
+                }
+
+                @Component(
+                    {template: '<div Dir1WithStyle Dir2WithStyle [style.width]="width"></div>'})
+                class App {
+                  @ViewChild(Dir1WithStyle) dir1Instance !: Dir1WithStyle;
+                  @ViewChild(Dir2WithStyle) dir2Instance !: Dir2WithStyle;
+                  width: string|null = null;
+                }
+
+                TestBed.configureTestingModule({declarations: [App, Dir1WithStyle, Dir2WithStyle]});
+                const fixture = TestBed.createComponent(App);
+                fixture.detectChanges();
+                const {dir1Instance, dir2Instance} = fixture.componentInstance;
+
+                const target: HTMLDivElement = fixture.nativeElement.querySelector('div');
+                expect(target.style.getPropertyValue('width')).toEqual('111px');
+
+                fixture.componentInstance.width = '999px';
+                dir1Instance.width = '222px';
+                dir2Instance.width = '333px';
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('999px');
+
+                fixture.componentInstance.width = null;
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('222px');
+
+                dir1Instance.width = null;
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('333px');
+
+                dir2Instance.width = null;
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('111px');
+
+                dir1Instance.width = '666px';
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('666px');
+
+                fixture.componentInstance.width = '777px';
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('777px');
+              });
+
+      onlyInIvy('Style binding merging works differently in Ivy')
+          .it('should properly prioritize multi style binding collisions when they exist on multiple directives',
+              () => {
+                @Directive({
+                  selector: '[Dir1WithStyling]',
+                  host: {'[style]': 'stylesExp', '[class]': 'classesExp'}
+                })
+                class Dir1WithStyling {
+                  classesExp: any = {};
+                  stylesExp: any = {};
+                }
+
+                @Directive({
+                  selector: '[Dir2WithStyling]',
+                  host: {'style': 'width: 111px', '[style]': 'stylesExp'}
+                })
+                class Dir2WithStyling {
+                  stylesExp: any = {};
+                }
+
+                @Component({
+                  template:
+                      '<div Dir1WithStyling Dir2WithStyling [style]="stylesExp" [class]="classesExp"></div>'
+                })
+                class App {
+                  @ViewChild(Dir1WithStyling) dir1Instance !: Dir1WithStyling;
+                  @ViewChild(Dir2WithStyling) dir2Instance !: Dir2WithStyling;
+                  stylesExp: any = {};
+                  classesExp: any = {};
+                }
+
+                TestBed.configureTestingModule(
+                    {declarations: [App, Dir1WithStyling, Dir2WithStyling]});
+                const fixture = TestBed.createComponent(App);
+                fixture.detectChanges();
+                const {dir1Instance, dir2Instance} = fixture.componentInstance;
+
+                const target = fixture.nativeElement.querySelector('div') !;
+                expect(target.style.getPropertyValue('width')).toEqual('111px');
+
+                const compInstance = fixture.componentInstance;
+                compInstance.stylesExp = {width: '999px', height: null};
+                compInstance.classesExp = {one: true, two: false};
+                dir1Instance.stylesExp = {width: '222px'};
+                dir1Instance.classesExp = {two: true, three: false};
+                dir2Instance.stylesExp = {width: '333px', height: '100px'};
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('999px');
+                expect(target.style.getPropertyValue('height')).toEqual('100px');
+                expect(target.classList.contains('one')).toBeTruthy();
+                expect(target.classList.contains('two')).toBeFalsy();
+                expect(target.classList.contains('three')).toBeFalsy();
+
+                compInstance.stylesExp = {};
+                compInstance.classesExp = {};
+                dir1Instance.stylesExp = {width: '222px', height: '200px'};
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('222px');
+                expect(target.style.getPropertyValue('height')).toEqual('200px');
+                expect(target.classList.contains('one')).toBeFalsy();
+                expect(target.classList.contains('two')).toBeTruthy();
+                expect(target.classList.contains('three')).toBeFalsy();
+
+                dir1Instance.stylesExp = {};
+                dir1Instance.classesExp = {};
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('333px');
+                expect(target.style.getPropertyValue('height')).toEqual('100px');
+                expect(target.classList.contains('one')).toBeFalsy();
+                expect(target.classList.contains('two')).toBeFalsy();
+                expect(target.classList.contains('three')).toBeFalsy();
+
+                dir2Instance.stylesExp = {};
+                compInstance.stylesExp = {height: '900px'};
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('111px');
+                expect(target.style.getPropertyValue('height')).toEqual('900px');
+
+                dir1Instance.stylesExp = {width: '666px', height: '600px'};
+                dir1Instance.classesExp = {four: true, one: true};
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('666px');
+                expect(target.style.getPropertyValue('height')).toEqual('900px');
+                expect(target.classList.contains('one')).toBeTruthy();
+                expect(target.classList.contains('two')).toBeFalsy();
+                expect(target.classList.contains('three')).toBeFalsy();
+                expect(target.classList.contains('four')).toBeTruthy();
+
+                compInstance.stylesExp = {width: '777px'};
+                compInstance.classesExp = {four: false};
+                fixture.detectChanges();
+                expect(target.style.getPropertyValue('width')).toEqual('777px');
+                expect(target.style.getPropertyValue('height')).toEqual('600px');
+                expect(target.classList.contains('one')).toBeTruthy();
+                expect(target.classList.contains('two')).toBeFalsy();
+                expect(target.classList.contains('three')).toBeFalsy();
+                expect(target.classList.contains('four')).toBeFalsy();
+              });
+    });
+
+    it('should properly handle and render interpolation for class attribute bindings', () => {
+      @Component({template: '<div class="-{{name}}-{{age}}-"></div>'})
+      class App {
+        name = '';
+        age = '';
+      }
+
+      TestBed.configureTestingModule({declarations: [App]});
+      const fixture = TestBed.createComponent(App);
+      const target = fixture.nativeElement.querySelector('div') !;
+
+      expect(target.classList.contains('-fred-36-')).toBeFalsy();
+
+      fixture.componentInstance.name = 'fred';
+      fixture.componentInstance.age = '36';
+      fixture.detectChanges();
+
+      expect(target.classList.contains('-fred-36-')).toBeTruthy();
+    });
+  });
+
   it('should only call inherited host listeners once', () => {
     let clicks = 0;
 
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 9c0118f69d..9af14ac2b4 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -6,1080 +6,42 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ElementRef, TemplateRef, ViewContainerRef} from '@angular/core';
-
 import {RendererType2} from '../../src/render/api';
 import {getLContext} from '../../src/render3/context_discovery';
-import {AttributeMarker, ΔclassMap, ΔdefineComponent, ΔdefineDirective, ΔstyleMap, ΔtemplateRefExtractor} from '../../src/render3/index';
-import {ΔallocHostVars, Δbind, ΔclassProp, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementAttribute, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementHostAttrs, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δinterpolation2, Δinterpolation3, Δinterpolation4, Δinterpolation5, Δinterpolation6, Δinterpolation7, Δinterpolation8, ΔinterpolationV, Δprojection, ΔprojectionDef, Δreference, Δselect, ΔstyleProp, Δstyling, ΔstylingApply, Δtemplate, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {AttributeMarker, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
+import {ΔallocHostVars, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementAttribute, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δprojection, ΔprojectionDef, Δselect, Δstyling, ΔstylingApply, Δtemplate, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
 import {MONKEY_PATCH_KEY_NAME} from '../../src/render3/interfaces/context';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {RElement, Renderer3, RendererFactory3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {StylingIndex} from '../../src/render3/interfaces/styling';
 import {CONTEXT, HEADER_OFFSET} from '../../src/render3/interfaces/view';
-import {ΔdisableBindings, ΔenableBindings} from '../../src/render3/state';
 import {ΔsanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
 import {NgIf} from './common_with_def';
-import {ComponentFixture, MockRendererFactory, TemplateFixture, createComponent, renderToHtml} from './render_util';
+import {ComponentFixture, MockRendererFactory, renderToHtml} from './render_util';
 
 describe('render3 integration test', () => {
 
   describe('render', () => {
-
-    it('should render basic template', () => {
-      expect(renderToHtml(Template, {}, 2)).toEqual('<span title="Hello">Greetings</span>');
-
-      function Template(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'span', ['title', 'Hello']);
-          { Δtext(1, 'Greetings'); }
-          ΔelementEnd();
-        }
-      }
-      expect(ngDevMode).toHaveProperties({
-        firstTemplatePass: 1,
-        tNode: 3,  // 1 for div, 1 for text, 1 for host element
-        tView: 2,  // 1 for root view, 1 for template
-        rendererCreateElement: 1,
-      });
-    });
-
-    it('should render and update basic "Hello, World" template', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'h1');
-          { Δtext(1); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔtextBinding(1, Δinterpolation1('Hello, ', ctx.name, '!'));
-        }
-      }, 2, 1);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.name = 'World';
-      fixture.update();
-      expect(fixture.html).toEqual('<h1>Hello, World!</h1>');
-
-      fixture.component.name = 'New World';
-      fixture.update();
-      expect(fixture.html).toEqual('<h1>Hello, New World!</h1>');
-    });
-  });
-
-  describe('text bindings', () => {
-    it('should render "undefined" as "" when used with `bind()`', () => {
-      function Template(rf: RenderFlags, name: string) {
-        if (rf & RenderFlags.Create) {
-          Δtext(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔtextBinding(0, Δbind(name));
-        }
-      }
-
-      expect(renderToHtml(Template, 'benoit', 1, 1)).toEqual('benoit');
-      expect(renderToHtml(Template, undefined, 1, 1)).toEqual('');
-      expect(ngDevMode).toHaveProperties({
-        firstTemplatePass: 0,
-        tNode: 2,
-        tView: 2,  // 1 for root view, 1 for template
-        rendererSetText: 2,
-      });
-    });
-
-    it('should render "null" as "" when used with `bind()`', () => {
-      function Template(rf: RenderFlags, name: string) {
-        if (rf & RenderFlags.Create) {
-          Δtext(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔtextBinding(0, Δbind(name));
-        }
-      }
-
-      expect(renderToHtml(Template, 'benoit', 1, 1)).toEqual('benoit');
-      expect(renderToHtml(Template, null, 1, 1)).toEqual('');
-      expect(ngDevMode).toHaveProperties({
-        firstTemplatePass: 0,
-        tNode: 2,
-        tView: 2,  // 1 for root view, 1 for template
-        rendererSetText: 2,
-      });
-    });
-
-    it('should support creation-time values in text nodes', () => {
-      function Template(rf: RenderFlags, value: string) {
-        if (rf & RenderFlags.Create) {
-          Δtext(0);
-          ΔtextBinding(0, value);
-        }
-      }
-      expect(renderToHtml(Template, 'once', 1, 1)).toEqual('once');
-      expect(renderToHtml(Template, 'twice', 1, 1)).toEqual('once');
-      expect(ngDevMode).toHaveProperties({
-        firstTemplatePass: 0,
-        tNode: 2,
-        tView: 2,  // 1 for root view, 1 for template
-        rendererSetText: 1,
-      });
-    });
-
-  });
-
-
-  describe('ngNonBindable handling', () => {
-    it('should keep local ref for host element', () => {
-      /**
-       * <b ngNonBindable #myRef id="my-id">
-       *   <i>Hello {{ name }}!</i>
-       * </b>
-       * {{ myRef.id }}
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'b', ['id', 'my-id'], ['myRef', '']);
-          ΔdisableBindings();
-          ΔelementStart(2, 'i');
-          Δtext(3, 'Hello {{ name }}!');
-          ΔelementEnd();
-          ΔenableBindings();
-          ΔelementEnd();
-          Δtext(4);
-        }
-        if (rf & RenderFlags.Update) {
-          const ref = Δreference(1) as any;
-          ΔtextBinding(4, Δinterpolation1(' ', ref.id, ' '));
-        }
-      }, 5, 1);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<b id="my-id"><i>Hello {{ name }}!</i></b> my-id ');
-    });
-
-    it('should invoke directives for host element', () => {
-      let directiveInvoked: boolean = false;
-
-      class TestDirective {
-        ngOnInit() { directiveInvoked = true; }
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: TestDirective,
-          selectors: [['', 'directive', '']],
-          factory: () => new TestDirective()
-        });
-      }
-
-      /**
-       * <b ngNonBindable directive>
-       *   <i>Hello {{ name }}!</i>
-       * </b>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'b', ['directive', '']);
-          ΔdisableBindings();
-          ΔelementStart(1, 'i');
-          Δtext(2, 'Hello {{ name }}!');
-          ΔelementEnd();
-          ΔenableBindings();
-          ΔelementEnd();
-        }
-      }, 3, 0, [TestDirective]);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<b directive=""><i>Hello {{ name }}!</i></b>');
-      expect(directiveInvoked).toEqual(true);
-    });
-
-    it('should not invoke directives for nested elements', () => {
-      let directiveInvoked: boolean = false;
-
-      class TestDirective {
-        ngOnInit() { directiveInvoked = true; }
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: TestDirective,
-          selectors: [['', 'directive', '']],
-          factory: () => new TestDirective()
-        });
-      }
-
-      /**
-       * <b ngNonBindable>
-       *   <i directive>Hello {{ name }}!</i>
-       * </b>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'b');
-          ΔdisableBindings();
-          ΔelementStart(1, 'i', ['directive', '']);
-          Δtext(2, 'Hello {{ name }}!');
-          ΔelementEnd();
-          ΔenableBindings();
-          ΔelementEnd();
-        }
-      }, 3, 0, [TestDirective]);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<b><i directive="">Hello {{ name }}!</i></b>');
-      expect(directiveInvoked).toEqual(false);
-    });
-  });
-
-  describe('Siblings update', () => {
-    it('should handle a flat list of static/bound text nodes', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtext(0, 'Hello ');
-          Δtext(1);
-          Δtext(2, '!');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔtextBinding(1, Δbind(ctx.name));
-        }
-      }, 3, 1);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.name = 'world';
-      fixture.update();
-      expect(fixture.html).toEqual('Hello world!');
-
-      fixture.component.name = 'monde';
-      fixture.update();
-      expect(fixture.html).toEqual('Hello monde!');
-    });
-
-    it('should handle a list of static/bound text nodes as element children', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'b');
-          {
-            Δtext(1, 'Hello ');
-            Δtext(2);
-            Δtext(3, '!');
-          }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔtextBinding(2, Δbind(ctx.name));
-        }
-      }, 4, 1);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.name = 'world';
-      fixture.update();
-      expect(fixture.html).toEqual('<b>Hello world!</b>');
-
-      fixture.component.name = 'mundo';
-      fixture.update();
-      expect(fixture.html).toEqual('<b>Hello mundo!</b>');
-    });
-
-    it('should render/update text node as a child of a deep list of elements', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'b');
-          {
-            ΔelementStart(1, 'b');
-            {
-              ΔelementStart(2, 'b');
-              {
-                ΔelementStart(3, 'b');
-                { Δtext(4); }
-                ΔelementEnd();
-              }
-              ΔelementEnd();
-            }
-            ΔelementEnd();
-          }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔtextBinding(4, Δinterpolation1('Hello ', ctx.name, '!'));
-        }
-      }, 5, 1);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.name = 'world';
-      fixture.update();
-      expect(fixture.html).toEqual('<b><b><b><b>Hello world!</b></b></b></b>');
-
-      fixture.component.name = 'mundo';
-      fixture.update();
-      expect(fixture.html).toEqual('<b><b><b><b>Hello mundo!</b></b></b></b>');
-    });
-
-    it('should update 2 sibling elements', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'b');
-          {
-            Δelement(1, 'span');
-            ΔelementStart(2, 'span', ['class', 'foo']);
-            {}
-            ΔelementEnd();
-          }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementAttribute(2, 'id', Δbind(ctx.id));
-        }
-      }, 3, 1);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.id = 'foo';
-      fixture.update();
-      expect(fixture.html).toEqual('<b><span></span><span class="foo" id="foo"></span></b>');
-
-      fixture.component.id = 'bar';
-      fixture.update();
-      expect(fixture.html).toEqual('<b><span></span><span class="foo" id="bar"></span></b>');
-    });
-
-    it('should handle sibling text node after element with child text node', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'p');
-          { Δtext(1, 'hello'); }
-          ΔelementEnd();
-          Δtext(2, 'world');
-        }
-      }, 3);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<p>hello</p>world');
-    });
-  });
-
-  describe('basic components', () => {
-
-    class TodoComponent {
-      value = ' one';
-
-      static ngComponentDef = ΔdefineComponent({
-        type: TodoComponent,
-        selectors: [['todo']],
-        consts: 3,
-        vars: 1,
-        template: function TodoTemplate(rf: RenderFlags, ctx: any) {
+    describe('text bindings', () => {
+      it('should support creation-time values in text nodes', () => {
+        function Template(rf: RenderFlags, value: string) {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'p');
-            {
-              Δtext(1, 'Todo');
-              Δtext(2);
-            }
-            ΔelementEnd();
+            Δtext(0);
+            ΔtextBinding(0, value);
           }
-          if (rf & RenderFlags.Update) {
-            ΔtextBinding(2, Δbind(ctx.value));
-          }
-        },
-        factory: () => new TodoComponent
+        }
+        expect(renderToHtml(Template, 'once', 1, 1)).toEqual('once');
+        expect(renderToHtml(Template, 'twice', 1, 1)).toEqual('once');
+        expect(ngDevMode).toHaveProperties({
+          firstTemplatePass: 0,
+          tNode: 2,
+          tView: 2,  // 1 for root view, 1 for template
+          rendererSetText: 1,
+        });
       });
-    }
-
-    const defs = [TodoComponent];
-
-    it('should support a basic component template', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'todo');
-        }
-      }, 1, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<todo><p>Todo one</p></todo>');
     });
-
-    it('should support a component template with sibling', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'todo');
-          Δtext(1, 'two');
-        }
-      }, 2, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<todo><p>Todo one</p></todo>two');
-    });
-
-    it('should support a component template with component sibling', () => {
-      /**
-       * <todo></todo>
-       * <todo></todo>
-       */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'todo');
-          Δelement(1, 'todo');
-        }
-      }, 2, 0, defs);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<todo><p>Todo one</p></todo><todo><p>Todo one</p></todo>');
-    });
-
-    it('should support a component with binding on host element', () => {
-      let cmptInstance: TodoComponentHostBinding|null;
-
-      class TodoComponentHostBinding {
-        title = 'one';
-        static ngComponentDef = ΔdefineComponent({
-          type: TodoComponentHostBinding,
-          selectors: [['todo']],
-          consts: 1,
-          vars: 1,
-          template: function TodoComponentHostBindingTemplate(
-              rf: RenderFlags, ctx: TodoComponentHostBinding) {
-            if (rf & RenderFlags.Create) {
-              Δtext(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ΔtextBinding(0, Δbind(ctx.title));
-            }
-          },
-          factory: () => cmptInstance = new TodoComponentHostBinding,
-          hostBindings: function(rf: RenderFlags, ctx: any, elementIndex: number): void {
-            if (rf & RenderFlags.Create) {
-              ΔallocHostVars(1);
-            }
-            if (rf & RenderFlags.Update) {
-              // host bindings
-              ΔelementProperty(elementIndex, 'title', Δbind(ctx.title));
-            }
-          }
-        });
-      }
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'todo');
-        }
-      }, 1, 0, [TodoComponentHostBinding]);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<todo title="one">one</todo>');
-
-      cmptInstance !.title = 'two';
-      fixture.update();
-      expect(fixture.html).toEqual('<todo title="two">two</todo>');
-    });
-
-    it('should support root component with host attribute', () => {
-      class HostAttributeComp {
-        static ngComponentDef = ΔdefineComponent({
-          type: HostAttributeComp,
-          selectors: [['host-attr-comp']],
-          factory: () => new HostAttributeComp(),
-          consts: 0,
-          vars: 0,
-          hostBindings: function(rf, ctx, elIndex) {
-            if (rf & RenderFlags.Create) {
-              ΔelementHostAttrs(['role', 'button']);
-            }
-          },
-          template: (rf: RenderFlags, ctx: HostAttributeComp) => {},
-        });
-      }
-
-      const fixture = new ComponentFixture(HostAttributeComp);
-      expect(fixture.hostElement.getAttribute('role')).toEqual('button');
-    });
-
-    it('should support component with bindings in template', () => {
-      /** <p> {{ name }} </p>*/
-      class MyComp {
-        name = 'Bess';
-        static ngComponentDef = ΔdefineComponent({
-          type: MyComp,
-          selectors: [['comp']],
-          consts: 2,
-          vars: 1,
-          template: function MyCompTemplate(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'p');
-              { Δtext(1); }
-              ΔelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              ΔtextBinding(1, Δbind(ctx.name));
-            }
-          },
-          factory: () => new MyComp
-        });
-      }
-
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-      }, 1, 0, [MyComp]);
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('<comp><p>Bess</p></comp>');
-    });
-
-    it('should support a component with sub-views', () => {
-      /**
-       * % if (condition) {
-       *   <div>text</div>
-       * % }
-       */
-      class MyComp {
-        // TODO(issue/24571): remove '!'.
-        condition !: boolean;
-        static ngComponentDef = ΔdefineComponent({
-          type: MyComp,
-          selectors: [['comp']],
-          consts: 1,
-          vars: 0,
-          template: function MyCompTemplate(rf: RenderFlags, ctx: any) {
-            if (rf & RenderFlags.Create) {
-              Δcontainer(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ΔcontainerRefreshStart(0);
-              {
-                if (ctx.condition) {
-                  let rf1 = ΔembeddedViewStart(0, 2, 0);
-                  if (rf1 & RenderFlags.Create) {
-                    ΔelementStart(0, 'div');
-                    { Δtext(1, 'text'); }
-                    ΔelementEnd();
-                  }
-                  ΔembeddedViewEnd();
-                }
-              }
-              ΔcontainerRefreshEnd();
-            }
-          },
-          factory: () => new MyComp,
-          inputs: {condition: 'condition'}
-        });
-      }
-
-      /** <comp [condition]="condition"></comp> */
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'condition', Δbind(ctx.condition));
-        }
-      }, 1, 1, [MyComp]);
-
-      const fixture = new ComponentFixture(App);
-      fixture.component.condition = true;
-      fixture.update();
-      expect(fixture.html).toEqual('<comp><div>text</div></comp>');
-
-      fixture.component.condition = false;
-      fixture.update();
-      expect(fixture.html).toEqual('<comp></comp>');
-    });
-
-  });
-
-  describe('ng-container', () => {
-
-    it('should insert as a child of a regular element', () => {
-      /**
-       * <div>before|<ng-container>Greetings<span></span></ng-container>|after</div>
-       */
-      function Template() {
-        ΔelementStart(0, 'div');
-        {
-          Δtext(1, 'before|');
-          ΔelementContainerStart(2);
-          {
-            Δtext(3, 'Greetings');
-            Δelement(4, 'span');
-          }
-          ΔelementContainerEnd();
-          Δtext(5, '|after');
-        }
-        ΔelementEnd();
-      }
-
-      const fixture = new TemplateFixture(Template, () => {}, 6);
-      expect(fixture.html).toEqual('<div>before|Greetings<span></span>|after</div>');
-    });
-
-    it('should add and remove DOM nodes when ng-container is a child of a regular element', () => {
-      /**
-       * {% if (value) { %}
-       * <div>
-       *  <ng-container>content</ng-container>
-       * </div>
-       * {% } %}
-       */
-      const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags, ctx: {value: any}) {
-        if (rf & RenderFlags.Create) {
-          Δcontainer(0);
-        }
-        if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
-          if (ctx.value) {
-            let rf1 = ΔembeddedViewStart(0, 3, 0);
-            {
-              if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'div');
-                {
-                  ΔelementContainerStart(1);
-                  { Δtext(2, 'content'); }
-                  ΔelementContainerEnd();
-                }
-                ΔelementEnd();
-              }
-            }
-            ΔembeddedViewEnd();
-          }
-          ΔcontainerRefreshEnd();
-        }
-      }, 1);
-
-      const fixture = new ComponentFixture(TestCmpt);
-      expect(fixture.html).toEqual('');
-
-      fixture.component.value = true;
-      fixture.update();
-      expect(fixture.html).toEqual('<div>content</div>');
-
-      fixture.component.value = false;
-      fixture.update();
-      expect(fixture.html).toEqual('');
-    });
-
-    it('should add and remove DOM nodes when ng-container is a child of an embedded view (JS block)',
-       () => {
-         /**
-          * {% if (value) { %}
-          *  <ng-container>content</ng-container>
-          * {% } %}
-          */
-         const TestCmpt =
-             createComponent('test-cmpt', function(rf: RenderFlags, ctx: {value: any}) {
-               if (rf & RenderFlags.Create) {
-                 Δcontainer(0);
-               }
-               if (rf & RenderFlags.Update) {
-                 ΔcontainerRefreshStart(0);
-                 if (ctx.value) {
-                   let rf1 = ΔembeddedViewStart(0, 2, 0);
-                   {
-                     if (rf1 & RenderFlags.Create) {
-                       ΔelementContainerStart(0);
-                       { Δtext(1, 'content'); }
-                       ΔelementContainerEnd();
-                     }
-                   }
-                   ΔembeddedViewEnd();
-                 }
-                 ΔcontainerRefreshEnd();
-               }
-             }, 1);
-
-         const fixture = new ComponentFixture(TestCmpt);
-         expect(fixture.html).toEqual('');
-
-         fixture.component.value = true;
-         fixture.update();
-         expect(fixture.html).toEqual('content');
-
-         fixture.component.value = false;
-         fixture.update();
-         expect(fixture.html).toEqual('');
-       });
-
-    it('should add and remove DOM nodes when ng-container is a child of an embedded view (ViewContainerRef)',
-       () => {
-
-         function ngIfTemplate(rf: RenderFlags, ctx: any) {
-           if (rf & RenderFlags.Create) {
-             ΔelementContainerStart(0);
-             { Δtext(1, 'content'); }
-             ΔelementContainerEnd();
-           }
-         }
-
-         /**
-          * <ng-container *ngIf="value">content</ng-container>
-          */
-         // equivalent to:
-         /**
-          * <ng-template [ngIf]="value">
-          *  <ng-container>
-          *    content
-          *  </ng-container>
-          * </ng-template>
-          */
-         const TestCmpt =
-             createComponent('test-cmpt', function(rf: RenderFlags, ctx: {value: any}) {
-               if (rf & RenderFlags.Create) {
-                 Δtemplate(
-                     0, ngIfTemplate, 2, 0, 'ng-template', [AttributeMarker.Bindings, 'ngIf']);
-               }
-               if (rf & RenderFlags.Update) {
-                 ΔelementProperty(0, 'ngIf', Δbind(ctx.value));
-               }
-             }, 1, 1, [NgIf]);
-
-         const fixture = new ComponentFixture(TestCmpt);
-         expect(fixture.html).toEqual('');
-
-         fixture.component.value = true;
-         fixture.update();
-         expect(fixture.html).toEqual('content');
-
-         fixture.component.value = false;
-         fixture.update();
-         expect(fixture.html).toEqual('');
-       });
-
-    // https://stackblitz.com/edit/angular-tfhcz1?file=src%2Fapp%2Fapp.component.ts
-    it('should add and remove DOM nodes when ng-container is a child of a delayed embedded view',
-       () => {
-
-         class TestDirective {
-           constructor(private _tplRef: TemplateRef<any>, private _vcRef: ViewContainerRef) {}
-
-           createAndInsert() { this._vcRef.insert(this._tplRef.createEmbeddedView({})); }
-
-           clear() { this._vcRef.clear(); }
-
-           static ngDirectiveDef = ΔdefineDirective({
-             type: TestDirective,
-             selectors: [['', 'testDirective', '']],
-             factory: () => testDirective = new TestDirective(
-                          ΔdirectiveInject(TemplateRef as any),
-                          ΔdirectiveInject(ViewContainerRef as any)),
-           });
-         }
-
-
-         function embeddedTemplate(rf: RenderFlags, ctx: any) {
-           if (rf & RenderFlags.Create) {
-             ΔelementContainerStart(0);
-             { Δtext(1, 'content'); }
-             ΔelementContainerEnd();
-           }
-         }
-
-         let testDirective: TestDirective;
-
-
-         `<ng-template testDirective>
-            <ng-container>
-              content
-            </ng-container>
-          </ng-template>`;
-         const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
-           if (rf & RenderFlags.Create) {
-             Δtemplate(
-                 0, embeddedTemplate, 2, 0, 'ng-template',
-                 [AttributeMarker.Bindings, 'testDirective']);
-           }
-         }, 1, 0, [TestDirective]);
-
-         const fixture = new ComponentFixture(TestCmpt);
-         expect(fixture.html).toEqual('');
-
-         testDirective !.createAndInsert();
-         fixture.update();
-         expect(fixture.html).toEqual('content');
-
-         testDirective !.clear();
-         fixture.update();
-         expect(fixture.html).toEqual('');
-       });
-
-    it('should render at the component view root', () => {
-      /**
-       * <ng-container>component template</ng-container>
-       */
-      const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
-        if (rf & RenderFlags.Create) {
-          ΔelementContainerStart(0);
-          { Δtext(1, 'component template'); }
-          ΔelementContainerEnd();
-        }
-      }, 2);
-
-      function App() { Δelement(0, 'test-cmpt'); }
-
-      const fixture = new TemplateFixture(App, () => {}, 1, 0, [TestCmpt]);
-      expect(fixture.html).toEqual('<test-cmpt>component template</test-cmpt>');
-    });
-
-    it('should render inside another ng-container', () => {
-      /**
-       * <ng-container>
-       *   <ng-container>
-       *     <ng-container>
-       *       content
-       *     </ng-container>
-       *   </ng-container>
-       * </ng-container>
-       */
-      const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
-        if (rf & RenderFlags.Create) {
-          ΔelementContainerStart(0);
-          {
-            ΔelementContainerStart(1);
-            {
-              ΔelementContainerStart(2);
-              { Δtext(3, 'content'); }
-              ΔelementContainerEnd();
-            }
-            ΔelementContainerEnd();
-          }
-          ΔelementContainerEnd();
-        }
-      }, 4);
-
-      function App() { Δelement(0, 'test-cmpt'); }
-
-      const fixture = new TemplateFixture(App, () => {}, 1, 0, [TestCmpt]);
-      expect(fixture.html).toEqual('<test-cmpt>content</test-cmpt>');
-    });
-
-    it('should render inside another ng-container at the root of a delayed view', () => {
-      let testDirective: TestDirective;
-
-      class TestDirective {
-        constructor(private _tplRef: TemplateRef<any>, private _vcRef: ViewContainerRef) {}
-
-        createAndInsert() { this._vcRef.insert(this._tplRef.createEmbeddedView({})); }
-
-        clear() { this._vcRef.clear(); }
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: TestDirective,
-          selectors: [['', 'testDirective', '']],
-          factory:
-              () => testDirective = new TestDirective(
-                  ΔdirectiveInject(TemplateRef as any), ΔdirectiveInject(ViewContainerRef as any)),
-        });
-      }
-
-
-      function embeddedTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementContainerStart(0);
-          {
-            ΔelementContainerStart(1);
-            {
-              ΔelementContainerStart(2);
-              { Δtext(3, 'content'); }
-              ΔelementContainerEnd();
-            }
-            ΔelementContainerEnd();
-          }
-          ΔelementContainerEnd();
-        }
-      }
-
-      /**
-       * <ng-template testDirective>
-       *   <ng-container>
-       *     <ng-container>
-       *       <ng-container>
-       *         content
-       *       </ng-container>
-       *     </ng-container>
-       *   </ng-container>
-       * </ng-template>
-       */
-      const TestCmpt = createComponent('test-cmpt', function(rf: RenderFlags) {
-        if (rf & RenderFlags.Create) {
-          Δtemplate(
-              0, embeddedTemplate, 4, 0, 'ng-template',
-              [AttributeMarker.Bindings, 'testDirective']);
-        }
-      }, 1, 0, [TestDirective]);
-
-      function App() { Δelement(0, 'test-cmpt'); }
-
-      const fixture = new ComponentFixture(TestCmpt);
-      expect(fixture.html).toEqual('');
-
-      testDirective !.createAndInsert();
-      fixture.update();
-      expect(fixture.html).toEqual('content');
-
-      testDirective !.createAndInsert();
-      fixture.update();
-      expect(fixture.html).toEqual('contentcontent');
-
-      testDirective !.clear();
-      fixture.update();
-      expect(fixture.html).toEqual('');
-    });
-
-    it('should support directives and inject ElementRef', () => {
-
-      class Directive {
-        constructor(public elRef: ElementRef) {}
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: Directive,
-          selectors: [['', 'dir', '']],
-          factory: () => directive = new Directive(ΔdirectiveInject(ElementRef)),
-        });
-      }
-
-      let directive: Directive;
-
-      /**
-       * <div><ng-container dir></ng-container></div>
-       */
-      function Template() {
-        ΔelementStart(0, 'div');
-        {
-          ΔelementContainerStart(1, [AttributeMarker.Bindings, 'dir']);
-          ΔelementContainerEnd();
-        }
-        ΔelementEnd();
-      }
-
-      const fixture = new TemplateFixture(Template, () => {}, 2, 0, [Directive]);
-      expect(fixture.html).toEqual('<div></div>');
-      expect(directive !.elRef.nativeElement.nodeType).toBe(Node.COMMENT_NODE);
-    });
-
-    it('should support ViewContainerRef when ng-container is at the root of a view', () => {
-
-      function ContentTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtext(0, 'Content');
-        }
-      }
-
-      class Directive {
-        contentTpl: TemplateRef<{}>|null = null;
-
-        constructor(private _vcRef: ViewContainerRef) {}
-
-        insertView() { this._vcRef.createEmbeddedView(this.contentTpl as TemplateRef<{}>); }
-
-        clear() { this._vcRef.clear(); }
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: Directive,
-          selectors: [['', 'dir', '']],
-          factory: () => directive = new Directive(ΔdirectiveInject(ViewContainerRef as any)),
-          inputs: {contentTpl: 'contentTpl'},
-        });
-      }
-
-      let directive: Directive;
-
-      /**
-       * <ng-container dir [contentTpl]="content">
-       *    <ng-template #content>Content</ng-template>
-       * </ng-container>
-       */
-      const App = createComponent('app', function(rf: RenderFlags) {
-        if (rf & RenderFlags.Create) {
-          ΔelementContainerStart(0, [AttributeMarker.Bindings, 'dir']);
-          Δtemplate(
-              1, ContentTemplate, 1, 0, 'ng-template', null, ['content', ''],
-              ΔtemplateRefExtractor);
-          ΔelementContainerEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          const content = Δreference(2) as any;
-          ΔelementProperty(0, 'contentTpl', Δbind(content));
-        }
-      }, 3, 1, [Directive]);
-
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('');
-
-      directive !.insertView();
-      fixture.update();
-      expect(fixture.html).toEqual('Content');
-
-      directive !.clear();
-      fixture.update();
-      expect(fixture.html).toEqual('');
-    });
-
-    it('should support ViewContainerRef on <ng-template> inside <ng-container>', () => {
-      function ContentTemplate(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δtext(0, 'Content');
-        }
-      }
-
-      class Directive {
-        constructor(private _tplRef: TemplateRef<{}>, private _vcRef: ViewContainerRef) {}
-
-        insertView() { this._vcRef.createEmbeddedView(this._tplRef); }
-
-        clear() { this._vcRef.clear(); }
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: Directive,
-          selectors: [['', 'dir', '']],
-          factory:
-              () => directive = new Directive(
-                  ΔdirectiveInject(TemplateRef as any), ΔdirectiveInject(ViewContainerRef as any)),
-        });
-      }
-
-      let directive: Directive;
-
-      /**
-       * <ng-container>
-       *    <ng-template dir>Content</ng-template>
-       * </ng-container>
-       */
-      const App = createComponent('app', function(rf: RenderFlags) {
-        if (rf & RenderFlags.Create) {
-          ΔelementContainerStart(0);
-          Δtemplate(
-              1, ContentTemplate, 1, 0, 'ng-template', [AttributeMarker.Bindings, 'dir'], [],
-              ΔtemplateRefExtractor);
-          ΔelementContainerEnd();
-        }
-      }, 2, 0, [Directive]);
-
-
-      const fixture = new ComponentFixture(App);
-      expect(fixture.html).toEqual('');
-
-      directive !.insertView();
-      fixture.update();
-      expect(fixture.html).toEqual('Content');
-
-      directive !.clear();
-      fixture.update();
-      expect(fixture.html).toEqual('');
-    });
-
-    it('should not set any attributes', () => {
-      /**
-       * <div><ng-container id="foo"></ng-container></div>
-       */
-      function Template() {
-        ΔelementStart(0, 'div');
-        {
-          ΔelementContainerStart(1, ['id', 'foo']);
-          ΔelementContainerEnd();
-        }
-        ΔelementEnd();
-      }
-
-      const fixture = new TemplateFixture(Template, () => {}, 2);
-      expect(fixture.html).toEqual('<div></div>');
-    });
-
   });
 
   describe('tree', () => {
@@ -1232,920 +194,6 @@ describe('render3 integration test', () => {
 
   });
 
-  describe('element bindings', () => {
-
-    describe('elementAttribute', () => {
-      it('should support attribute bindings', () => {
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'span');
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementAttribute(0, 'title', Δbind(ctx.title));
-          }
-        }, 1, 1);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.title = 'Hello';
-        fixture.update();
-        // initial binding
-        expect(fixture.html).toEqual('<span title="Hello"></span>');
-
-        // update binding
-        fixture.component.title = 'Hi!';
-        fixture.update();
-        expect(fixture.html).toEqual('<span title="Hi!"></span>');
-
-        // remove attribute
-        fixture.component.title = null;
-        fixture.update();
-        expect(fixture.html).toEqual('<span></span>');
-      });
-
-      it('should stringify values used attribute bindings', () => {
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'span');
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementAttribute(0, 'title', Δbind(ctx.title));
-          }
-        }, 1, 1);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.title = NaN;
-        fixture.update();
-        expect(fixture.html).toEqual('<span title="NaN"></span>');
-
-        fixture.component.title = {toString: () => 'Custom toString'};
-        fixture.update();
-        expect(fixture.html).toEqual('<span title="Custom toString"></span>');
-      });
-
-      it('should update bindings', () => {
-        function Template(rf: RenderFlags, c: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'b');
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementAttribute(0, 'a', ΔinterpolationV(c));
-            ΔelementAttribute(0, 'a0', Δbind(c[1]));
-            ΔelementAttribute(0, 'a1', Δinterpolation1(c[0], c[1], c[16]));
-            ΔelementAttribute(0, 'a2', Δinterpolation2(c[0], c[1], c[2], c[3], c[16]));
-            ΔelementAttribute(0, 'a3', Δinterpolation3(c[0], c[1], c[2], c[3], c[4], c[5], c[16]));
-            ΔelementAttribute(
-                0, 'a4', Δinterpolation4(c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[16]));
-            ΔelementAttribute(
-                0, 'a5',
-                Δinterpolation5(c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[16]));
-            ΔelementAttribute(
-                0, 'a6', Δinterpolation6(
-                             c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[10],
-                             c[11], c[16]));
-            ΔelementAttribute(
-                0, 'a7', Δinterpolation7(
-                             c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[10],
-                             c[11], c[12], c[13], c[16]));
-            ΔelementAttribute(
-                0, 'a8', Δinterpolation8(
-                             c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[10],
-                             c[11], c[12], c[13], c[14], c[15], c[16]));
-          }
-        }
-        let args = ['(', 0, 'a', 1, 'b', 2, 'c', 3, 'd', 4, 'e', 5, 'f', 6, 'g', 7, ')'];
-        expect(renderToHtml(Template, args, 1, 54))
-            .toEqual(
-                '<b a="(0a1b2c3d4e5f6g7)" a0="0" a1="(0)" a2="(0a1)" a3="(0a1b2)" a4="(0a1b2c3)" a5="(0a1b2c3d4)" a6="(0a1b2c3d4e5)" a7="(0a1b2c3d4e5f6)" a8="(0a1b2c3d4e5f6g7)"></b>');
-        args = args.reverse();
-        expect(renderToHtml(Template, args, 1, 54))
-            .toEqual(
-                '<b a=")7g6f5e4d3c2b1a0(" a0="7" a1=")7(" a2=")7g6(" a3=")7g6f5(" a4=")7g6f5e4(" a5=")7g6f5e4d3(" a6=")7g6f5e4d3c2(" a7=")7g6f5e4d3c2b1(" a8=")7g6f5e4d3c2b1a0("></b>');
-        args = args.reverse();
-        expect(renderToHtml(Template, args, 1, 54))
-            .toEqual(
-                '<b a="(0a1b2c3d4e5f6g7)" a0="0" a1="(0)" a2="(0a1)" a3="(0a1b2)" a4="(0a1b2c3)" a5="(0a1b2c3d4)" a6="(0a1b2c3d4e5)" a7="(0a1b2c3d4e5f6)" a8="(0a1b2c3d4e5f6g7)"></b>');
-      });
-
-      it('should not update DOM if context has not changed', () => {
-        const ctx: {title: string | null} = {title: 'Hello'};
-
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'span');
-            Δcontainer(1);
-            ΔelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementAttribute(0, 'title', Δbind(ctx.title));
-            ΔcontainerRefreshStart(1);
-            {
-              if (true) {
-                let rf1 = ΔembeddedViewStart(1, 1, 1);
-                {
-                  if (rf1 & RenderFlags.Create) {
-                    ΔelementStart(0, 'b');
-                    {}
-                    ΔelementEnd();
-                  }
-                  if (rf1 & RenderFlags.Update) {
-                    ΔelementAttribute(0, 'title', Δbind(ctx.title));
-                  }
-                }
-                ΔembeddedViewEnd();
-              }
-            }
-            ΔcontainerRefreshEnd();
-          }
-        }, 2, 1);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.title = 'Hello';
-        fixture.update();
-        // initial binding
-        expect(fixture.html).toEqual('<span title="Hello"><b title="Hello"></b></span>');
-        // update DOM manually
-        fixture.hostElement.querySelector('b') !.setAttribute('title', 'Goodbye');
-
-        // refresh with same binding
-        fixture.update();
-        expect(fixture.html).toEqual('<span title="Hello"><b title="Goodbye"></b></span>');
-
-        // refresh again with same binding
-        fixture.update();
-        expect(fixture.html).toEqual('<span title="Hello"><b title="Goodbye"></b></span>');
-      });
-
-      it('should support host attribute bindings', () => {
-        let hostBindingDir: HostBindingDir;
-
-        class HostBindingDir {
-          /* @HostBinding('attr.aria-label') */
-          label = 'some label';
-
-          static ngDirectiveDef = ΔdefineDirective({
-            type: HostBindingDir,
-            selectors: [['', 'hostBindingDir', '']],
-            factory: function HostBindingDir_Factory() {
-              return hostBindingDir = new HostBindingDir();
-            },
-            hostBindings: function HostBindingDir_HostBindings(
-                rf: RenderFlags, ctx: any, elIndex: number) {
-              if (rf & RenderFlags.Create) {
-                ΔallocHostVars(1);
-              }
-              if (rf & RenderFlags.Update) {
-                ΔelementAttribute(elIndex, 'aria-label', Δbind(ctx.label));
-              }
-            }
-          });
-        }
-
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'div', ['hostBindingDir', '']);
-          }
-        }, 1, 0, [HostBindingDir]);
-
-        const fixture = new ComponentFixture(App);
-        expect(fixture.html).toEqual(`<div aria-label="some label" hostbindingdir=""></div>`);
-
-        hostBindingDir !.label = 'other label';
-        fixture.update();
-        expect(fixture.html).toEqual(`<div aria-label="other label" hostbindingdir=""></div>`);
-      });
-    });
-
-    describe('elementStyle', () => {
-      it('should support binding to styles', () => {
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'span');
-            Δstyling(null, ['border-color']);
-            ΔelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            Δselect(0);
-            ΔstyleProp(0, ctx.color);
-            ΔstylingApply();
-          }
-        }, 1);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.color = 'red';
-        fixture.update();
-        expect(fixture.html).toEqual('<span style="border-color: red;"></span>');
-
-        fixture.component.color = 'green';
-        fixture.update();
-        expect(fixture.html).toEqual('<span style="border-color: green;"></span>');
-
-        fixture.component.color = null;
-        fixture.update();
-        expect(fixture.html).toEqual('<span></span>');
-      });
-
-      it('should support binding to styles with suffix', () => {
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'span');
-            Δstyling(null, ['font-size']);
-            ΔelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            Δselect(0);
-            ΔstyleProp(0, ctx.time, 'px');
-            ΔstylingApply();
-          }
-        }, 1);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.time = '100';
-        fixture.update();
-        expect(fixture.html).toEqual('<span style="font-size: 100px;"></span>');
-
-        fixture.component.time = 200;
-        fixture.update();
-        expect(fixture.html).toEqual('<span style="font-size: 200px;"></span>');
-
-        fixture.component.time = 0;
-        fixture.update();
-        expect(fixture.html).toEqual('<span style="font-size: 0px;"></span>');
-
-        fixture.component.time = null;
-        fixture.update();
-        expect(fixture.html).toEqual('<span></span>');
-      });
-    });
-
-    describe('class-based styling', () => {
-      it('should support CSS class toggle', () => {
-        /** <span [class.active]="class"></span> */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'span');
-            Δstyling(['active']);
-            ΔelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            Δselect(0);
-            ΔclassProp(0, ctx.class);
-            ΔstylingApply();
-          }
-        }, 1);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.class = true;
-        fixture.update();
-        expect(fixture.html).toEqual('<span class="active"></span>');
-
-        fixture.component.class = false;
-        fixture.update();
-        expect(fixture.html).toEqual('<span class=""></span>');
-
-        // truthy values
-        fixture.component.class = 'a_string';
-        fixture.update();
-        expect(fixture.html).toEqual('<span class="active"></span>');
-
-        fixture.component.class = 10;
-        fixture.update();
-        expect(fixture.html).toEqual('<span class="active"></span>');
-
-        // falsy values
-        fixture.component.class = '';
-        fixture.update();
-        expect(fixture.html).toEqual('<span class=""></span>');
-
-        fixture.component.class = 0;
-        fixture.update();
-        expect(fixture.html).toEqual('<span class=""></span>');
-      });
-
-      it('should work correctly with existing static classes', () => {
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'span', [AttributeMarker.Classes, 'existing']);
-            Δstyling(['existing', 'active']);
-            ΔelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            Δselect(0);
-            ΔclassProp(1, ctx.class);
-            ΔstylingApply();
-          }
-        }, 1);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.class = true;
-        fixture.update();
-        expect(fixture.html).toEqual('<span class="existing active"></span>');
-
-        fixture.component.class = false;
-        fixture.update();
-        expect(fixture.html).toEqual('<span class="existing"></span>');
-      });
-
-      it('should apply classes properly when nodes are components', () => {
-        const MyComp = createComponent('my-comp', (rf: RenderFlags, ctx: any) => {
-          if (rf & RenderFlags.Create) {
-            Δtext(0, 'Comp Content');
-          }
-        }, 1, 0, []);
-
-        /**
-         * <my-comp [class.active]="class"></my-comp>
-         */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'my-comp');
-            Δstyling(['active']);
-            ΔelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            Δselect(0);
-            ΔclassProp(0, ctx.class);
-            ΔstylingApply();
-          }
-        }, 1, 0, [MyComp]);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.class = true;
-        fixture.update();
-        expect(fixture.html).toEqual('<my-comp class="active">Comp Content</my-comp>');
-
-        fixture.component.class = false;
-        fixture.update();
-        expect(fixture.html).toEqual('<my-comp class="">Comp Content</my-comp>');
-      });
-
-      it('should apply classes properly when nodes have LContainers', () => {
-        let structuralComp !: StructuralComp;
-
-        class StructuralComp {
-          tmp !: TemplateRef<any>;
-
-          constructor(public vcr: ViewContainerRef) {}
-
-          create() { this.vcr.createEmbeddedView(this.tmp); }
-
-          static ngComponentDef = ΔdefineComponent({
-            type: StructuralComp,
-            selectors: [['structural-comp']],
-            factory: () => structuralComp =
-                         new StructuralComp(ΔdirectiveInject(ViewContainerRef as any)),
-            inputs: {tmp: 'tmp'},
-            consts: 1,
-            vars: 0,
-            template: (rf: RenderFlags, ctx: StructuralComp) => {
-              if (rf & RenderFlags.Create) {
-                Δtext(0, 'Comp Content');
-              }
-            }
-          });
-        }
-
-        function FooTemplate(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δtext(0, 'Temp Content');
-          }
-        }
-
-        /**
-         * <ng-template #foo>
-         *     Temp Content
-         * </ng-template>
-         * <structural-comp [class.active]="class" [tmp]="foo"></structural-comp>
-         */
-        const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δtemplate(
-                0, FooTemplate, 1, 0, 'ng-template', null, ['foo', ''], ΔtemplateRefExtractor);
-            ΔelementStart(2, 'structural-comp');
-            Δstyling(['active']);
-            ΔelementEnd();
-          }
-          if (rf & RenderFlags.Update) {
-            const foo = Δreference(1) as any;
-            Δselect(2);
-            ΔclassProp(0, ctx.class);
-            ΔstylingApply();
-            ΔelementProperty(2, 'tmp', Δbind(foo));
-          }
-        }, 3, 1, [StructuralComp]);
-
-        const fixture = new ComponentFixture(App);
-        fixture.component.class = true;
-        fixture.update();
-        expect(fixture.html)
-            .toEqual('<structural-comp class="active">Comp Content</structural-comp>');
-
-        structuralComp.create();
-        fixture.update();
-        expect(fixture.html)
-            .toEqual('<structural-comp class="active">Comp Content</structural-comp>Temp Content');
-
-        fixture.component.class = false;
-        fixture.update();
-        expect(fixture.html)
-            .toEqual('<structural-comp class="">Comp Content</structural-comp>Temp Content');
-      });
-
-      let mockClassDirective: DirWithClassDirective;
-      class DirWithClassDirective {
-        static ngDirectiveDef = ΔdefineDirective({
-          type: DirWithClassDirective,
-          selectors: [['', 'DirWithClass', '']],
-          factory: () => mockClassDirective = new DirWithClassDirective(),
-          inputs: {'klass': 'class'}
-        });
-
-        public classesVal: string = '';
-        set klass(value: string) { this.classesVal = value; }
-      }
-
-      let mockStyleDirective: DirWithStyleDirective;
-      class DirWithStyleDirective {
-        static ngDirectiveDef = ΔdefineDirective({
-          type: DirWithStyleDirective,
-          selectors: [['', 'DirWithStyle', '']],
-          factory: () => mockStyleDirective = new DirWithStyleDirective(),
-          inputs: {'style': 'style'}
-        });
-
-        public stylesVal: string = '';
-        set style(value: string) { this.stylesVal = value; }
-      }
-
-      it('should delegate initial classes to a [class] input binding if present on a directive on the same element',
-         () => {
-           /**
-            * <div class="apple orange banana" DirWithClass></div>
-            */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               ΔelementStart(
-                   0, 'div',
-                   ['DirWithClass', '', AttributeMarker.Classes, 'apple', 'orange', 'banana']);
-               Δstyling();
-               ΔelementEnd();
-             }
-             if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔstylingApply();
-             }
-           }, 1, 0, [DirWithClassDirective]);
-
-           const fixture = new ComponentFixture(App);
-           expect(mockClassDirective !.classesVal).toEqual('apple orange banana');
-         });
-
-      it('should delegate initial styles to a [style] input binding if present on a directive on the same element',
-         () => {
-           /**
-            * <div width="width:100px; height:200px;" DirWithStyle></div>
-            */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'div', [
-                 'DirWithStyle', '', AttributeMarker.Styles, 'width', '100px', 'height', '200px'
-               ]);
-               Δstyling();
-               ΔelementEnd();
-             }
-             if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔstylingApply();
-             }
-           }, 1, 0, [DirWithStyleDirective]);
-
-           const fixture = new ComponentFixture(App);
-           expect(mockStyleDirective !.stylesVal).toEqual('width:100px;height:200px');
-         });
-
-      it('should update `[class]` and bindings in the provided directive if the input is matched',
-         () => {
-           /**
-            * <div DirWithClass></div>
-           */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'div', ['DirWithClass']);
-               Δstyling();
-               ΔelementEnd();
-             }
-             if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔclassMap('cucumber grape');
-               ΔstylingApply();
-             }
-           }, 1, 0, [DirWithClassDirective]);
-
-           const fixture = new ComponentFixture(App);
-           expect(mockClassDirective !.classesVal).toEqual('cucumber grape');
-         });
-
-      it('should update `[style]` and bindings in the provided directive if the input is matched',
-         () => {
-           /**
-            * <div DirWithStyle></div>
-           */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'div', ['DirWithStyle']);
-               Δstyling();
-               ΔelementEnd();
-             }
-             if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔstyleMap({width: '200px', height: '500px'});
-               ΔstylingApply();
-             }
-           }, 1, 0, [DirWithStyleDirective]);
-
-           const fixture = new ComponentFixture(App);
-           expect(mockStyleDirective !.stylesVal).toEqual('width:200px;height:500px');
-         });
-
-      it('should apply initial styling to the element that contains the directive with host styling',
-         () => {
-           class DirWithInitialStyling {
-             static ngDirectiveDef = ΔdefineDirective({
-               type: DirWithInitialStyling,
-               selectors: [['', 'DirWithInitialStyling', '']],
-               factory: () => new DirWithInitialStyling(),
-               hostBindings: function(
-                   rf: RenderFlags, ctx: DirWithInitialStyling, elementIndex: number) {
-                 if (rf & RenderFlags.Create) {
-                   ΔelementHostAttrs([
-                     'title', 'foo', AttributeMarker.Classes, 'heavy', 'golden',
-                     AttributeMarker.Styles, 'color', 'purple', 'font-weight', 'bold'
-                   ]);
-                 }
-               }
-             });
-
-             public classesVal: string = '';
-           }
-
-           /**
-            * <div DirWithInitialStyling
-            *   class="big"
-            *   style="color:black; font-size:200px"></div>
-           */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', [
-                 'DirWithInitialStyling', '', AttributeMarker.Classes, 'big',
-                 AttributeMarker.Styles, 'color', 'black', 'font-size', '200px'
-               ]);
-             }
-           }, 1, 0, [DirWithInitialStyling]);
-
-           const fixture = new ComponentFixture(App);
-           const target = fixture.hostElement.querySelector('div') !;
-           const classes = target.getAttribute('class') !.split(/\s+/).sort();
-           expect(classes).toEqual(['big', 'golden', 'heavy']);
-
-           expect(target.getAttribute('title')).toEqual('foo');
-           expect(target.style.getPropertyValue('color')).toEqual('black');
-           expect(target.style.getPropertyValue('font-size')).toEqual('200px');
-           expect(target.style.getPropertyValue('font-weight')).toEqual('bold');
-         });
-
-      it('should apply single styling bindings present within a directive onto the same element and defer the element\'s initial styling values when missing',
-         () => {
-           let dirInstance: DirWithSingleStylingBindings;
-           /**
-            * <DirWithInitialStyling class="def" [class.xyz] style="width:555px;" [style.width]
-            * [style.height]></my-comp>
-           */
-           class DirWithSingleStylingBindings {
-             static ngDirectiveDef = ΔdefineDirective({
-               type: DirWithSingleStylingBindings,
-               selectors: [['', 'DirWithSingleStylingBindings', '']],
-               factory: () => dirInstance = new DirWithSingleStylingBindings(),
-               hostBindings: function(
-                   rf: RenderFlags, ctx: DirWithSingleStylingBindings, elementIndex: number) {
-                 if (rf & RenderFlags.Create) {
-                   ΔelementHostAttrs(
-                       [AttributeMarker.Classes, 'def', AttributeMarker.Styles, 'width', '555px']);
-                   Δstyling(['xyz'], ['width', 'height']);
-                 }
-                 if (rf & RenderFlags.Update) {
-                   ΔstyleProp(0, ctx.width);
-                   ΔstyleProp(1, ctx.height);
-                   ΔclassProp(0, ctx.activateXYZClass);
-                   ΔstylingApply();
-                 }
-               }
-             });
-
-             width: null|string = null;
-             height: null|string = null;
-             activateXYZClass: boolean = false;
-           }
-
-           /**
-            * <div DirWithInitialStyling class="abc" style="width:100px;
-            * height:200px"></div>
-           */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', [
-                 'DirWithSingleStylingBindings', '', AttributeMarker.Classes, 'abc',
-                 AttributeMarker.Styles, 'width', '100px', 'height', '200px'
-               ]);
-             }
-           }, 1, 0, [DirWithSingleStylingBindings]);
-
-           const fixture = new ComponentFixture(App);
-           const target = fixture.hostElement.querySelector('div') !;
-           expect(target.style.getPropertyValue('width')).toEqual('100px');
-           expect(target.style.getPropertyValue('height')).toEqual('200px');
-           expect(target.classList.contains('abc')).toBeTruthy();
-           expect(target.classList.contains('def')).toBeTruthy();
-           expect(target.classList.contains('xyz')).toBeFalsy();
-
-           dirInstance !.width = '444px';
-           dirInstance !.height = '999px';
-           dirInstance !.activateXYZClass = true;
-           fixture.update();
-
-           expect(target.style.getPropertyValue('width')).toEqual('444px');
-           expect(target.style.getPropertyValue('height')).toEqual('999px');
-           expect(target.classList.contains('abc')).toBeTruthy();
-           expect(target.classList.contains('def')).toBeTruthy();
-           expect(target.classList.contains('xyz')).toBeTruthy();
-
-           dirInstance !.width = null;
-           dirInstance !.height = null;
-           fixture.update();
-
-           expect(target.style.getPropertyValue('width')).toEqual('100px');
-           expect(target.style.getPropertyValue('height')).toEqual('200px');
-           expect(target.classList.contains('abc')).toBeTruthy();
-           expect(target.classList.contains('def')).toBeTruthy();
-           expect(target.classList.contains('xyz')).toBeTruthy();
-         });
-
-      it('should properly prioritize single style binding collisions when they exist on multiple directives',
-         () => {
-           let dir1Instance: Dir1WithStyle;
-           /**
-            * Directive with host props:
-            *   [style.width]
-           */
-           class Dir1WithStyle {
-             static ngDirectiveDef = ΔdefineDirective({
-               type: Dir1WithStyle,
-               selectors: [['', 'Dir1WithStyle', '']],
-               factory: () => dir1Instance = new Dir1WithStyle(),
-               hostBindings: function(rf: RenderFlags, ctx: Dir1WithStyle, elementIndex: number) {
-                 if (rf & RenderFlags.Create) {
-                   Δstyling(null, ['width']);
-                 }
-                 if (rf & RenderFlags.Update) {
-                   ΔstyleProp(0, ctx.width);
-                   ΔstylingApply();
-                 }
-               }
-             });
-             width: null|string = null;
-           }
-
-           let dir2Instance: Dir2WithStyle;
-           /**
-            * Directive with host props:
-            *   [style.width]
-            *   style="width:111px"
-           */
-           class Dir2WithStyle {
-             static ngDirectiveDef = ΔdefineDirective({
-               type: Dir2WithStyle,
-               selectors: [['', 'Dir2WithStyle', '']],
-               factory: () => dir2Instance = new Dir2WithStyle(),
-               hostBindings: function(rf: RenderFlags, ctx: Dir2WithStyle, elementIndex: number) {
-                 if (rf & RenderFlags.Create) {
-                   ΔelementHostAttrs([AttributeMarker.Styles, 'width', '111px']);
-                   Δstyling(null, ['width']);
-                 }
-                 if (rf & RenderFlags.Update) {
-                   ΔstyleProp(0, ctx.width);
-                   ΔstylingApply();
-                 }
-               }
-             });
-             width: null|string = null;
-           }
-
-           /**
-            * Component with the following template:
-            *   <div Dir1WithStyle Dir2WithStyle [style.width]></div>
-           */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', ['Dir1WithStyle', '', 'Dir2WithStyle', '']);
-               Δstyling(null, ['width']);
-             }
-             if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔstyleProp(0, ctx.width);
-               ΔstylingApply();
-             }
-           }, 1, 0, [Dir1WithStyle, Dir2WithStyle]);
-
-           const fixture = new ComponentFixture(App);
-           const target = fixture.hostElement.querySelector('div') !;
-           expect(target.style.getPropertyValue('width')).toEqual('111px');
-
-           fixture.component.width = '999px';
-           dir1Instance !.width = '222px';
-           dir2Instance !.width = '333px';
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('999px');
-
-           fixture.component.width = null;
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('222px');
-
-           dir1Instance !.width = null;
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('333px');
-
-           dir2Instance !.width = null;
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('111px');
-
-           dir1Instance !.width = '666px';
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('666px');
-
-           fixture.component.width = '777px';
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('777px');
-         });
-
-      it('should properly prioritize multi style binding collisions when they exist on multiple directives',
-         () => {
-           let dir1Instance: Dir1WithStyling;
-           /**
-            * Directive with host props:
-            *   [style]
-            *   [class]
-           */
-           class Dir1WithStyling {
-             static ngDirectiveDef = ΔdefineDirective({
-               type: Dir1WithStyling,
-               selectors: [['', 'Dir1WithStyling', '']],
-               factory: () => dir1Instance = new Dir1WithStyling(),
-               hostBindings: function(rf: RenderFlags, ctx: Dir1WithStyling, elementIndex: number) {
-                 if (rf & RenderFlags.Create) {
-                   Δstyling();
-                 }
-                 if (rf & RenderFlags.Update) {
-                   ΔstyleMap(ctx.stylesExp);
-                   ΔclassMap(ctx.classesExp);
-                   ΔstylingApply();
-                 }
-               }
-             });
-
-             classesExp: any = {};
-             stylesExp: any = {};
-           }
-
-           let dir2Instance: Dir2WithStyling;
-           /**
-            * Directive with host props:
-            *   [style]
-            *   style="width:111px"
-           */
-           class Dir2WithStyling {
-             static ngDirectiveDef = ΔdefineDirective({
-               type: Dir2WithStyling,
-               selectors: [['', 'Dir2WithStyling', '']],
-               factory: () => dir2Instance = new Dir2WithStyling(),
-               hostBindings: function(rf: RenderFlags, ctx: Dir2WithStyling, elementIndex: number) {
-                 if (rf & RenderFlags.Create) {
-                   ΔelementHostAttrs([AttributeMarker.Styles, 'width', '111px']);
-                   Δstyling();
-                 }
-                 if (rf & RenderFlags.Update) {
-                   ΔstyleMap(ctx.stylesExp);
-                   ΔstylingApply();
-                 }
-               }
-             });
-
-             stylesExp: any = {};
-           }
-
-           /**
-            * Component with the following template:
-            *   <div Dir1WithStyling Dir2WithStyling [style] [class]></div>
-           */
-           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-             if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', ['Dir1WithStyling', '', 'Dir2WithStyling', '']);
-               Δstyling();
-             }
-             if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔstyleMap(ctx.stylesExp);
-               ΔclassMap(ctx.classesExp);
-               ΔstylingApply();
-             }
-           }, 1, 0, [Dir1WithStyling, Dir2WithStyling]);
-
-           const fixture = new ComponentFixture(App);
-           const target = fixture.hostElement.querySelector('div') !;
-           expect(target.style.getPropertyValue('width')).toEqual('111px');
-
-           const compInstance = fixture.component;
-           compInstance.stylesExp = {width: '999px', height: null};
-           compInstance.classesExp = {one: true, two: false};
-           dir1Instance !.stylesExp = {width: '222px'};
-           dir1Instance !.classesExp = {two: true, three: false};
-           dir2Instance !.stylesExp = {width: '333px', height: '100px'};
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('999px');
-           expect(target.style.getPropertyValue('height')).toEqual('100px');
-           expect(target.classList.contains('one')).toBeTruthy();
-           expect(target.classList.contains('two')).toBeFalsy();
-           expect(target.classList.contains('three')).toBeFalsy();
-
-           compInstance.stylesExp = {};
-           compInstance !.classesExp = {};
-           dir1Instance !.stylesExp = {width: '222px', height: '200px'};
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('222px');
-           expect(target.style.getPropertyValue('height')).toEqual('200px');
-           expect(target.classList.contains('one')).toBeFalsy();
-           expect(target.classList.contains('two')).toBeTruthy();
-           expect(target.classList.contains('three')).toBeFalsy();
-
-           dir1Instance !.stylesExp = {};
-           dir1Instance !.classesExp = {};
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('333px');
-           expect(target.style.getPropertyValue('height')).toEqual('100px');
-           expect(target.classList.contains('one')).toBeFalsy();
-           expect(target.classList.contains('two')).toBeFalsy();
-           expect(target.classList.contains('three')).toBeFalsy();
-
-           dir2Instance !.stylesExp = {};
-           compInstance.stylesExp = {height: '900px'};
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('111px');
-           expect(target.style.getPropertyValue('height')).toEqual('900px');
-
-           dir1Instance !.stylesExp = {width: '666px', height: '600px'};
-           dir1Instance !.classesExp = {four: true, one: true};
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('666px');
-           expect(target.style.getPropertyValue('height')).toEqual('900px');
-           expect(target.classList.contains('one')).toBeTruthy();
-           expect(target.classList.contains('two')).toBeFalsy();
-           expect(target.classList.contains('three')).toBeFalsy();
-           expect(target.classList.contains('four')).toBeTruthy();
-
-           compInstance.stylesExp = {width: '777px'};
-           compInstance.classesExp = {four: false};
-           fixture.update();
-           expect(target.style.getPropertyValue('width')).toEqual('777px');
-           expect(target.style.getPropertyValue('height')).toEqual('600px');
-           expect(target.classList.contains('one')).toBeTruthy();
-           expect(target.classList.contains('two')).toBeFalsy();
-           expect(target.classList.contains('three')).toBeFalsy();
-           expect(target.classList.contains('four')).toBeFalsy();
-         });
-    });
-
-    it('should properly handle and render interpolation for class attribute bindings', () => {
-      const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'div');
-          Δstyling();
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          Δselect(0);
-          ΔclassMap(Δinterpolation2('-', ctx.name, '-', ctx.age, '-'));
-          ΔstylingApply();
-        }
-      }, 1, 2);
-
-      const fixture = new ComponentFixture(App);
-      const target = fixture.hostElement.querySelector('div') !;
-      expect(target.classList.contains('-fred-36-')).toBeFalsy();
-
-      fixture.component.name = 'fred';
-      fixture.component.age = '36';
-      fixture.update();
-
-      expect(target.classList.contains('-fred-36-')).toBeTruthy();
-    });
-  });
 });
 
 describe('template data', () => {

From b1ba2d6f4eb088c288f8a8c6f0b3fbb1092b1752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mis=CC=8Cko=20Hevery?= <misko@hevery.com>
Date: Thu, 4 Apr 2019 15:03:40 -0700
Subject: [PATCH 087/275] test(ivy): add expanding_rows performance benchmark
 which runs in ViewEngine and Ivy (#30449)

PR Close #30449
---
 .../benchmarks/src/expanding_rows/BUILD.bazel |  74 +++
 .../src/expanding_rows/benchmark.ts           |  76 +++
 .../src/expanding_rows/benchmark_module.ts    |  54 ++
 .../src/expanding_rows/benchmark_spec.ts      |  24 +
 .../benchmarkable_expanding_row.ts            |  73 +++
 .../benchmarkable_expanding_row_module.ts     |  25 +
 .../src/expanding_rows/expanding_row.ts       | 371 +++++++++++++
 .../expanding_rows/expanding_row_blacklist.ts |  19 +
 .../src/expanding_rows/expanding_row_css.ts   |  87 +++
 .../expanding_row_details_caption.ts          |  58 ++
 .../expanding_row_details_content.ts          |  50 ++
 .../src/expanding_rows/expanding_row_host.ts  | 519 ++++++++++++++++++
 .../expanding_rows/expanding_row_module.ts    |  42 ++
 .../expanding_rows/expanding_row_summary.ts   | 219 ++++++++
 .../expanding_row_toggle_event.ts             |  22 +
 .../benchmarks/src/expanding_rows/index.html  |  35 ++
 .../benchmarks/src/expanding_rows/index.ts    |  19 +
 17 files changed, 1767 insertions(+)
 create mode 100644 modules/benchmarks/src/expanding_rows/BUILD.bazel
 create mode 100644 modules/benchmarks/src/expanding_rows/benchmark.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/benchmark_module.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/benchmark_spec.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_css.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_host.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_module.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_summary.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/expanding_row_toggle_event.ts
 create mode 100644 modules/benchmarks/src/expanding_rows/index.html
 create mode 100644 modules/benchmarks/src/expanding_rows/index.ts

diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel
new file mode 100644
index 0000000000..2d1f00d691
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel
@@ -0,0 +1,74 @@
+package(default_visibility = ["//modules/benchmarks:__subpackages__"])
+
+load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
+
+ng_module(
+    name = "application_lib",
+    srcs = glob(
+        ["**/*.ts"],
+        exclude = ["**/*_spec.ts"],
+    ),
+    deps = [
+        "//packages:types",
+        "//packages/common",
+        "//packages/core",
+        "//packages/platform-browser",
+        "@npm//rxjs",
+    ],
+)
+
+ng_module(
+    name = "application_spec",
+    srcs = glob(["**/*_spec.ts"]),
+    deps = [
+        "//packages:types",
+        "//packages/common",
+        "//packages/core",
+        "@npm//reflect-metadata",
+    ],
+)
+
+ng_rollup_bundle(
+    name = "bundle",
+    entry_point = "modules/benchmarks/src/expanding_rows/index.js",
+    deps = [
+        ":application_lib",
+        "@npm//rxjs",
+    ],
+)
+
+ts_devserver(
+    name = "prodserver",
+    static_files = [
+        ":bundle.min_debug.js",
+        ":bundle.min.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "index.html",
+    ],
+)
+
+ts_devserver(
+    name = "devserver",
+    entry_module = "angular/modules/benchmarks/src/expanding_rows/index",
+    index_html = "index.html",
+    scripts = [
+        "@npm//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
+    serving_path = "/index.js",
+    static_files = [
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "index.html",
+    ],
+    deps = [":application_lib"],
+)
+
+benchmark_test(
+    name = "perf",
+    server = ":prodserver",
+    deps = [
+        ":application_spec",
+    ],
+)
diff --git a/modules/benchmarks/src/expanding_rows/benchmark.ts b/modules/benchmarks/src/expanding_rows/benchmark.ts
new file mode 100644
index 0000000000..c7c8b90640
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/benchmark.ts
@@ -0,0 +1,76 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {AfterViewInit, Component, NgModule, ViewChild, ViewEncapsulation} from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+
+import {BenchmarkModule} from './benchmark_module';
+import {BenchmarkableExpandingRow} from './benchmarkable_expanding_row';
+import {BenchmarkableExpandingRowModule} from './benchmarkable_expanding_row_module';
+
+@Component({
+  selector: 'benchmark-root',
+  encapsulation: ViewEncapsulation.None,
+  template: `
+    <h2>cfc-expanding-row initialization benchmark</h2>
+
+    <section>
+      <button id="reset" (click)="reset()">Reset</button>
+      <button (click)="handleInitClick()">Init</button>
+      <button id="run" (click)="runAll()">Run All</button>
+    </section>
+
+    <benchmark-area>
+      <benchmarkable-expanding-row></benchmarkable-expanding-row>
+    </benchmark-area>`,
+})
+export class InitializationRoot implements AfterViewInit {
+  @ViewChild(BenchmarkableExpandingRow, {static: true})
+  expandingRow !: BenchmarkableExpandingRow;
+
+  ngAfterViewInit() {}
+
+  reset() { this.expandingRow.reset(); }
+
+  async runAll() {
+    await execTimed('initialization_benchmark', async() => { await this.doInit(); });
+  }
+
+  async handleInitClick() { await this.doInit(); }
+
+  private async doInit() {
+    await execTimed('initial_load', async() => { this.expandingRow.init(); });
+  }
+}
+
+@NgModule({
+  declarations: [InitializationRoot],
+  exports: [InitializationRoot],
+  imports: [
+    CommonModule,
+    BenchmarkableExpandingRowModule,
+    BenchmarkModule,
+    BrowserModule,
+  ],
+  bootstrap: [InitializationRoot],
+})
+// Component benchmarks must export a BenchmarkModule.
+export class ExpandingRowBenchmarkModule {
+}
+
+export async function execTimed(description: string, func: () => Promise<void>) {
+  console.time(description);
+  await func();
+  await nextTick(200);
+  console.timeEnd(description);
+}
+
+export async function nextTick(delay = 1) {
+  return new Promise((res, rej) => { setTimeout(() => { res(); }, delay); });
+}
diff --git a/modules/benchmarks/src/expanding_rows/benchmark_module.ts b/modules/benchmarks/src/expanding_rows/benchmark_module.ts
new file mode 100644
index 0000000000..783dc9fbf6
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/benchmark_module.ts
@@ -0,0 +1,54 @@
+/**
+ * @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 {ErrorHandler} from '@angular/core';
+import {Component, Injectable, NgModule} from '@angular/core';
+
+@Component({
+  selector: 'benchmark-area',
+  template: '<ng-content></ng-content>',
+  styles: [`
+    :host {
+      padding: 1;
+      margin: 1;
+      background-color: white;
+      width: 1000px;
+      display: block;
+    }`],
+  host: {
+    'class': 'cfc-ng2-region',
+  }
+})
+export class BenchmarkArea {
+}
+
+declare interface ExtendedWindow extends Window {
+  benchmarkErrors?: string[];
+}
+const extendedWindow = window as ExtendedWindow;
+
+@Injectable({providedIn: 'root'})
+export class BenchmarkErrorHandler implements ErrorHandler {
+  handleError(error: Error) {
+    if (!extendedWindow.benchmarkErrors) {
+      extendedWindow.benchmarkErrors = [];
+    }
+    extendedWindow.benchmarkErrors.push(error.message);
+    console.error(error);
+  }
+}
+
+@NgModule({
+  declarations: [BenchmarkArea],
+  exports: [BenchmarkArea],
+  providers: [
+    {provide: ErrorHandler, useClass: BenchmarkErrorHandler},
+  ]
+})
+export class BenchmarkModule {
+}
diff --git a/modules/benchmarks/src/expanding_rows/benchmark_spec.ts b/modules/benchmarks/src/expanding_rows/benchmark_spec.ts
new file mode 100644
index 0000000000..ed661f4edf
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/benchmark_spec.ts
@@ -0,0 +1,24 @@
+/**
+ * @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 {$} from 'protractor';
+import {openTreeBenchmark, runTreeBenchmark} from './tree_perf_test_utils';
+
+describe('benchmarks', () => {
+
+  it('should work for createOnly', done => {
+    runTreeBenchmark({
+      // This cannot be called "createOnly" because the actual destroy benchmark
+      // has the "createOnly" id already. See: https://github.com/angular/angular/pull/21503
+      id: 'createOnlyForReal',
+      prepare: () => $('#destroyDom').click(),
+      work: () => $('#createDom').click()
+    }).then(done, done.fail);
+  });
+
+});
diff --git a/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts
new file mode 100644
index 0000000000..a677ef152e
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Component} from '@angular/core';
+
+export interface MlbTeam {
+  name: string;
+  id: number;
+  division: string;
+  stadium: string;
+  projection: string;
+}
+
+@Component({
+  selector: 'benchmarkable-expanding-row',
+  template: `
+    <cfc-expanding-row-host *ngIf="showExpandingRow">
+    <cfc-expanding-row *ngFor="let team of teams" [rowId]="$any(team.id)">
+      <cfc-expanding-row-summary>
+        Team {{team.id}}
+      </cfc-expanding-row-summary>
+      <cfc-expanding-row-details-caption>
+        {{team.name}}
+        <a href="https://www.google.com" class="cfc-demo-expanding-row-caption-link">
+          {{team.id}}
+        </a>
+      </cfc-expanding-row-details-caption>
+      <cfc-expanding-row-details-content>
+        <ul ace-list>
+          <li>Division: {{team.division}}</li>
+          <li>
+            <a href="https://www.google.com">{{team.stadium}}</a>
+          </li>
+          <li>Projected Record: {{team.projection}}</li>
+        </ul>
+      </cfc-expanding-row-details-content>
+    </cfc-expanding-row>
+  </cfc-expanding-row-host>`,
+})
+export class BenchmarkableExpandingRow {
+  // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
+  showExpandingRow!: boolean;
+
+  // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
+  teams!: MlbTeam[];
+  // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
+  private fakeTeams!: MlbTeam[];
+
+  init(): void {
+    this.teams = this.fakeTeams;
+    this.showExpandingRow = true;
+  }
+
+  reset(numItems = 5000): void {
+    this.showExpandingRow = false;
+
+    this.fakeTeams = [];
+    for (let i = 0; i < numItems; i++) {
+      this.fakeTeams.push({
+        name: `name ${i}`,
+        id: i,
+        division: `division ${i}`,
+        stadium: `stadium ${i}`,
+        projection: `projection ${i}`,
+      });
+    }
+  }
+}
diff --git a/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts
new file mode 100644
index 0000000000..9294f21ac2
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts
@@ -0,0 +1,25 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {ExpandingRowModule} from './expanding_row_module';
+
+import {BenchmarkableExpandingRow} from './benchmarkable_expanding_row';
+
+@NgModule({
+  declarations: [BenchmarkableExpandingRow],
+  exports: [BenchmarkableExpandingRow],
+  imports: [
+    CommonModule,
+    ExpandingRowModule,
+  ],
+})
+export class BenchmarkableExpandingRowModule {
+}
+ 
\ No newline at end of file
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row.ts b/modules/benchmarks/src/expanding_rows/expanding_row.ts
new file mode 100644
index 0000000000..ce098dfe8b
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row.ts
@@ -0,0 +1,371 @@
+/**
+ * @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 {AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Inject, InjectionToken, Input, Output, QueryList, ViewChild} from '@angular/core';
+
+import {ExpandingRowSummary} from './expanding_row_summary';
+import {ExpandingRowToggleEvent} from './expanding_row_toggle_event';
+import { expanding_row_css } from './expanding_row_css';
+
+/**
+ * Injection token to break cylic dependency between ExpandingRow and
+ * ExpandingRowHost
+ */
+export const EXPANDING_ROW_HOST_INJECTION_TOKEN =
+    new InjectionToken<ExpandingRowHostBase>('ExpandingRowHost');
+
+/** The base class for ExpandingRowHost component to break cylic dependency. */
+export interface ExpandingRowHostBase {
+  /**
+   * A reference to all child cfc-expanding-row elements. We will need for
+   * keyboard accessibility and scroll adjustments. For example, we need to know
+   * which row is previous row when user presses "left arrow" on a focused row.
+   */
+  contentRows: QueryList<ExpandingRow>;
+
+  /**
+   * Keeps track of the last row that had focus before focus left the list
+   * of expanding rows.
+   */
+  lastFocusedRow?: ExpandingRow;
+
+  /**
+   * Handles summary element click on a cfc-expanding-row component. Note
+   * that summary element is visible only when the row is collapsed. So this
+   * event will fired prior to expansion of a collapsed row. Scroll adjustment
+   * below makes sure mouse stays on the caption element when the collapsed
+   * row expands.
+   */
+  handleRowSummaryClick(row: ExpandingRow): void;
+
+  /**
+   * Check if element is blacklisted.  Blacklisted elements will not collapse an
+   * open row when clicked.
+   */
+  isBlacklisted(element: HTMLElement|null): boolean;
+
+  /**
+   * Handles caption element click on a cfc-expanding-row component. Note
+   * that caption element is visible only when the row is expanded. So this
+   * means we will collapse the expanded row. The scroll adjustment below
+   * makes sure that the mouse stays under the summary of the expanded row
+   * when the row collapses.
+   */
+  handleRowCaptionClick(row: ExpandingRow): void;
+
+  /**
+   * Handles expansion of a row. When a new row expands, we need to remove
+   * previous expansion and collapse. We also need to save the currently
+   * expanded row so that we can collapse this row once another row expands.
+   */
+  handleRowExpand(row: ExpandingRow): void;
+
+  /**
+   * Handles focus on a row. When a new row gets focus (note that this is
+   * different from expansion), we need to remove previous focus and expansion.
+   * We need to save the reference to this focused row so that we can unfocus
+   * this row when another row is focused.
+   */
+  handleRowFocus(row: ExpandingRow): void;
+
+  /**
+   * Function that is called by expanding row summary to focus on the last
+   * focusable element before the list of expanding rows.
+   */
+  focusOnPreviousFocusableElement(): void;
+
+  /**
+   * Function that is called by expanding row summary to focus on the next
+   * focusable element after the list of expanding rows.
+   */
+  focusOnNextFocusableElement(): void;
+}
+
+/**
+ * This component is used to render a single expanding row. It should contain
+ * cfc-expanding-row-summary, cfc-expanding-row-details-caption and
+ * cfc-expanding-row-details-content components.
+ */
+@Component({
+  selector: 'cfc-expanding-row',
+  styles: [expanding_row_css],
+  template: `
+  <div #expandingRowMainElement
+       class="cfc-expanding-row"
+       cdkMonitorSubtreeFocus
+       [attr.tabindex]="isExpanded ? '0' : '-1'"
+       [class.cfc-expanding-row-has-focus]="isFocused"
+       [class.cfc-expanding-row-is-expanded]="isExpanded"
+       ve="CfcExpandingRow">
+    <ng-content></ng-content>
+  </div>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ExpandingRow {
+  /**
+   * The identifier for this node provided by the user code. We need this
+   * while we are emitting onToggle event.
+   */
+  @Input() rowId!: string;
+
+  /**
+   * An ElementRef to the main element in this component. We need a reference
+   * to this element to compute the height. The height of cfc-expanding-row
+   * is used in [cfcExpandingRowHost] directive for scroll adjustments.
+   */
+  @ViewChild('expandingRowMainElement', {static: true})
+  expandingRowMainElement!: ElementRef;
+
+  /**
+   * This @Output event emitter will be triggered when the user expands or
+   * collapses this node.
+   */
+  @Output() onToggle = new EventEmitter<ExpandingRowToggleEvent>();
+
+  /**
+   * A boolean indicating if this node is expanded. This value is used to
+   * hide/show summary, caption, and content of the expanding row. There should
+   * only be one expanded row within [cfcExpandingRowHost] directive. And if
+   * there is an expanded row, there shouldn't be any focused rows.
+   */
+  set isExpanded(value: boolean) {
+    const changed: boolean = this.isExpandedInternal !== value;
+    this.isExpandedInternal = value;
+
+    if (changed) {
+      this.isExpandedChange.emit();
+      this.changeDetectorRef.markForCheck();
+    }
+  }
+
+  /** TS getter for isExpanded property. */
+  get isExpanded(): boolean {
+    return this.isExpandedInternal;
+  }
+
+  /** Triggered when isExpanded property changes. */
+  isExpandedChange = new EventEmitter<void>();
+
+  /** Triggered when index property changes. */
+  indexChange = new EventEmitter<void>();
+
+  /**
+   * A boolean indicating if this node is focused. This value is used to add
+   * a CSS class that should render a blue border on the right. There should
+   * only be one focused row in [cfcExpandingRowHost] directive.
+   */
+  set isFocused(value: boolean) {
+    this.isFocusedInternal = value;
+    this.changeDetectorRef.markForCheck();
+  }
+
+  /** TS getter for isFocused property. */
+  get isFocused(): boolean {
+    return this.isFocusedInternal;
+  }
+
+  /** The index of the row in the context of the entire collection. */
+  set index(value: number) {
+    const changed: boolean = this.indexInternal !== value;
+    this.indexInternal = value;
+
+    if (changed) {
+      this.indexChange.emit();
+      this.changeDetectorRef.markForCheck();
+    }
+  }
+
+  /** TS getter for index property. */
+  get index(): number {
+    return this.indexInternal;
+  }
+
+  /**
+   * We should probably rename this to summaryContentChild. Because technically
+   * this is not a @ViewChild that is in a template. This will be transcluded.
+   * Note that we are not using @ContentChild directive here. The @ContentChild
+   * will cause cyclic reference if the class definition for ExpandingRowSummary
+   * component is not in the same file as ExpandingRow.
+   */
+  // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
+  summaryViewChild!: ExpandingRowSummary;
+
+  /**
+   * We compute the collapsed height (which is just height of
+   * cfc-expanding-row-summary component) in this component. This is used in
+   * [cfcExpandingRowHost] for scroll adjustment calculation.
+   */
+  collapsedHeight = -1;
+
+  /** Internal storage for isExpanded public property. */
+  private isExpandedInternal = false;
+
+  /** Internal storage for isFocused public property. */
+  private isFocusedInternal = false;
+
+  /** Internal storage for index public property. */
+  // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
+  private indexInternal!: number;
+
+  /**
+   * This holds a reference to [cfcExpandingRowHost] directive. We need
+   * this reference to notify the host when this row expands/collapses or is
+   * focused.
+   */
+  constructor(
+      public elementRef: ElementRef,
+      @Inject(EXPANDING_ROW_HOST_INJECTION_TOKEN) public expandingRowHost:
+          ExpandingRowHostBase,
+      private readonly changeDetectorRef: ChangeDetectorRef) {}
+
+  /**
+   * Handles click on cfc-expanding-row-summary component. This will expand
+   * this row and collapse the previously expanded row. The collapse & blur
+   * is handled in [cfcExpandingRowHost] directive.
+   */
+  handleSummaryClick(): void {
+    this.collapsedHeight = this.elementRef.nativeElement
+                               .querySelector('.cfc-expanding-row-summary')
+                               .offsetHeight;
+    this.expandingRowHost.handleRowSummaryClick(this);
+    this.expand();
+  }
+
+  /**
+   * When user tabs into child cfc-expanding-row-summary component. This method
+   * will make sure we focuse on this row, and blur on previously focused row.
+   */
+  handleSummaryFocus(): void {
+    this.focus();
+  }
+
+  /**
+   * cfc-expanding-row-details-caption component will call this function to
+   * notify click on its host element. Note that caption is only shown when
+   * the row is expanded. Hence this will collapse this row and put the focus
+   * on it.
+   * If a blacklisted element exists in the caption, clicking that element will
+   * not trigger the row collapse.
+   */
+  handleCaptionClick(event: MouseEvent): void {
+    if (this.expandingRowHost.isBlacklisted(
+            event.target as {} as HTMLElement)) {
+      return;
+    }
+    this.expandingRowHost.handleRowCaptionClick(this);
+    this.collapse();
+    this.focus();
+  }
+
+  /**
+   * Gets the height of this component. This height is used in parent
+   * [cfcExpandingRowHost] directive to compute scroll adjustment.
+   */
+  getHeight(): number {
+    return this.expandingRowMainElement.nativeElement.offsetHeight;
+  }
+
+  /**
+   * Expands this row. This will notify the host so that it can collapse
+   * previously expanded row. This function also emits onToggle @Output event
+   * to the user code.
+   */
+  expand(): void {
+    this.isExpanded = true;
+    this.expandingRowHost.handleRowExpand(this);
+
+    // setTimeout here makes sure we scroll this row into view after animation.
+    setTimeout(() => {
+      this.expandingRowMainElement.nativeElement.focus();
+    });
+
+    this.onToggle.emit({rowId: this.rowId, isExpand: true});
+  }
+
+  /**
+   * Collapses this row. Setting isExpanded to false will make sure we hide
+   * the caption and details, and show cfc-expanding-row-summary component.
+   * This also emits onToggle @Output event to the user code.
+   */
+  collapse(): void {
+    this.isExpanded = false;
+    this.onToggle.emit({rowId: this.rowId, isExpand: false});
+  }
+
+  /**
+   * Blurs this row. This should remove the blue border on the left if there
+   * is any. This function will remove DOM focus on the
+   * cfc-expanding-row-summary
+   * component.
+   */
+  blur(): void {
+    this.isFocused = false;
+    this.summaryViewChild.blur();
+  }
+
+  /**
+   * Focuses this row. This should put blue border on the left. If there is
+   * any previous focus/selection, those should be gone. Parent
+   * [cfcExpandingRowHost] component takes care of that.
+   */
+  focus(): void {
+    this.isFocused = true;
+    this.expandingRowHost.handleRowFocus(this);
+
+    // Summary child is not present currently. We need to NG2 to update the
+    // template.
+    setTimeout(() => {
+      this.summaryViewChild.focus();
+    });
+  }
+
+  /**
+   * We listen for TAB press here to make sure we trap the focus on the
+   * expanded
+   * row. If the row is not expanded, we don't care about this event since focus
+   * trap should work for expanded rows only.
+   */
+  @HostListener('keydown', ['$event'])
+  handleKeyDown(event: KeyboardEvent) {
+    const charCode = event.which || event.keyCode;
+
+    switch (charCode) {
+      case 9:
+        if (!this.isExpanded) {
+          return;
+        }
+
+        this.trapFocus(event);
+        break;
+      default:
+        break;
+    }
+  }
+
+  /**
+   * When this row is expanded, this function traps the focus between focusable
+   * elements contained in this row.
+   */
+  private trapFocus(event: KeyboardEvent): void {
+    const rowElement: HTMLElement = this.expandingRowMainElement.nativeElement;
+    const focusableEls: HTMLElement[] = [];
+    let lastFocusableEl: HTMLElement = rowElement;
+
+    if (focusableEls.length) {
+      lastFocusableEl = focusableEls[focusableEls.length - 1];
+    }
+
+    if (event.target === lastFocusableEl && !event.shiftKey) {
+      rowElement.focus();
+      event.preventDefault();
+    } else if (event.target === rowElement && event.shiftKey) {
+      lastFocusableEl.focus();
+      event.preventDefault();
+    }
+  }
+}
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts b/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
new file mode 100644
index 0000000000..fb0546b28a
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
@@ -0,0 +1,19 @@
+/**
+ * @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 {Directive} from '@angular/core';
+
+
+/**
+ * This directive is used to flag an element to NOT trigger collapsing an
+ * expanded row
+ */
+@Directive({
+  selector: '[cfcExpandingRowBlacklist]',
+})
+export class ExpandingRowBlacklist {}
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_css.ts b/modules/benchmarks/src/expanding_rows/expanding_row_css.ts
new file mode 100644
index 0000000000..6eff25fba7
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_css.ts
@@ -0,0 +1,87 @@
+/**
+ * @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 const expanding_row_css = `
+  ::ng-deep [cfcExpandingRowHost] {
+    display: block;
+    margin-bottom: 2;
+  }
+
+  :host(cfc-expanding-row),
+  :host(cfc-expanding-row-summary),
+  :host(cfc-expanding-row-details-caption),
+  :host(cfc-expanding-row-details-content) {
+    display: block;
+  }
+
+  .cfc-expanding-row {
+    background: white;
+    border-top: 1 solid black;
+    box-shadow: 0 1 1 gray;
+    transition: margin 1 1;
+    will-change: margin;
+  }
+
+  .cfc-expanding-row.cfc-expanding-row-is-expanded {
+    margin: 1 (-1);
+  }
+
+  .cfc-expanding-row:focus {
+    outline: none;
+  }
+
+  .cfc-expanding-row-summary {
+
+    display: flex;
+    border-left: 6 solid transparent;
+    cursor: pointer;
+    padding: 6 2;
+
+  }
+
+  .cfc-expanding-row-summary:focus {
+    outline: none;
+    border-left-color: $cfc-color-active;
+  }
+
+  // Adjust icons to be positioned correctly in the row.
+  .cfc-expanding-row-summary::ng-deep cfc-icon {
+    margin-top: 3;
+  }
+
+  .cfc-expanding-row-details-caption {
+    display: flex;
+    cursor: pointer;
+    padding: 4 2;
+
+  }
+
+  .cfc-expanding-row-details-caption::ng-deep a,
+  .cfc-expanding-row-details-caption::ng-deep a:visited,
+  .cfc-expanding-row-details-caption::ng-deep a .cfc-external-link-content {
+    border-color: $cfc-color-text-primary-inverse;
+    color: $cfc-color-text-primary-inverse;
+  }
+
+  // Adjust icons to be positioned correctly in the row.
+  ::ng-deep cfc-icon {
+    margin-top: 3;
+  }
+
+  .cfc-expanding-row-details-content {
+    padding: 2;
+  }
+
+  .cfc-expanding-row-details-content::ng-deep .ace-kv-list.cfc-full-bleed {
+    width: 200px;
+  }
+
+
+  .cfc-expanding-row-accessibility-text {
+    display: none;
+  }`;
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts b/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
new file mode 100644
index 0000000000..ee514f6f40
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, Input, OnDestroy} from '@angular/core';
+import {Subject} from 'rxjs';
+import {takeUntil} from 'rxjs/operators';
+
+import {ExpandingRow} from './expanding_row';
+import { expanding_row_css } from './expanding_row_css';
+
+/**
+ * This component should be within cfc-expanding-row component. The caption
+ * is only visible when the row is expanded.
+ */
+@Component({
+  selector: 'cfc-expanding-row-details-caption',
+  styles: [expanding_row_css],
+  template: `
+    <div *ngIf="expandingRow.isExpanded"
+        (click)="expandingRow.handleCaptionClick($event)"
+        [style.backgroundColor]="color"
+        class="cfc-expanding-row-details-caption">
+      <ng-content></ng-content>
+    </div>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ExpandingRowDetailsCaption implements OnDestroy {
+  /** The background color of this component. */
+  @Input() color: string = 'blue';
+
+  /** This is triggered when this component is destroyed. */
+  private readonly onDestroy = new Subject();
+
+  /**
+   * We need a reference to parent cfc-expanding-row component here to hide
+   * this component when the row is collapsed. We also need to relay clicks
+   * to the parent component.
+   */
+  constructor(
+      @Host() public expandingRow: ExpandingRow,
+      changeDetectorRef: ChangeDetectorRef) {
+    this.expandingRow.isExpandedChange.pipe(takeUntil(this.onDestroy))
+        .subscribe(() => {
+          changeDetectorRef.markForCheck();
+        });
+  }
+
+  /** When component is destroyed, unlisten to isExpanded. */
+  ngOnDestroy(): void {
+    this.onDestroy.next();
+  }
+}
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts b/modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts
new file mode 100644
index 0000000000..b67cc1f02d
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts
@@ -0,0 +1,50 @@
+/**
+ * @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 {ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, OnDestroy} from '@angular/core';
+import {Subscription} from 'rxjs';
+
+import {ExpandingRow} from './expanding_row';
+import { expanding_row_css } from './expanding_row_css';
+
+/**
+ * This component should be within cfc-expanding-row component. Note that the
+ * content is visible only when the row is expanded.
+ */
+@Component({
+  styles: [expanding_row_css],
+  selector: 'cfc-expanding-row-details-content',
+  template: `
+    <div class="cfc-expanding-row-details-content"
+        *ngIf="expandingRow.isExpanded">
+      <ng-content></ng-content>
+    </div>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ExpandingRowDetailsContent implements OnDestroy {
+  /** Used for unsubscribing to changes in isExpanded parent property. */
+  private isExpandedChangeSubscription: Subscription;
+
+  /**
+   * We need a reference to parent cfc-expanding-row component to make sure we
+   * hide this component if the row is collapsed.
+   */
+  constructor(
+      @Host() public expandingRow: ExpandingRow,
+      changeDetectorRef: ChangeDetectorRef) {
+    this.isExpandedChangeSubscription =
+        this.expandingRow.isExpandedChange.subscribe(() => {
+          changeDetectorRef.markForCheck();
+        });
+  }
+
+  /** Unsubscribe from changes in parent isExpanded property. */
+  ngOnDestroy(): void {
+    this.isExpandedChangeSubscription.unsubscribe();
+  }
+}
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_host.ts b/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
new file mode 100644
index 0000000000..64f41bd146
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
@@ -0,0 +1,519 @@
+/**
+ * @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 {AfterContentInit, AfterViewInit, ChangeDetectionStrategy, Component, ContentChildren, ElementRef, EventEmitter, forwardRef, HostListener, Input, OnDestroy, Output, QueryList, ViewChild} from '@angular/core';
+import {Subscription} from 'rxjs';
+
+import {EXPANDING_ROW_HOST_INJECTION_TOKEN, ExpandingRow, ExpandingRowHostBase} from './expanding_row';
+
+/**
+ * We use this class in <cfc-expanding-row/> template to identify the row.
+ * The [cfcExpandingRowHost] directive also uses this class to check if a given
+ * HTMLElement is within an <cfc-expanding-row/>.
+ */
+const EXPANDING_ROW_CLASS_NAME = 'cfc-expanding-row';
+
+/** Throttle duration in milliseconds for repeated key presses. */
+export const EXPANDING_ROW_KEYPRESS_THORTTLE_MS = 50;
+
+/**
+ * This type union is created to make arguments of handleUpOrDownPress*
+ * methods in ExpandingRowHost class more readable.
+ */
+type UpOrDown = 'up'|'down';
+
+/**
+ * This is the wrapper directive for the cfc-expanding-row components. Note that
+ * we wanted to make this a directive instead of component because child
+ * cfc-expanding-row components does not have to be a direct child.
+ */
+@Component({
+  selector: 'cfc-expanding-row-host',
+  template: `
+    <div #firstFocusable
+      (focus)="focusOnLastFocusedRow()"
+      tabindex="0">
+    </div>
+    <ng-content></ng-content>
+    <div #lastFocusable
+      (focus)="focusOnLastFocusedRow()"
+      tabindex="0">
+    </div>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [
+    {provide: EXPANDING_ROW_HOST_INJECTION_TOKEN, useExisting: ExpandingRowHost}
+  ],
+})
+export class ExpandingRowHost implements AfterViewInit, OnDestroy,
+                                         ExpandingRowHostBase {
+  /**
+   * An HTML selector (e.g. "body") for the scroll element. We need this to
+   * make some scroll adjustments.
+   */
+  @Input() scrollElementSelector = '.cfc-panel-body-scrollable';
+
+  /**
+   * An HTML selector (e.g. "body") for the click root. While the row is
+   * expanded, and user clicks outside of the expanded row, we collapse this row
+   * But to do this, we need to know the clickable area.
+   */
+  @Input() clickRootElementSelector = 'cfc-panel-body';
+
+  /**
+   * The @Output will be triggered when the user wants to focus on the
+   * previously expanded row, and we are already at the first row. The logs team
+   * will use this to prepend data on demand.
+   */
+  @Output() onPrepend = new EventEmitter<void>();
+
+  /** A reference to the last focusable element in list of expanding rows. */
+  @ViewChild('lastFocusable', {static: true}) lastFocusableElement!: ElementRef;
+
+  /** A reference to the first focusable element in list of expanding rows. */
+  @ViewChild('firstFocusable', {static: true})
+  firstFocusableElement!: ElementRef;
+
+  /**
+   * A reference to all child cfc-expanding-row elements. We will need for
+   * keyboard accessibility and scroll adjustments. For example, we need to know
+   * which row is previous row when user presses "left arrow" on a focused row.
+   */
+  @ContentChildren(forwardRef(() => ExpandingRow), {descendants: true})
+  contentRows!: QueryList<ExpandingRow>;
+
+  /**
+   * Keeps track of the last row that had focus before focus left the list
+   * of expanding rows.
+   */
+  lastFocusedRow?: ExpandingRow = undefined;
+
+  /**
+   * Focused rows just show a blue left border. This node is not expanded. We
+   * need to keep a reference to the focused row to unfocus when another row
+   * is focused.
+   */
+  private focusedRow?: ExpandingRow = undefined;
+
+  /**
+   * This is the expanded row. If there is an expanded row there shouldn't be
+   * any focused rows. We need a reference to this. For example we need to
+   * collapse the currently expanded row, if another row is expanded.
+   */
+  private expandedRow?: ExpandingRow = undefined;
+
+  /**
+   * This is just handleRootMouseUp.bind(this). handleRootMouseUp handles
+   * click events on root element (defined by clickRootElementSelector @Input)
+   * Since we attach the click listener dynamically, we need to keep this
+   * function around. This enables us to detach the click listener when
+   * component is destroyed.
+   */
+  private handleRootMouseUpBound: EventListenerObject =
+      this.handleRootMouseUp.bind(this);
+
+  /**
+   * 16px is the margin animation we have on cfc-expanding-row component.
+   * We need this value to compute scroll adjustments.
+   */
+  private static rowMargin = 16;
+
+  /** Subscription to changes in the expanding rows. */
+  // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
+  private rowChangeSubscription!: Subscription;
+
+  /**
+   * When component initializes we need to attach click listener to the root
+   * element. This click listener will allows us to collapse the
+   * currently expanded row when user clicks outside of it.
+   */
+  ngAfterViewInit(): void {
+    const clickRootElement: HTMLElement = this.getClickRootElement();
+
+    if (!clickRootElement) {
+      return;
+    }
+
+    clickRootElement.addEventListener('mouseup', this.handleRootMouseUpBound);
+
+    this.rowChangeSubscription = this.contentRows.changes.subscribe(() => {
+      this.recalcRowIndexes();
+    });
+    this.recalcRowIndexes();
+  }
+
+  /**
+   * Detaches the click listener on the root element. Note that we are attaching
+   * this listener on ngAfterViewInit function.
+   */
+  ngOnDestroy(): void {
+    const clickRootElement: HTMLElement = this.getClickRootElement();
+
+    if (!clickRootElement) {
+      return;
+    }
+
+    clickRootElement.removeEventListener(
+        'mouseup', this.handleRootMouseUpBound);
+
+    if (this.rowChangeSubscription) {
+      this.rowChangeSubscription.unsubscribe();
+    }
+  }
+
+  /**
+   * Handles caption element click on a cfc-expanding-row component. Note
+   * that caption element is visible only when the row is expanded. So this
+   * means we will collapse the expanded row. The scroll adjustment below
+   * makes sure that the mouse stays under the summary of the expanded row
+   * when the row collapses.
+   */
+  handleRowCaptionClick(row: ExpandingRow): void {
+    const scrollAdjustment: number = -ExpandingRowHost.rowMargin;
+    const scrollElement: HTMLElement = this.getScrollElement() as HTMLElement;
+    if (!scrollElement) {
+      return;
+    }
+
+    scrollElement.scrollTop += scrollAdjustment;
+  }
+
+  /**
+   * Handles summary element click on a cfc-expanding-row component. Note
+   * that summary element is visible only when the row is collapsed. So this
+   * event will fired prior to expansion of a collapsed row. Scroll adjustment
+   * below makes sure mouse stays on the caption element when the collapsed
+   * row expands.
+   */
+  handleRowSummaryClick(row: ExpandingRow): void {
+    const hadPreviousSelection: boolean = !!this.expandedRow;
+    const previousSelectedRowIndex: number =
+        this.getRowIndex(this.expandedRow as ExpandingRow);
+    const newSelectedRowIndex: number = this.getRowIndex(row);
+    const previousCollapsedHeight: number =
+        this.getSelectedRowCollapsedHeight();
+    const previousExpansionHeight = this.getSelectedRowExpandedHeight();
+
+    if (this.expandedRow) {
+      return;
+    }
+
+    let scrollAdjustment = 0;
+    const scrollElement: HTMLElement = this.getScrollElement() as HTMLElement;
+    if (!scrollElement) {
+      return;
+    }
+
+    if (previousExpansionHeight > 0 && previousCollapsedHeight >= 0) {
+      scrollAdjustment = previousExpansionHeight - previousCollapsedHeight;
+    }
+
+    const newSelectionIsInfrontOfPrevious: boolean =
+        newSelectedRowIndex > previousSelectedRowIndex;
+    const multiplier = newSelectionIsInfrontOfPrevious ? -1 : 0;
+    scrollAdjustment =
+        scrollAdjustment * multiplier + ExpandingRowHost.rowMargin;
+
+    scrollElement.scrollTop += scrollAdjustment;
+  }
+
+  /**
+   * Handles expansion of a row. When a new row expands, we need to remove
+   * previous expansion and collapse. We also need to save the currently
+   * expanded row so that we can collapse this row once another row expands.
+   */
+  handleRowExpand(row: ExpandingRow): void {
+    this.removePreviousFocus();
+    this.removePreviousExpansion();
+    this.expandedRow = row;
+  }
+
+  /**
+   * Handles focus on a row. When a new row gets focus (note that this is
+   * different from expansion), we need to remove previous focus and expansion.
+   * We need to save the reference to this focused row so that we can unfocus
+   * this row when another row is focused.
+   */
+  handleRowFocus(row: ExpandingRow): void {
+    // Do not blur then refocus the row if it's already selected.
+    if (row === this.focusedRow) {
+      return;
+    }
+
+    this.removePreviousFocus();
+    this.removePreviousExpansion();
+    this.focusedRow = row;
+  }
+
+  /**
+   * Called when shift+tabbing from the first focusable element after the list
+   * of expanding rows or tabbing from the last focusable element before.
+   */
+  focusOnLastFocusedRow(): void {
+    if (!this.lastFocusedRow) {
+      this.lastFocusedRow = this.contentRows.toArray()[0];
+    }
+    this.lastFocusedRow.focus();
+  }
+
+  /**
+   * Function that is called by expanding row summary to focus on the last
+   * focusable element before the list of expanding rows.
+   */
+  focusOnPreviousFocusableElement(): void {
+    this.lastFocusedRow = this.focusedRow;
+  }
+
+  /**
+   * Function that is called by expanding row summary to focus on the next
+   * focusable element after the list of expanding rows.
+   */
+  focusOnNextFocusableElement(): void {
+    this.lastFocusedRow = this.focusedRow;
+  }
+
+  /**
+   * Handles keydown event on the host. We are just concerned with up,
+   * down arrow, ESC, and ENTER presses here. Note that Up/Down presses
+   * can be repeated.
+   *
+   * - Up: Focuses on the row above.
+   * - Down: Focuses on the row below.
+   * - Escape: Collapses the expanded row.
+   * - Enter: Expands the focused row.
+   */
+  @HostListener('keydown', ['$event'])
+  handleKeyDown(event: KeyboardEvent) {
+  }
+
+  /**
+   * Recursively returns true if target HTMLElement is within a
+   * cfc-expanding-row component. It will return false otherwise.
+   * We need this function in handleRootMouseUp to collapse the expanded row
+   * when user clicks outside of all expanded rows.
+   */
+  private isTargetInRow(target: HTMLElement): boolean {
+    return target.classList.contains(EXPANDING_ROW_CLASS_NAME);
+  }
+
+  /**
+   * Gets the click root element that is described by clickRootElementSelector
+   * @Input value.
+   */
+  private getClickRootElement(): HTMLElement {
+    return document.querySelector(this.clickRootElementSelector) as HTMLElement;
+  }
+
+  /**
+   * Handles all of the mouseup events on the click root. When user clicks
+   * outside of an expanded row, we need to collapse that row.
+   * We trigger collapse by calling handleCaptionClick() on the expanded row.
+   */
+  private handleRootMouseUp(event: MouseEvent): void {
+    if (!this.expandedRow) {
+      return;
+    }
+
+    if (!this.isTargetInRow(event.target as {} as HTMLElement)) {
+      this.expandedRow.handleCaptionClick(event);
+    }
+  }
+
+  /**
+   * Check if element is blacklisted.  Blacklisted elements will not collapse an
+   * open row when clicked.
+   */
+  isBlacklisted(element: HTMLElement|null): boolean {
+    const clickRoot = this.getClickRootElement();
+    while (element && element !== clickRoot) {
+      if (element.hasAttribute('cfcexpandingrowblacklist')) {
+        return true;
+      }
+      element = element.parentElement;
+    }
+    return false;
+  }
+
+  /**
+   * Removes focus state from a previously focused row. We blur this row and
+   * set the focusedRow to undefined in this method. This usually happens when
+   * another row is focused.
+   */
+  private removePreviousFocus(): void {
+    if (this.focusedRow) {
+      this.focusedRow.blur();
+      this.focusedRow = undefined;
+    }
+  }
+
+  /**
+   * Removes the expanded state from a previously expanded row. We collapse this
+   * row and set the expandedRow to undefined in this method. This usually
+   * happens when another row is expanded.
+   */
+  private removePreviousExpansion(): void {
+    if (this.expandedRow) {
+      this.expandedRow.collapse();
+      this.expandedRow = undefined;
+    }
+  }
+
+  /**
+   * Gets the collapsed height of the currently expanded row. We need this for
+   * scroll adjustments. Note that collapsed height of a cfc-expanding-row
+   * component is equal to height of cfc-expanding-row-summary component within
+   * the row.
+   */
+  private getSelectedRowCollapsedHeight(): number {
+    if (this.expandedRow) {
+      return this.expandedRow.collapsedHeight;
+    } else {
+      return -1;
+    }
+  }
+
+  /**
+   * Gets the current height of the expanded row. We need this value for the
+   * scroll adjustment computation.
+   */
+  private getSelectedRowExpandedHeight(): number {
+    if (this.expandedRow) {
+      return this.expandedRow.getHeight();
+    } else {
+      return -1;
+    }
+  }
+
+  /**
+   * Gets the HTML element described by scrollElementSelector @Input value.
+   * We need this value for scroll adjustments.
+   */
+  private getScrollElement(): HTMLElement|undefined {
+    if (!this.scrollElementSelector) {
+      return undefined;
+    }
+
+    return document.querySelector(this.scrollElementSelector) as HTMLElement;
+  }
+
+  /**
+   * Handles escape presses on the host element. Escape removes previous focus
+   * if there is one. If there is an expanded row, escape row collapses this
+   * row and focuses on it. A subsequent escape press will blur this row.
+   */
+  private handleEscapePress(): void {
+    this.removePreviousFocus();
+
+    if (this.expandedRow) {
+      this.expandedRow.collapse();
+      this.expandedRow.focus();
+      this.expandedRow = undefined;
+    }
+  }
+
+  /**
+   * Handles enter keypress. If there is a focused row, an enter key press on
+   * host element will expand this row.
+   */
+  private handleEnterPress(): void {
+    if (document.activeElement !== this.focusedRowSummary()) {
+      return;
+    }
+
+    if (this.focusedRow) {
+      this.focusedRow.expand();
+    }
+  }
+
+  /** Returns the HTMLElement that is the currently focused row summary. */
+  private focusedRowSummary(): HTMLElement|undefined {
+    return this.focusedRow ?
+        this.focusedRow.summaryViewChild.mainElementRef.nativeElement :
+        undefined;
+  }
+
+  /**
+   * Returns the index of a given row. This enables us to figure out the row
+   * above/below the focused row.
+   */
+  private getRowIndex(rowToLookFor: ExpandingRow): number {
+    return rowToLookFor ? rowToLookFor.index : -1;
+  }
+
+  /**
+   * Handles up/down arrow presses on the host element. Up arrow press will
+   * focus/expand on the row above. Down arrow press will focus/expand the row
+   * below. If we have a focus on the current row, this function will focus on
+   * the computed (the one above or below) row. If host has an expanded row,
+   * this function will expand the computed row.
+   */
+  private handleUpOrDownPressOnce(upOrDown: UpOrDown, event: KeyboardEvent):
+      void {
+    event.preventDefault();
+
+    // If row is expanded but focus is inside the expanded element, arrow
+    // key presses should not do anything.
+    if (this.expandedRow &&
+        document.activeElement !==
+            this.expandedRow.expandingRowMainElement.nativeElement) {
+      return;
+    }
+
+    // If focus is inside a collapsed row header, arrow key presses should not
+    // do anything.
+    if (this.focusedRow &&
+        document.activeElement !== this.focusedRowSummary()) {
+      return;
+    }
+    // We only want screen reader to read the message the first time we enter
+    // the list of expanding rows, so we must reset the variable here
+    this.lastFocusedRow = undefined;
+
+    const rowToLookFor: ExpandingRow|undefined =
+        this.expandedRow || this.focusedRow;
+    if (!rowToLookFor) {
+      return;
+    }
+
+    const isFocus: boolean = (rowToLookFor === this.focusedRow);
+
+    const rowIndex: number = this.getRowIndex(rowToLookFor);
+    const contentRowsArray: ExpandingRow[] = this.contentRows.toArray();
+
+    if (rowIndex < 0) {
+      return;
+    }
+
+    const potentialIndex: number = (upOrDown === 'up' ? -1 : +1) + rowIndex;
+    if (potentialIndex < 0) {
+      this.onPrepend.emit();
+      return;
+    }
+
+    if (potentialIndex >= contentRowsArray.length) {
+      return;
+    }
+
+    const potentialRow: ExpandingRow = contentRowsArray[potentialIndex];
+    if (isFocus) {
+      potentialRow.focus();
+    } else {
+      potentialRow.expand();
+    }
+  }
+
+  // Updates all of the rows with their new index.
+  private recalcRowIndexes() {
+    let index = 0;
+    setTimeout(() => {
+      this.contentRows.forEach((row: ExpandingRow) => {
+        row.index = index++;
+      });
+    });
+  }
+}
+
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_module.ts b/modules/benchmarks/src/expanding_rows/expanding_row_module.ts
new file mode 100644
index 0000000000..13ced09aa4
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_module.ts
@@ -0,0 +1,42 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+
+import {ExpandingRow} from './expanding_row';
+import {ExpandingRowBlacklist} from './expanding_row_blacklist';
+import {ExpandingRowDetailsCaption} from './expanding_row_details_caption';
+import {ExpandingRowDetailsContent} from './expanding_row_details_content';
+import {ExpandingRowHost} from './expanding_row_host';
+import {ExpandingRowSummary} from './expanding_row_summary';
+
+/** The main module for the cfc-expanding-row component. */
+@NgModule({
+  declarations: [
+    ExpandingRow,
+    ExpandingRowDetailsCaption,
+    ExpandingRowDetailsContent,
+    ExpandingRowHost,
+    ExpandingRowSummary,
+    ExpandingRowBlacklist,
+  ],
+  exports: [
+    ExpandingRow,
+    ExpandingRowDetailsCaption,
+    ExpandingRowDetailsContent,
+    ExpandingRowHost,
+    ExpandingRowSummary,
+    ExpandingRowBlacklist,
+  ],
+  imports: [
+    CommonModule,
+  ],
+})
+export class ExpandingRowModule {
+}
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_summary.ts b/modules/benchmarks/src/expanding_rows/expanding_row_summary.ts
new file mode 100644
index 0000000000..2e724c889f
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_summary.ts
@@ -0,0 +1,219 @@
+/**
+ * @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 {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Host, HostListener, OnDestroy, ViewChild} from '@angular/core';
+import {Subscription} from 'rxjs';
+
+import {ExpandingRow} from './expanding_row';
+import { expanding_row_css } from './expanding_row_css';
+
+const KEY_CODE_TAB = 9;
+
+/**
+ * This component should be used within cfc-expanding-row component. Note that
+ * summary is visible only when the row is collapsed.
+ */
+@Component({
+  selector: 'cfc-expanding-row-summary',
+  styles: [expanding_row_css],
+  template: `
+    <div *ngIf="!expandingRow.isExpanded"
+      #expandingRowSummaryMainElement
+      class="cfc-expanding-row-summary"
+      tabindex="-1"
+      (click)="expandingRow.handleSummaryClick()"
+      (focus)="handleFocus()">
+      <ng-content></ng-content>
+      <div class="cfc-expanding-row-accessibility-text">.</div>
+      <div class="cfc-expanding-row-accessibility-text"
+          i18n="This is the label used to indicate that the user is in a list of expanding rows.">
+        Row {{expandingRow.index + 1}} in list of expanding rows.
+      </div>
+      <div *ngIf="isPreviouslyFocusedRow()"
+          class="cfc-expanding-row-accessibility-text"
+          i18n="This is the label used for the first row in list of expanding rows.">
+        Use arrow keys to navigate.
+      </div>
+  </div>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ExpandingRowSummary implements OnDestroy {
+  /**
+   * A reference to the main element. This element should be focusable. We need
+   * reference to compute collapsed height of the row. We also use this
+   * reference for focus and blur methods below.
+   */
+  @ViewChild('expandingRowSummaryMainElement', {static: false})
+  mainElementRef!: ElementRef;
+
+  /** Subscription for changes in parent isExpanded property. */
+  private isExpandedSubscription: Subscription;
+
+  /** Subscription for changes in parent index property. */
+  private indexSubscription: Subscription;
+
+  /**
+   * We need the parent cfc-expanding-row component here to hide this element
+   * when the row is expanded. cfc-expanding-row-details-caption element
+   * will act as a header for expanded rows. We also need to relay tab-in and
+   * click events to the parent.
+   */
+  constructor(
+      @Host() public expandingRow: ExpandingRow,
+      changeDetectorRef: ChangeDetectorRef) {
+    this.expandingRow.summaryViewChild = this;
+    this.isExpandedSubscription =
+        this.expandingRow.isExpandedChange.subscribe(() => {
+          changeDetectorRef.markForCheck();
+        });
+
+    this.indexSubscription = this.expandingRow.indexChange.subscribe(() => {
+      changeDetectorRef.markForCheck();
+    });
+  }
+
+
+  /** When component is destroyed, unlisten to isExpanded. */
+  ngOnDestroy(): void {
+    if (this.isExpandedSubscription) {
+      this.isExpandedSubscription.unsubscribe();
+    }
+    if (this.indexSubscription) {
+      this.indexSubscription.unsubscribe();
+    }
+  }
+
+  /**
+   * Handles focus event on the element. We basically want to detect any focus
+   * in this component and relay this information to parent cfc-expanding-row
+   * component.
+   */
+  handleFocus(): void {
+    // Clicking causes a focus event to occur before the click event. Filter
+    // out click events using the cdkFocusMonitor.
+    //
+    // TODO(b/62385992) Use the KeyboardFocusService to detect focus cause
+    // instead of creating multiple monitors on a page.
+    if (this.expandingRow.expandingRowMainElement.nativeElement.classList
+            .contains('cdk-mouse-focused')) {
+      return;
+    }
+
+    if (!this.expandingRow.isFocused && !this.expandingRow.isExpanded) {
+      this.expandingRow.handleSummaryFocus();
+    }
+  }
+
+  /**
+   * Handles tab & shift+tab presses on expanding row summaries in case there
+   * are tabbable elements inside the summaries.
+   */
+  @HostListener('keydown', ['$event'])
+  handleKeyDown(event: KeyboardEvent) {
+    const charCode = event.which || event.keyCode;
+    if (charCode === KEY_CODE_TAB) {
+      this.handleTabKeypress(event);
+    }
+  }
+
+  /**
+   * Handles tab and shift+tab presses inside expanding row summaries;
+   *
+   * From inside collapsed row summary:
+   * - Tab: If focus was on the last focusable child, should shift focus to
+   *        the next focusable element outside the list of expanding rows.
+   * - Shift+tab: If focus was on first focusable child, should shift focus to
+   *              the main collapsed row summary element
+   *              If focus was on main collapsed row summary element, should
+   *              shift focus to the last focusable element before the list of
+   *              expanding rows.
+   */
+  handleTabKeypress(event: KeyboardEvent): void {
+    const focusableChildren = this.getFocusableChildren();
+
+    if (focusableChildren.length === 0) {
+      return;
+    }
+
+    // Shift+tab on expanding row summary should focus on last focusable element
+    // before expanding row list. Otherwise, if shift+tab is pressed on first
+    // focusable child inside expanding row summary, it should focus on main
+    // expanding row summary element.
+    if (event.shiftKey &&
+        document.activeElement === this.mainElementRef.nativeElement) {
+      event.preventDefault();
+      this.expandingRow.expandingRowHost.focusOnPreviousFocusableElement();
+      return;
+    } else if (
+        event.shiftKey && document.activeElement === focusableChildren[0]) {
+      event.preventDefault();
+      this.expandingRow.focus();
+    }
+
+    // If tab is pressed on the last focusable element inside an expanding row
+    // summary, focus should be set to the next focusable element after the list
+    // of expanding rows.
+    if (!event.shiftKey &&
+        document.activeElement ===
+            focusableChildren[focusableChildren.length - 1]) {
+      event.preventDefault();
+      this.expandingRow.expandingRowHost.focusOnNextFocusableElement();
+    }
+  }
+
+  /**
+   * Finds the row that had focus before focus left the list of expanding rows
+   * and checks if the current row summary is that row.
+   */
+  isPreviouslyFocusedRow(): boolean {
+    if (!this.expandingRow.expandingRowHost.contentRows) {
+      return false;
+    }
+
+    const expandingRowHost = this.expandingRow.expandingRowHost;
+
+    if (!this.mainElementRef || !expandingRowHost.lastFocusedRow) {
+      return false;
+    }
+
+    if (!expandingRowHost.lastFocusedRow.summaryViewChild.mainElementRef) {
+      return false;
+    }
+
+    // If the current expanding row summary was the last focused one before
+    // focus exited the list, then return true to trigger the screen reader
+    if (this.mainElementRef.nativeElement ===
+        expandingRowHost.lastFocusedRow.summaryViewChild.mainElementRef
+            .nativeElement) {
+      return true;
+    }
+    return false;
+  }
+
+  /** Puts the DOM focus on the main element. */
+  focus(): void {
+    if (this.mainElementRef &&
+        document.activeElement !== this.mainElementRef.nativeElement) {
+      this.mainElementRef.nativeElement.focus();
+    }
+  }
+
+  /** Removes the DOM focus on the main element. */
+  blur(): void {
+    if (!this.mainElementRef) {
+      return;
+    }
+
+    this.mainElementRef.nativeElement.blur();
+  }
+
+  /** Returns array of focusable elements within this component. */
+  private getFocusableChildren(): HTMLElement[] {
+    return [];
+  }
+}
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_toggle_event.ts b/modules/benchmarks/src/expanding_rows/expanding_row_toggle_event.ts
new file mode 100644
index 0000000000..e1b1e334fc
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_toggle_event.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 interface is used to send toggle (expand/collapse) events to the user
+ * code.
+ */
+export interface ExpandingRowToggleEvent {
+  /** The identifier of the row that was toggled. */
+  rowId: string;
+
+  /**
+   * A boolean indicating whether or not this row was expanded. This is set to
+   * false if the row was collapsed.
+   */
+  isExpand: boolean;
+}
diff --git a/modules/benchmarks/src/expanding_rows/index.html b/modules/benchmarks/src/expanding_rows/index.html
new file mode 100644
index 0000000000..b4e258faa0
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/index.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html>
+
+<head>
+  <!-- Prevent the browser from requesting any favicon. -->
+  <link rel="icon" href="data:,">
+</head>
+
+<body>
+
+  <h1>Change Detection Benchmark</h1>
+  <div id="rendererMode">...</div>
+
+  <benchmark-root>loading...</benchmark-root>
+
+  <script>
+    addEventListener('DOMContentLoaded', () => {
+      window.ngDevMode = location.hash == '#ngDevMode';
+      // DevServer has automatic bootstrap code, so if we already have <scripts> than we don't need to bootstrap
+      var alreadyBootstraped = document.querySelectorAll('script').length > 1; // 1 for ourselves
+
+      if (!alreadyBootstraped) {
+        function loadScript(url) {
+          var script = document.createElement('script');
+          script.src = url;
+          document.body.append(script);
+        }
+        loadScript('/npm/node_modules/zone.js/dist/zone.js');
+        loadScript(document.location.search.endsWith('debug') ? 'bundle.min_debug.js' : 'bundle.min.js');
+      }
+    });
+  </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/modules/benchmarks/src/expanding_rows/index.ts b/modules/benchmarks/src/expanding_rows/index.ts
new file mode 100644
index 0000000000..6dd9db9d86
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/index.ts
@@ -0,0 +1,19 @@
+/**
+ * @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 {platformBrowser} from '@angular/platform-browser';
+
+import {ExpandingRowBenchmarkModule} from './benchmark';
+import {ExpandingRowBenchmarkModuleNgFactory} from './benchmark.ngfactory';
+
+setMode(ExpandingRowBenchmarkModule.hasOwnProperty('ngModuleDef') ? 'Ivy' : 'ViewEngine');
+platformBrowser().bootstrapModuleFactory(ExpandingRowBenchmarkModuleNgFactory);
+
+function setMode(name: string): void {
+  document.querySelector('#rendererMode') !.textContent = `Render Mode: ${name}`;
+}
\ No newline at end of file

From 8c1a041411c61a758bd8c6193266df0217e5d98d Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 14 May 2019 09:39:11 +0200
Subject: [PATCH 088/275] fixup! test(ivy): rebase, format and lint (#30449)

PR Close #30449
---
 .../src/expanding_rows/benchmark_module.ts    |  7 +-
 .../benchmarkable_expanding_row.ts            |  6 +-
 .../benchmarkable_expanding_row_module.ts     |  3 +-
 .../src/expanding_rows/expanding_row.ts       | 50 ++++--------
 .../expanding_rows/expanding_row_blacklist.ts |  3 +-
 .../expanding_row_details_caption.ts          | 17 ++--
 .../expanding_row_details_content.ts          | 14 +---
 .../src/expanding_rows/expanding_row_host.ts  | 80 +++++++------------
 .../expanding_rows/expanding_row_summary.ts   | 40 ++++------
 9 files changed, 78 insertions(+), 142 deletions(-)

diff --git a/modules/benchmarks/src/expanding_rows/benchmark_module.ts b/modules/benchmarks/src/expanding_rows/benchmark_module.ts
index 783dc9fbf6..6f13981f60 100644
--- a/modules/benchmarks/src/expanding_rows/benchmark_module.ts
+++ b/modules/benchmarks/src/expanding_rows/benchmark_module.ts
@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ErrorHandler} from '@angular/core';
-import {Component, Injectable, NgModule} from '@angular/core';
+import {Component, ErrorHandler, Injectable, NgModule} from '@angular/core';
 
 @Component({
   selector: 'benchmark-area',
@@ -27,9 +26,7 @@ import {Component, Injectable, NgModule} from '@angular/core';
 export class BenchmarkArea {
 }
 
-declare interface ExtendedWindow extends Window {
-  benchmarkErrors?: string[];
-}
+declare interface ExtendedWindow extends Window { benchmarkErrors?: string[]; }
 const extendedWindow = window as ExtendedWindow;
 
 @Injectable({providedIn: 'root'})
diff --git a/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts
index a677ef152e..8c70934388 100644
--- a/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts
+++ b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row.ts
@@ -44,12 +44,12 @@ export interface MlbTeam {
 })
 export class BenchmarkableExpandingRow {
   // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
-  showExpandingRow!: boolean;
+  showExpandingRow !: boolean;
 
   // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
-  teams!: MlbTeam[];
+  teams !: MlbTeam[];
   // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
-  private fakeTeams!: MlbTeam[];
+  private fakeTeams !: MlbTeam[];
 
   init(): void {
     this.teams = this.fakeTeams;
diff --git a/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts
index 9294f21ac2..7459cf92f4 100644
--- a/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts
+++ b/modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts
@@ -8,9 +8,9 @@
 
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {ExpandingRowModule} from './expanding_row_module';
 
 import {BenchmarkableExpandingRow} from './benchmarkable_expanding_row';
+import {ExpandingRowModule} from './expanding_row_module';
 
 @NgModule({
   declarations: [BenchmarkableExpandingRow],
@@ -22,4 +22,3 @@ import {BenchmarkableExpandingRow} from './benchmarkable_expanding_row';
 })
 export class BenchmarkableExpandingRowModule {
 }
- 
\ No newline at end of file
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row.ts b/modules/benchmarks/src/expanding_rows/expanding_row.ts
index ce098dfe8b..da6da38bb8 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row.ts
@@ -8,9 +8,10 @@
 
 import {AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Inject, InjectionToken, Input, Output, QueryList, ViewChild} from '@angular/core';
 
+import {expanding_row_css} from './expanding_row_css';
 import {ExpandingRowSummary} from './expanding_row_summary';
 import {ExpandingRowToggleEvent} from './expanding_row_toggle_event';
-import { expanding_row_css } from './expanding_row_css';
+
 
 /**
  * Injection token to break cylic dependency between ExpandingRow and
@@ -111,7 +112,7 @@ export class ExpandingRow {
    * The identifier for this node provided by the user code. We need this
    * while we are emitting onToggle event.
    */
-  @Input() rowId!: string;
+  @Input() rowId !: string;
 
   /**
    * An ElementRef to the main element in this component. We need a reference
@@ -119,7 +120,7 @@ export class ExpandingRow {
    * is used in [cfcExpandingRowHost] directive for scroll adjustments.
    */
   @ViewChild('expandingRowMainElement', {static: true})
-  expandingRowMainElement!: ElementRef;
+  expandingRowMainElement !: ElementRef;
 
   /**
    * This @Output event emitter will be triggered when the user expands or
@@ -144,9 +145,7 @@ export class ExpandingRow {
   }
 
   /** TS getter for isExpanded property. */
-  get isExpanded(): boolean {
-    return this.isExpandedInternal;
-  }
+  get isExpanded(): boolean { return this.isExpandedInternal; }
 
   /** Triggered when isExpanded property changes. */
   isExpandedChange = new EventEmitter<void>();
@@ -165,9 +164,7 @@ export class ExpandingRow {
   }
 
   /** TS getter for isFocused property. */
-  get isFocused(): boolean {
-    return this.isFocusedInternal;
-  }
+  get isFocused(): boolean { return this.isFocusedInternal; }
 
   /** The index of the row in the context of the entire collection. */
   set index(value: number) {
@@ -181,9 +178,7 @@ export class ExpandingRow {
   }
 
   /** TS getter for index property. */
-  get index(): number {
-    return this.indexInternal;
-  }
+  get index(): number { return this.indexInternal; }
 
   /**
    * We should probably rename this to summaryContentChild. Because technically
@@ -193,7 +188,7 @@ export class ExpandingRow {
    * component is not in the same file as ExpandingRow.
    */
   // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
-  summaryViewChild!: ExpandingRowSummary;
+  summaryViewChild !: ExpandingRowSummary;
 
   /**
    * We compute the collapsed height (which is just height of
@@ -210,7 +205,7 @@ export class ExpandingRow {
 
   /** Internal storage for index public property. */
   // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
-  private indexInternal!: number;
+  private indexInternal !: number;
 
   /**
    * This holds a reference to [cfcExpandingRowHost] directive. We need
@@ -219,8 +214,7 @@ export class ExpandingRow {
    */
   constructor(
       public elementRef: ElementRef,
-      @Inject(EXPANDING_ROW_HOST_INJECTION_TOKEN) public expandingRowHost:
-          ExpandingRowHostBase,
+      @Inject(EXPANDING_ROW_HOST_INJECTION_TOKEN) public expandingRowHost: ExpandingRowHostBase,
       private readonly changeDetectorRef: ChangeDetectorRef) {}
 
   /**
@@ -229,9 +223,8 @@ export class ExpandingRow {
    * is handled in [cfcExpandingRowHost] directive.
    */
   handleSummaryClick(): void {
-    this.collapsedHeight = this.elementRef.nativeElement
-                               .querySelector('.cfc-expanding-row-summary')
-                               .offsetHeight;
+    this.collapsedHeight =
+        this.elementRef.nativeElement.querySelector('.cfc-expanding-row-summary').offsetHeight;
     this.expandingRowHost.handleRowSummaryClick(this);
     this.expand();
   }
@@ -240,9 +233,7 @@ export class ExpandingRow {
    * When user tabs into child cfc-expanding-row-summary component. This method
    * will make sure we focuse on this row, and blur on previously focused row.
    */
-  handleSummaryFocus(): void {
-    this.focus();
-  }
+  handleSummaryFocus(): void { this.focus(); }
 
   /**
    * cfc-expanding-row-details-caption component will call this function to
@@ -253,8 +244,7 @@ export class ExpandingRow {
    * not trigger the row collapse.
    */
   handleCaptionClick(event: MouseEvent): void {
-    if (this.expandingRowHost.isBlacklisted(
-            event.target as {} as HTMLElement)) {
+    if (this.expandingRowHost.isBlacklisted(event.target as {} as HTMLElement)) {
       return;
     }
     this.expandingRowHost.handleRowCaptionClick(this);
@@ -266,9 +256,7 @@ export class ExpandingRow {
    * Gets the height of this component. This height is used in parent
    * [cfcExpandingRowHost] directive to compute scroll adjustment.
    */
-  getHeight(): number {
-    return this.expandingRowMainElement.nativeElement.offsetHeight;
-  }
+  getHeight(): number { return this.expandingRowMainElement.nativeElement.offsetHeight; }
 
   /**
    * Expands this row. This will notify the host so that it can collapse
@@ -280,9 +268,7 @@ export class ExpandingRow {
     this.expandingRowHost.handleRowExpand(this);
 
     // setTimeout here makes sure we scroll this row into view after animation.
-    setTimeout(() => {
-      this.expandingRowMainElement.nativeElement.focus();
-    });
+    setTimeout(() => { this.expandingRowMainElement.nativeElement.focus(); });
 
     this.onToggle.emit({rowId: this.rowId, isExpand: true});
   }
@@ -319,9 +305,7 @@ export class ExpandingRow {
 
     // Summary child is not present currently. We need to NG2 to update the
     // template.
-    setTimeout(() => {
-      this.summaryViewChild.focus();
-    });
+    setTimeout(() => { this.summaryViewChild.focus(); });
   }
 
   /**
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts b/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
index fb0546b28a..6da0e5f31b 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
@@ -16,4 +16,5 @@ import {Directive} from '@angular/core';
 @Directive({
   selector: '[cfcExpandingRowBlacklist]',
 })
-export class ExpandingRowBlacklist {}
+export class ExpandingRowBlacklist {
+}
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts b/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
index ee514f6f40..15f77c95db 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
@@ -12,7 +12,7 @@ import {Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
 
 import {ExpandingRow} from './expanding_row';
-import { expanding_row_css } from './expanding_row_css';
+import {expanding_row_css} from './expanding_row_css';
 
 /**
  * This component should be within cfc-expanding-row component. The caption
@@ -42,17 +42,12 @@ export class ExpandingRowDetailsCaption implements OnDestroy {
    * this component when the row is collapsed. We also need to relay clicks
    * to the parent component.
    */
-  constructor(
-      @Host() public expandingRow: ExpandingRow,
-      changeDetectorRef: ChangeDetectorRef) {
-    this.expandingRow.isExpandedChange.pipe(takeUntil(this.onDestroy))
-        .subscribe(() => {
-          changeDetectorRef.markForCheck();
-        });
+  constructor(@Host() public expandingRow: ExpandingRow, changeDetectorRef: ChangeDetectorRef) {
+    this.expandingRow.isExpandedChange.pipe(takeUntil(this.onDestroy)).subscribe(() => {
+      changeDetectorRef.markForCheck();
+    });
   }
 
   /** When component is destroyed, unlisten to isExpanded. */
-  ngOnDestroy(): void {
-    this.onDestroy.next();
-  }
+  ngOnDestroy(): void { this.onDestroy.next(); }
 }
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts b/modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts
index b67cc1f02d..2ab182a39c 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts
@@ -10,7 +10,7 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, OnDestroy}
 import {Subscription} from 'rxjs';
 
 import {ExpandingRow} from './expanding_row';
-import { expanding_row_css } from './expanding_row_css';
+import {expanding_row_css} from './expanding_row_css';
 
 /**
  * This component should be within cfc-expanding-row component. Note that the
@@ -34,17 +34,11 @@ export class ExpandingRowDetailsContent implements OnDestroy {
    * We need a reference to parent cfc-expanding-row component to make sure we
    * hide this component if the row is collapsed.
    */
-  constructor(
-      @Host() public expandingRow: ExpandingRow,
-      changeDetectorRef: ChangeDetectorRef) {
+  constructor(@Host() public expandingRow: ExpandingRow, changeDetectorRef: ChangeDetectorRef) {
     this.isExpandedChangeSubscription =
-        this.expandingRow.isExpandedChange.subscribe(() => {
-          changeDetectorRef.markForCheck();
-        });
+        this.expandingRow.isExpandedChange.subscribe(() => { changeDetectorRef.markForCheck(); });
   }
 
   /** Unsubscribe from changes in parent isExpanded property. */
-  ngOnDestroy(): void {
-    this.isExpandedChangeSubscription.unsubscribe();
-  }
+  ngOnDestroy(): void { this.isExpandedChangeSubscription.unsubscribe(); }
 }
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_host.ts b/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
index 64f41bd146..28a6ed15f9 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AfterContentInit, AfterViewInit, ChangeDetectionStrategy, Component, ContentChildren, ElementRef, EventEmitter, forwardRef, HostListener, Input, OnDestroy, Output, QueryList, ViewChild} from '@angular/core';
+import {AfterContentInit, AfterViewInit, ChangeDetectionStrategy, Component, ContentChildren, ElementRef, EventEmitter, HostListener, Input, OnDestroy, Output, QueryList, ViewChild, forwardRef} from '@angular/core';
 import {Subscription} from 'rxjs';
 
 import {EXPANDING_ROW_HOST_INJECTION_TOKEN, ExpandingRow, ExpandingRowHostBase} from './expanding_row';
 
+
 /**
  * We use this class in <cfc-expanding-row/> template to identify the row.
  * The [cfcExpandingRowHost] directive also uses this class to check if a given
@@ -25,7 +26,7 @@ export const EXPANDING_ROW_KEYPRESS_THORTTLE_MS = 50;
  * This type union is created to make arguments of handleUpOrDownPress*
  * methods in ExpandingRowHost class more readable.
  */
-type UpOrDown = 'up'|'down';
+type UpOrDown = 'up' | 'down';
 
 /**
  * This is the wrapper directive for the cfc-expanding-row components. Note that
@@ -45,12 +46,10 @@ type UpOrDown = 'up'|'down';
       tabindex="0">
     </div>`,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [
-    {provide: EXPANDING_ROW_HOST_INJECTION_TOKEN, useExisting: ExpandingRowHost}
-  ],
+  providers: [{provide: EXPANDING_ROW_HOST_INJECTION_TOKEN, useExisting: ExpandingRowHost}],
 })
-export class ExpandingRowHost implements AfterViewInit, OnDestroy,
-                                         ExpandingRowHostBase {
+export class ExpandingRowHost implements AfterViewInit,
+    OnDestroy, ExpandingRowHostBase {
   /**
    * An HTML selector (e.g. "body") for the scroll element. We need this to
    * make some scroll adjustments.
@@ -72,11 +71,11 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
   @Output() onPrepend = new EventEmitter<void>();
 
   /** A reference to the last focusable element in list of expanding rows. */
-  @ViewChild('lastFocusable', {static: true}) lastFocusableElement!: ElementRef;
+  @ViewChild('lastFocusable', {static: true}) lastFocusableElement !: ElementRef;
 
   /** A reference to the first focusable element in list of expanding rows. */
   @ViewChild('firstFocusable', {static: true})
-  firstFocusableElement!: ElementRef;
+  firstFocusableElement !: ElementRef;
 
   /**
    * A reference to all child cfc-expanding-row elements. We will need for
@@ -84,7 +83,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
    * which row is previous row when user presses "left arrow" on a focused row.
    */
   @ContentChildren(forwardRef(() => ExpandingRow), {descendants: true})
-  contentRows!: QueryList<ExpandingRow>;
+  contentRows !: QueryList<ExpandingRow>;
 
   /**
    * Keeps track of the last row that had focus before focus left the list
@@ -113,8 +112,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
    * function around. This enables us to detach the click listener when
    * component is destroyed.
    */
-  private handleRootMouseUpBound: EventListenerObject =
-      this.handleRootMouseUp.bind(this);
+  private handleRootMouseUpBound: EventListenerObject = this.handleRootMouseUp.bind(this);
 
   /**
    * 16px is the margin animation we have on cfc-expanding-row component.
@@ -124,7 +122,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
 
   /** Subscription to changes in the expanding rows. */
   // TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
-  private rowChangeSubscription!: Subscription;
+  private rowChangeSubscription !: Subscription;
 
   /**
    * When component initializes we need to attach click listener to the root
@@ -140,9 +138,8 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
 
     clickRootElement.addEventListener('mouseup', this.handleRootMouseUpBound);
 
-    this.rowChangeSubscription = this.contentRows.changes.subscribe(() => {
-      this.recalcRowIndexes();
-    });
+    this.rowChangeSubscription =
+        this.contentRows.changes.subscribe(() => { this.recalcRowIndexes(); });
     this.recalcRowIndexes();
   }
 
@@ -157,8 +154,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
       return;
     }
 
-    clickRootElement.removeEventListener(
-        'mouseup', this.handleRootMouseUpBound);
+    clickRootElement.removeEventListener('mouseup', this.handleRootMouseUpBound);
 
     if (this.rowChangeSubscription) {
       this.rowChangeSubscription.unsubscribe();
@@ -191,11 +187,9 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
    */
   handleRowSummaryClick(row: ExpandingRow): void {
     const hadPreviousSelection: boolean = !!this.expandedRow;
-    const previousSelectedRowIndex: number =
-        this.getRowIndex(this.expandedRow as ExpandingRow);
+    const previousSelectedRowIndex: number = this.getRowIndex(this.expandedRow as ExpandingRow);
     const newSelectedRowIndex: number = this.getRowIndex(row);
-    const previousCollapsedHeight: number =
-        this.getSelectedRowCollapsedHeight();
+    const previousCollapsedHeight: number = this.getSelectedRowCollapsedHeight();
     const previousExpansionHeight = this.getSelectedRowExpandedHeight();
 
     if (this.expandedRow) {
@@ -212,11 +206,9 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
       scrollAdjustment = previousExpansionHeight - previousCollapsedHeight;
     }
 
-    const newSelectionIsInfrontOfPrevious: boolean =
-        newSelectedRowIndex > previousSelectedRowIndex;
+    const newSelectionIsInfrontOfPrevious: boolean = newSelectedRowIndex > previousSelectedRowIndex;
     const multiplier = newSelectionIsInfrontOfPrevious ? -1 : 0;
-    scrollAdjustment =
-        scrollAdjustment * multiplier + ExpandingRowHost.rowMargin;
+    scrollAdjustment = scrollAdjustment * multiplier + ExpandingRowHost.rowMargin;
 
     scrollElement.scrollTop += scrollAdjustment;
   }
@@ -264,17 +256,13 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
    * Function that is called by expanding row summary to focus on the last
    * focusable element before the list of expanding rows.
    */
-  focusOnPreviousFocusableElement(): void {
-    this.lastFocusedRow = this.focusedRow;
-  }
+  focusOnPreviousFocusableElement(): void { this.lastFocusedRow = this.focusedRow; }
 
   /**
    * Function that is called by expanding row summary to focus on the next
    * focusable element after the list of expanding rows.
    */
-  focusOnNextFocusableElement(): void {
-    this.lastFocusedRow = this.focusedRow;
-  }
+  focusOnNextFocusableElement(): void { this.lastFocusedRow = this.focusedRow; }
 
   /**
    * Handles keydown event on the host. We are just concerned with up,
@@ -287,8 +275,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
    * - Enter: Expands the focused row.
    */
   @HostListener('keydown', ['$event'])
-  handleKeyDown(event: KeyboardEvent) {
-  }
+  handleKeyDown(event: KeyboardEvent) {}
 
   /**
    * Recursively returns true if target HTMLElement is within a
@@ -431,9 +418,8 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
 
   /** Returns the HTMLElement that is the currently focused row summary. */
   private focusedRowSummary(): HTMLElement|undefined {
-    return this.focusedRow ?
-        this.focusedRow.summaryViewChild.mainElementRef.nativeElement :
-        undefined;
+    return this.focusedRow ? this.focusedRow.summaryViewChild.mainElementRef.nativeElement :
+                             undefined;
   }
 
   /**
@@ -451,30 +437,26 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
    * the computed (the one above or below) row. If host has an expanded row,
    * this function will expand the computed row.
    */
-  private handleUpOrDownPressOnce(upOrDown: UpOrDown, event: KeyboardEvent):
-      void {
+  private handleUpOrDownPressOnce(upOrDown: UpOrDown, event: KeyboardEvent): void {
     event.preventDefault();
 
     // If row is expanded but focus is inside the expanded element, arrow
     // key presses should not do anything.
     if (this.expandedRow &&
-        document.activeElement !==
-            this.expandedRow.expandingRowMainElement.nativeElement) {
+        document.activeElement !== this.expandedRow.expandingRowMainElement.nativeElement) {
       return;
     }
 
     // If focus is inside a collapsed row header, arrow key presses should not
     // do anything.
-    if (this.focusedRow &&
-        document.activeElement !== this.focusedRowSummary()) {
+    if (this.focusedRow && document.activeElement !== this.focusedRowSummary()) {
       return;
     }
     // We only want screen reader to read the message the first time we enter
     // the list of expanding rows, so we must reset the variable here
     this.lastFocusedRow = undefined;
 
-    const rowToLookFor: ExpandingRow|undefined =
-        this.expandedRow || this.focusedRow;
+    const rowToLookFor: ExpandingRow|undefined = this.expandedRow || this.focusedRow;
     if (!rowToLookFor) {
       return;
     }
@@ -509,11 +491,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
   // Updates all of the rows with their new index.
   private recalcRowIndexes() {
     let index = 0;
-    setTimeout(() => {
-      this.contentRows.forEach((row: ExpandingRow) => {
-        row.index = index++;
-      });
-    });
+    setTimeout(
+        () => { this.contentRows.forEach((row: ExpandingRow) => { row.index = index++; }); });
   }
 }
-
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_summary.ts b/modules/benchmarks/src/expanding_rows/expanding_row_summary.ts
index 2e724c889f..172b97ee49 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_summary.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_summary.ts
@@ -10,7 +10,7 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Host,
 import {Subscription} from 'rxjs';
 
 import {ExpandingRow} from './expanding_row';
-import { expanding_row_css } from './expanding_row_css';
+import {expanding_row_css} from './expanding_row_css';
 
 const KEY_CODE_TAB = 9;
 
@@ -49,7 +49,7 @@ export class ExpandingRowSummary implements OnDestroy {
    * reference for focus and blur methods below.
    */
   @ViewChild('expandingRowSummaryMainElement', {static: false})
-  mainElementRef!: ElementRef;
+  mainElementRef !: ElementRef;
 
   /** Subscription for changes in parent isExpanded property. */
   private isExpandedSubscription: Subscription;
@@ -63,18 +63,13 @@ export class ExpandingRowSummary implements OnDestroy {
    * will act as a header for expanded rows. We also need to relay tab-in and
    * click events to the parent.
    */
-  constructor(
-      @Host() public expandingRow: ExpandingRow,
-      changeDetectorRef: ChangeDetectorRef) {
+  constructor(@Host() public expandingRow: ExpandingRow, changeDetectorRef: ChangeDetectorRef) {
     this.expandingRow.summaryViewChild = this;
     this.isExpandedSubscription =
-        this.expandingRow.isExpandedChange.subscribe(() => {
-          changeDetectorRef.markForCheck();
-        });
+        this.expandingRow.isExpandedChange.subscribe(() => { changeDetectorRef.markForCheck(); });
 
-    this.indexSubscription = this.expandingRow.indexChange.subscribe(() => {
-      changeDetectorRef.markForCheck();
-    });
+    this.indexSubscription =
+        this.expandingRow.indexChange.subscribe(() => { changeDetectorRef.markForCheck(); });
   }
 
 
@@ -99,8 +94,8 @@ export class ExpandingRowSummary implements OnDestroy {
     //
     // TODO(b/62385992) Use the KeyboardFocusService to detect focus cause
     // instead of creating multiple monitors on a page.
-    if (this.expandingRow.expandingRowMainElement.nativeElement.classList
-            .contains('cdk-mouse-focused')) {
+    if (this.expandingRow.expandingRowMainElement.nativeElement.classList.contains(
+            'cdk-mouse-focused')) {
       return;
     }
 
@@ -144,13 +139,11 @@ export class ExpandingRowSummary implements OnDestroy {
     // before expanding row list. Otherwise, if shift+tab is pressed on first
     // focusable child inside expanding row summary, it should focus on main
     // expanding row summary element.
-    if (event.shiftKey &&
-        document.activeElement === this.mainElementRef.nativeElement) {
+    if (event.shiftKey && document.activeElement === this.mainElementRef.nativeElement) {
       event.preventDefault();
       this.expandingRow.expandingRowHost.focusOnPreviousFocusableElement();
       return;
-    } else if (
-        event.shiftKey && document.activeElement === focusableChildren[0]) {
+    } else if (event.shiftKey && document.activeElement === focusableChildren[0]) {
       event.preventDefault();
       this.expandingRow.focus();
     }
@@ -159,8 +152,7 @@ export class ExpandingRowSummary implements OnDestroy {
     // summary, focus should be set to the next focusable element after the list
     // of expanding rows.
     if (!event.shiftKey &&
-        document.activeElement ===
-            focusableChildren[focusableChildren.length - 1]) {
+        document.activeElement === focusableChildren[focusableChildren.length - 1]) {
       event.preventDefault();
       this.expandingRow.expandingRowHost.focusOnNextFocusableElement();
     }
@@ -188,8 +180,7 @@ export class ExpandingRowSummary implements OnDestroy {
     // If the current expanding row summary was the last focused one before
     // focus exited the list, then return true to trigger the screen reader
     if (this.mainElementRef.nativeElement ===
-        expandingRowHost.lastFocusedRow.summaryViewChild.mainElementRef
-            .nativeElement) {
+        expandingRowHost.lastFocusedRow.summaryViewChild.mainElementRef.nativeElement) {
       return true;
     }
     return false;
@@ -197,8 +188,7 @@ export class ExpandingRowSummary implements OnDestroy {
 
   /** Puts the DOM focus on the main element. */
   focus(): void {
-    if (this.mainElementRef &&
-        document.activeElement !== this.mainElementRef.nativeElement) {
+    if (this.mainElementRef && document.activeElement !== this.mainElementRef.nativeElement) {
       this.mainElementRef.nativeElement.focus();
     }
   }
@@ -213,7 +203,5 @@ export class ExpandingRowSummary implements OnDestroy {
   }
 
   /** Returns array of focusable elements within this component. */
-  private getFocusableChildren(): HTMLElement[] {
-    return [];
-  }
+  private getFocusableChildren(): HTMLElement[] { return []; }
 }

From a5a1f4f52f07f1842894f75dc0bd0250797db51a Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 14 May 2019 14:50:24 +0200
Subject: [PATCH 089/275] fixup! test(ivy): enableProdMode (#30449)

PR Close #30449
---
 modules/benchmarks/src/expanding_rows/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/benchmarks/src/expanding_rows/index.ts b/modules/benchmarks/src/expanding_rows/index.ts
index 6dd9db9d86..743f0ee323 100644
--- a/modules/benchmarks/src/expanding_rows/index.ts
+++ b/modules/benchmarks/src/expanding_rows/index.ts
@@ -5,13 +5,14 @@
  * 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 {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {ExpandingRowBenchmarkModule} from './benchmark';
 import {ExpandingRowBenchmarkModuleNgFactory} from './benchmark.ngfactory';
 
 setMode(ExpandingRowBenchmarkModule.hasOwnProperty('ngModuleDef') ? 'Ivy' : 'ViewEngine');
+enableProdMode();
 platformBrowser().bootstrapModuleFactory(ExpandingRowBenchmarkModuleNgFactory);
 
 function setMode(name: string): void {

From 98ded949dd72a579092fa132e6083e69cb6b3320 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 14 May 2019 10:03:21 +0200
Subject: [PATCH 090/275] fixup! test(ivy): make the test run with benchpress
 (#30449)

PR Close #30449
---
 .../benchmarks/src/expanding_rows/BUILD.bazel | 18 ++++++-------
 .../src/expanding_rows/benchmark.ts           |  4 ++-
 .../src/expanding_rows/benchmark_perf.spec.ts | 26 +++++++++++++++++++
 .../src/expanding_rows/benchmark_spec.ts      | 24 -----------------
 .../benchmarks/src/expanding_rows/index.html  | 19 +++++++++-----
 protractor-perf.conf.js                       |  2 +-
 6 files changed, 51 insertions(+), 42 deletions(-)
 create mode 100644 modules/benchmarks/src/expanding_rows/benchmark_perf.spec.ts
 delete mode 100644 modules/benchmarks/src/expanding_rows/benchmark_spec.ts

diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel
index 2d1f00d691..0592ca38ca 100644
--- a/modules/benchmarks/src/expanding_rows/BUILD.bazel
+++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel
@@ -1,5 +1,6 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
+load("//tools:defaults.bzl", "ts_library")
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
 load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
@@ -8,7 +9,7 @@ ng_module(
     name = "application_lib",
     srcs = glob(
         ["**/*.ts"],
-        exclude = ["**/*_spec.ts"],
+        exclude = ["**/*.spec.ts"],
     ),
     deps = [
         "//packages:types",
@@ -19,14 +20,13 @@ ng_module(
     ],
 )
 
-ng_module(
-    name = "application_spec",
-    srcs = glob(["**/*_spec.ts"]),
+ts_library(
+    name = "perf_lib",
+    testonly = 1,
+    srcs = ["benchmark_perf.spec.ts"],
     deps = [
-        "//packages:types",
-        "//packages/common",
-        "//packages/core",
-        "@npm//reflect-metadata",
+        "//modules/e2e_util",
+        "@npm//protractor",
     ],
 )
 
@@ -69,6 +69,6 @@ benchmark_test(
     name = "perf",
     server = ":prodserver",
     deps = [
-        ":application_spec",
+        ":perf_lib",
     ],
 )
diff --git a/modules/benchmarks/src/expanding_rows/benchmark.ts b/modules/benchmarks/src/expanding_rows/benchmark.ts
index c7c8b90640..2fc9492f0a 100644
--- a/modules/benchmarks/src/expanding_rows/benchmark.ts
+++ b/modules/benchmarks/src/expanding_rows/benchmark.ts
@@ -22,7 +22,7 @@ import {BenchmarkableExpandingRowModule} from './benchmarkable_expanding_row_mod
 
     <section>
       <button id="reset" (click)="reset()">Reset</button>
-      <button (click)="handleInitClick()">Init</button>
+      <button id="init" (click)="init()">Init</button>
       <button id="run" (click)="runAll()">Run All</button>
     </section>
 
@@ -38,6 +38,8 @@ export class InitializationRoot implements AfterViewInit {
 
   reset() { this.expandingRow.reset(); }
 
+  init() { this.expandingRow.init(); }
+
   async runAll() {
     await execTimed('initialization_benchmark', async() => { await this.doInit(); });
   }
diff --git a/modules/benchmarks/src/expanding_rows/benchmark_perf.spec.ts b/modules/benchmarks/src/expanding_rows/benchmark_perf.spec.ts
new file mode 100644
index 0000000000..d8aec894e3
--- /dev/null
+++ b/modules/benchmarks/src/expanding_rows/benchmark_perf.spec.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {$, browser} from 'protractor';
+import {runBenchmark} from '../../../e2e_util/perf_util';
+
+describe('benchmarks', () => {
+
+  it('should work for create', done => {
+    browser.rootEl = '#root';
+    runBenchmark({
+      id: 'create',
+      url: '',
+      ignoreBrowserSynchronization: true,
+      params: [],
+      prepare: () => $('#reset').click(),
+      work: () => $('#init').click()
+    }).then(done, done.fail);
+  });
+
+});
diff --git a/modules/benchmarks/src/expanding_rows/benchmark_spec.ts b/modules/benchmarks/src/expanding_rows/benchmark_spec.ts
deleted file mode 100644
index ed661f4edf..0000000000
--- a/modules/benchmarks/src/expanding_rows/benchmark_spec.ts
+++ /dev/null
@@ -1,24 +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 {$} from 'protractor';
-import {openTreeBenchmark, runTreeBenchmark} from './tree_perf_test_utils';
-
-describe('benchmarks', () => {
-
-  it('should work for createOnly', done => {
-    runTreeBenchmark({
-      // This cannot be called "createOnly" because the actual destroy benchmark
-      // has the "createOnly" id already. See: https://github.com/angular/angular/pull/21503
-      id: 'createOnlyForReal',
-      prepare: () => $('#destroyDom').click(),
-      work: () => $('#createDom').click()
-    }).then(done, done.fail);
-  });
-
-});
diff --git a/modules/benchmarks/src/expanding_rows/index.html b/modules/benchmarks/src/expanding_rows/index.html
index b4e258faa0..d514d50a2f 100644
--- a/modules/benchmarks/src/expanding_rows/index.html
+++ b/modules/benchmarks/src/expanding_rows/index.html
@@ -14,19 +14,24 @@
   <benchmark-root>loading...</benchmark-root>
 
   <script>
+    window.ngDevMode = location.hash == '#ngDevMode';
     addEventListener('DOMContentLoaded', () => {
-      window.ngDevMode = location.hash == '#ngDevMode';
       // DevServer has automatic bootstrap code, so if we already have <scripts> than we don't need to bootstrap
       var alreadyBootstraped = document.querySelectorAll('script').length > 1; // 1 for ourselves
-
       if (!alreadyBootstraped) {
         function loadScript(url) {
-          var script = document.createElement('script');
-          script.src = url;
-          document.body.append(script);
+          return new Promise(function (resolve, reject) {
+            var script = document.createElement('script');
+            script.src = url;
+            script.onload = resolve;
+            script.onerror = reject;
+            document.body.append(script);
+          });
         }
-        loadScript('/npm/node_modules/zone.js/dist/zone.js');
-        loadScript(document.location.search.endsWith('debug') ? 'bundle.min_debug.js' : 'bundle.min.js');
+        // zone.js must be loaded and processed before Angular bundle gets executed
+        loadScript('/npm/node_modules/zone.js/dist/zone.js').then(function () {
+          loadScript(document.location.search.endsWith('debug') ? 'bundle.min_debug.js' : 'bundle.min.js');
+        });
       }
     });
   </script>
diff --git a/protractor-perf.conf.js b/protractor-perf.conf.js
index 2839079890..748ea12c2b 100644
--- a/protractor-perf.conf.js
+++ b/protractor-perf.conf.js
@@ -34,7 +34,7 @@ exports.config = {
   framework: 'jasmine2',
   jasmineNodeOpts: {
     showColors: true,
-    defaultTimeoutInterval: 60000,
+    defaultTimeoutInterval: 90000,
     print: function(msg) { console.log(msg); },
   },
   useAllAngular2AppRoots: true

From 6bf8b1007c40640c18ad880e9baa1d2d87e86d38 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 16 May 2019 18:14:41 +0300
Subject: [PATCH 091/275] test(platform-browser-dynamic): make
 `CachedResourceLoader` tests more reliable (#30515)

Previously, [this test][1] would occasionally fail (e.g. on CI) with
"Template cache was not found in $templateCache". This was due to a
combination of:
1. [That test][2] (which removes the cache) being run right before the
   failing test.
2. The async `TestBed.compileComponents()` operation run in the
   `beforeEach()` block (which sets the cache) not having completed
   before the `it()` block.

This commit fixes the issue by ensuring the cache is always set, before
instantiating `CachedResourceLoader`.

This commit also moves some operations that are only needed in one test
from the `beforeEach()` block to that test's `it()` block.

[1]: https://github.com/angular/angular/blob/79903b184248a57d7e9e10d69c94098f4fe34fa6/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts#L50
[2]: https://github.com/angular/angular/blob/79903b184248a57d7e9e10d69c94098f4fe34fa6/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts#L37

Fixes #30499

PR Close #30515
---
 .../resource_loader_cache_spec.ts             | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts
index ead5fa17b2..f5b42e1b6e 100644
--- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts
+++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts
@@ -21,17 +21,6 @@ if (isBrowser) {
       setTemplateCache({'test.html': '<div>Hello</div>'});
       return new CachedResourceLoader();
     }
-    beforeEach(fakeAsync(() => {
-      TestBed.configureCompiler({
-        providers: [
-          {provide: UrlResolver, useClass: TestUrlResolver, deps: []},
-          {provide: ResourceLoader, useFactory: createCachedResourceLoader, deps: []}
-        ]
-      });
-
-      TestBed.configureTestingModule({declarations: [TestComponent]});
-      TestBed.compileComponents();
-    }));
 
     it('should throw exception if $templateCache is not found', () => {
       setTemplateCache(null);
@@ -41,13 +30,12 @@ if (isBrowser) {
     });
 
     it('should resolve the Promise with the cached file content on success', async(() => {
-         setTemplateCache({'test.html': '<div>Hello</div>'});
-         resourceLoader = new CachedResourceLoader();
+         resourceLoader = createCachedResourceLoader();
          resourceLoader.get('test.html').then((text) => { expect(text).toBe('<div>Hello</div>'); });
        }));
 
     it('should reject the Promise on failure', async(() => {
-         resourceLoader = new CachedResourceLoader();
+         resourceLoader = createCachedResourceLoader();
          resourceLoader.get('unknown.html')
              .then((text) => { throw new Error('Not expected to succeed.'); })
              .catch((error) => {/** success */});
@@ -55,6 +43,12 @@ if (isBrowser) {
 
     it('should allow fakeAsync Tests to load components with templateUrl synchronously',
        fakeAsync(() => {
+         TestBed.configureCompiler({
+           providers: [
+             {provide: UrlResolver, useClass: TestUrlResolver, deps: []},
+             {provide: ResourceLoader, useFactory: createCachedResourceLoader, deps: []}
+           ]
+         });
          TestBed.configureTestingModule({declarations: [TestComponent]});
          TestBed.compileComponents();
          tick();

From 848e53efd0eca1cd5a409dea6c65297769162e5e Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 16 May 2019 18:33:18 +0300
Subject: [PATCH 092/275] test(platform-browser-dynamic): avoid swallowing
 error in `CachedResourceLoader` test (#30515)

Previously, in order to assert that the promise was not resolved, an
error was thrown when the promise was resolved successfully. At the
same, `.catch()` was used to silence the (expected) promise rejection.
However, the chained `.catch()` handler would also catch (and swallow)
the error thrown on resolving the promise, making the test pass, even if
the promise was not rejected.

This commit fixes it by ensuring that the error thrown on resolving the
promise is not caught by the rejection handler.

PR Close #30515
---
 .../test/resource_loader/resource_loader_cache_spec.ts      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts
index f5b42e1b6e..316152f7b9 100644
--- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts
+++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts
@@ -36,9 +36,9 @@ if (isBrowser) {
 
     it('should reject the Promise on failure', async(() => {
          resourceLoader = createCachedResourceLoader();
-         resourceLoader.get('unknown.html')
-             .then((text) => { throw new Error('Not expected to succeed.'); })
-             .catch((error) => {/** success */});
+         resourceLoader.get('unknown.html').then(() => {
+           throw new Error('Not expected to succeed.');
+         }, () => {/* success */});
        }));
 
     it('should allow fakeAsync Tests to load components with templateUrl synchronously',

From f03475cac8bbc79aaf13caf94b099b0c234028bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Wed, 8 May 2019 16:30:28 -0700
Subject: [PATCH 093/275] refactor(ivy): evaluate prop-based styling bindings
 with a new algorithm (#30469)

This is the first refactor PR designed to change how styling bindings
(i.e. `[style]` and `[class]`) behave in Ivy. Instead of having a heavy
element-by-element context be generated for each element, this new
refactor aims to use a single context for each `tNode` element that is
examined and iterated over when styling values are to be applied to the
element.

This patch brings this new functionality to prop-based bindings such as
`[style.prop]` and `[class.name]`.

PR Close #30469
---
 integration/_payload-limits.json              |   2 +-
 .../compiler/src/render3/view/compiler.ts     |   2 +-
 .../src/render3/view/styling_builder.ts       |   6 +
 .../src/render3/view/styling_state.ts         |  37 ++
 packages/core/src/render3/debug.ts            |  26 +-
 .../core/src/render3/instructions/element.ts  |   9 +-
 .../core/src/render3/instructions/shared.ts   |   4 +
 .../core/src/render3/instructions/styling.ts  |  51 ++-
 packages/core/src/render3/interfaces/node.ts  |   6 +-
 packages/core/src/render3/jit/environment.ts  |   5 +-
 packages/core/src/render3/state.ts            |  21 ++
 .../styling/class_and_style_bindings.ts       |   2 +-
 .../core/src/render3/styling_next/bindings.ts | 356 ++++++++++++++++++
 .../src/render3/styling_next/instructions.ts  | 211 +++++++++++
 .../src/render3/styling_next/interfaces.ts    | 239 ++++++++++++
 .../core/src/render3/styling_next/state.ts    |  37 ++
 .../src/render3/styling_next/styling_debug.ts | 210 +++++++++++
 .../core/src/render3/styling_next/util.ts     |  82 ++++
 packages/core/src/render3/util/debug_utils.ts |  10 +
 .../core/test/acceptance/styling_next_spec.ts | 330 ++++++++++++++++
 .../cyclic_import/bundle.golden_symbols.json  |  45 +++
 .../bundling/todo/bundle.golden_symbols.json  | 153 +++++++-
 .../styling_next/styling_context_spec.ts      |  93 +++++
 .../styling_next/styling_debug_spec.ts        |  82 ++++
 24 files changed, 1993 insertions(+), 26 deletions(-)
 create mode 100644 packages/compiler/src/render3/view/styling_state.ts
 create mode 100644 packages/core/src/render3/styling_next/bindings.ts
 create mode 100644 packages/core/src/render3/styling_next/instructions.ts
 create mode 100644 packages/core/src/render3/styling_next/interfaces.ts
 create mode 100644 packages/core/src/render3/styling_next/state.ts
 create mode 100644 packages/core/src/render3/styling_next/styling_debug.ts
 create mode 100644 packages/core/src/render3/styling_next/util.ts
 create mode 100644 packages/core/src/render3/util/debug_utils.ts
 create mode 100644 packages/core/test/acceptance/styling_next_spec.ts
 create mode 100644 packages/core/test/render3/styling_next/styling_context_spec.ts
 create mode 100644 packages/core/test/render3/styling_next/styling_debug_spec.ts

diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
index 1b13ca56bd..9d62c9f0fa 100644
--- a/integration/_payload-limits.json
+++ b/integration/_payload-limits.json
@@ -21,7 +21,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1440,
-        "main": 146225,
+        "main": 147764,
         "polyfills": 43567
       }
     }
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 92dcd4cf53..7ea88f0221 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -13,7 +13,6 @@ import {BindingForm, convertPropertyBinding} from '../../compiler_util/expressio
 import {ConstantPool, DefinitionKind} from '../../constant_pool';
 import * as core from '../../core';
 import {AST, ParsedEvent, ParsedEventType, ParsedProperty} from '../../expression_parser/ast';
-import {LifecycleHooks} from '../../lifecycle_reflector';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../ml_parser/interpolation_config';
 import * as o from '../../output/output_ast';
 import {ParseError, ParseSourceSpan, typeSourceSpan} from '../../parse_util';
@@ -725,6 +724,7 @@ function createHostBindingsFunction(
     // the update block of a component/directive templateFn/hostBindingsFn so that the bindings
     // are evaluated and updated for the element.
     styleBuilder.buildUpdateLevelInstructions(getValueConverter()).forEach(instruction => {
+      totalHostVarsCount += instruction.allocateBindingSlots;
       updateStatements.push(createStylingStmt(instruction, bindingContext, bindingFn));
     });
   }
diff --git a/packages/compiler/src/render3/view/styling_builder.ts b/packages/compiler/src/render3/view/styling_builder.ts
index 0260b29f1f..b355d20cb7 100644
--- a/packages/compiler/src/render3/view/styling_builder.ts
+++ b/packages/compiler/src/render3/view/styling_builder.ts
@@ -15,6 +15,7 @@ import * as t from '../r3_ast';
 import {Identifiers as R3} from '../r3_identifiers';
 
 import {parse as parseStyle} from './style_parser';
+import {compilerIsNewStylingInUse} from './styling_state';
 import {ValueConverter} from './template';
 
 const IMPORTANT_FLAG = '!important';
@@ -389,6 +390,11 @@ export class StylingBuilder {
       const bindingIndex: number = mapIndex.get(input.name !) !;
       const value = input.value.visit(valueConverter);
       totalBindingSlotsRequired += (value instanceof Interpolation) ? value.expressions.length : 0;
+      if (compilerIsNewStylingInUse()) {
+        // the old implementation does not reserve slot values for
+        // binding entries. The new one does.
+        totalBindingSlotsRequired++;
+      }
       return {
         sourceSpan: input.sourceSpan,
         allocateBindingSlots: totalBindingSlotsRequired, reference,
diff --git a/packages/compiler/src/render3/view/styling_state.ts b/packages/compiler/src/render3/view/styling_state.ts
new file mode 100644
index 0000000000..c63ab6d8e6
--- /dev/null
+++ b/packages/compiler/src/render3/view/styling_state.ts
@@ -0,0 +1,37 @@
+/**
+* @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
+*/
+
+/**
+ * A temporary enum of states that inform the core whether or not
+ * to defer all styling instruction calls to the old or new
+ * styling implementation.
+ */
+export const enum CompilerStylingMode {
+  UseOld = 0,
+  UseBothOldAndNew = 1,
+  UseNew = 2,
+}
+
+let _stylingMode = 0;
+
+/**
+ * Temporary function used to inform the existing styling algorithm
+ * code to delegate all styling instruction calls to the new refactored
+ * styling code.
+ */
+export function compilerSetStylingMode(mode: CompilerStylingMode) {
+  _stylingMode = mode;
+}
+
+export function compilerIsNewStylingInUse() {
+  return _stylingMode > CompilerStylingMode.UseOld;
+}
+
+export function compilerAllowOldStyling() {
+  return _stylingMode < CompilerStylingMode.UseNew;
+}
diff --git a/packages/core/src/render3/debug.ts b/packages/core/src/render3/debug.ts
index f0cf7258ed..e8d9997b76 100644
--- a/packages/core/src/render3/debug.ts
+++ b/packages/core/src/render3/debug.ts
@@ -15,11 +15,10 @@ import {LQueries} from './interfaces/query';
 import {RComment, RElement} from './interfaces/renderer';
 import {StylingContext} from './interfaces/styling';
 import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTENT_QUERIES, CONTEXT, DECLARATION_VIEW, FLAGS, HEADER_OFFSET, HOST, INJECTOR, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, TVIEW, T_HOST} from './interfaces/view';
-import {getTNode, unwrapRNode} from './util/view_utils';
-
-function attachDebugObject(obj: any, debug: any) {
-  Object.defineProperty(obj, 'debug', {value: debug, enumerable: false});
-}
+import {runtimeIsNewStylingInUse} from './styling_next/state';
+import {DebugStyling as DebugNewStyling, NodeStylingDebug} from './styling_next/styling_debug';
+import {attachDebugObject} from './util/debug_utils';
+import {getTNode, isStylingContext, unwrapRNode} from './util/view_utils';
 
 /*
  * This file contains conditionally attached classes which provide human readable (debug) level
@@ -171,6 +170,8 @@ export class LViewDebug {
 export interface DebugNode {
   html: string|null;
   native: Node;
+  styles: DebugNewStyling|null;
+  classes: DebugNewStyling|null;
   nodes: DebugNode[]|null;
   component: LViewDebug|null;
 }
@@ -188,12 +189,21 @@ export function toDebugNodes(tNode: TNode | null, lView: LView): DebugNode[]|nul
     while (tNodeCursor) {
       const rawValue = lView[tNode.index];
       const native = unwrapRNode(rawValue);
-      const componentLViewDebug = toDebug(readLViewValue(rawValue));
+      const componentLViewDebug =
+          isStylingContext(rawValue) ? null : toDebug(readLViewValue(rawValue));
+
+      let styles: DebugNewStyling|null = null;
+      let classes: DebugNewStyling|null = null;
+      if (runtimeIsNewStylingInUse()) {
+        styles = tNode.newStyles ? new NodeStylingDebug(tNode.newStyles, lView) : null;
+        classes = tNode.newClasses ? new NodeStylingDebug(tNode.newClasses, lView) : null;
+      }
+
       debugNodes.push({
         html: toHtml(native),
-        native: native as any,
+        native: native as any, styles, classes,
         nodes: toDebugNodes(tNode.child, lView),
-        component: componentLViewDebug
+        component: componentLViewDebug,
       });
       tNodeCursor = tNodeCursor.next;
     }
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index 5f8e81a8c7..2fdb61954e 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -21,6 +21,8 @@ import {applyOnCreateInstructions} from '../node_util';
 import {decreaseElementDepthCount, getElementDepthCount, getIsParent, getLView, getPreviousOrParentTNode, getSelectedIndex, increaseElementDepthCount, setIsParent, setPreviousOrParentTNode} from '../state';
 import {getInitialClassNameValue, getInitialStyleStringValue, initializeStaticContext, patchContextWithStaticAttrs, renderInitialClasses, renderInitialStyles} from '../styling/class_and_style_bindings';
 import {getStylingContextFromLView, hasClassInput, hasStyleInput} from '../styling/util';
+import {registerInitialStylingIntoContext} from '../styling_next/instructions';
+import {runtimeIsNewStylingInUse} from '../styling_next/state';
 import {NO_CHANGE} from '../tokens';
 import {attrsStylingIndexOf, setUpAttributes} from '../util/attrs_utils';
 import {renderStringify} from '../util/misc_utils';
@@ -63,8 +65,9 @@ export function ΔelementStart(
   let initialStylesIndex = 0;
   let initialClassesIndex = 0;
 
+  let lastAttrIndex = -1;
   if (attrs) {
-    const lastAttrIndex = setUpAttributes(native, attrs);
+    lastAttrIndex = setUpAttributes(native, attrs);
 
     // it's important to only prepare styling-related datastructures once for a given
     // tNode and not each time an element is created. Also, the styling code is designed
@@ -116,6 +119,10 @@ export function ΔelementStart(
     renderInitialStyles(native, tNode.stylingTemplate, renderer, initialStylesIndex);
   }
 
+  if (runtimeIsNewStylingInUse() && lastAttrIndex >= 0) {
+    registerInitialStylingIntoContext(tNode, attrs as TAttributes, lastAttrIndex);
+  }
+
   const currentQueries = lView[QUERIES];
   if (currentQueries) {
     currentQueries.addNode(tNode);
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index df17271738..d3a849e7a0 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -777,6 +777,10 @@ export function createTNode(
     stylingTemplate: null,
     projection: null,
     onElementCreationFns: null,
+    // TODO (matsko): rename this to `styles` once the old styling impl is gone
+    newStyles: null,
+    // TODO (matsko): rename this to `classes` once the old styling impl is gone
+    newClasses: null,
   };
 }
 
diff --git a/packages/core/src/render3/instructions/styling.ts b/packages/core/src/render3/instructions/styling.ts
index 2d2911ba95..6fd0186849 100644
--- a/packages/core/src/render3/instructions/styling.ts
+++ b/packages/core/src/render3/instructions/styling.ts
@@ -17,6 +17,9 @@ import {BoundPlayerFactory} from '../styling/player_factory';
 import {DEFAULT_TEMPLATE_DIRECTIVE_INDEX} from '../styling/shared';
 import {getCachedStylingContext, setCachedStylingContext} from '../styling/state';
 import {allocateOrUpdateDirectiveIntoContext, createEmptyStylingContext, forceClassesAsString, forceStylesAsString, getStylingContextFromLView, hasClassInput, hasStyleInput} from '../styling/util';
+import {classProp as newClassProp, styleProp as newStyleProp, stylingApply as newStylingApply, stylingInit as newStylingInit} from '../styling_next/instructions';
+import {runtimeAllowOldStyling, runtimeIsNewStylingInUse} from '../styling_next/state';
+import {getBindingNameFromIndex} from '../styling_next/util';
 import {NO_CHANGE} from '../tokens';
 import {renderStringify} from '../util/misc_utils';
 import {getRootContext} from '../util/view_traversal_utils';
@@ -73,6 +76,13 @@ export function Δstyling(
 
   const directiveStylingIndex = getActiveDirectiveStylingIndex();
   if (directiveStylingIndex) {
+    // this is temporary hack to get the existing styling instructions to
+    // play ball with the new refactored implementation.
+    // TODO (matsko): remove this once the old implementation is not needed.
+    if (runtimeIsNewStylingInUse()) {
+      newStylingInit();
+    }
+
     // despite the binding being applied in a queue (below), the allocation
     // of the directive into the context happens right away. The reason for
     // this is to retain the ordering of the directives (which is important
@@ -81,7 +91,7 @@ export function Δstyling(
 
     const fns = tNode.onElementCreationFns = tNode.onElementCreationFns || [];
     fns.push(() => {
-      initstyling(
+      initStyling(
           tNode, classBindingNames, styleBindingNames, styleSanitizer, directiveStylingIndex);
       registerHostDirective(tNode.stylingTemplate !, directiveStylingIndex);
     });
@@ -92,13 +102,13 @@ export function Δstyling(
     // components) then they will be applied at the end of the `elementEnd`
     // instruction (because directives are created first before styling is
     // executed for a new element).
-    initstyling(
+    initStyling(
         tNode, classBindingNames, styleBindingNames, styleSanitizer,
         DEFAULT_TEMPLATE_DIRECTIVE_INDEX);
   }
 }
 
-function initstyling(
+function initStyling(
     tNode: TNode, classBindingNames: string[] | null | undefined,
     styleBindingNames: string[] | null | undefined,
     styleSanitizer: StyleSanitizeFn | null | undefined, directiveStylingIndex: number): void {
@@ -148,6 +158,15 @@ export function ΔstyleProp(
     updatestyleProp(
         stylingContext, styleIndex, valueToAdd, DEFAULT_TEMPLATE_DIRECTIVE_INDEX, forceOverride);
   }
+
+  if (runtimeIsNewStylingInUse()) {
+    const prop = getBindingNameFromIndex(stylingContext, styleIndex, directiveStylingIndex, false);
+
+    // the reason why we cast the value as `boolean` is
+    // because the new styling refactor does not yet support
+    // sanitization or animation players.
+    newStyleProp(prop, value as string | number, suffix);
+  }
 }
 
 function resolveStylePropValue(
@@ -206,6 +225,15 @@ export function ΔclassProp(
     updateclassProp(
         stylingContext, classIndex, input, DEFAULT_TEMPLATE_DIRECTIVE_INDEX, forceOverride);
   }
+
+  if (runtimeIsNewStylingInUse()) {
+    const prop = getBindingNameFromIndex(stylingContext, classIndex, directiveStylingIndex, true);
+
+    // the reason why we cast the value as `boolean` is
+    // because the new styling refactor does not yet support
+    // sanitization or animation players.
+    newClassProp(prop, input as boolean);
+  }
 }
 
 
@@ -324,11 +352,14 @@ export function ΔstylingApply(): void {
   const renderer = tNode.type === TNodeType.Element ? lView[RENDERER] : null;
   const isFirstRender = (lView[FLAGS] & LViewFlags.FirstLViewPass) !== 0;
   const stylingContext = getStylingContext(index, lView);
-  const totalPlayersQueued = renderStyling(
-      stylingContext, renderer, lView, isFirstRender, null, null, directiveStylingIndex);
-  if (totalPlayersQueued > 0) {
-    const rootContext = getRootContext(lView);
-    scheduleTick(rootContext, RootContextFlags.FlushPlayers);
+
+  if (runtimeAllowOldStyling()) {
+    const totalPlayersQueued = renderStyling(
+        stylingContext, renderer, lView, isFirstRender, null, null, directiveStylingIndex);
+    if (totalPlayersQueued > 0) {
+      const rootContext = getRootContext(lView);
+      scheduleTick(rootContext, RootContextFlags.FlushPlayers);
+    }
   }
 
   // because select(n) may not run between every instruction, the cached styling
@@ -339,6 +370,10 @@ export function ΔstylingApply(): void {
   // cleared because there is no code in Angular that applies more styling code after a
   // styling flush has occurred. Note that this will be fixed once FW-1254 lands.
   setCachedStylingContext(null);
+
+  if (runtimeIsNewStylingInUse()) {
+    newStylingApply();
+  }
 }
 
 export function getActiveDirectiveStylingIndex() {
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index c4f476ce7c..cb6f99b466 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -5,7 +5,7 @@
  * 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 {TStylingContext} from '../styling_next/interfaces';
 import {CssSelector} from './projection';
 import {RNode} from './renderer';
 import {StylingContext} from './styling';
@@ -438,6 +438,10 @@ export interface TNode {
    * with functions each time the creation block is called.
    */
   onElementCreationFns: Function[]|null;
+  // TODO (matsko): rename this to `styles` once the old styling impl is gone
+  newStyles: TStylingContext|null;
+  // TODO (matsko): rename this to `classes` once the old styling impl is gone
+  newClasses: TStylingContext|null;
 }
 
 /** Static data for an element  */
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 1518a0e7f6..c246c12672 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ΔdefineInjectable, ΔdefineInjector,} from '../../di/interface/defs';
 import {Δinject} from '../../di/injector_compatibility';
-import * as r3 from '../index';
+import {ΔdefineInjectable, ΔdefineInjector} from '../../di/interface/defs';
 import * as sanitization from '../../sanitization/sanitization';
+import * as r3 from '../index';
+
 
 
 /**
diff --git a/packages/core/src/render3/state.ts b/packages/core/src/render3/state.ts
index 7234afc2c2..647446ae32 100644
--- a/packages/core/src/render3/state.ts
+++ b/packages/core/src/render3/state.ts
@@ -245,6 +245,27 @@ export function adjustActiveDirectiveSuperClassDepthPosition(delta: number) {
       Math.max(activeDirectiveSuperClassHeight, activeDirectiveSuperClassDepthPosition);
 }
 
+/**
+ * Returns he current depth of the super/sub class inheritance chain.
+ *
+ * This will return how many inherited directive/component classes
+ * exist in the current chain.
+ *
+ * ```typescript
+ * @Directive({ selector: '[super-dir]' })
+ * class SuperDir {}
+ *
+ * @Directive({ selector: '[sub-dir]' })
+ * class SubDir extends SuperDir {}
+ *
+ * // if `<div sub-dir>` is used then the super class height is `1`
+ * // if `<div super-dir>` is used then the super class height is `0`
+ * ```
+ */
+export function getActiveDirectiveSuperClassHeight() {
+  return activeDirectiveSuperClassHeight;
+}
+
 /**
  * Returns the current super class (reverse inheritance) depth for a directive.
  *
diff --git a/packages/core/src/render3/styling/class_and_style_bindings.ts b/packages/core/src/render3/styling/class_and_style_bindings.ts
index 7f08b2748a..4a30e99837 100644
--- a/packages/core/src/render3/styling/class_and_style_bindings.ts
+++ b/packages/core/src/render3/styling/class_and_style_bindings.ts
@@ -1636,7 +1636,7 @@ function diffSummaryValues(result: any[], name: string, prop: string, a: any, b:
   }
 }
 
-function getSinglePropIndexValue(
+export function getSinglePropIndexValue(
     context: StylingContext, directiveIndex: number, offset: number, isClassBased: boolean) {
   const singlePropOffsetRegistryIndex =
       context[StylingIndex.DirectiveRegistryPosition]
diff --git a/packages/core/src/render3/styling_next/bindings.ts b/packages/core/src/render3/styling_next/bindings.ts
new file mode 100644
index 0000000000..d3ef4c9c7e
--- /dev/null
+++ b/packages/core/src/render3/styling_next/bindings.ts
@@ -0,0 +1,356 @@
+/**
+* @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 {ProceduralRenderer3, RElement, Renderer3, RendererStyleFlags3, isProceduralRenderer} from '../interfaces/renderer';
+import {ApplyStylingFn, StylingBindingData, TStylingContext, TStylingContextIndex} from './interfaces';
+import {allowStylingFlush, getGuardMask, getProp, getValue, getValuesCount, isContextLocked, lockContext} from './util';
+
+
+/**
+ * This file contains the core logic for styling in Angular.
+ *
+ * All styling bindings (i.e. `[style]`, `[style.prop]`, `[class]` and `[class.name]`)
+ * will have their values be applied through the logic in this file.
+ *
+ * When a binding is encountered (e.g. `<div [style.width]="w">`) then
+ * the binding data will be populated into a `TStylingContext` data-structure.
+ * There is only one `TStylingContext` per `TNode` and each element instance
+ * will update its style/class binding values in concert with the styling
+ * context.
+ *
+ * To learn more about the algorithm see `TStylingContext`.
+ */
+
+// the values below are global to all styling code below. Each value
+// will either increment or mutate each time a styling instruction is
+// executed. Do not modify the values below.
+let currentStyleIndex = 0;
+let currentClassIndex = 0;
+let stylesBitMask = 0;
+let classesBitMask = 0;
+let deferredBindingQueue: (TStylingContext | number | string | null)[] = [];
+
+const DEFAULT_BINDING_VALUE = null;
+const DEFAULT_SIZE_VALUE = 1;
+const DEFAULT_MASK_VALUE = 0;
+export const DEFAULT_BINDING_INDEX_VALUE = -1;
+export const BIT_MASK_APPLY_ALL = -1;
+
+
+/**
+ * Visits a class-based binding and updates the new value (if changed).
+ *
+ * This function is called each time a class-based styling instruction
+ * is executed. It's important that it's always called (even if the value
+ * has not changed) so that the inner counter index value is incremented.
+ * This way, each instruction is always guaranteed to get the same counter
+ * state each time its called (which then allows the `TStylingContext`
+ * and the bit mask values to be in sync).
+ */
+export function updateClassBinding(
+    context: TStylingContext, data: StylingBindingData, prop: string, bindingIndex: number,
+    value: boolean | null | undefined, deferRegistration: boolean): void {
+  const index = currentClassIndex++;
+  if (updateBindingData(context, data, index, prop, bindingIndex, value, deferRegistration)) {
+    classesBitMask |= 1 << index;
+  }
+}
+
+/**
+ * Visits a style-based binding and updates the new value (if changed).
+ *
+ * This function is called each time a style-based styling instruction
+ * is executed. It's important that it's always called (even if the value
+ * has not changed) so that the inner counter index value is incremented.
+ * This way, each instruction is always guaranteed to get the same counter
+ * state each time its called (which then allows the `TStylingContext`
+ * and the bit mask values to be in sync).
+ */
+export function updateStyleBinding(
+    context: TStylingContext, data: StylingBindingData, prop: string, bindingIndex: number,
+    value: String | string | number | null | undefined, deferRegistration: boolean): void {
+  const index = currentStyleIndex++;
+  if (updateBindingData(context, data, index, prop, bindingIndex, value, deferRegistration)) {
+    stylesBitMask |= 1 << index;
+  }
+}
+
+function updateBindingData(
+    context: TStylingContext, data: StylingBindingData, counterIndex: number, prop: string,
+    bindingIndex: number, value: string | String | number | boolean | null | undefined,
+    deferRegistration?: boolean): boolean {
+  if (!isContextLocked(context)) {
+    if (deferRegistration) {
+      deferBindingRegistration(context, counterIndex, prop, bindingIndex);
+    } else {
+      deferredBindingQueue.length && flushDeferredBindings();
+
+      // this will only happen during the first update pass of the
+      // context. The reason why we can't use `tNode.firstTemplatePass`
+      // here is because its not guaranteed to be true when the first
+      // update pass is executed (remember that all styling instructions
+      // are run in the update phase, and, as a result, are no more
+      // styling instructions that are run in the creation phase).
+      registerBinding(context, counterIndex, prop, bindingIndex);
+    }
+  }
+
+  if (data[bindingIndex] !== value) {
+    data[bindingIndex] = value;
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Schedules a binding registration to be run at a later point.
+ *
+ * The reasoning for this feature is to ensure that styling
+ * bindings are registered in the correct order for when
+ * directives/components have a super/sub class inheritance
+ * chains. Each directive's styling bindings must be
+ * registered into the context in reverse order. Therefore all
+ * bindings will be buffered in reverse order and then applied
+ * after the inheritance chain exits.
+ */
+function deferBindingRegistration(
+    context: TStylingContext, counterIndex: number, prop: string, bindingIndex: number) {
+  deferredBindingQueue.splice(0, 0, context, counterIndex, prop, bindingIndex);
+}
+
+/**
+ * Flushes the collection of deferred bindings and causes each entry
+ * to be registered into the context.
+ */
+function flushDeferredBindings() {
+  let i = 0;
+  while (i < deferredBindingQueue.length) {
+    const context = deferredBindingQueue[i++] as TStylingContext;
+    const count = deferredBindingQueue[i++] as number;
+    const prop = deferredBindingQueue[i++] as string;
+    const bindingIndex = deferredBindingQueue[i++] as number | null;
+    registerBinding(context, count, prop, bindingIndex);
+  }
+  deferredBindingQueue.length = 0;
+}
+
+/**
+ * Registers the provided binding (prop + bindingIndex) into the context.
+ *
+ * This function is shared between bindings that are assigned immediately
+ * (via `updateBindingData`) and at a deferred stage. When called, it will
+ * figure out exactly where to place the binding data in the context.
+ *
+ * It is needed because it will either update or insert a styling property
+ * into the context at the correct spot.
+ *
+ * When called, one of two things will happen:
+ *
+ * 1) If the property already exists in the context then it will just add
+ *    the provided `bindingValue` to the end of the binding sources region
+ *    for that particular property.
+ *
+ *    - If the binding value is a number then it will be added as a new
+ *      binding index source next to the other binding sources for the property.
+ *
+ *    - Otherwise, if the binding value is a string/boolean/null type then it will
+ *      replace the default value for the property if the default value is `null`.
+ *
+ * 2) If the property does not exist then it will be inserted into the context.
+ *    The styling context relies on all properties being stored in alphabetical
+ *    order, so it knows exactly where to store it.
+ *
+ *    When inserted, a default `null` value is created for the property which exists
+ *    as the default value for the binding. If the bindingValue property is inserted
+ *    and it is either a string, number or null value then that will replace the default
+ *    value.
+ */
+export function registerBinding(
+    context: TStylingContext, countId: number, prop: string,
+    bindingValue: number | null | string | boolean) {
+  let i = TStylingContextIndex.ValuesStartPosition;
+  let found = false;
+  while (i < context.length) {
+    const valuesCount = getValuesCount(context, i);
+    const p = getProp(context, i);
+    found = prop <= p;
+    if (found) {
+      // all style/class bindings are sorted by property name
+      if (prop < p) {
+        allocateNewContextEntry(context, i, prop);
+      }
+      addBindingIntoContext(context, i, bindingValue, countId);
+      break;
+    }
+    i += TStylingContextIndex.BindingsStartOffset + valuesCount;
+  }
+
+  if (!found) {
+    allocateNewContextEntry(context, context.length, prop);
+    addBindingIntoContext(context, i, bindingValue, countId);
+  }
+}
+
+function allocateNewContextEntry(context: TStylingContext, index: number, prop: string) {
+  context.splice(index, 0, DEFAULT_MASK_VALUE, DEFAULT_SIZE_VALUE, prop, DEFAULT_BINDING_VALUE);
+}
+
+/**
+ * Inserts a new binding value into a styling property tuple in the `TStylingContext`.
+ *
+ * A bindingValue is inserted into a context during the first update pass
+ * of a template or host bindings function. When this occurs, two things
+ * happen:
+ *
+ * - If the bindingValue value is a number then it is treated as a bindingIndex
+ *   value (a index in the `LView`) and it will be inserted next to the other
+ *   binding index entries.
+ *
+ * - Otherwise the binding value will update the default value for the property
+ *   and this will only happen if the default value is `null`.
+ */
+function addBindingIntoContext(
+    context: TStylingContext, index: number, bindingValue: number | string | boolean | null,
+    countId: number) {
+  const valuesCount = getValuesCount(context, index);
+
+  // -1 is used because we want the last value that's in the list (not the next slot)
+  const lastValueIndex = index + TStylingContextIndex.BindingsStartOffset + valuesCount - 1;
+
+  if (typeof bindingValue === 'number') {
+    context.splice(lastValueIndex, 0, bindingValue);
+    (context[index + TStylingContextIndex.ValuesCountOffset] as number)++;
+    (context[index + TStylingContextIndex.MaskOffset] as number) |= 1 << countId;
+  } else if (typeof bindingValue === 'string' && context[lastValueIndex] == null) {
+    context[lastValueIndex] = bindingValue;
+  }
+}
+
+/**
+ * Applies all class entries in the provided context to the provided element.
+ */
+export function applyClasses(
+    renderer: Renderer3 | ProceduralRenderer3 | null, data: StylingBindingData,
+    context: TStylingContext, element: RElement, directiveIndex: number) {
+  if (allowStylingFlush(context, directiveIndex)) {
+    const isFirstPass = isContextLocked(context);
+    isFirstPass && lockContext(context);
+    applyStyling(context, renderer, element, data, classesBitMask, setClass, isFirstPass);
+    currentClassIndex = 0;
+    classesBitMask = 0;
+  }
+}
+
+/**
+ * Applies all style entries in the provided context to the provided element.
+ */
+export function applyStyles(
+    renderer: Renderer3 | ProceduralRenderer3 | null, data: StylingBindingData,
+    context: TStylingContext, element: RElement, directiveIndex: number) {
+  if (allowStylingFlush(context, directiveIndex)) {
+    const isFirstPass = isContextLocked(context);
+    isFirstPass && lockContext(context);
+    applyStyling(context, renderer, element, data, stylesBitMask, setStyle, isFirstPass);
+    currentStyleIndex = 0;
+    stylesBitMask = 0;
+  }
+}
+
+/**
+ * Runs through the provided styling context and applies each value to
+ * the provided element (via the renderer) if one or more values are present.
+ *
+ * Note that this function is not designed to be called in isolation (use
+ * `applyClasses` and `applyStyles` to actually apply styling values).
+ */
+export function applyStyling(
+    context: TStylingContext, renderer: Renderer3 | ProceduralRenderer3 | null, element: RElement,
+    bindingData: StylingBindingData, bitMask: number, applyStylingFn: ApplyStylingFn,
+    forceApplyDefaultValues?: boolean) {
+  deferredBindingQueue.length && flushDeferredBindings();
+
+  if (bitMask) {
+    let processAllEntries = bitMask === BIT_MASK_APPLY_ALL;
+    let i = TStylingContextIndex.ValuesStartPosition;
+    while (i < context.length) {
+      const valuesCount = getValuesCount(context, i);
+      const guardMask = getGuardMask(context, i);
+
+      // the guard mask value is non-zero if and when
+      // there are binding values present for the property.
+      // If there are ONLY static values (i.e. `style="prop:val")
+      // then the guard value will stay as zero.
+      const processEntry =
+          processAllEntries || (guardMask ? (bitMask & guardMask) : forceApplyDefaultValues);
+      if (processEntry) {
+        const prop = getProp(context, i);
+        const limit = valuesCount - 1;
+        for (let j = 0; j <= limit; j++) {
+          const isFinalValue = j === limit;
+          const bindingValue = getValue(context, i, j);
+          const bindingIndex =
+              isFinalValue ? DEFAULT_BINDING_INDEX_VALUE : (bindingValue as number);
+          const valueToApply: string|null = isFinalValue ? bindingValue : bindingData[bindingIndex];
+          if (isValueDefined(valueToApply) || isFinalValue) {
+            applyStylingFn(renderer, element, prop, valueToApply, bindingIndex);
+            break;
+          }
+        }
+      }
+      i += TStylingContextIndex.BindingsStartOffset + valuesCount;
+    }
+  }
+}
+
+function isValueDefined(value: any) {
+  // the reason why null is compared against is because
+  // a CSS class value that is set to `false` must be
+  // respected (otherwise it would be treated as falsy).
+  // Empty string values are because developers usually
+  // set a value to an empty string to remove it.
+  return value != null && value !== '';
+}
+
+/**
+ * Assigns a style value to a style property for the given element.
+ */
+const setStyle: ApplyStylingFn =
+    (renderer: Renderer3 | null, native: any, prop: string, value: string | null) => {
+      if (value) {
+        // opacity, z-index and flexbox all have number values
+        // and these need to be converted into strings so that
+        // they can be assigned properly.
+        value = value.toString();
+        ngDevMode && ngDevMode.rendererSetStyle++;
+        renderer && isProceduralRenderer(renderer) ?
+            renderer.setStyle(native, prop, value, RendererStyleFlags3.DashCase) :
+            native.style.setProperty(prop, value);
+      } else {
+        ngDevMode && ngDevMode.rendererRemoveStyle++;
+        renderer && isProceduralRenderer(renderer) ?
+            renderer.removeStyle(native, prop, RendererStyleFlags3.DashCase) :
+            native.style.removeProperty(prop);
+      }
+    };
+
+/**
+ * Adds/removes the provided className value to the provided element.
+ */
+const setClass: ApplyStylingFn =
+    (renderer: Renderer3 | null, native: any, className: string, value: any) => {
+      if (className !== '') {
+        if (value) {
+          ngDevMode && ngDevMode.rendererAddClass++;
+          renderer && isProceduralRenderer(renderer) ? renderer.addClass(native, className) :
+                                                       native.classList.add(className);
+        } else {
+          ngDevMode && ngDevMode.rendererRemoveClass++;
+          renderer && isProceduralRenderer(renderer) ? renderer.removeClass(native, className) :
+                                                       native.classList.remove(className);
+        }
+      }
+    };
diff --git a/packages/core/src/render3/styling_next/instructions.ts b/packages/core/src/render3/styling_next/instructions.ts
new file mode 100644
index 0000000000..81b8b33d4b
--- /dev/null
+++ b/packages/core/src/render3/styling_next/instructions.ts
@@ -0,0 +1,211 @@
+/**
+* @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 {LContainer} from '../interfaces/container';
+import {AttributeMarker, TAttributes, TNode, TNodeType} from '../interfaces/node';
+import {RElement} from '../interfaces/renderer';
+import {StylingContext as OldStylingContext, StylingIndex as OldStylingIndex} from '../interfaces/styling';
+import {BINDING_INDEX, HEADER_OFFSET, HOST, LView, RENDERER} from '../interfaces/view';
+import {getActiveDirectiveId, getActiveDirectiveSuperClassDepth, getActiveDirectiveSuperClassHeight, getLView, getSelectedIndex} from '../state';
+import {getTNode, isStylingContext as isOldStylingContext} from '../util/view_utils';
+
+import {applyClasses, applyStyles, registerBinding, updateClassBinding, updateStyleBinding} from './bindings';
+import {TStylingContext} from './interfaces';
+import {attachStylingDebugObject} from './styling_debug';
+import {allocStylingContext, updateContextDirectiveIndex} from './util';
+
+
+/**
+ * This file contains the core logic for how styling instructions are processed in Angular.
+ *
+ * To learn more about the algorithm see `TStylingContext`.
+ */
+
+/**
+ * Temporary function to bridge styling functionality between this new
+ * refactor (which is here inside of `styling_next/`) and the old
+ * implementation (which lives inside of `styling/`).
+ *
+ * This function is executed during the creation block of an element.
+ * Because the existing styling implementation issues a call to the
+ * `styling()` instruction, this instruction will also get run. The
+ * central idea here is that the directive index values are bound
+ * into the context. The directive index is temporary and is only
+ * required until the `select(n)` instruction is fully functional.
+ */
+export function stylingInit() {
+  const lView = getLView();
+  const index = getSelectedIndex();
+  const tNode = getTNode(index, lView);
+  updateLastDirectiveIndex(tNode, getActiveDirectiveStylingIndex());
+}
+
+/**
+ * Mirror implementation of the `styleProp()` instruction (found in `instructions/styling.ts`).
+ */
+export function styleProp(
+    prop: string, value: string | number | String | null, suffix?: string | null): void {
+  const index = getSelectedIndex();
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX]++;
+  const tNode = getTNode(index, lView);
+  const tContext = getStylesContext(tNode);
+  const defer = getActiveDirectiveSuperClassHeight() > 0;
+  updateStyleBinding(tContext, lView, prop, bindingIndex, value, defer);
+}
+
+/**
+ * Mirror implementation of the `classProp()` instruction (found in `instructions/styling.ts`).
+ */
+export function classProp(className: string, value: boolean | null): void {
+  const index = getSelectedIndex();
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX]++;
+  const tNode = getTNode(index, lView);
+  const tContext = getClassesContext(tNode);
+  const defer = getActiveDirectiveSuperClassHeight() > 0;
+  updateClassBinding(tContext, lView, className, bindingIndex, value, defer);
+}
+
+/**
+ * Temporary function to bridge styling functionality between this new
+ * refactor (which is here inside of `styling_next/`) and the old
+ * implementation (which lives inside of `styling/`).
+ *
+ * The new styling refactor ensures that styling flushing is called
+ * automatically when a template function exits or a follow-up element
+ * is visited (i.e. when `select(n)` is called). Because the `select(n)`
+ * instruction is not fully implemented yet (it doesn't actually execute
+ * host binding instruction code at the right time), this means that a
+ * styling apply function is still needed.
+ *
+ * This function is a mirror implementation of the `stylingApply()`
+ * instruction (found in `instructions/styling.ts`).
+ */
+export function stylingApply() {
+  const index = getSelectedIndex();
+  const lView = getLView();
+  const tNode = getTNode(index, lView);
+  const renderer = getRenderer(tNode, lView);
+  const native = getNativeFromLView(index, lView);
+  const directiveIndex = getActiveDirectiveStylingIndex();
+  applyClasses(renderer, lView, getClassesContext(tNode), native, directiveIndex);
+  applyStyles(renderer, lView, getStylesContext(tNode), native, directiveIndex);
+}
+
+function getStylesContext(tNode: TNode): TStylingContext {
+  return getContext(tNode, false);
+}
+
+function getClassesContext(tNode: TNode): TStylingContext {
+  return getContext(tNode, true);
+}
+
+/**
+ * Returns/instantiates a styling context from/to a `tNode` instance.
+ */
+function getContext(tNode: TNode, isClassBased: boolean) {
+  let context = isClassBased ? tNode.newClasses : tNode.newStyles;
+  if (!context) {
+    context = allocStylingContext();
+    if (ngDevMode) {
+      attachStylingDebugObject(context);
+    }
+    if (isClassBased) {
+      tNode.newClasses = context;
+    } else {
+      tNode.newStyles = context;
+    }
+  }
+  return context;
+}
+
+/**
+ * Temporary function to bridge styling functionality between this new
+ * refactor (which is here inside of `styling_next/`) and the old
+ * implementation (which lives inside of `styling/`).
+ *
+ * The purpose of this function is to traverse through the LView data
+ * for a specific element index and return the native node. Because the
+ * current implementation relies on there being a styling context array,
+ * the code below will need to loop through these array values until it
+ * gets a native element node.
+ *
+ * Note that this code is temporary and will disappear once the new
+ * styling refactor lands in its entirety.
+ */
+function getNativeFromLView(index: number, viewData: LView): RElement {
+  let storageIndex = index + HEADER_OFFSET;
+  let slotValue: LContainer|LView|OldStylingContext|RElement = viewData[storageIndex];
+  let wrapper: LContainer|LView|OldStylingContext = viewData;
+  while (Array.isArray(slotValue)) {
+    wrapper = slotValue;
+    slotValue = slotValue[HOST] as LView | OldStylingContext | RElement;
+  }
+  if (isOldStylingContext(wrapper)) {
+    return wrapper[OldStylingIndex.ElementPosition] as RElement;
+  } else {
+    return slotValue;
+  }
+}
+
+function getRenderer(tNode: TNode, lView: LView) {
+  return tNode.type === TNodeType.Element ? lView[RENDERER] : null;
+}
+
+/**
+ * Searches and assigns provided all static style/class entries (found in the `attrs` value)
+ * and registers them in their respective styling contexts.
+ */
+export function registerInitialStylingIntoContext(
+    tNode: TNode, attrs: TAttributes, startIndex: number) {
+  let classesContext !: TStylingContext;
+  let stylesContext !: TStylingContext;
+  let mode = -1;
+  for (let i = startIndex; i < attrs.length; i++) {
+    const attr = attrs[i];
+    if (typeof attr == 'number') {
+      mode = attr;
+    } else if (mode == AttributeMarker.Classes) {
+      classesContext = classesContext || getClassesContext(tNode);
+      registerBinding(classesContext, -1, attr as string, true);
+    } else if (mode == AttributeMarker.Styles) {
+      stylesContext = stylesContext || getStylesContext(tNode);
+      registerBinding(stylesContext, -1, attr as string, attrs[++i] as string);
+    }
+  }
+}
+
+/**
+ * Mirror implementation of the same function found in `instructions/styling.ts`.
+ */
+export function getActiveDirectiveStylingIndex(): number {
+  // whenever a directive's hostBindings function is called a uniqueId value
+  // is assigned. Normally this is enough to help distinguish one directive
+  // from another for the styling context, but there are situations where a
+  // sub-class directive could inherit and assign styling in concert with a
+  // parent directive. To help the styling code distinguish between a parent
+  // sub-classed directive the inheritance depth is taken into account as well.
+  return getActiveDirectiveId() + getActiveDirectiveSuperClassDepth();
+}
+
+/**
+ * Temporary function that will update the max directive index value in
+ * both the classes and styles contexts present on the provided `tNode`.
+ *
+ * This code is only used because the `select(n)` code functionality is not
+ * yet 100% functional. The `select(n)` instruction cannot yet evaluate host
+ * bindings function code in sync with the associated template function code.
+ * For this reason the styling algorithm needs to track the last directive index
+ * value so that it knows exactly when to render styling to the element since
+ * `stylingApply()` is called multiple times per CD (`stylingApply` will be
+ * removed once `select(n)` is fixed).
+ */
+function updateLastDirectiveIndex(tNode: TNode, directiveIndex: number) {
+  updateContextDirectiveIndex(getClassesContext(tNode), directiveIndex);
+  updateContextDirectiveIndex(getStylesContext(tNode), directiveIndex);
+}
diff --git a/packages/core/src/render3/styling_next/interfaces.ts b/packages/core/src/render3/styling_next/interfaces.ts
new file mode 100644
index 0000000000..3ccdcf1142
--- /dev/null
+++ b/packages/core/src/render3/styling_next/interfaces.ts
@@ -0,0 +1,239 @@
+/**
+* @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 {ProceduralRenderer3, RElement, Renderer3} from '../interfaces/renderer';
+import {LView} from '../interfaces/view';
+
+/**
+ * A static-level representation of all style or class bindings/values
+ * associated with a `TNode`.
+ *
+ * The `TStylingContext` unites all template styling bindings (i.e.
+ * `[class]` and `[style]` bindings) as well as all host-level
+ * styling bindings (for components and directives) together into
+ * a single manifest. It is used each time there are one or more
+ * styling bindings present for an element.
+ *
+ * The styling context is stored on a `TNode` on and there are
+ * two instances of it: one for classes and another for styles.
+ *
+ * ```typescript
+ * tNode.styles = [ ... a context only for styles ... ];
+ * tNode.classes = [ ... a context only for classes ... ];
+ * ```
+ *
+ * Due to the fact the the `TStylingContext` is stored on a `TNode`
+ * this means that all data within the context is static. Instead of
+ * storing actual styling binding values, the lView binding index values
+ * are stored within the context. (static nature means it is more compact.)
+
+ *
+ * ```typescript
+ * // <div [class.active]="c"  // lView binding index = 20
+ * //      [style.width]="x"   // lView binding index = 21
+ * //      [style.height]="y"> // lView binding index = 22
+ * tNode.stylesContext = [
+ *   0, // the context config value
+ *
+ *   0b001, // guard mask for width
+ *   2, // total entries for width
+ *   'width', // the property name
+ *   21, // the binding location for the "x" binding in the lView
+ *   null,
+ *
+ *   0b010, // guard mask for height
+ *   2, // total entries for height
+ *   'height', // the property name
+ *   22, // the binding location for the "y" binding in the lView
+ *   null,
+ * ];
+ *
+ * tNode.classesContext = [
+ *   0, // the context config value
+ *
+ *   0b001, // guard mask for active
+ *   2, // total entries for active
+ *   'active', // the property name
+ *   20, // the binding location for the "c" binding in the lView
+ *   null,
+ * ];
+ * ```
+ *
+ * Entry value present in an entry (called a tuple) within the
+ * styling context is as follows:
+ *
+ * ```typescript
+ * context = [
+ *   CONFIG, // the styling context config value
+ *   //...
+ *   guardMask,
+ *   totalEntries,
+ *   propName,
+ *   bindingIndices...,
+ *   defaultValue
+ * ];
+ * ```
+ *
+ * Below is a breakdown of each value:
+ *
+ * - **guardMask**:
+ *   A numeric value where each bit represents a binding index
+ *   location. Each binding index location is assigned based on
+ *   a local counter value that increments each time an instruction
+ *   is called:
+ *
+ * ```
+ * <div [style.width]="x"   // binding index = 21 (counter index = 0)
+ *      [style.height]="y"> // binding index = 22 (counter index = 1)
+ * ```
+ *
+ *   In the example code above, if the `width` value where to change
+ *   then the first bit in the local bit mask value would be flipped
+ *   (and the second bit for when `height`).
+ *
+ *   If and when there are more than 32 binding sources in the context
+ *   (more than 32 `[style/class]` bindings) then the bit masking will
+ *   overflow and we are left with a situation where a `-1` value will
+ *   represent the bit mask. Due to the way that JavaScript handles
+ *   negative values, when the bit mask is `-1` then all bits within
+ *   that value will be automatically flipped (this is a quick and
+ *   efficient way to flip all bits on the mask when a special kind
+ *   of caching scenario occurs or when there are more than 32 bindings).
+ *
+ * - **totalEntries**:
+ *   Each property present in the contains various binding sources of
+ *   where the styling data could come from. This includes template
+ *   level bindings, directive/component host bindings as well as the
+ *   default value (or static value) all writing to the same property.
+ *   This value depicts how many binding source entries exist for the
+ *   property.
+ *
+ *   The reason why the totalEntries value is needed is because the
+ *   styling context is dynamic in size and it's not possible
+ *   for the flushing or update algorithms to know when and where
+ *   a property starts and ends without it.
+ *
+ * - **propName**:
+ *   The CSS property name or class name (e.g `width` or `active`).
+ *
+ * - **bindingIndices...**:
+ *   A series of numeric binding values that reflect where in the
+ *   lView to find the style/class values associated with the property.
+ *   Each value is in order in terms of priority (templates are first,
+ *   then directives and then components). When the context is flushed
+ *   and the style/class values are applied to the element (this happens
+ *   inside of the `stylingApply` instruction) then the flushing code
+ *   will keep checking each binding index against the associated lView
+ *   to find the first style/class value that is non-null.
+ *
+ * - **defaultValue**:
+ *   This is the default that will always be applied to the element if
+ *   and when all other binding sources return a result that is null.
+ *   Usually this value is null but it can also be a static value that
+ *   is intercepted when the tNode is first constructured (e.g.
+ *   `<div style="width:200px">` has a default value of `200px` for
+ *   the `width` property).
+ *
+ * Each time a new binding is encountered it is registered into the
+ * context. The context then is continually updated until the first
+ * styling apply call has been called (this is triggered by the
+ * `stylingApply()` instruction for the active element).
+ *
+ * # How Styles/Classes are Applied
+ * Each time a styling instruction (e.g. `[class.name]`, `[style.prop]`,
+ * etc...) is executed, the associated `lView` for the view is updated
+ * at the current binding location. Also, when this happens, a local
+ * counter value is incremented. If the binding value has changed then
+ * a local `bitMask` variable is updated with the specific bit based
+ * on the counter value.
+ *
+ * Below is a lightweight example of what happens when a single style
+ * property is updated (i.e. `<div [style.prop]="val">`):
+ *
+ * ```typescript
+ * function updateStyleProp(prop: string, value: string) {
+ *   const lView = getLView();
+ *   const bindingIndex = BINDING_INDEX++;
+ *   const indexForStyle = localStylesCounter++;
+ *   if (lView[bindingIndex] !== value) {
+ *     lView[bindingIndex] = value;
+ *     localBitMaskForStyles |= 1 << indexForStyle;
+ *   }
+ * }
+ * ```
+ *
+ * Once all the styling instructions have been evaluated, then the styling
+ * context(s) are flushed to the element. When this happens, the context will
+ * be iterated over (property by property) and each binding source will be
+ * examined and the first non-null value will be applied to the element.
+ *
+ */
+export interface TStylingContext extends Array<number|string|number|boolean|null> {
+  [TStylingContextIndex.ConfigPosition]: TStylingConfigFlags;
+
+  /* Temporary value used to track directive index entries until
+     the old styling code is fully removed. The reason why this
+     is required is to figure out which directive is last and,
+     when encountered, trigger a styling flush to happen */
+  [TStylingContextIndex.MaxDirectiveIndexPosition]: number;
+}
+
+/**
+ * A series of flags used to configure the config value present within a
+ * `TStylingContext` value.
+ */
+export const enum TStylingConfigFlags {
+  /**
+   * The initial state of the styling context config
+   */
+  Initial = 0b0,
+
+  /**
+   * A flag which marks the context as being locked.
+   *
+   * The styling context is constructed across an element template
+   * function as well as any associated hostBindings functions. When
+   * this occurs, the context itself is open to mutation and only once
+   * it has been flushed once then it will be locked for good (no extra
+   * bindings can be added to it).
+   */
+  Locked = 0b1,
+}
+
+/**
+ * An index of position and offset values used to natigate the `TStylingContext`.
+ */
+export const enum TStylingContextIndex {
+  ConfigPosition = 0,
+  MaxDirectiveIndexPosition = 1,
+  ValuesStartPosition = 2,
+
+  // each tuple entry in the context
+  // (mask, count, prop, ...bindings||default-value)
+  MaskOffset = 0,
+  ValuesCountOffset = 1,
+  PropOffset = 2,
+  BindingsStartOffset = 3,
+}
+
+/**
+ * A function used to apply or remove styling from an element for a given property.
+ */
+export interface ApplyStylingFn {
+  (renderer: Renderer3|ProceduralRenderer3|null, element: RElement, prop: string,
+   value: string|null, bindingIndex: number): void;
+}
+
+/**
+ * Runtime data type that is used to store binding data referenced from the `TStylingContext`.
+ *
+ * Because `LView` is just an array with data, there is no reason to
+ * special case `LView` everywhere in the styling algorithm. By allowing
+ * this data type to be an array that contains various scalar data types,
+ * an instance of `LView` doesn't need to be constructed for tests.
+ */
+export type StylingBindingData = LView | (string | number | boolean)[];
diff --git a/packages/core/src/render3/styling_next/state.ts b/packages/core/src/render3/styling_next/state.ts
new file mode 100644
index 0000000000..d4c5d281e2
--- /dev/null
+++ b/packages/core/src/render3/styling_next/state.ts
@@ -0,0 +1,37 @@
+/**
+* @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
+*/
+
+/**
+ * A temporary enum of states that inform the core whether or not
+ * to defer all styling instruction calls to the old or new
+ * styling implementation.
+ */
+export const enum RuntimeStylingMode {
+  UseOld = 0,
+  UseBothOldAndNew = 1,
+  UseNew = 2,
+}
+
+let _stylingMode = 0;
+
+/**
+ * Temporary function used to inform the existing styling algorithm
+ * code to delegate all styling instruction calls to the new refactored
+ * styling code.
+ */
+export function runtimeSetStylingMode(mode: RuntimeStylingMode) {
+  _stylingMode = mode;
+}
+
+export function runtimeIsNewStylingInUse() {
+  return _stylingMode > RuntimeStylingMode.UseOld;
+}
+
+export function runtimeAllowOldStyling() {
+  return _stylingMode < RuntimeStylingMode.UseNew;
+}
diff --git a/packages/core/src/render3/styling_next/styling_debug.ts b/packages/core/src/render3/styling_next/styling_debug.ts
new file mode 100644
index 0000000000..5dda787365
--- /dev/null
+++ b/packages/core/src/render3/styling_next/styling_debug.ts
@@ -0,0 +1,210 @@
+/**
+* @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 {RElement} from '../interfaces/renderer';
+import {attachDebugObject} from '../util/debug_utils';
+
+import {BIT_MASK_APPLY_ALL, DEFAULT_BINDING_INDEX_VALUE, applyStyling} from './bindings';
+import {StylingBindingData, TStylingContext, TStylingContextIndex} from './interfaces';
+import {getDefaultValue, getGuardMask, getProp, getValuesCount, isContextLocked} from './util';
+
+
+/**
+ * A debug/testing-oriented summary of a styling entry.
+ *
+ * A value such as this is generated as an artifact of the `DebugStyling`
+ * summary.
+ */
+export interface StylingSummary {
+  /** The style/class property that the summary is attached to */
+  prop: string;
+
+  /** The last applied value for the style/class property */
+  value: string|null;
+
+  /** The binding index of the last applied style/class property */
+  bindingIndex: number|null;
+
+  /** Every binding source that is writing the style/class property represented in this tuple */
+  sourceValues: {value: string | number | null, bindingIndex: number|null}[];
+}
+
+/**
+ * A debug/testing-oriented summary of all styling entries for a `DebugNode` instance.
+ */
+export interface DebugStyling {
+  /** The associated TStylingContext instance */
+  context: TStylingContext;
+
+  /**
+   * A summarization of each style/class property
+   * present in the context.
+   */
+  summary: {[key: string]: StylingSummary}|null;
+
+  /**
+   * A key/value map of all styling properties and their
+   * runtime values.
+   */
+  values: {[key: string]: string | number | null | boolean};
+}
+
+/**
+ * A debug/testing-oriented summary of all styling entries within a `TStylingContext`.
+ */
+export interface TStylingTupleSummary {
+  /** The property (style or class property) that this tuple represents */
+  prop: string;
+
+  /** The total amount of styling entries apart of this tuple */
+  valuesCount: number;
+
+  /**
+   * The bit guard mask that is used to compare and protect against
+   * styling changes when and styling bindings update
+   */
+  guardMask: number;
+
+  /**
+   * The default value that will be applied if any bindings are falsy.
+   */
+  defaultValue: string|boolean|null;
+
+  /**
+   * All bindingIndex sources that have been registered for this style.
+   */
+  sources: (number|null|string)[];
+}
+
+/**
+ * Instantiates and attaches an instance of `TStylingContextDebug` to the provided context.
+ */
+export function attachStylingDebugObject(context: TStylingContext) {
+  const debug = new TStylingContextDebug(context);
+  attachDebugObject(context, debug);
+  return debug;
+}
+
+/**
+ * A human-readable debug summary of the styling data present within `TStylingContext`.
+ *
+ * This class is designed to be used within testing code or when an
+ * application has `ngDevMode` activated.
+ */
+class TStylingContextDebug {
+  constructor(public readonly context: TStylingContext) {}
+
+  get isLocked() { return isContextLocked(this.context); }
+
+  /**
+   * Returns a detailed summary of each styling entry in the context.
+   *
+   * See `TStylingTupleSummary`.
+   */
+  get entries(): {[prop: string]: TStylingTupleSummary} {
+    const context = this.context;
+    const entries: {[prop: string]: TStylingTupleSummary} = {};
+    const start = TStylingContextIndex.ValuesStartPosition;
+    let i = start;
+    while (i < context.length) {
+      const prop = getProp(context, i);
+      const guardMask = getGuardMask(context, i);
+      const valuesCount = getValuesCount(context, i);
+      const defaultValue = getDefaultValue(context, i);
+
+      const bindingsStartPosition = i + TStylingContextIndex.BindingsStartOffset;
+      const sources: (number | string | null)[] = [];
+
+      for (let j = 0; j < valuesCount; j++) {
+        sources.push(context[bindingsStartPosition + j] as number | string | null);
+      }
+
+      entries[prop] = {prop, guardMask, valuesCount, defaultValue, sources};
+
+      i += TStylingContextIndex.BindingsStartOffset + valuesCount;
+    }
+    return entries;
+  }
+}
+
+/**
+ * A human-readable debug summary of the styling data present for a `DebugNode` instance.
+ *
+ * This class is designed to be used within testing code or when an
+ * application has `ngDevMode` activated.
+ */
+export class NodeStylingDebug implements DebugStyling {
+  private _contextDebug: TStylingContextDebug;
+
+  constructor(public context: TStylingContext, private _data: StylingBindingData) {
+    this._contextDebug = (this.context as any).debug as any;
+  }
+
+  /**
+   * Returns a detailed summary of each styling entry in the context and
+   * what their runtime representation is.
+   *
+   * See `StylingSummary`.
+   */
+  get summary(): {[key: string]: StylingSummary} {
+    const contextEntries = this._contextDebug.entries;
+    const finalValues: {[key: string]: {value: string, bindingIndex: number}} = {};
+    this._mapValues((prop: string, value: any, bindingIndex: number) => {
+      finalValues[prop] = {value, bindingIndex};
+    });
+
+    const entries: {[key: string]: StylingSummary} = {};
+    const values = this.values;
+    const props = Object.keys(values);
+    for (let i = 0; i < props.length; i++) {
+      const prop = props[i];
+      const contextEntry = contextEntries[prop];
+      const sourceValues = contextEntry.sources.map(v => {
+        let value: string|number|null;
+        let bindingIndex: number|null;
+        if (typeof v === 'number') {
+          value = this._data[v];
+          bindingIndex = v;
+        } else {
+          value = v;
+          bindingIndex = null;
+        }
+        return {bindingIndex, value};
+      });
+
+      const finalValue = finalValues[prop] !;
+      let bindingIndex: number|null = finalValue.bindingIndex;
+      bindingIndex = bindingIndex === DEFAULT_BINDING_INDEX_VALUE ? null : bindingIndex;
+
+      entries[prop] = {prop, value: finalValue.value, bindingIndex, sourceValues};
+    }
+
+    return entries;
+  }
+
+  /**
+   * Returns a key/value map of all the styles/classes that were last applied to the element.
+   */
+  get values(): {[key: string]: any} {
+    const entries: {[key: string]: any} = {};
+    this._mapValues((prop: string, value: any) => { entries[prop] = value; });
+    return entries;
+  }
+
+  private _mapValues(fn: (prop: string, value: any, bindingIndex: number) => any) {
+    // there is no need to store/track an element instance. The
+    // element is only used when the styling algorithm attempts to
+    // style the value (and we mock out the stylingApplyFn anyway).
+    const mockElement = {} as any;
+
+    const mapFn =
+        (renderer: any, element: RElement, prop: string, value: any, bindingIndex: number) => {
+          fn(prop, value, bindingIndex);
+        };
+    applyStyling(this.context, null, mockElement, this._data, BIT_MASK_APPLY_ALL, mapFn);
+  }
+}
diff --git a/packages/core/src/render3/styling_next/util.ts b/packages/core/src/render3/styling_next/util.ts
new file mode 100644
index 0000000000..13a76aa3f3
--- /dev/null
+++ b/packages/core/src/render3/styling_next/util.ts
@@ -0,0 +1,82 @@
+/**
+* @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 {StylingContext} from '../interfaces/styling';
+import {getProp as getOldProp, getSinglePropIndexValue as getOldSinglePropIndexValue} from '../styling/class_and_style_bindings';
+import {TStylingConfigFlags, TStylingContext, TStylingContextIndex} from './interfaces';
+
+/**
+ * Creates a new instance of the `TStylingContext`.
+ */
+export function allocStylingContext(): TStylingContext {
+  return [TStylingConfigFlags.Initial, 0];
+}
+
+/**
+ * Temporary function that allows for a string-based property name to be
+ * obtained from an index-based property identifier.
+ *
+ * This function will be removed once the new styling refactor code (which
+ * lives inside of `render3/styling_next/`) replaces the existing styling
+ * implementation.
+ */
+export function getBindingNameFromIndex(
+    stylingContext: StylingContext, offset: number, directiveIndex: number, isClassBased: boolean) {
+  const singleIndex =
+      getOldSinglePropIndexValue(stylingContext, directiveIndex, offset, isClassBased);
+  return getOldProp(stylingContext, singleIndex);
+}
+
+export function updateContextDirectiveIndex(context: TStylingContext, index: number) {
+  context[TStylingContextIndex.MaxDirectiveIndexPosition] = index;
+}
+
+function getConfig(context: TStylingContext) {
+  return context[TStylingContextIndex.ConfigPosition];
+}
+
+export function setConfig(context: TStylingContext, value: number) {
+  context[TStylingContextIndex.ConfigPosition] = value;
+}
+
+export function getProp(context: TStylingContext, index: number) {
+  return context[index + TStylingContextIndex.PropOffset] as string;
+}
+
+export function getGuardMask(context: TStylingContext, index: number) {
+  return context[index + TStylingContextIndex.MaskOffset] as number;
+}
+
+export function getValuesCount(context: TStylingContext, index: number) {
+  return context[index + TStylingContextIndex.ValuesCountOffset] as number;
+}
+
+export function getValue(context: TStylingContext, index: number, offset: number) {
+  return context[index + TStylingContextIndex.BindingsStartOffset + offset] as number | string;
+}
+
+export function getDefaultValue(context: TStylingContext, index: number): string|boolean|null {
+  const valuesCount = getValuesCount(context, index);
+  return context[index + TStylingContextIndex.BindingsStartOffset + valuesCount - 1] as string |
+      boolean | null;
+}
+
+/**
+ * Temporary function which determines whether or not a context is
+ * allowed to be flushed based on the provided directive index.
+ */
+export function allowStylingFlush(context: TStylingContext, index: number) {
+  return index === context[TStylingContextIndex.MaxDirectiveIndexPosition];
+}
+
+export function lockContext(context: TStylingContext) {
+  setConfig(context, getConfig(context) | TStylingConfigFlags.Locked);
+}
+
+export function isContextLocked(context: TStylingContext): boolean {
+  return (getConfig(context) & TStylingConfigFlags.Locked) > 0;
+}
diff --git a/packages/core/src/render3/util/debug_utils.ts b/packages/core/src/render3/util/debug_utils.ts
new file mode 100644
index 0000000000..3c30200ed1
--- /dev/null
+++ b/packages/core/src/render3/util/debug_utils.ts
@@ -0,0 +1,10 @@
+/**
+ * @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 function attachDebugObject(obj: any, debug: any) {
+  Object.defineProperty(obj, 'debug', {value: debug, enumerable: false});
+}
diff --git a/packages/core/test/acceptance/styling_next_spec.ts b/packages/core/test/acceptance/styling_next_spec.ts
new file mode 100644
index 0000000000..8ca9277a45
--- /dev/null
+++ b/packages/core/test/acceptance/styling_next_spec.ts
@@ -0,0 +1,330 @@
+/**
+ * @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 {CompilerStylingMode, compilerSetStylingMode} from '@angular/compiler/src/render3/view/styling_state';
+import {Component, Directive, HostBinding, Input} from '@angular/core';
+import {DebugNode, LViewDebug, toDebug} from '@angular/core/src/render3/debug';
+import {RuntimeStylingMode, runtimeSetStylingMode} from '@angular/core/src/render3/styling_next/state';
+import {loadLContextFromNode} from '@angular/core/src/render3/util/discovery_utils';
+import {TestBed} from '@angular/core/testing';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
+import {onlyInIvy} from '@angular/private/testing';
+
+describe('new styling integration', () => {
+  beforeEach(() => {
+    runtimeSetStylingMode(RuntimeStylingMode.UseNew);
+    compilerSetStylingMode(CompilerStylingMode.UseNew);
+  });
+
+  afterEach(() => {
+    runtimeSetStylingMode(RuntimeStylingMode.UseOld);
+    compilerSetStylingMode(CompilerStylingMode.UseOld);
+  });
+
+  onlyInIvy('ivy resolves styling across directives, components and templates in unison')
+      .it('should apply single property styles/classes to the element and default to any static styling values',
+          () => {
+            @Component({
+              template: `
+        <div [style.width]="w"
+             [style.height]="h"
+             [style.opacity]="o"
+             style="width:200px; height:200px;"
+             [class.abc]="abc"
+             [class.xyz]="xyz"></div>
+      `
+            })
+            class Cmp {
+              w: string|null = '100px';
+              h: string|null = '100px';
+              o: string|null = '0.5';
+              abc = true;
+              xyz = false;
+            }
+
+            TestBed.configureTestingModule({declarations: [Cmp]});
+            const fixture = TestBed.createComponent(Cmp);
+            fixture.detectChanges();
+
+            const element = fixture.nativeElement.querySelector('div');
+            expect(element.style.width).toEqual('100px');
+            expect(element.style.height).toEqual('100px');
+            expect(element.style.opacity).toEqual('0.5');
+            expect(element.classList.contains('abc')).toBeTruthy();
+            expect(element.classList.contains('xyz')).toBeFalsy();
+
+            fixture.componentInstance.w = null;
+            fixture.componentInstance.h = null;
+            fixture.componentInstance.o = null;
+            fixture.componentInstance.abc = false;
+            fixture.componentInstance.xyz = true;
+            fixture.detectChanges();
+
+            expect(element.style.width).toEqual('200px');
+            expect(element.style.height).toEqual('200px');
+            expect(element.style.opacity).toBeFalsy();
+            expect(element.classList.contains('abc')).toBeFalsy();
+            expect(element.classList.contains('xyz')).toBeTruthy();
+          });
+
+  onlyInIvy('ivy resolves styling across directives, components and templates in unison')
+      .it('should apply single style/class across the template and directive host bindings', () => {
+        @Directive({selector: '[dir-that-sets-width]'})
+        class DirThatSetsWidthDirective {
+          @Input('dir-that-sets-width') @HostBinding('style.width') public width: string = '';
+        }
+
+        @Directive({selector: '[another-dir-that-sets-width]', host: {'[style.width]': 'width'}})
+        class AnotherDirThatSetsWidthDirective {
+          @Input('another-dir-that-sets-width') public width: string = '';
+        }
+
+        @Component({
+          template: `
+        <div [style.width]="w0"
+             [dir-that-sets-width]="w1"
+             [another-dir-that-sets-width]="w2">
+      `
+        })
+        class Cmp {
+          w0: string|null = null;
+          w1: string|null = null;
+          w2: string|null = null;
+        }
+
+        TestBed.configureTestingModule(
+            {declarations: [Cmp, DirThatSetsWidthDirective, AnotherDirThatSetsWidthDirective]});
+        const fixture = TestBed.createComponent(Cmp);
+        fixture.componentInstance.w0 = '100px';
+        fixture.componentInstance.w1 = '200px';
+        fixture.componentInstance.w2 = '300px';
+        fixture.detectChanges();
+
+        const element = fixture.nativeElement.querySelector('div');
+        expect(element.style.width).toEqual('100px');
+
+        fixture.componentInstance.w0 = null;
+        fixture.detectChanges();
+
+        expect(element.style.width).toEqual('200px');
+
+        fixture.componentInstance.w1 = null;
+        fixture.detectChanges();
+
+        expect(element.style.width).toEqual('300px');
+
+        fixture.componentInstance.w2 = null;
+        fixture.detectChanges();
+
+        expect(element.style.width).toBeFalsy();
+
+        fixture.componentInstance.w2 = '400px';
+        fixture.detectChanges();
+
+        expect(element.style.width).toEqual('400px');
+
+        fixture.componentInstance.w1 = '500px';
+        fixture.componentInstance.w0 = '600px';
+        fixture.detectChanges();
+
+        expect(element.style.width).toEqual('600px');
+      });
+
+  onlyInIvy('ivy resolves styling across directives, components and templates in unison')
+      .it('should combine all styling across the template, directive and component host bindings',
+          () => {
+            @Directive({selector: '[dir-with-styling]'})
+            class DirWithStyling {
+              @HostBinding('style.color') public color = 'red';
+
+              @HostBinding('style.font-size') public fontSize = '100px';
+
+              @HostBinding('class.dir') public dirClass = true;
+            }
+
+            @Component({selector: 'comp-with-styling'})
+            class CompWithStyling {
+              @HostBinding('style.width') public width = '900px';
+
+              @HostBinding('style.height') public height = '900px';
+
+              @HostBinding('class.comp') public compClass = true;
+            }
+
+            @Component({
+              template: `
+        <comp-with-styling
+          [style.opacity]="opacity"
+          [style.width]="width"
+          [class.tpl]="tplClass"
+          dir-with-styling>...</comp-with-styling>
+      `
+            })
+            class Cmp {
+              opacity: string|null = '0.5';
+              width: string|null = 'auto';
+              tplClass = true;
+            }
+
+            TestBed.configureTestingModule({declarations: [Cmp, DirWithStyling, CompWithStyling]});
+            const fixture = TestBed.createComponent(Cmp);
+            fixture.detectChanges();
+
+            const element = fixture.nativeElement.querySelector('comp-with-styling');
+
+            const node = getDebugNode(element) !;
+            const styles = node.styles !;
+            const classes = node.classes !;
+
+            expect(styles.values).toEqual({
+              'color': 'red',
+              'width': 'auto',
+              'opacity': '0.5',
+              'height': '900px',
+              'font-size': '100px'
+            });
+            expect(classes.values).toEqual({
+              'dir': true,
+              'comp': true,
+              'tpl': true,
+            });
+
+            fixture.componentInstance.width = null;
+            fixture.componentInstance.opacity = null;
+            fixture.componentInstance.tplClass = false;
+            fixture.detectChanges();
+
+            expect(styles.values).toEqual({
+              'color': 'red',
+              'width': '900px',
+              'opacity': null,
+              'height': '900px',
+              'font-size': '100px'
+            });
+            expect(classes.values).toEqual({
+              'dir': true,
+              'comp': true,
+              'tpl': false,
+            });
+          });
+
+  onlyInIvy('ivy resolves styling across directives, components and templates in unison')
+      .it('should properly apply styling across sub and super class directive host bindings',
+          () => {
+            @Directive({selector: '[super-class-dir]'})
+            class SuperClassDirective {
+              @HostBinding('style.width') public w1 = '100px';
+            }
+
+            @Component({selector: '[sub-class-dir]'})
+            class SubClassDirective extends SuperClassDirective {
+              @HostBinding('style.width') public w2 = '200px';
+            }
+
+            @Component({
+              template: `
+          <div sub-class-dir [style.width]="w3"></div>
+      `
+            })
+            class Cmp {
+              w3: string|null = '300px';
+            }
+
+            TestBed.configureTestingModule(
+                {declarations: [Cmp, SuperClassDirective, SubClassDirective]});
+            const fixture = TestBed.createComponent(Cmp);
+            fixture.detectChanges();
+
+            const element = fixture.nativeElement.querySelector('div');
+
+            const node = getDebugNode(element) !;
+            const styles = node.styles !;
+
+            expect(styles.values).toEqual({
+              'width': '300px',
+            });
+
+            fixture.componentInstance.w3 = null;
+            fixture.detectChanges();
+            expect(styles.values).toEqual({
+              'width': '200px',
+            });
+          });
+
+  onlyInIvy('only ivy has style debugging support')
+      .it('should support situations where there are more than 32 bindings', () => {
+        const TOTAL_BINDINGS = 34;
+
+        let bindingsHTML = '';
+        let bindingsArr: any[] = [];
+        for (let i = 0; i < TOTAL_BINDINGS; i++) {
+          bindingsHTML += `[style.prop${i}]="bindings[${i}]" `;
+          bindingsArr.push(null);
+        }
+
+        @Component({template: `<div ${bindingsHTML}></div>`})
+        class Cmp {
+          bindings = bindingsArr;
+
+          updateBindings(value: string) {
+            for (let i = 0; i < TOTAL_BINDINGS; i++) {
+              this.bindings[i] = value + i;
+            }
+          }
+        }
+
+        TestBed.configureTestingModule({declarations: [Cmp]});
+        const fixture = TestBed.createComponent(Cmp);
+
+        let testValue = 'initial';
+        fixture.componentInstance.updateBindings('initial');
+        fixture.detectChanges();
+
+        const element = fixture.nativeElement.querySelector('div');
+
+        const node = getDebugNode(element) !;
+        const styles = node.styles !;
+
+        let values = styles.values;
+        let props = Object.keys(values);
+        expect(props.length).toEqual(TOTAL_BINDINGS);
+
+        for (let i = 0; i < props.length; i++) {
+          const prop = props[i];
+          const value = values[prop] as string;
+          const num = value.substr(testValue.length);
+          expect(value).toEqual(`initial${num}`);
+        }
+
+        testValue = 'final';
+        fixture.componentInstance.updateBindings('final');
+        fixture.detectChanges();
+
+        values = styles.values;
+        props = Object.keys(values);
+        expect(props.length).toEqual(TOTAL_BINDINGS);
+        for (let i = 0; i < props.length; i++) {
+          const prop = props[i];
+          const value = values[prop] as string;
+          const num = value.substr(testValue.length);
+          expect(value).toEqual(`final${num}`);
+        }
+      });
+});
+
+function getDebugNode(element: Node): DebugNode|null {
+  const lContext = loadLContextFromNode(element);
+  const lViewDebug = toDebug(lContext.lView) as LViewDebug;
+  const debugNodes = lViewDebug.nodes || [];
+  for (let i = 0; i < debugNodes.length; i++) {
+    const n = debugNodes[i];
+    if (n.native === element) {
+      return n;
+    }
+  }
+  return null;
+}
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index a57178edd4..94c5b7ccc8 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -32,6 +32,15 @@
   {
     "name": "DECLARATION_VIEW"
   },
+  {
+    "name": "DEFAULT_BINDING_VALUE"
+  },
+  {
+    "name": "DEFAULT_MASK_VALUE"
+  },
+  {
+    "name": "DEFAULT_SIZE_VALUE"
+  },
   {
     "name": "DEFAULT_TEMPLATE_DIRECTIVE_INDEX"
   },
@@ -161,6 +170,12 @@
   {
     "name": "_selectedIndex"
   },
+  {
+    "name": "_stylingMode"
+  },
+  {
+    "name": "addBindingIntoContext"
+  },
   {
     "name": "addComponentLogic"
   },
@@ -173,6 +188,12 @@
   {
     "name": "allocStylingContext"
   },
+  {
+    "name": "allocStylingContext"
+  },
+  {
+    "name": "allocateNewContextEntry"
+  },
   {
     "name": "allocateOrUpdateDirectiveIntoContext"
   },
@@ -311,6 +332,9 @@
   {
     "name": "getCheckNoChangesMode"
   },
+  {
+    "name": "getClassesContext"
+  },
   {
     "name": "getClosureSafeProperty"
   },
@@ -323,6 +347,9 @@
   {
     "name": "getContainerRenderParent"
   },
+  {
+    "name": "getContext"
+  },
   {
     "name": "getDirectiveDef"
   },
@@ -398,6 +425,9 @@
   {
     "name": "getPreviousOrParentTNode"
   },
+  {
+    "name": "getProp"
+  },
   {
     "name": "getRenderFlags"
   },
@@ -413,12 +443,18 @@
   {
     "name": "getSelectedIndex"
   },
+  {
+    "name": "getStylesContext"
+  },
   {
     "name": "getStylingContextFromLView"
   },
   {
     "name": "getTNode"
   },
+  {
+    "name": "getValuesCount"
+  },
   {
     "name": "hasClassInput"
   },
@@ -575,6 +611,12 @@
   {
     "name": "refreshDynamicEmbeddedViews"
   },
+  {
+    "name": "registerBinding"
+  },
+  {
+    "name": "registerInitialStylingIntoContext"
+  },
   {
     "name": "registerPostOrderHooks"
   },
@@ -608,6 +650,9 @@
   {
     "name": "resolveDirectives"
   },
+  {
+    "name": "runtimeIsNewStylingInUse"
+  },
   {
     "name": "saveNameToExportMap"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 1fbcba97b2..be0d39505d 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -11,6 +11,9 @@
   {
     "name": "BINDING_INDEX"
   },
+  {
+    "name": "BIT_MASK_APPLY_ALL"
+  },
   {
     "name": "BLOOM_MASK"
   },
@@ -47,6 +50,18 @@
   {
     "name": "DECLARATION_VIEW"
   },
+  {
+    "name": "DEFAULT_BINDING_INDEX_VALUE"
+  },
+  {
+    "name": "DEFAULT_BINDING_VALUE"
+  },
+  {
+    "name": "DEFAULT_MASK_VALUE"
+  },
+  {
+    "name": "DEFAULT_SIZE_VALUE"
+  },
   {
     "name": "DEFAULT_TEMPLATE_DIRECTIVE_INDEX"
   },
@@ -377,6 +392,9 @@
   {
     "name": "_selectedIndex"
   },
+  {
+    "name": "_stylingMode"
+  },
   {
     "name": "_symbolIterator"
   },
@@ -389,6 +407,9 @@
   {
     "name": "activeDirectiveSuperClassHeight"
   },
+  {
+    "name": "addBindingIntoContext"
+  },
   {
     "name": "addComponentLogic"
   },
@@ -413,21 +434,39 @@
   {
     "name": "allocStylingContext"
   },
+  {
+    "name": "allocStylingContext"
+  },
+  {
+    "name": "allocateNewContextEntry"
+  },
   {
     "name": "allocateOrUpdateDirectiveIntoContext"
   },
   {
     "name": "allowFlush"
   },
+  {
+    "name": "allowStylingFlush"
+  },
   {
     "name": "allowValueChange"
   },
   {
     "name": "appendChild"
   },
+  {
+    "name": "applyClasses"
+  },
   {
     "name": "applyOnCreateInstructions"
   },
+  {
+    "name": "applyStyles"
+  },
+  {
+    "name": "applyStyling"
+  },
   {
     "name": "assertTemplate"
   },
@@ -476,6 +515,12 @@
   {
     "name": "checkView"
   },
+  {
+    "name": "classProp"
+  },
+  {
+    "name": "classesBitMask"
+  },
   {
     "name": "cleanUpView"
   },
@@ -542,6 +587,9 @@
   {
     "name": "createViewBlueprint"
   },
+  {
+    "name": "currentClassIndex"
+  },
   {
     "name": "decreaseElementDepthCount"
   },
@@ -551,6 +599,12 @@
   {
     "name": "defaultScheduler"
   },
+  {
+    "name": "deferBindingRegistration"
+  },
+  {
+    "name": "deferredBindingQueue"
+  },
   {
     "name": "destroyLView"
   },
@@ -638,6 +692,9 @@
   {
     "name": "findViaComponent"
   },
+  {
+    "name": "flushDeferredBindings"
+  },
   {
     "name": "flushQueue"
   },
@@ -659,12 +716,21 @@
   {
     "name": "getActiveDirectiveStylingIndex"
   },
+  {
+    "name": "getActiveDirectiveStylingIndex"
+  },
   {
     "name": "getActiveDirectiveSuperClassDepth"
   },
+  {
+    "name": "getActiveDirectiveSuperClassHeight"
+  },
   {
     "name": "getBeforeNodeForView"
   },
+  {
+    "name": "getBindingNameFromIndex"
+  },
   {
     "name": "getBindingsEnabled"
   },
@@ -674,6 +740,9 @@
   {
     "name": "getCheckNoChangesMode"
   },
+  {
+    "name": "getClassesContext"
+  },
   {
     "name": "getCleanup"
   },
@@ -689,9 +758,15 @@
   {
     "name": "getComponentViewByInstance"
   },
+  {
+    "name": "getConfig"
+  },
   {
     "name": "getContainerRenderParent"
   },
+  {
+    "name": "getContext"
+  },
   {
     "name": "getContextLView"
   },
@@ -713,6 +788,9 @@
   {
     "name": "getGlobal"
   },
+  {
+    "name": "getGuardMask"
+  },
   {
     "name": "getHighestElementOrICUContainer"
   },
@@ -776,6 +854,9 @@
   {
     "name": "getNativeByTNode"
   },
+  {
+    "name": "getNativeFromLView"
+  },
   {
     "name": "getNodeInjectable"
   },
@@ -833,12 +914,18 @@
   {
     "name": "getProp"
   },
+  {
+    "name": "getProp"
+  },
   {
     "name": "getRenderFlags"
   },
   {
     "name": "getRenderParent"
   },
+  {
+    "name": "getRenderer"
+  },
   {
     "name": "getRootContext"
   },
@@ -854,6 +941,9 @@
   {
     "name": "getStyleSanitizer"
   },
+  {
+    "name": "getStylesContext"
+  },
   {
     "name": "getStylingContext"
   },
@@ -878,6 +968,12 @@
   {
     "name": "getValue"
   },
+  {
+    "name": "getValue"
+  },
+  {
+    "name": "getValuesCount"
+  },
   {
     "name": "handleError"
   },
@@ -920,15 +1016,15 @@
   {
     "name": "initNodeFlags"
   },
+  {
+    "name": "initStyling"
+  },
   {
     "name": "initializeStaticContext"
   },
   {
     "name": "initializeTNodeInputs"
   },
-  {
-    "name": "initstyling"
-  },
   {
     "name": "injectElementRef"
   },
@@ -980,6 +1076,9 @@
   {
     "name": "isContextDirty"
   },
+  {
+    "name": "isContextLocked"
+  },
   {
     "name": "isCreationMode"
   },
@@ -1031,6 +1130,9 @@
   {
     "name": "isStylingContext"
   },
+  {
+    "name": "isValueDefined"
+  },
   {
     "name": "iterateListLike"
   },
@@ -1049,6 +1151,9 @@
   {
     "name": "locateHostElement"
   },
+  {
+    "name": "lockContext"
+  },
   {
     "name": "looseIdentical"
   },
@@ -1145,9 +1250,15 @@
   {
     "name": "refreshDynamicEmbeddedViews"
   },
+  {
+    "name": "registerBinding"
+  },
   {
     "name": "registerHostDirective"
   },
+  {
+    "name": "registerInitialStylingIntoContext"
+  },
   {
     "name": "registerMultiMapEntry"
   },
@@ -1199,6 +1310,12 @@
   {
     "name": "resolveForwardRef"
   },
+  {
+    "name": "runtimeAllowOldStyling"
+  },
+  {
+    "name": "runtimeIsNewStylingInUse"
+  },
   {
     "name": "saveNameToExportMap"
   },
@@ -1229,6 +1346,12 @@
   {
     "name": "setClass"
   },
+  {
+    "name": "setClass"
+  },
+  {
+    "name": "setConfig"
+  },
   {
     "name": "setContextDirty"
   },
@@ -1289,6 +1412,9 @@
   {
     "name": "setStyle"
   },
+  {
+    "name": "setStyle"
+  },
   {
     "name": "setTNodeAndViewData"
   },
@@ -1313,9 +1439,18 @@
   {
     "name": "stringifyForError"
   },
+  {
+    "name": "stylesBitMask"
+  },
+  {
+    "name": "stylingApply"
+  },
   {
     "name": "stylingContext"
   },
+  {
+    "name": "stylingInit"
+  },
   {
     "name": "syncViewWithBlueprint"
   },
@@ -1331,12 +1466,24 @@
   {
     "name": "unwrapRNode"
   },
+  {
+    "name": "updateBindingData"
+  },
+  {
+    "name": "updateClassBinding"
+  },
   {
     "name": "updateClassProp"
   },
+  {
+    "name": "updateContextDirectiveIndex"
+  },
   {
     "name": "updateContextWithBindings"
   },
+  {
+    "name": "updateLastDirectiveIndex"
+  },
   {
     "name": "updateSingleStylingValue"
   },
diff --git a/packages/core/test/render3/styling_next/styling_context_spec.ts b/packages/core/test/render3/styling_next/styling_context_spec.ts
new file mode 100644
index 0000000000..ff21327acd
--- /dev/null
+++ b/packages/core/test/render3/styling_next/styling_context_spec.ts
@@ -0,0 +1,93 @@
+/**
+ * @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 {registerBinding} from '@angular/core/src/render3/styling_next/bindings';
+import {attachStylingDebugObject} from '@angular/core/src/render3/styling_next/styling_debug';
+
+import {allocStylingContext} from '../../../src/render3/styling_next/util';
+
+describe('styling context', () => {
+  it('should register a series of entries into the context', () => {
+    const debug = makeContextWithDebug();
+    const context = debug.context;
+    expect(debug.entries).toEqual({});
+
+    registerBinding(context, 0, 'width', '100px');
+    expect(debug.entries['width']).toEqual({
+      prop: 'width',
+      valuesCount: 1,
+      guardMask: buildGuardMask(),
+      defaultValue: '100px',
+      sources: ['100px'],
+    });
+
+    registerBinding(context, 1, 'width', 20);
+    expect(debug.entries['width']).toEqual({
+      prop: 'width',
+      valuesCount: 2,
+      guardMask: buildGuardMask(1),
+      defaultValue: '100px',
+      sources: [20, '100px'],
+    });
+
+    registerBinding(context, 2, 'height', 10);
+    registerBinding(context, 3, 'height', 15);
+    expect(debug.entries['height']).toEqual({
+      prop: 'height',
+      valuesCount: 3,
+      guardMask: buildGuardMask(2, 3),
+      defaultValue: null,
+      sources: [10, 15, null],
+    });
+  });
+
+  it('should overwrite a default value for an entry only if it is non-null', () => {
+    const debug = makeContextWithDebug();
+    const context = debug.context;
+    expect(debug.entries).toEqual({});
+
+    registerBinding(context, 0, 'width', null);
+    expect(debug.entries['width']).toEqual({
+      prop: 'width',
+      valuesCount: 1,
+      guardMask: buildGuardMask(),
+      defaultValue: null,
+      sources: [null]
+    });
+
+    registerBinding(context, 0, 'width', '100px');
+    expect(debug.entries['width']).toEqual({
+      prop: 'width',
+      valuesCount: 1,
+      guardMask: buildGuardMask(),
+      defaultValue: '100px',
+      sources: ['100px']
+    });
+
+    registerBinding(context, 0, 'width', '200px');
+    expect(debug.entries['width']).toEqual({
+      prop: 'width',
+      valuesCount: 1,
+      guardMask: buildGuardMask(),
+      defaultValue: '100px',
+      sources: ['100px']
+    });
+  });
+});
+
+function makeContextWithDebug() {
+  const ctx = allocStylingContext();
+  return attachStylingDebugObject(ctx);
+}
+
+function buildGuardMask(...bindingIndices: number[]) {
+  let mask = 0;
+  for (let i = 0; i < bindingIndices.length; i++) {
+    mask |= 1 << bindingIndices[i];
+  }
+  return mask;
+}
diff --git a/packages/core/test/render3/styling_next/styling_debug_spec.ts b/packages/core/test/render3/styling_next/styling_debug_spec.ts
new file mode 100644
index 0000000000..a43e1fd107
--- /dev/null
+++ b/packages/core/test/render3/styling_next/styling_debug_spec.ts
@@ -0,0 +1,82 @@
+/**
+ * @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 {registerBinding} from '@angular/core/src/render3/styling_next/bindings';
+import {NodeStylingDebug, attachStylingDebugObject} from '@angular/core/src/render3/styling_next/styling_debug';
+import {allocStylingContext} from '@angular/core/src/render3/styling_next/util';
+
+describe('styling debugging tools', () => {
+  describe('NodeStylingDebug', () => {
+    it('should list out each of the values in the context paired together with the provided data',
+       () => {
+         const debug = makeContextWithDebug();
+         const context = debug.context;
+         const data: any[] = [];
+         const d = new NodeStylingDebug(context, data);
+
+         registerBinding(context, 0, 'width', null);
+         expect(d.summary).toEqual({
+           width: {
+             prop: 'width',
+             value: null,
+             bindingIndex: null,
+             sourceValues: [{value: null, bindingIndex: null}],
+           },
+         });
+
+         registerBinding(context, 0, 'width', '100px');
+         expect(d.summary).toEqual({
+           width: {
+             prop: 'width',
+             value: '100px',
+             bindingIndex: null,
+             sourceValues: [
+               {bindingIndex: null, value: '100px'},
+             ],
+           },
+         });
+
+         const someBindingIndex1 = 1;
+         data[someBindingIndex1] = '200px';
+
+         registerBinding(context, 0, 'width', someBindingIndex1);
+         expect(d.summary).toEqual({
+           width: {
+             prop: 'width',
+             value: '200px',
+             bindingIndex: someBindingIndex1,
+             sourceValues: [
+               {bindingIndex: someBindingIndex1, value: '200px'},
+               {bindingIndex: null, value: '100px'},
+             ],
+           },
+         });
+
+         const someBindingIndex2 = 2;
+         data[someBindingIndex2] = '500px';
+
+         registerBinding(context, 0, 'width', someBindingIndex2);
+         expect(d.summary).toEqual({
+           width: {
+             prop: 'width',
+             value: '200px',
+             bindingIndex: someBindingIndex1,
+             sourceValues: [
+               {bindingIndex: someBindingIndex1, value: '200px'},
+               {bindingIndex: someBindingIndex2, value: '500px'},
+               {bindingIndex: null, value: '100px'},
+             ],
+           },
+         });
+       });
+  });
+});
+
+function makeContextWithDebug() {
+  const ctx = allocStylingContext();
+  return attachStylingDebugObject(ctx);
+}

From 6f073885b0ea5c9be0b0a1e16f23137ea00a2762 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 14 Apr 2019 19:01:01 +0200
Subject: [PATCH 094/275] refactor(ivy): translate template nodes to typescript
 using a visitor (#30177)

PR Close #30177
---
 .../src/ngtsc/typecheck/src/expression.ts     | 200 +++++++++++-------
 1 file changed, 126 insertions(+), 74 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
index ffc1643ab5..abe2e0ae50 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, ASTWithSource, Binary, Conditional, Interpolation, KeyedRead, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, SafeMethodCall, SafePropertyRead} from '@angular/compiler';
+import {AST, ASTWithSource, AstVisitor, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {TypeCheckingConfig} from './api';
@@ -42,30 +42,82 @@ const BINARY_OPS = new Map<string, ts.SyntaxKind>([
 export function astToTypescript(
     ast: AST, maybeResolve: (ast: AST) => ts.Expression | null,
     config: TypeCheckingConfig): ts.Expression {
-  const resolved = maybeResolve(ast);
-  if (resolved !== null) {
-    return resolved;
+  const translator = new AstTranslator(maybeResolve, config);
+  return translator.translate(ast);
+}
+
+class AstTranslator implements AstVisitor {
+  constructor(
+      private maybeResolve: (ast: AST) => ts.Expression | null,
+      private config: TypeCheckingConfig) {}
+
+  translate(ast: AST): ts.Expression {
+    // Skip over an `ASTWithSource` as its `visit` method calls directly into its ast's `visit`,
+    // which would prevent any custom resolution through `maybeResolve` for that node.
+    if (ast instanceof ASTWithSource) {
+      ast = ast.ast;
+    }
+
+    // First attempt to let any custom resolution logic provide a translation for the given node.
+    const resolved = this.maybeResolve(ast);
+    if (resolved !== null) {
+      return resolved;
+    }
+
+    return ast.visit(this);
   }
-  // Branch based on the type of expression being processed.
-  if (ast instanceof ASTWithSource) {
-    // Fall through to the underlying AST.
-    return astToTypescript(ast.ast, maybeResolve, config);
-  } else if (ast instanceof PropertyRead) {
-    // This is a normal property read - convert the receiver to an expression and emit the correct
-    // TypeScript expression to read the property.
-    const receiver = astToTypescript(ast.receiver, maybeResolve, config);
-    return ts.createPropertyAccess(receiver, ast.name);
-  } else if (ast instanceof Interpolation) {
-    return astArrayToExpression(ast.expressions, maybeResolve, config);
-  } else if (ast instanceof Binary) {
-    const lhs = astToTypescript(ast.left, maybeResolve, config);
-    const rhs = astToTypescript(ast.right, maybeResolve, config);
+
+  visitBinary(ast: Binary): ts.Expression {
+    const lhs = this.translate(ast.left);
+    const rhs = this.translate(ast.right);
     const op = BINARY_OPS.get(ast.operation);
     if (op === undefined) {
       throw new Error(`Unsupported Binary.operation: ${ast.operation}`);
     }
     return ts.createBinary(lhs, op as any, rhs);
-  } else if (ast instanceof LiteralPrimitive) {
+  }
+
+  visitChain(ast: Chain): never { throw new Error('Method not implemented.'); }
+
+  visitConditional(ast: Conditional): ts.Expression {
+    const condExpr = this.translate(ast.condition);
+    const trueExpr = this.translate(ast.trueExp);
+    const falseExpr = this.translate(ast.falseExp);
+    return ts.createParen(ts.createConditional(condExpr, trueExpr, falseExpr));
+  }
+
+  visitFunctionCall(ast: FunctionCall): never { throw new Error('Method not implemented.'); }
+
+  visitImplicitReceiver(ast: ImplicitReceiver): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitInterpolation(ast: Interpolation): ts.Expression {
+    return this.astArrayToExpression(ast.expressions);
+  }
+
+  visitKeyedRead(ast: KeyedRead): ts.Expression {
+    const receiver = this.translate(ast.obj);
+    const key = this.translate(ast.key);
+    return ts.createElementAccess(receiver, key);
+  }
+
+  visitKeyedWrite(ast: KeyedWrite): never { throw new Error('Method not implemented.'); }
+
+  visitLiteralArray(ast: LiteralArray): ts.Expression {
+    const elements = ast.expressions.map(expr => this.translate(expr));
+    return ts.createArrayLiteral(elements);
+  }
+
+  visitLiteralMap(ast: LiteralMap): ts.Expression {
+    const properties = ast.keys.map(({key}, idx) => {
+      const value = this.translate(ast.values[idx]);
+      return ts.createPropertyAssignment(ts.createStringLiteral(key), value);
+    });
+    return ts.createObjectLiteral(properties, true);
+  }
+
+  visitLiteralPrimitive(ast: LiteralPrimitive): ts.Expression {
     if (ast.value === undefined) {
       return ts.createIdentifier('undefined');
     } else if (ast.value === null) {
@@ -73,72 +125,72 @@ export function astToTypescript(
     } else {
       return ts.createLiteral(ast.value);
     }
-  } else if (ast instanceof MethodCall) {
-    const receiver = astToTypescript(ast.receiver, maybeResolve, config);
+  }
+
+  visitMethodCall(ast: MethodCall): ts.Expression {
+    const receiver = this.translate(ast.receiver);
     const method = ts.createPropertyAccess(receiver, ast.name);
-    const args = ast.args.map(expr => astToTypescript(expr, maybeResolve, config));
+    const args = ast.args.map(expr => this.translate(expr));
     return ts.createCall(method, undefined, args);
-  } else if (ast instanceof Conditional) {
-    const condExpr = astToTypescript(ast.condition, maybeResolve, config);
-    const trueExpr = astToTypescript(ast.trueExp, maybeResolve, config);
-    const falseExpr = astToTypescript(ast.falseExp, maybeResolve, config);
-    return ts.createParen(ts.createConditional(condExpr, trueExpr, falseExpr));
-  } else if (ast instanceof LiteralArray) {
-    const elements = ast.expressions.map(expr => astToTypescript(expr, maybeResolve, config));
-    return ts.createArrayLiteral(elements);
-  } else if (ast instanceof LiteralMap) {
-    const properties = ast.keys.map(({key}, idx) => {
-      const value = astToTypescript(ast.values[idx], maybeResolve, config);
-      return ts.createPropertyAssignment(ts.createStringLiteral(key), value);
-    });
-    return ts.createObjectLiteral(properties, true);
-  } else if (ast instanceof KeyedRead) {
-    const receiver = astToTypescript(ast.obj, maybeResolve, config);
-    const key = astToTypescript(ast.key, maybeResolve, config);
-    return ts.createElementAccess(receiver, key);
-  } else if (ast instanceof NonNullAssert) {
-    const expr = astToTypescript(ast.expression, maybeResolve, config);
+  }
+
+  visitNonNullAssert(ast: NonNullAssert): ts.Expression {
+    const expr = this.translate(ast.expression);
     return ts.createNonNullExpression(expr);
-  } else if (ast instanceof PrefixNot) {
-    return ts.createLogicalNot(astToTypescript(ast.expression, maybeResolve, config));
-  } else if (ast instanceof SafePropertyRead) {
+  }
+
+  visitPipe(ast: BindingPipe): never { throw new Error('Method not implemented.'); }
+
+  visitPrefixNot(ast: PrefixNot): ts.Expression {
+    return ts.createLogicalNot(this.translate(ast.expression));
+  }
+
+  visitPropertyRead(ast: PropertyRead): ts.Expression {
+    // This is a normal property read - convert the receiver to an expression and emit the correct
+    // TypeScript expression to read the property.
+    const receiver = this.translate(ast.receiver);
+    return ts.createPropertyAccess(receiver, ast.name);
+  }
+
+  visitPropertyWrite(ast: PropertyWrite): never { throw new Error('Method not implemented.'); }
+
+  visitQuote(ast: Quote): never { throw new Error('Method not implemented.'); }
+
+  visitSafeMethodCall(ast: SafeMethodCall): ts.Expression {
+    // See the comment in SafePropertyRead above for an explanation of the need for the non-null
+    // assertion here.
+    const receiver = this.translate(ast.receiver);
+    const method = ts.createPropertyAccess(ts.createNonNullExpression(receiver), ast.name);
+    const args = ast.args.map(expr => this.translate(expr));
+    const expr = ts.createCall(method, undefined, args);
+    const whenNull = this.config.strictSafeNavigationTypes ? UNDEFINED : NULL_AS_ANY;
+    return safeTernary(receiver, expr, whenNull);
+  }
+
+  visitSafePropertyRead(ast: SafePropertyRead): ts.Expression {
     // A safe property expression a?.b takes the form `(a != null ? a!.b : whenNull)`, where
     // whenNull is either of type 'any' or or 'undefined' depending on strictness. The non-null
     // assertion is necessary because in practice 'a' may be a method call expression, which won't
     // have a narrowed type when repeated in the ternary true branch.
-    const receiver = astToTypescript(ast.receiver, maybeResolve, config);
+    const receiver = this.translate(ast.receiver);
     const expr = ts.createPropertyAccess(ts.createNonNullExpression(receiver), ast.name);
-    const whenNull = config.strictSafeNavigationTypes ? UNDEFINED : NULL_AS_ANY;
+    const whenNull = this.config.strictSafeNavigationTypes ? UNDEFINED : NULL_AS_ANY;
     return safeTernary(receiver, expr, whenNull);
-  } else if (ast instanceof SafeMethodCall) {
-    const receiver = astToTypescript(ast.receiver, maybeResolve, config);
-    // See the comment in SafePropertyRead above for an explanation of the need for the non-null
-    // assertion here.
-    const method = ts.createPropertyAccess(ts.createNonNullExpression(receiver), ast.name);
-    const args = ast.args.map(expr => astToTypescript(expr, maybeResolve, config));
-    const expr = ts.createCall(method, undefined, args);
-    const whenNull = config.strictSafeNavigationTypes ? UNDEFINED : NULL_AS_ANY;
-    return safeTernary(receiver, expr, whenNull);
-  } else {
-    throw new Error(`Unknown node type: ${Object.getPrototypeOf(ast).constructor}`);
   }
-}
 
-/**
- * Convert an array of `AST` expressions into a single `ts.Expression`, by converting them all
- * and separating them with commas.
- */
-function astArrayToExpression(
-    astArray: AST[], maybeResolve: (ast: AST) => ts.Expression | null,
-    config: TypeCheckingConfig): ts.Expression {
-  // Reduce the `asts` array into a `ts.Expression`. Multiple expressions are combined into a
-  // `ts.BinaryExpression` with a comma separator. First make a copy of the input array, as
-  // it will be modified during the reduction.
-  const asts = astArray.slice();
-  return asts.reduce(
-      (lhs, ast) => ts.createBinary(
-          lhs, ts.SyntaxKind.CommaToken, astToTypescript(ast, maybeResolve, config)),
-      astToTypescript(asts.pop() !, maybeResolve, config));
+  /**
+   * Convert an array of `AST` expressions into a single `ts.Expression`, by converting them all
+   * and separating them with commas.
+   */
+  private astArrayToExpression(astArray: AST[]): ts.Expression {
+    // Reduce the `asts` array into a `ts.Expression`. Multiple expressions are combined into a
+    // `ts.BinaryExpression` with a comma separator. First make a copy of the input array, as
+    // it will be modified during the reduction.
+    const asts = astArray.slice();
+    return asts.reduce(
+        (lhs, ast) => ts.createBinary(lhs, ts.SyntaxKind.CommaToken, this.translate(ast)),
+        this.translate(asts.pop() !));
+  }
 }
 
 function safeTernary(

From 0937062a642b500d9862cd217bfe48899ee2bf99 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 28 Apr 2019 16:20:16 +0200
Subject: [PATCH 095/275] fix(ivy): type-checking should infer string type for
 interpolations (#30177)

Previously, interpolations were generated into TCBs as a comma-separated
list of expressions, letting TypeScript infer the type of the expression
as the type of the last expression in the chain. This is undesirable, as
interpolations always result in a string type at runtime. Therefore,
type-checking of bindings such as `<img src="{{ link }}"/>` where `link`
is an object would incorrectly report a type-error.

This commit adjusts the emitted TCB code for interpolations, where a
chain of string concatenations is emitted, starting with the empty string.
This ensures that the inferred type of the interpolation is of type string.

PR Close #30177
---
 .../src/ngtsc/typecheck/src/expression.ts     | 21 ++++++-------------
 .../typecheck/test/type_check_block_spec.ts   |  8 +++----
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
index abe2e0ae50..9228824a4a 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
@@ -93,7 +93,12 @@ class AstTranslator implements AstVisitor {
   }
 
   visitInterpolation(ast: Interpolation): ts.Expression {
-    return this.astArrayToExpression(ast.expressions);
+    // Build up a chain of binary + operations to simulate the string concatenation of the
+    // interpolation's expressions. The chain is started using an actual string literal to ensure
+    // the type is inferred as 'string'.
+    return ast.expressions.reduce(
+        (lhs, ast) => ts.createBinary(lhs, ts.SyntaxKind.PlusToken, this.translate(ast)),
+        ts.createLiteral(''));
   }
 
   visitKeyedRead(ast: KeyedRead): ts.Expression {
@@ -177,20 +182,6 @@ class AstTranslator implements AstVisitor {
     const whenNull = this.config.strictSafeNavigationTypes ? UNDEFINED : NULL_AS_ANY;
     return safeTernary(receiver, expr, whenNull);
   }
-
-  /**
-   * Convert an array of `AST` expressions into a single `ts.Expression`, by converting them all
-   * and separating them with commas.
-   */
-  private astArrayToExpression(astArray: AST[]): ts.Expression {
-    // Reduce the `asts` array into a `ts.Expression`. Multiple expressions are combined into a
-    // `ts.BinaryExpression` with a comma separator. First make a copy of the input array, as
-    // it will be modified during the reduction.
-    const asts = astArray.slice();
-    return asts.reduce(
-        (lhs, ast) => ts.createBinary(lhs, ts.SyntaxKind.CommaToken, this.translate(ast)),
-        this.translate(asts.pop() !));
-  }
 }
 
 function safeTernary(
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
index aed6cd41b4..84887b8c23 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
@@ -18,7 +18,7 @@ import {generateTypeCheckBlock} from '../src/type_check_block';
 
 describe('type check blocks', () => {
   it('should generate a basic block for a binding',
-     () => { expect(tcb('{{hello}}')).toContain('ctx.hello;'); });
+     () => { expect(tcb('{{hello}} {{world}}')).toContain('"" + ctx.hello + ctx.world;'); });
 
   it('should generate literal map expressions', () => {
     const TEMPLATE = '{{ method({foo: a, bar: b}) }}';
@@ -32,7 +32,7 @@ describe('type check blocks', () => {
 
   it('should handle non-null assertions', () => {
     const TEMPLATE = `{{a!}}`;
-    expect(tcb(TEMPLATE)).toContain('ctx.a!;');
+    expect(tcb(TEMPLATE)).toContain('(ctx.a!);');
   });
 
   it('should handle keyed property access', () => {
@@ -45,7 +45,7 @@ describe('type check blocks', () => {
       {{ i.value }}
       <input #i>
     `;
-    expect(tcb(TEMPLATE)).toContain('var _t1 = document.createElement("input"); _t1.value;');
+    expect(tcb(TEMPLATE)).toContain('var _t1 = document.createElement("input"); "" + _t1.value;');
   });
 
   it('should generate a forward directive reference correctly', () => {
@@ -61,7 +61,7 @@ describe('type check blocks', () => {
     }];
     expect(tcb(TEMPLATE, DIRECTIVES))
         .toContain(
-            'var _t1 = Dir.ngTypeCtor({}); _t1.value; var _t2 = document.createElement("div");');
+            'var _t1 = Dir.ngTypeCtor({}); "" + _t1.value; var _t2 = document.createElement("div");');
   });
 
   it('should handle style and class bindings specially', () => {

From eda09e69eae9513d368d7e4b2838b03ac2b3479a Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Thu, 9 May 2019 11:23:30 +0100
Subject: [PATCH 096/275] fix(ivy): ngtsc - do not wrap arguments unnecessarily
 (#30349)

Previously we defensively wrapped expressions in case they ran afoul of
precedence rules. For example, it would be easy to create the TS AST structure
Call(Ternary(a, b, c)), but might result in printed code of:

```
a ? b : c()
```

Whereas the actual structure we meant to generate is:

```
(a ? b : c)()
```

However the TypeScript renderer appears to be clever enough to provide
parenthesis as necessary.

This commit removes these defensive paraenthesis in the cases of binary
and ternary operations.

FW-1273

PR Close #30349
---
 .../src/ngtsc/translator/src/translator.ts    | 18 ++----
 .../compliance/r3_compiler_compliance_spec.ts | 56 +++++++++----------
 .../compliance/r3_view_compiler_i18n_spec.ts  | 12 ++--
 .../r3_view_compiler_listener_spec.ts         |  2 +-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     |  2 +-
 .../test/ngtsc/template_mapping_spec.ts       | 16 +++---
 6 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
index f1b6e478ff..4cef26deac 100644
--- a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
@@ -264,10 +264,10 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     }
   }
 
-  visitConditionalExpr(ast: ConditionalExpr, context: Context): ts.ParenthesizedExpression {
-    return ts.createParen(ts.createConditional(
+  visitConditionalExpr(ast: ConditionalExpr, context: Context): ts.ConditionalExpression {
+    return ts.createConditional(
         ast.condition.visitExpression(this, context), ast.trueCase.visitExpression(this, context),
-        ast.falseCase !.visitExpression(this, context)));
+        ast.falseCase !.visitExpression(this, context));
   }
 
   visitNotExpr(ast: NotExpr, context: Context): ts.PrefixUnaryExpression {
@@ -296,10 +296,9 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     if (!BINARY_OPERATORS.has(ast.operator)) {
       throw new Error(`Unknown binary operator: ${BinaryOperator[ast.operator]}`);
     }
-    const binEx = ts.createBinary(
+    return ts.createBinary(
         ast.lhs.visitExpression(this, context), BINARY_OPERATORS.get(ast.operator) !,
         ast.rhs.visitExpression(this, context));
-    return ast.parens ? ts.createParen(binEx) : binEx;
   }
 
   visitReadPropExpr(ast: ReadPropExpr, context: Context): ts.PropertyAccessExpression {
@@ -513,12 +512,3 @@ export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
     return ts.createTypeQueryNode(expr as ts.Identifier);
   }
 }
-
-function entityNameToExpr(entity: ts.EntityName): ts.Expression {
-  if (ts.isIdentifier(entity)) {
-    return entity;
-  }
-  const {left, right} = entity;
-  const leftExpr = ts.isIdentifier(left) ? left : entityNameToExpr(left);
-  return ts.createPropertyAccess(leftExpr, right);
-}
diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 846179485b..53811b67eb 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -373,10 +373,10 @@ describe('compiler compliance', () => {
           }
           if (rf & 2) {
             $r3$.Δselect(0);
-            $r3$.Δproperty("ternary", (ctx.cond ? $r3$.ΔpureFunction1(8, $c0$, ctx.a): $c1$));
+            $r3$.Δproperty("ternary", ctx.cond ? $r3$.ΔpureFunction1(8, $c0$, ctx.a): $c1$);
             $r3$.Δproperty("pipe", $r3$.ΔpipeBind3(1, 4, ctx.value, 1, 2));
-            $r3$.Δproperty("and", (ctx.cond && $r3$.ΔpureFunction1(10, $c0$, ctx.b)));
-            $r3$.Δproperty("or", (ctx.cond || $r3$.ΔpureFunction1(12, $c0$, ctx.c)));
+            $r3$.Δproperty("and", ctx.cond && $r3$.ΔpureFunction1(10, $c0$, ctx.b));
+            $r3$.Δproperty("or", ctx.cond || $r3$.ΔpureFunction1(12, $c0$, ctx.c));
           }
         }
       `;
@@ -1508,8 +1508,8 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$);
               }
             },
             consts: 1,
@@ -1566,8 +1566,8 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$);
               }
             },
             …
@@ -1619,8 +1619,8 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.foo = $tmp$.first));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.foo = $tmp$.first);
               }
             },
             consts: 1,
@@ -1684,10 +1684,10 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
                 var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$);
               }
             },
             …
@@ -1748,8 +1748,8 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirList = $tmp$));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirList = $tmp$);
               }
             },
             ngContentSelectors: _c0,
@@ -1808,8 +1808,8 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$);
               }
             },
             …
@@ -1870,8 +1870,8 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.foo = $tmp$.first));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.foo = $tmp$.first);
               }
             },
             ngContentSelectors: $_c1$,
@@ -1937,10 +1937,10 @@ describe('compiler compliance', () => {
               }
               if (rf & 2) {
               var $tmp$;
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$));
-                ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirs = $tmp$));
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$);
+                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirs = $tmp$);
               }
             },
             …
@@ -2076,7 +2076,7 @@ describe('compiler compliance', () => {
                   $r3$.Δselect(0);
                   $r3$.ΔtextBinding(0, $r3$.Δinterpolation1("", $r3$.ΔpipeBind2(1, 3, $r3$.ΔpipeBind2(2, 6, ctx.name, ctx.size), ctx.size), ""));
                   $r3$.Δselect(4);
-                  $r3$.ΔtextBinding(4, $r3$.Δinterpolation2("", $r3$.ΔpipeBindV(5, 9, $r3$.ΔpureFunction1(18, $c0$, ctx.name)), " ", (ctx.name ? 1 : $r3$.ΔpipeBind1(6, 16, 2)), ""));
+                  $r3$.ΔtextBinding(4, $r3$.Δinterpolation2("", $r3$.ΔpipeBindV(5, 9, $r3$.ΔpureFunction1(18, $c0$, ctx.name)), " ", ctx.name ? 1 : $r3$.ΔpipeBind1(6, 16, 2), ""));
                 }
               },
               pipes: [MyPurePipe, MyPipe],
@@ -3078,7 +3078,7 @@ describe('compiler compliance', () => {
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$.first));
+            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$.first);
           }
         }
       });
@@ -3123,7 +3123,7 @@ describe('compiler compliance', () => {
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$));
+            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$);
           }
         }
       });
@@ -3166,7 +3166,7 @@ describe('compiler compliance', () => {
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$.first));
+            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$.first);
           }
         }
       });
@@ -3211,7 +3211,7 @@ describe('compiler compliance', () => {
           }
           if (rf & 2) {
             var $tmp$;
-            ($r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$));
+            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$);
           }
         }
       });
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index ba0757b5e7..697aafcfbe 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -476,7 +476,7 @@ describe('i18n support in the view compiler', () => {
             $r3$.Δselect(3);
             $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
             $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
-            $r3$.Δi18nExp($r3$.Δbind((ctx.valueA + ctx.valueB)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA + ctx.valueB));
             $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
             $r3$.Δi18nApply(4);
           }
@@ -705,7 +705,7 @@ describe('i18n support in the view compiler', () => {
             $r3$.Δselect(3);
             $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
             $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
-            $r3$.Δi18nExp($r3$.Δbind((ctx.valueA + ctx.valueB)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA + ctx.valueB));
             $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
             $r3$.Δi18nApply(4);
           }
@@ -1065,7 +1065,7 @@ describe('i18n support in the view compiler', () => {
           if (rf & 2) {
             $r3$.Δselect(1);
             $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 2, ctx.valueA)));
-            $r3$.Δi18nExp($r3$.Δbind(((ctx.valueA == null) ? null : ((ctx.valueA.a == null) ? null : ctx.valueA.a.b))));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA == null ? null : ctx.valueA.a == null ? null : ctx.valueA.a.b));
             $r3$.Δi18nApply(1);
           }
         }
@@ -1141,7 +1141,7 @@ describe('i18n support in the view compiler', () => {
             $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(4, 3, ctx.two)));
             $r3$.Δi18nApply(3);
             $r3$.Δselect(6);
-            $r3$.Δi18nExp($r3$.Δbind(((ctx.three + ctx.four) + ctx.five)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.three + ctx.four + ctx.five));
             $r3$.Δi18nApply(6);
           }
         }
@@ -1609,7 +1609,7 @@ describe('i18n support in the view compiler', () => {
           if (rf & 2) {
             const $ctx_r1$ = $r3$.ΔnextContext();
             $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind(($ctx_r1$.valueE + $ctx_r1$.valueF)));
+            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.valueE + $ctx_r1$.valueF));
             $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(3, 2, $ctx_r1$.valueG)));
             $r3$.Δi18nApply(0);
           }
@@ -2765,7 +2765,7 @@ describe('i18n support in the view compiler', () => {
           if (rf & 2) {
             $r3$.Δselect(1);
             $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nExp($r3$.Δbind(((ctx.ageA + ctx.ageB) + ctx.ageC)));
+            $r3$.Δi18nExp($r3$.Δbind(ctx.ageA + ctx.ageB + ctx.ageC));
             $r3$.Δi18nApply(1);
           }
         }
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
index 179851d796..ce9d81f7c9 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
@@ -48,7 +48,7 @@ describe('compiler compliance: listen()', () => {
             $r3$.ΔelementStart(0, "div", $e0_attrs$);
             $r3$.Δlistener("click", function MyComponent_Template_div_click_0_listener($event) {
               ctx.onClick($event);
-              return (1 == 2);
+              return 1 == 2;
             });
             $r3$.ΔelementEnd();
           }
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index d57d117494..b1d1452f1b 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -2299,7 +2299,7 @@ describe('ngtsc behavioral tests', () => {
         .toContain('function Base_Factory(t) { return new (t || Base)(i0.Δinject(Dep)); }');
     expect(jsContents).toContain('var \u0275Child_BaseFactory = i0.ΔgetInheritedFactory(Child)');
     expect(jsContents)
-        .toContain('function Child_Factory(t) { return \u0275Child_BaseFactory((t || Child)); }');
+        .toContain('function Child_Factory(t) { return \u0275Child_BaseFactory(t || Child); }');
     expect(jsContents)
         .toContain('function GrandChild_Factory(t) { return new (t || GrandChild)(); }');
   });
diff --git a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
index 1fb37030bf..3c0d117bb2 100644
--- a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
@@ -58,7 +58,7 @@ describe('template source-mapping', () => {
         expect(mappings).toContain({
           source: '{{ greeting + " " + name }}',
           generated:
-              'i0.ΔtextBinding(1, i0.Δinterpolation1("", ((ctx.greeting + " ") + ctx.name), ""))',
+              'i0.ΔtextBinding(1, i0.Δinterpolation1("", ctx.greeting + " " + ctx.name, ""))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
@@ -119,7 +119,7 @@ describe('template source-mapping', () => {
         });
         expect(mappings).toContain({
           source: '[attr]="greeting + name"',
-          generated: 'i0.Δproperty("attr", (ctx.greeting + ctx.name))',
+          generated: 'i0.Δproperty("attr", ctx.greeting + ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -164,12 +164,12 @@ describe('template source-mapping', () => {
         expect(mappings).toContain(
             {source: 'Add Item', generated: 'i0.Δtext(1, "Add Item")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: 'items.push(', generated: 'ctx.items.push((', sourceUrl: '../test.ts'});
+            {source: 'items.push(', generated: 'ctx.items.push(', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: `'item' `, generated: `"item"`, sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '+ items.length)',
-          generated: ' + ctx.items.length))',
+          generated: ' + ctx.items.length)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
@@ -370,7 +370,7 @@ describe('template source-mapping', () => {
 
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
+        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -398,7 +398,7 @@ describe('template source-mapping', () => {
 
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
+        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -452,7 +452,7 @@ describe('template source-mapping', () => {
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
+          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../dir/test.html'
         });
@@ -496,7 +496,7 @@ describe('template source-mapping', () => {
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", (1 + 2), ""))',
+          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../extraRootDir/test.html'
         });

From 80d4fc5e268561869ba609f6370e917d02619451 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Thu, 16 May 2019 12:51:57 -0700
Subject: [PATCH 097/275] test(ivy): remove `new Component` use from
 inheritance tests (#30522)

PR Close #30522
---
 .../inherit_definition_feature_spec.ts        | 80 ++++++++++++-------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/packages/core/test/acceptance/inherit_definition_feature_spec.ts b/packages/core/test/acceptance/inherit_definition_feature_spec.ts
index 353588802a..f61f7d899d 100644
--- a/packages/core/test/acceptance/inherit_definition_feature_spec.ts
+++ b/packages/core/test/acceptance/inherit_definition_feature_spec.ts
@@ -43,10 +43,6 @@ describe('inheritance', () => {
       });
 
   describe('ngOnChanges', () => {
-    @Component({selector: 'app-comp', template: ``})
-    class AppComp {
-    }
-
     it('should be inherited when super is a directive', () => {
       const log: string[] = [];
 
@@ -61,10 +57,14 @@ describe('inheritance', () => {
       class SubDirective extends SuperDirective {
       }
 
-      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-      TestBed.overrideComponent(
-          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-      const fixture = TestBed.createComponent(AppComp);
+      @Component({template: `<div subDir [someInput]="1"></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
       fixture.detectChanges();
 
       expect(log).toEqual(['on changes!']);
@@ -82,10 +82,14 @@ describe('inheritance', () => {
         @Input() someInput = '';
       }
 
-      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-      TestBed.overrideComponent(
-          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-      const fixture = TestBed.createComponent(AppComp);
+      @Component({template: `<div subDir [someInput]="1"></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective],
+      });
+      const fixture = TestBed.createComponent(App);
       fixture.detectChanges();
 
       expect(log).toEqual(['on changes!']);
@@ -109,10 +113,15 @@ describe('inheritance', () => {
       class SubDirective extends SuperDirective {
       }
 
-      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-      TestBed.overrideComponent(
-          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-      const fixture = TestBed.createComponent(AppComp);
+
+      @Component({template: `<div subDir [someInput]="1"></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective, GrandSuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
       fixture.detectChanges();
 
       expect(log).toEqual(['on changes!']);
@@ -134,10 +143,15 @@ describe('inheritance', () => {
       class SubDirective extends SuperDirective {
       }
 
-      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-      TestBed.overrideComponent(
-          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-      const fixture = TestBed.createComponent(AppComp);
+
+      @Component({template: `<div subDir [someInput]="1"></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, SuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
       fixture.detectChanges();
 
       expect(log).toEqual(['on changes!']);
@@ -159,10 +173,15 @@ describe('inheritance', () => {
       class SubDirective extends SuperClass {
       }
 
-      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-      TestBed.overrideComponent(
-          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-      const fixture = TestBed.createComponent(AppComp);
+
+      @Component({template: `<div subDir [someInput]="1"></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective, GrandSuperDirective],
+      });
+      const fixture = TestBed.createComponent(App);
       fixture.detectChanges();
 
       expect(log).toEqual(['on changes!']);
@@ -182,10 +201,15 @@ describe('inheritance', () => {
         @Input() someInput = '';
       }
 
-      TestBed.configureTestingModule({declarations: [AppComp, SubDirective]});
-      TestBed.overrideComponent(
-          AppComp, {set: new Component({template: '<div subDir [someInput]="1"></div>'})});
-      const fixture = TestBed.createComponent(AppComp);
+
+      @Component({template: `<div subDir [someInput]="1"></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, SubDirective],
+      });
+      const fixture = TestBed.createComponent(App);
       fixture.detectChanges();
 
       expect(log).toEqual(['on changes!']);

From 01919fbaae98c0d7b09a09ee80b09e289e39c39b Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Thu, 16 May 2019 13:45:54 -0700
Subject: [PATCH 098/275] test(ivy): Add TODOs (#30522)

PR Close #30522
---
 .../inherit_definition_feature_spec.ts        | 2531 ++++++++++-------
 1 file changed, 1457 insertions(+), 1074 deletions(-)

diff --git a/packages/core/test/acceptance/inherit_definition_feature_spec.ts b/packages/core/test/acceptance/inherit_definition_feature_spec.ts
index f61f7d899d..682cde4e34 100644
--- a/packages/core/test/acceptance/inherit_definition_feature_spec.ts
+++ b/packages/core/test/acceptance/inherit_definition_feature_spec.ts
@@ -217,6 +217,9 @@ describe('inheritance', () => {
   });
 
   describe('of bare super class by a directive', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
+
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -506,196 +509,248 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      class SuperDirective {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        bar = '';
+      it('should inherit inputs', () => {
+        class SuperDirective {
+          @Input()
+          foo = '';
 
-        @Input()
-        baz = '';
-      }
+          @Input()
+          bar = '';
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-        @Input()
-        baz = '';
+          @Input()
+          baz = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+          @Input()
+          baz = '';
 
-      @Component({template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`})
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective],
+        @Component({template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`})
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const subDir =
+            fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
+
+        expect(subDir.foo).toBe('a');
+        expect(subDir.bar).toBe('b');
+        expect(subDir.baz).toBe('c');
+        expect(subDir.qux).toBe('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-
-      const subDir =
-          fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
-
-      expect(subDir.foo).toBe('a');
-      expect(subDir.bar).toBe('b');
-      expect(subDir.baz).toBe('c');
-      expect(subDir.qux).toBe('d');
     });
 
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-    it('should inherit outputs', () => {
-      class SuperDirective {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+      it('should inherit outputs', () => {
+        class SuperDirective {
+          @Output()
+          foo = new EventEmitter<string>();
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-        ngOnInit() { this.foo.emit('test'); }
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnInit() { this.foo.emit('test'); }
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
         <div sub-dir (foo)="handleFoo($event)"></div>
       `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        handleFoo(event: string) { this.foo = event; }
-      }
+          handleFoo(event: string) { this.foo = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test');
     });
 
-    it('should compose host bindings for styles', () => {
-      class SuperDirective {
-        @HostBinding('style.color')
-        color = 'red';
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        class SuperDirective {
+          @HostBinding('style.color')
+          color = 'red';
 
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+        }
 
-      @Component({
-        template: `
-        <p sub-dir>test</p>
-      `
-      })
-      class App {
-      }
+        @Component({
+          template: `
+          <p sub-dir>test</p>
+        `
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+        expect(queryResult.nativeElement.tagName).toBe('P');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
-
-      expect(queryResult.nativeElement.tagName).toBe('P');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      class SuperDirective {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        class SuperDirective {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-      }
-      @Component({
-        template: `
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+        }
+        @Component({
+          template: `
         <p sub-dir superTitle="test">test</p>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+        expect(queryResult.nativeElement.title).toBe('test!!!');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
-
-      expect(queryResult.nativeElement.title).toBe('test!!!');
     });
 
-    it('should inherit ContentChildren queries', () => {
-      let foundQueryList: QueryList<ChildDir>;
+    describe('ContentChildren', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should inherit ContentChildren queries', () => {
+        let foundQueryList: QueryList<ChildDir>;
 
-      @Directive({selector: '[child-dir]'})
-      class ChildDir {
-      }
+        @Directive({selector: '[child-dir]'})
+        class ChildDir {
+        }
 
-      class SuperDirective {
-        // TODO(issue/24571): remove '!'.
-        @ContentChildren(ChildDir)
-        customDirs !: QueryList<ChildDir>;
-      }
+        class SuperDirective {
+          @ContentChildren(ChildDir)
+          customDirs !: QueryList<ChildDir>;
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-        ngAfterViewInit() { foundQueryList = this.customDirs; }
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngAfterViewInit() { foundQueryList = this.customDirs; }
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
         <ul sub-dir>
           <li child-dir>one</li>
           <li child-dir>two</li>
         </ul>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, ChildDir],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, ChildDir],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        expect(foundQueryList !.length).toBe(2);
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-
-      expect(foundQueryList !.length).toBe(2);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 
   describe('of a directive by another directive', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
+
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -988,162 +1043,183 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      @Directive({selector: '[super-dir]'})
-      class SuperDirective {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        bar = '';
+      it('should inherit inputs', () => {
+        @Directive({selector: '[super-dir]'})
+        class SuperDirective {
+          @Input()
+          foo = '';
 
-        @Input()
-        baz = '';
-      }
+          @Input()
+          bar = '';
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-        @Input()
-        baz = '';
+          @Input()
+          baz = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+          @Input()
+          baz = '';
 
-      @Component({template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`})
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective],
+        @Component({template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`})
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const subDir =
+            fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
+
+        expect(subDir.foo).toBe('a');
+        expect(subDir.bar).toBe('b');
+        expect(subDir.baz).toBe('c');
+        expect(subDir.qux).toBe('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
 
-      const subDir =
-          fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
-
-      expect(subDir.foo).toBe('a');
-      expect(subDir.bar).toBe('b');
-      expect(subDir.baz).toBe('c');
-      expect(subDir.qux).toBe('d');
     });
 
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-    it('should inherit outputs', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+      it('should inherit outputs', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @Output()
+          foo = new EventEmitter<string>();
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-        ngOnInit() { this.foo.emit('test'); }
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnInit() { this.foo.emit('test'); }
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
         <div sub-dir (foo)="handleFoo($event)"></div>
       `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        handleFoo(event: string) { this.foo = event; }
-      }
+          handleFoo(event: string) { this.foo = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test');
     });
 
-    it('should compose host bindings for styles', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @HostBinding('style.color')
-        color = 'red';
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @HostBinding('style.color')
+          color = 'red';
 
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
         <p sub-dir>test</p>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+        expect(queryResult.nativeElement.tagName).toBe('P');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
-
-      expect(queryResult.nativeElement.tagName).toBe('P');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-      }
-      @Component({
-        template: `
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+        }
+        @Component({
+          template: `
         <p sub-dir superTitle="test">test</p>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+        expect(queryResult.nativeElement.title).toBe('test!!!');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
-
-      expect(queryResult.nativeElement.title).toBe('test!!!');
     });
 
     it('should inherit ContentChildren queries', () => {
@@ -1157,7 +1233,6 @@ describe('inheritance', () => {
         selector: '[super-dir]',
       })
       class SuperDirective {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -1188,9 +1263,37 @@ describe('inheritance', () => {
 
       expect(foundQueryList !.length).toBe(2);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 
   describe('of a directive by a bare class then by another directive', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -1485,191 +1588,212 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      @Directive({selector: '[super-dir]'})
-      class SuperSuperDirective {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        baz = '';
-      }
+      it('should inherit inputs', () => {
+        @Directive({selector: '[super-dir]'})
+        class SuperSuperDirective {
+          @Input()
+          foo = '';
 
-      class SuperDirective extends SuperSuperDirective {
-        @Input()
-        bar = '';
-      }
+          @Input()
+          baz = '';
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-        @Input()
-        baz = '';
+        class SuperDirective extends SuperSuperDirective {
+          @Input()
+          bar = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+          @Input()
+          baz = '';
 
-      @Component({
-        selector: 'my-app',
-        template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`,
-      })
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        @Component({
+          selector: 'my-app',
+          template: `<p sub-dir [foo]="a" [bar]="b" [baz]="c" [qux]="d"></p>`,
+        })
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const subDir =
+            fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
+
+        expect(subDir.foo).toBe('a');
+        expect(subDir.bar).toBe('b');
+        expect(subDir.baz).toBe('c');
+        expect(subDir.qux).toBe('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-
-      const subDir =
-          fixture.debugElement.query(By.directive(SubDirective)).injector.get(SubDirective);
-
-      expect(subDir.foo).toBe('a');
-      expect(subDir.bar).toBe('b');
-      expect(subDir.baz).toBe('c');
-      expect(subDir.qux).toBe('d');
     });
 
-    it('should inherit outputs', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperSuperDirective {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-      class SuperDirective extends SuperSuperDirective {
-        @Output()
-        bar = new EventEmitter<string>();
-      }
-
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-        ngOnInit() {
-          this.foo.emit('test1');
-          this.bar.emit('test2');
+      it('should inherit outputs', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperSuperDirective {
+          @Output()
+          foo = new EventEmitter<string>();
         }
-      }
 
-      @Component({
-        template: `
+        class SuperDirective extends SuperSuperDirective {
+          @Output()
+          bar = new EventEmitter<string>();
+        }
+
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+          ngOnInit() {
+            this.foo.emit('test1');
+            this.bar.emit('test2');
+          }
+        }
+
+        @Component({
+          template: `
           <div sub-dir (foo)="handleFoo($event)" (bar)="handleBar($event)"></div>
         `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        bar = '';
+          bar = '';
 
-        handleFoo(event: string) { this.foo = event; }
+          handleFoo(event: string) { this.foo = event; }
 
-        handleBar(event: string) { this.bar = event; }
-      }
+          handleBar(event: string) { this.bar = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test1');
+        expect(app.bar).toBe('test2');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test1');
-      expect(app.bar).toBe('test2');
     });
 
-    it('should compose host bindings for styles', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperSuperDirective {
-        @HostBinding('style.color')
-        color = 'red';
-      }
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperSuperDirective {
+          @HostBinding('style.color')
+          color = 'red';
+        }
 
-      class SuperDirective extends SuperSuperDirective {
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+        class SuperDirective extends SuperSuperDirective {
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-      }
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <p sub-dir>test</p>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(SubDirective));
+
+        expect(queryResult.nativeElement.tagName).toBe('P');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(SubDirective));
-
-      expect(queryResult.nativeElement.tagName).toBe('P');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperSuperDirective {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperSuperDirective {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      class SuperDirective extends SuperSuperDirective {
-        @HostBinding('accessKey')
-        get boundAltKey() { return this.superAccessKey + '???'; }
+        class SuperDirective extends SuperSuperDirective {
+          @HostBinding('accessKey')
+          get boundAltKey() { return this.superAccessKey + '???'; }
 
-        @Input()
-        superAccessKey = '';
-      }
+          @Input()
+          superAccessKey = '';
+        }
 
-      @Directive({
-        selector: '[sub-dir]',
-      })
-      class SubDirective extends SuperDirective {
-      }
-      @Component({
-        template: `
+        @Directive({
+          selector: '[sub-dir]',
+        })
+        class SubDirective extends SuperDirective {
+        }
+        @Component({
+          template: `
         <p sub-dir superTitle="test1" superAccessKey="test2">test</p>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, SubDirective, SuperDirective, SuperSuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const p: HTMLParagraphElement =
+            fixture.debugElement.query(By.directive(SubDirective)).nativeElement;
+
+        expect(p.title).toBe('test1!!!');
+        expect(p.accessKey).toBe('test2???');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const p: HTMLParagraphElement =
-          fixture.debugElement.query(By.directive(SubDirective)).nativeElement;
-
-      expect(p.title).toBe('test1!!!');
-      expect(p.accessKey).toBe('test2???');
     });
 
     it('should inherit ContentChildren queries', () => {
@@ -1688,13 +1812,11 @@ describe('inheritance', () => {
         selector: '[super-dir]',
       })
       class SuperSuperDirective {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir1)
         childDir1s !: QueryList<ChildDir1>;
       }
 
       class SuperDirective extends SuperSuperDirective {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir1)
         childDir2s !: QueryList<ChildDir2>;
       }
@@ -1730,9 +1852,37 @@ describe('inheritance', () => {
       expect(foundChildDir1s !.length).toBe(2);
       expect(foundChildDir2s !.length).toBe(2);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 
   describe('of bare super class by a component', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -2025,153 +2175,174 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      class SuperComponent {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        bar = '';
+      it('should inherit inputs', () => {
+        class SuperComponent {
+          @Input()
+          foo = '';
 
-        @Input()
-        baz = '';
-      }
+          @Input()
+          bar = '';
 
-      @Component({selector: 'my-comp', template: `<p>test</p>`})
-      class MyComponent extends SuperComponent {
-        @Input()
-        baz = '';
+          @Input()
+          baz = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends SuperComponent {
+          @Input()
+          baz = '';
 
-      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent],
+        @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const subDir: MyComponent =
+            fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+        expect(subDir.foo).toEqual('a');
+        expect(subDir.bar).toEqual('b');
+        expect(subDir.baz).toEqual('c');
+        expect(subDir.qux).toEqual('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
 
-      const subDir: MyComponent =
-          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
-
-      expect(subDir.foo).toEqual('a');
-      expect(subDir.bar).toEqual('b');
-      expect(subDir.baz).toEqual('c');
-      expect(subDir.qux).toEqual('d');
     });
 
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-    it('should inherit outputs', () => {
-      class SuperComponent {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+      it('should inherit outputs', () => {
+        class SuperComponent {
+          @Output()
+          foo = new EventEmitter<string>();
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-        ngOnInit() { this.foo.emit('test'); }
-      }
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnInit() { this.foo.emit('test'); }
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <my-comp (foo)="handleFoo($event)"></my-comp>
         `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        handleFoo(event: string) { this.foo = event; }
-      }
+          handleFoo(event: string) { this.foo = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test');
     });
 
-    it('should compose host bindings for styles', () => {
-      class SuperComponent {
-        @HostBinding('style.color')
-        color = 'red';
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        class SuperComponent {
+          @HostBinding('style.color')
+          color = 'red';
 
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-      }
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <my-comp>test</my-comp>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      class SuperComponent {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        class SuperComponent {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-      }
-      @Component({
-        template: `
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+        }
+        @Component({
+          template: `
         <my-comp superTitle="test">test</my-comp>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.title).toBe('test!!!');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.title).toBe('test!!!');
     });
 
     it('should inherit ContentChildren queries', () => {
@@ -2182,7 +2353,6 @@ describe('inheritance', () => {
       }
 
       class SuperComponent {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -2211,9 +2381,37 @@ describe('inheritance', () => {
 
       expect(foundQueryList !.length).toBe(2);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 
   describe('of a directive inherited by a component', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -2510,164 +2708,185 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        bar = '';
+      it('should inherit inputs', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @Input()
+          foo = '';
 
-        @Input()
-        baz = '';
-      }
+          @Input()
+          bar = '';
 
-      @Component({selector: 'my-comp', template: `<p>test</p>`})
-      class MyComponent extends SuperDirective {
-        @Input()
-        baz = '';
+          @Input()
+          baz = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends SuperDirective {
+          @Input()
+          baz = '';
 
-      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperDirective],
+        @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const subDir: MyComponent =
+            fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+        expect(subDir.foo).toEqual('a');
+        expect(subDir.bar).toEqual('b');
+        expect(subDir.baz).toEqual('c');
+        expect(subDir.qux).toEqual('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-
-      const subDir: MyComponent =
-          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
-
-      expect(subDir.foo).toEqual('a');
-      expect(subDir.bar).toEqual('b');
-      expect(subDir.baz).toEqual('c');
-      expect(subDir.qux).toEqual('d');
     });
 
-    it('should inherit outputs', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperDirective {
-        ngOnInit() { this.foo.emit('test'); }
-      }
+      it('should inherit outputs', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @Output()
+          foo = new EventEmitter<string>();
+        }
 
-      @Component({
-        template: `
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+          ngOnInit() { this.foo.emit('test'); }
+        }
+
+        @Component({
+          template: `
           <my-comp (foo)="handleFoo($event)"></my-comp>
         `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        handleFoo(event: string) { this.foo = event; }
-      }
+          handleFoo(event: string) { this.foo = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test');
     });
 
-    it('should compose host bindings for styles', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @HostBinding('style.color')
-        color = 'red';
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @HostBinding('style.color')
+          color = 'red';
 
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperDirective {
-      }
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <my-comp>test</my-comp>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperDirective {
-      }
-      @Component({
-        template: `
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperDirective {
+        }
+        @Component({
+          template: `
         <my-comp superTitle="test">test</my-comp>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.title).toBe('test!!!');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.title).toBe('test!!!');
     });
 
     it('should inherit ContentChildren queries', () => {
@@ -2681,7 +2900,6 @@ describe('inheritance', () => {
         selector: '[super-dir]',
       })
       class SuperDirective {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -2722,7 +2940,6 @@ describe('inheritance', () => {
         selector: '[super-dir]',
       })
       class SuperDirective {
-        // TODO(issue/24571): remove '!'.
         @ViewChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -2756,9 +2973,37 @@ describe('inheritance', () => {
 
       expect(foundQueryList !.length).toBe(5);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 
   describe('of a directive inherited by a bare class and then by a component', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -3056,180 +3301,200 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        baz = '';
-      }
+      it('should inherit inputs', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @Input()
+          foo = '';
 
-      class BareClass extends SuperDirective {
-        @Input()
-        bar = '';
-      }
+          @Input()
+          baz = '';
+        }
 
-      @Component({selector: 'my-comp', template: `<p>test</p>`})
-      class MyComponent extends BareClass {
-        @Input()
-        baz = '';
+        class BareClass extends SuperDirective {
+          @Input()
+          bar = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends BareClass {
+          @Input()
+          baz = '';
 
-      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, BareClass, SuperDirective],
+        @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, BareClass, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const subDir: MyComponent =
+            fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+        expect(subDir.foo).toEqual('a');
+        expect(subDir.bar).toEqual('b');
+        expect(subDir.baz).toEqual('c');
+        expect(subDir.qux).toEqual('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-
-      const subDir: MyComponent =
-          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
-
-      expect(subDir.foo).toEqual('a');
-      expect(subDir.bar).toEqual('b');
-      expect(subDir.baz).toEqual('c');
-      expect(subDir.qux).toEqual('d');
     });
 
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-    it('should inherit outputs', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+      it('should inherit outputs', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @Output()
+          foo = new EventEmitter<string>();
+        }
 
-      class BareClass extends SuperDirective {}
+        class BareClass extends SuperDirective {}
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends BareClass {
-        ngOnInit() { this.foo.emit('test'); }
-      }
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+          ngOnInit() { this.foo.emit('test'); }
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <my-comp (foo)="handleFoo($event)"></my-comp>
         `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        handleFoo(event: string) { this.foo = event; }
-      }
+          handleFoo(event: string) { this.foo = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperDirective],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperDirective],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test');
     });
 
-    it('should compose host bindings for styles', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @HostBinding('style.color')
-        color = 'red';
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @HostBinding('style.color')
+          color = 'red';
 
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      class BareClass extends SuperDirective {}
+        class BareClass extends SuperDirective {}
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends BareClass {
-      }
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <my-comp>test</my-comp>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      @Directive({
-        selector: '[super-dir]',
-      })
-      class SuperDirective {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        @Directive({
+          selector: '[super-dir]',
+        })
+        class SuperDirective {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      class BareClass extends SuperDirective {
-        @HostBinding('accessKey')
-        get boundAccessKey() { return this.superAccessKey + '???'; }
+        class BareClass extends SuperDirective {
+          @HostBinding('accessKey')
+          get boundAccessKey() { return this.superAccessKey + '???'; }
 
-        @Input()
-        superAccessKey = '';
-      }
+          @Input()
+          superAccessKey = '';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends BareClass {
-      }
-      @Component({
-        template: `
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends BareClass {
+        }
+        @Component({
+          template: `
           <my-comp superTitle="test1" superAccessKey="test2">test</my-comp>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, SuperDirective, BareClass, MyComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, SuperDirective, BareClass, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.title).toBe('test1!!!');
+        expect(queryResult.nativeElement.accessKey).toBe('test2???');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.title).toBe('test1!!!');
-      expect(queryResult.nativeElement.accessKey).toBe('test2???');
     });
 
     it('should inherit ContentChildren queries', () => {
@@ -3243,7 +3508,6 @@ describe('inheritance', () => {
         selector: '[super-dir]',
       })
       class SuperDirective {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -3289,7 +3553,6 @@ describe('inheritance', () => {
         selector: '[super-dir]',
       })
       class SuperDirective {
-        // TODO(issue/24571): remove '!'.
         @ViewChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -3325,9 +3588,37 @@ describe('inheritance', () => {
 
       expect(foundQueryList !.length).toBe(5);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 
   describe('of a component inherited by a component', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -3628,168 +3919,189 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperComponent {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        bar = '';
+      it('should inherit inputs', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperComponent {
+          @Input()
+          foo = '';
 
-        @Input()
-        baz = '';
-      }
+          @Input()
+          bar = '';
 
-      @Component({selector: 'my-comp', template: `<p>test</p>`})
-      class MyComponent extends SuperComponent {
-        @Input()
-        baz = '';
+          @Input()
+          baz = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends SuperComponent {
+          @Input()
+          baz = '';
 
-      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperComponent],
+        @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const subDir: MyComponent =
+            fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+        expect(subDir.foo).toEqual('a');
+        expect(subDir.bar).toEqual('b');
+        expect(subDir.baz).toEqual('c');
+        expect(subDir.qux).toEqual('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-
-      const subDir: MyComponent =
-          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
-
-      expect(subDir.foo).toEqual('a');
-      expect(subDir.bar).toEqual('b');
-      expect(subDir.baz).toEqual('c');
-      expect(subDir.qux).toEqual('d');
     });
 
-    it('should inherit outputs', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperComponent {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-        ngOnInit() { this.foo.emit('test'); }
-      }
+      it('should inherit outputs', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperComponent {
+          @Output()
+          foo = new EventEmitter<string>();
+        }
 
-      @Component({
-        template: `
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnInit() { this.foo.emit('test'); }
+        }
+
+        @Component({
+          template: `
           <my-comp (foo)="handleFoo($event)"></my-comp>
         `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        handleFoo(event: string) { this.foo = event; }
-      }
+          handleFoo(event: string) { this.foo = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test');
     });
 
-    it('should compose host bindings for styles', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperComponent {
-        @HostBinding('style.color')
-        color = 'red';
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperComponent {
+          @HostBinding('style.color')
+          color = 'red';
 
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-      }
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <my-comp>test</my-comp>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperComponent {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperComponent {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-      }
-      @Component({
-        template: `
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+        }
+        @Component({
+          template: `
         <my-comp superTitle="test">test</my-comp>
       `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.title).toBe('test!!!');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.title).toBe('test!!!');
     });
 
     it('should inherit ContentChildren queries', () => {
@@ -3804,7 +4116,6 @@ describe('inheritance', () => {
         template: `<p>super</p>`,
       })
       class SuperComponent {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -3849,7 +4160,6 @@ describe('inheritance', () => {
         template: `<p>super</p>`,
       })
       class SuperComponent {
-        // TODO(issue/24571): remove '!'.
         @ViewChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -3883,9 +4193,37 @@ describe('inheritance', () => {
 
       expect(foundQueryList !.length).toBe(5);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 
   describe('of a component inherited by a bare class then by a component', () => {
+    // TODO: Add tests for ContentChild
+    // TODO: Add tests for ViewChild
     describe('lifecycle hooks', () => {
       const fired: string[] = [];
 
@@ -4188,195 +4526,216 @@ describe('inheritance', () => {
       });
     });
 
-    it('should inherit inputs', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperSuperComponent {
-        @Input()
-        foo = '';
+    describe('inputs', () => {
+      // TODO: add test where the two inputs have a different alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
+      // TODO: add test where super has an @Input('alias') on the property and sub has no alias
 
-        @Input()
-        baz = '';
-      }
+      it('should inherit inputs', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperSuperComponent {
+          @Input()
+          foo = '';
 
-      class BareClass extends SuperSuperComponent {
-        @Input()
-        bar = '';
-      }
+          @Input()
+          baz = '';
+        }
 
-      @Component({selector: 'my-comp', template: `<p>test</p>`})
-      class MyComponent extends BareClass {
-        @Input()
-        baz = '';
+        class BareClass extends SuperSuperComponent {
+          @Input()
+          bar = '';
+        }
 
-        @Input()
-        qux = '';
-      }
+        @Component({selector: 'my-comp', template: `<p>test</p>`})
+        class MyComponent extends BareClass {
+          @Input()
+          baz = '';
 
-      @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
-      class App {
-        a = 'a';
-        b = 'b';
-        c = 'c';
-        d = 'd';
-      }
+          @Input()
+          qux = '';
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperSuperComponent, BareClass],
+        @Component({template: `<my-comp [foo]="a" [bar]="b" [baz]="c" [qux]="d"></my-comp>`})
+        class App {
+          a = 'a';
+          b = 'b';
+          c = 'c';
+          d = 'd';
+        }
+
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperSuperComponent, BareClass],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+
+        const myComp: MyComponent =
+            fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
+
+        expect(myComp.foo).toEqual('a');
+        expect(myComp.bar).toEqual('b');
+        expect(myComp.baz).toEqual('c');
+        expect(myComp.qux).toEqual('d');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-
-      const myComp: MyComponent =
-          fixture.debugElement.query(By.directive(MyComponent)).componentInstance;
-
-      expect(myComp.foo).toEqual('a');
-      expect(myComp.bar).toEqual('b');
-      expect(myComp.baz).toEqual('c');
-      expect(myComp.qux).toEqual('d');
     });
 
-    it('should inherit outputs', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperSuperComponent {
-        @Output()
-        foo = new EventEmitter<string>();
-      }
+    describe('outputs', () => {
+      // TODO: add tests where both sub and super have Output on same property with different
+      // aliases
+      // TODO: add test where super has property with alias and sub has property with no alias
+      // TODO: add test where super has an @Input() on the property, and sub does not
 
-      class SuperComponent extends SuperSuperComponent {
-        @Output()
-        bar = new EventEmitter<string>();
-      }
-
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-        ngOnInit() {
-          this.foo.emit('test1');
-          this.bar.emit('test2');
+      it('should inherit outputs', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperSuperComponent {
+          @Output()
+          foo = new EventEmitter<string>();
         }
-      }
 
-      @Component({
-        template: `
+        class SuperComponent extends SuperSuperComponent {
+          @Output()
+          bar = new EventEmitter<string>();
+        }
+
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+          ngOnInit() {
+            this.foo.emit('test1');
+            this.bar.emit('test2');
+          }
+        }
+
+        @Component({
+          template: `
           <my-comp (foo)="handleFoo($event)" (bar)="handleBar($event)"></my-comp>
         `
-      })
-      class App {
-        foo = '';
+        })
+        class App {
+          foo = '';
 
-        handleFoo(event: string) { this.foo = event; }
+          handleFoo(event: string) { this.foo = event; }
 
-        bar = '';
+          bar = '';
 
-        handleBar(event: string) { this.bar = event; }
-      }
+          handleBar(event: string) { this.bar = event; }
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const app = fixture.componentInstance;
+
+        expect(app.foo).toBe('test1');
+        expect(app.bar).toBe('test2');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const app = fixture.componentInstance;
-
-      expect(app.foo).toBe('test1');
-      expect(app.bar).toBe('test2');
     });
 
-    it('should compose host bindings for styles', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperSuperComponent {
-        @HostBinding('style.color')
-        color = 'red';
-      }
+    describe('host bindings (style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings for styles', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperSuperComponent {
+          @HostBinding('style.color')
+          color = 'red';
+        }
 
-      class SuperComponent extends SuperSuperComponent {
-        @HostBinding('style.backgroundColor')
-        bg = 'black';
-      }
+        class SuperComponent extends SuperSuperComponent {
+          @HostBinding('style.backgroundColor')
+          bg = 'black';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-      }
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+        }
 
-      @Component({
-        template: `
+        @Component({
+          template: `
           <my-comp>test</my-comp>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+        expect(queryResult.nativeElement.style.color).toBe('red');
+        expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
-      expect(queryResult.nativeElement.style.color).toBe('red');
-      expect(queryResult.nativeElement.style.backgroundColor).toBe('black');
     });
 
-    it('should compose host bindings (non-style related)', () => {
-      @Component({
-        selector: 'super-comp',
-        template: `<p>super</p>`,
-      })
-      class SuperSuperComponent {
-        @HostBinding('title')
-        get boundTitle() { return this.superTitle + '!!!'; }
+    describe('host bindings (non-style related)', () => {
+      // TODO: sub and super HostBinding same property but different bindings
+      // TODO: sub and super HostBinding same binding on two different properties
+      it('should compose host bindings (non-style related)', () => {
+        @Component({
+          selector: 'super-comp',
+          template: `<p>super</p>`,
+        })
+        class SuperSuperComponent {
+          @HostBinding('title')
+          get boundTitle() { return this.superTitle + '!!!'; }
 
-        @Input()
-        superTitle = '';
-      }
+          @Input()
+          superTitle = '';
+        }
 
-      class SuperComponent extends SuperSuperComponent {
-        @HostBinding('accessKey')
-        get boundAccessKey() { return this.superAccessKey + '???'; }
+        class SuperComponent extends SuperSuperComponent {
+          @HostBinding('accessKey')
+          get boundAccessKey() { return this.superAccessKey + '???'; }
 
-        @Input()
-        superAccessKey = '';
-      }
+          @Input()
+          superAccessKey = '';
+        }
 
-      @Component({
-        selector: 'my-comp',
-        template: `<p>test</p>`,
-      })
-      class MyComponent extends SuperComponent {
-      }
-      @Component({
-        template: `
+        @Component({
+          selector: 'my-comp',
+          template: `<p>test</p>`,
+        })
+        class MyComponent extends SuperComponent {
+        }
+        @Component({
+          template: `
           <my-comp superTitle="test1" superAccessKey="test2">test</my-comp>
         `
-      })
-      class App {
-      }
+        })
+        class App {
+        }
 
-      TestBed.configureTestingModule({
-        declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+        TestBed.configureTestingModule({
+          declarations: [App, MyComponent, SuperComponent, SuperSuperComponent],
+        });
+        const fixture = TestBed.createComponent(App);
+        fixture.detectChanges();
+        const queryResult = fixture.debugElement.query(By.directive(MyComponent));
+
+        expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
+        expect(queryResult.nativeElement.title).toBe('test1!!!');
+        expect(queryResult.nativeElement.accessKey).toBe('test2???');
       });
-      const fixture = TestBed.createComponent(App);
-      fixture.detectChanges();
-      const queryResult = fixture.debugElement.query(By.directive(MyComponent));
-
-      expect(queryResult.nativeElement.tagName).toBe('MY-COMP');
-      expect(queryResult.nativeElement.title).toBe('test1!!!');
-      expect(queryResult.nativeElement.accessKey).toBe('test2???');
     });
 
     it('should inherit ContentChildren queries', () => {
@@ -4391,7 +4750,6 @@ describe('inheritance', () => {
         template: `<p>super</p>`,
       })
       class SuperComponent {
-        // TODO(issue/24571): remove '!'.
         @ContentChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -4436,7 +4794,6 @@ describe('inheritance', () => {
         template: `<p>super</p>`,
       })
       class SuperComponent {
-        // TODO(issue/24571): remove '!'.
         @ViewChildren(ChildDir)
         customDirs !: QueryList<ChildDir>;
       }
@@ -4470,5 +4827,31 @@ describe('inheritance', () => {
 
       expect(foundQueryList !.length).toBe(5);
     });
+
+    xdescribe(
+        'what happens when...',
+        () => {
+            // TODO: sub has Input and super has Output on same property
+            // TODO: sub has Input and super has HostBinding on same property
+            // TODO: sub has Input and super has ViewChild on same property
+            // TODO: sub has Input and super has ViewChildren on same property
+            // TODO: sub has Input and super has ContentChild on same property
+            // TODO: sub has Input and super has ContentChildren on same property
+            // TODO: sub has Output and super has HostBinding on same property
+            // TODO: sub has Output and super has ViewChild on same property
+            // TODO: sub has Output and super has ViewChildren on same property
+            // TODO: sub has Output and super has ContentChild on same property
+            // TODO: sub has Output and super has ContentChildren on same property
+            // TODO: sub has HostBinding and super has ViewChild on same property
+            // TODO: sub has HostBinding and super has ViewChildren on same property
+            // TODO: sub has HostBinding and super has ContentChild on same property
+            // TODO: sub has HostBinding and super has ContentChildren on same property
+            // TODO: sub has ViewChild and super has ViewChildren on same property
+            // TODO: sub has ViewChild and super has ContentChild on same property
+            // TODO: sub has ViewChild and super has ContentChildren on same property
+            // TODO: sub has ViewChildren and super has ContentChild on same property
+            // TODO: sub has ViewChildren and super has ContentChildren on same property
+            // TODO: sub has ContentChild and super has ContentChildren on same property
+        });
   });
 });

From fd7dd4d9fc24ad3765936d956f0bec81c3585947 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 17 May 2019 15:02:20 +0200
Subject: [PATCH 099/275] refactor: clean up language service from unused code
 and imports (#30534)

PR Close #30534
---
 packages/language-service/src/language_service.ts          | 2 +-
 packages/language-service/src/reflector_host.ts            | 3 ---
 packages/language-service/src/typescript_host.ts           | 2 +-
 packages/language-service/test/completions_spec.ts         | 2 --
 packages/language-service/test/diagnostics_spec.ts         | 2 +-
 packages/language-service/test/language_service_spec.ts    | 1 -
 packages/language-service/test/template_references_spec.ts | 4 +---
 packages/language-service/test/test_data.ts                | 2 --
 packages/language-service/test/ts_plugin_spec.ts           | 6 ------
 9 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/packages/language-service/src/language_service.ts b/packages/language-service/src/language_service.ts
index c76a3039ed..94e0bcc56c 100644
--- a/packages/language-service/src/language_service.ts
+++ b/packages/language-service/src/language_service.ts
@@ -13,7 +13,7 @@ import {getTemplateCompletions} from './completions';
 import {getDefinition} from './definitions';
 import {getDeclarationDiagnostics, getTemplateDiagnostics} from './diagnostics';
 import {getHover} from './hover';
-import {Completions, Definition, Diagnostic, DiagnosticKind, Diagnostics, Hover, LanguageService, LanguageServiceHost, Pipes, Span, TemplateSource} from './types';
+import {Completions, Definition, Diagnostic, DiagnosticKind, Diagnostics, Hover, LanguageService, LanguageServiceHost, Span, TemplateSource} from './types';
 
 
 /**
diff --git a/packages/language-service/src/reflector_host.ts b/packages/language-service/src/reflector_host.ts
index dcf66f2fae..5fcbb57286 100644
--- a/packages/language-service/src/reflector_host.ts
+++ b/packages/language-service/src/reflector_host.ts
@@ -48,7 +48,6 @@ class ReflectorModuleModuleResolutionHost implements ts.ModuleResolutionHost, Me
 }
 
 export class ReflectorHost implements StaticSymbolResolverHost {
-  private moduleResolutionCache: ts.ModuleResolutionCache;
   private hostAdapter: ReflectorModuleModuleResolutionHost;
   private metadataReaderCache = createMetadataReaderCache();
 
@@ -56,8 +55,6 @@ export class ReflectorHost implements StaticSymbolResolverHost {
       getProgram: () => ts.Program, serviceHost: ts.LanguageServiceHost,
       private options: CompilerOptions) {
     this.hostAdapter = new ReflectorModuleModuleResolutionHost(serviceHost, getProgram);
-    this.moduleResolutionCache =
-        ts.createModuleResolutionCache(serviceHost.getCurrentDirectory(), (s) => s);
   }
 
   getMetadataFor(modulePath: string): {[key: string]: any}[]|undefined {
diff --git a/packages/language-service/src/typescript_host.ts b/packages/language-service/src/typescript_host.ts
index b5a26f7fcc..a3fa6eeaeb 100644
--- a/packages/language-service/src/typescript_host.ts
+++ b/packages/language-service/src/typescript_host.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AotSummaryResolver, CompileMetadataResolver, CompilerConfig, DEFAULT_INTERPOLATION_CONFIG, DirectiveNormalizer, DirectiveResolver, DomElementSchemaRegistry, FormattedError, FormattedMessageChain, HtmlParser, InterpolationConfig, JitSummaryResolver, NgAnalyzedModules, NgModuleResolver, ParseTreeResult, PipeResolver, ResourceLoader, StaticReflector, StaticSymbol, StaticSymbolCache, StaticSymbolResolver, analyzeNgModules, createOfflineCompileUrlResolver, isFormattedError} from '@angular/compiler';
+import {AotSummaryResolver, CompileMetadataResolver, CompilerConfig, DirectiveNormalizer, DirectiveResolver, DomElementSchemaRegistry, FormattedError, FormattedMessageChain, HtmlParser, JitSummaryResolver, NgAnalyzedModules, NgModuleResolver, ParseTreeResult, PipeResolver, ResourceLoader, StaticReflector, StaticSymbol, StaticSymbolCache, StaticSymbolResolver, analyzeNgModules, createOfflineCompileUrlResolver, isFormattedError} from '@angular/compiler';
 import {CompilerOptions, getClassMembersFromDeclaration, getPipesTable, getSymbolQuery} from '@angular/compiler-cli/src/language_services';
 import {ViewEncapsulation, ɵConsole as Console} from '@angular/core';
 import * as fs from 'fs';
diff --git a/packages/language-service/test/completions_spec.ts b/packages/language-service/test/completions_spec.ts
index 6b4dda17c9..d54624b7c9 100644
--- a/packages/language-service/test/completions_spec.ts
+++ b/packages/language-service/test/completions_spec.ts
@@ -86,12 +86,10 @@ describe('completions', () => {
 
     expect(() => {
       let chance = 0.05;
-      let requests = 0;
       function tryCompletionsAt(position: number) {
         try {
           if (Math.random() < chance) {
             ngService.getCompletionsAt(fileName, position);
-            requests++;
           }
         } catch (e) {
           // Emit enough diagnostic information to reproduce the error.
diff --git a/packages/language-service/test/diagnostics_spec.ts b/packages/language-service/test/diagnostics_spec.ts
index c756a995f6..892972034b 100644
--- a/packages/language-service/test/diagnostics_spec.ts
+++ b/packages/language-service/test/diagnostics_spec.ts
@@ -103,7 +103,7 @@ describe('diagnostics', () => {
 
     it('should not report an error for a form\'s host directives', () => {
       const code = '\n@Component({template: \'<form></form>\'}) export class MyComponent {}';
-      addCode(code, (fileName, content) => {
+      addCode(code, fileName => {
         const diagnostics = ngService.getDiagnostics(fileName);
         expectOnlyModuleDiagnostics(diagnostics);
       });
diff --git a/packages/language-service/test/language_service_spec.ts b/packages/language-service/test/language_service_spec.ts
index 38d3de1277..43a5fc45ca 100644
--- a/packages/language-service/test/language_service_spec.ts
+++ b/packages/language-service/test/language_service_spec.ts
@@ -9,7 +9,6 @@
 import * as ts from 'typescript';
 
 import {createLanguageService} from '../src/language_service';
-import {Completions, LanguageService} from '../src/types';
 import {TypeScriptServiceHost} from '../src/typescript_host';
 
 import {toh} from './test_data';
diff --git a/packages/language-service/test/template_references_spec.ts b/packages/language-service/test/template_references_spec.ts
index 814679a652..1147bc48d1 100644
--- a/packages/language-service/test/template_references_spec.ts
+++ b/packages/language-service/test/template_references_spec.ts
@@ -9,7 +9,7 @@
 import * as ts from 'typescript';
 
 import {createLanguageService} from '../src/language_service';
-import {Completions, Diagnostic, Diagnostics, LanguageService} from '../src/types';
+import {LanguageService} from '../src/types';
 import {TypeScriptServiceHost} from '../src/typescript_host';
 
 import {toh} from './test_data';
@@ -19,14 +19,12 @@ describe('references', () => {
   let documentRegistry = ts.createDocumentRegistry();
   let mockHost: MockTypescriptHost;
   let service: ts.LanguageService;
-  let program: ts.Program;
   let ngHost: TypeScriptServiceHost;
   let ngService: LanguageService = createLanguageService(undefined !);
 
   beforeEach(() => {
     mockHost = new MockTypescriptHost(['/app/main.ts', '/app/parsing-cases.ts'], toh);
     service = ts.createLanguageService(mockHost, documentRegistry);
-    program = service.getProgram() !;
     ngHost = new TypeScriptServiceHost(mockHost, service);
     ngService = createLanguageService(ngHost);
     ngHost.setSite(ngService);
diff --git a/packages/language-service/test/test_data.ts b/packages/language-service/test/test_data.ts
index 34931629aa..ebc639f9e2 100644
--- a/packages/language-service/test/test_data.ts
+++ b/packages/language-service/test/test_data.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MockData} from './test_utils';
-
 export const toh = {
   'foo.ts': `export * from './app/app.component.ts';`,
   app: {
diff --git a/packages/language-service/test/ts_plugin_spec.ts b/packages/language-service/test/ts_plugin_spec.ts
index 5948391008..5ccbbcd67c 100644
--- a/packages/language-service/test/ts_plugin_spec.ts
+++ b/packages/language-service/test/ts_plugin_spec.ts
@@ -212,12 +212,6 @@ describe('plugin', () => {
         locationMarker, plugin.getCompletionsAtPosition(fileName, location, undefined) !, ...names);
   }
 
-  function expectEmpty(fileName: string, locationMarker: string) {
-    const location = getMarkerLocation(fileName, locationMarker);
-    expect(plugin.getCompletionsAtPosition(fileName, location, undefined) !.entries || []).toEqual([
-    ]);
-  }
-
   function expectSemanticError(fileName: string, locationMarker: string, message: string) {
     const start = getMarkerLocation(fileName, locationMarker);
     const end = getMarkerLocation(fileName, locationMarker + '-end');

From 9d5abfb3d97376acad686a15dd1b97352f72e378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20My=C5=9Bliwiec?= <mail@kamilmysliwiec.com>
Date: Thu, 16 May 2019 12:07:45 +0200
Subject: [PATCH 100/275] docs: add kamil mysliwiec to GDE resources (#30508)

PR Close #30508
---
 aio/content/images/bios/kamilmysliwiec.jpg | Bin 0 -> 26570 bytes
 aio/content/marketing/contributors.json    |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 aio/content/images/bios/kamilmysliwiec.jpg

diff --git a/aio/content/images/bios/kamilmysliwiec.jpg b/aio/content/images/bios/kamilmysliwiec.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..88c240d57a468fae2f456588ab81fee9cd90a79a
GIT binary patch
literal 26570
zcmeFZbzD`;_b_}8-3`(pAt4|fx=T8xQ>jB9x)B7VyBidwyGsO-P9+7TBt%78L_*-%
z2jlAf-d}v)_w&C0Ja-@V-ZN{hS+i!%n%OgJX1JWaT)|0^@v^Z5fmBpLtRN5w4TJ>-
zfe?WZ7#t6O{1!&I3d3=az$oA0AOwJh;71rp2qyj!2B^T~AY?cn;4T1D{0diqnSV>m
z1?K=_0PY4b<SI-AglEHSKuEwFo^}g(F#vMGe;D5aKp-Z(pKnPEM>8m`y0xR5qpP)}
z6Ror~ErgScpO#t0)ZE4a4rBoV06`&6ULh_%S}uqXCzlYf00@Kx6b%*Njl>CoaOM6e
z<K-m?l#B2)UvPXb;$LBa7Ji|C5r4>z@_YHfE`OB|?DKp15Wv59JVf}#8yoXGJCHo^
zhL`c`eK~u%4Z^xA(>-Yw5W?jS2<IvWvIv0FUCx7oL0D*LXy|BI=;&DZm>8J&#JE^k
zxWuG{gv5k|r1)4@*N@lt$lsq}Y)njS9Be!s96TZ%92_F}1Bd8)68!%SgUe13J{l+&
zl#2+a10mpp5%Iy7i$EbUE_=Y@fRxDKs|yeqej$Ru2uR2%sA%XInBc!7!5{?0pGZ6q
z7zvDsfP{dIih_oWh{X*c@ez@(6L29*-Z3Sla}I={5GCZ*O3^bAYrHVy=5cvAE{)2V
zsJXYYZ|=%V@}w^4#_c363z@EbH@<5V+N;om`rz(K_qETmOvwcy4JkcS>xYGnz0>c$
z=vaD$rWQ5zz1}$Dm(#WK3`;9+?w@)86(59v07#2;B@-$NGVhfL*SQFg012Gw2$3Oy
z2}E!SUTBQ(aWj~$xI9dh)+9D}<=JOMfeV0ogSTq}5F-DYg^V_z8+7%T2>-PNOn-@R
z`38iAc$FtUNF4MwQGpRcl&HW^$dKsK_>yz{Vm*LKvaHl1|Aorv8}a97$+C%F3ZB>w
zEsRM$DFg~a8OMcB6b#Tm6aZ;h7!nmE)f1C$KaL3QkvPt63!bh>RG@2AU`SN-za0CE
z_f42-X#ma3=_Q6s&<3*}40pic!<)JL5#iwcoI4AmQk3B9ePGdkylR)0V`n8!N^kVH
zy|_D<AVKkOt|3XJQcB7_j~}AHGpIqko@@V>dZH{v)g%JX6D1{{EioQ}SJ~1R)uQ(q
z4~YUD{c7S(8wEy!WQI&uq@e3cZt=JnEH8oy31rXMWNQ)=2pBxx$uP>_(NJKBoVgtT
zDWaqhnBfCxpT%xmWvJ|MKWJh6RQiT@=sDGL+ue7Z8v!udM3DXcmYI*Om!QnW<)_7V
ze(Vh$l(r6wycA*47oXzBHGAzUn#$f13J(bFdHPR0=&cky)4v{zxE^f2W<GrhQhWW1
z^wj<HIC0B5Cn2ip?S2l&(@T)C7H^A0$T%dg_AIXUFpJz5)EHB_JnyQF1+(4VBt7im
z`rLx!SAVG1_CohPXJFhCx%!F!vlbkBRoAixbas$ej@*UJZT=Rdq~W+dWBYdSmsz&l
zH4!RISVi+CNR)!?!rV^(WRaft<>J#Su^5TQ+H<S3RQXo~c9xn!CC#9QW7{kngXi^Z
zDAWcbnHC>Hzv*x?Mc01NyVx<>F7AlHe<D1KKxXU3SF`pZx=6!mS{C0do_1nwI63;O
ziWsGbqE&KAp)QmmQNGgua^kx-BciN|leB}R`cZj~@eira)2<if#2S%Z7wSMqzjIM$
z=$Xd#k^`dD-gEKw{mt1!W2MY95W?%QB=Ibotmd!eCHJf<hK+MM#EMsNjICtNvt~H0
z2h5e%^pTvmIA?faBhu8c47)LNGO4FSE?iIu@8P$H1QbVDZ65khHz3jEK~$|<I5-O%
z{U18UE<ygSgqzD!L&Xg1&<5V=n$VhzH=l5}iyhxLHJx38*3$G%?M*UbR~8SovZiX@
z@YYsRf|u9Dlj~c*J=FU!+v@B;9^*fvN|xk?zdp6X;Bwt!Np<^vrJ>Ms#rsh>+J?vT
zLPO>5ytC*PVV)Gq;d+)lhO_U?jTfRoHzdZ@2N7^1C)?Yg78`o630sQSNVG)}rIysy
zSat5AAH}s}wd9z~IAN0~rnmDN#bA&mMowtKEGLUmgXN&D^iG6`lApPR_A*4|L<;at
z>9rG8Gl;}5Cx4nOL(xD?o7y<-1DP>5qha<>#~$JzHHP&*?y;XwhlTdteWjf4i-+4s
zK3zL@c)F-0e`L71P4n9HzBt{&koi~n;f?6?4)SH1@~E(HC=RraEfKeDvJ_fJIXpiE
z9MyP!_Ia_H?o|zL6@&&LY&1S4J%8`VBp8)9Y+g}uDmG&uAgtI`ox3P2?ds@G7Qg+T
zd~eM#n;zOESopH;%|(n@IZd4Iv5?L^Zgh)WQ96X<q~QTsKGkB$YbgW%iuNIm`u3Ng
zp`%Mst*skdrqLxxG0R9EqPLHuB^0L6MnNln2(1M1a4Lj8b}ZYqD)&4!Y`RFe`$12Q
zFFPw3M)QQ$KH^mS@pAd+=WmzlUBdV7;j>p*>bituzpB6{TI1_`q#EMlO~%o9pnK;_
z;f}*iRxxn@`_2oEbr?)?%b(Q)O<hEK3ge}%Y?V;l+&H^KXc}+eyrgr25N=^rgwVmZ
zlC)F^w6-CFP+Xjt^ED!^RBD(d={|WWNT^~4X-0OJXC2`qIa6)nXrh-=Ij^GLdvK*s
zh)3K=ppeU~a`q%$vxddT1nJAEzbeaZ)~-gtSL{pc1mu0W+gUbm`Slprw%#Pe_T_m!
zOwBx_<>qPQDlGe0JI}U&jnsL~=dY^G+6SR1karu_^83<fi)Mp}dDOT?0#v?jtgYA{
z-Sle2HpNbhYb7Un3+Sd8)qISV1UwcmjE$7ISX|$YB)u<d42xde2BB>TTjT8<Jynf-
zNfmS-jc`Crio^rln?@=WbUojbBYj<NCk^vcjG=_v03D-?qvMCcy=jk2kU{B}TJ&!l
z5k|KK8b>M1Z(r2kcwXdB!u%}&-&gOG>I$K^%vdlVk~%&+Oj-t|RNy{_gmuyg&tou4
zyD=6g0^!9+$&;QOq>@LPtvhZCD>5R2N$E_JjZ5W43JiM7m(#ygQ%I+=(bSiAPDUWd
zHAJp3yW#wjJ9dvw`WsQ$>!%(PLtRCCR#PUB*uCp!ekz044#^G0HZjY^gvbnI9}-tt
zAi6g+(kzOzZdrzZc77T}g~X{82c=|-+(-WceK9iLsn&A;`JT*!7y9wH6HURhZ!@q(
z<S;2^y^3xy@0|wa^`mz`)Rprn)*P+6$R26C>8^6$qGo#uslPSl>FD!M?M^dqUcXuG
z`(P2ba<lSN^nmA_jXiYKK6hXWq<ogfJ@qj!BekhHj7L}=QV^WaLZ&;yd-3%nozb1J
zf^iy_Epn^`wA>*xQj`Lux3-0B0;`hcR&%nu8$<Ex?cEMb>$&_6ibkX^gs%x`?2H)_
zH3T++kEiD4>%X)Ed}CQYbQHU5hPltaV$inGr>_sh;{KMh*z|gKYy(g7ZOD6ntzQ3T
z=CapeGl|1CuDD2ov7Y{$9L?mzJ}Q;HLyWUJr1{t1*fV{Yxqk`TWYZ1ys<}<Ygm3UA
z?!zT$#0Z(Duz0B3{)k51fvPX}0j9Wc{z4xG>%ai7Y>a)JvsF@a>sk3%_9S!4RaEXB
zaU{whJHyscdVT%6@Gc8wuWHL3wooHp1BZP<(q^3l?AItQc+wro-rJ{2La$NU?9l0V
zjOEmOpHA4jcGCwD`0rNgH8-1Fe@nW9q!>kQIG4sINuj&?J~9BZtro^vG<nSM738MA
z_$1AP6fNjY;x(Hm)gCLRHt(KF)yIy$=6Os-Y!~~fLX1N^g>*+Q=$0UYppiH3iNaow
zzXtvn|AiU_hNOjFxY90X{!$`~&K$%GJ%F*(DF$Rs9BYV|u$DGR*u1M$e?wrdBajcp
zq;pfi`{i`{SKi%Nk8@1%4}w1KTg7yVlO$6|{ZU5!{?ojpceVD}uDd<g7OUB=Z0Bd$
zZ&vnvw02JMy!@o}5`;fs8XwOAK`?j_QAGoMVtdG<cvP3fa2`oRo;oio<s?KeA~WQC
z2|TNUx2@1i(31;ilvfqtExUl!^rNqFh4UZIblT@(gd@is{^A8=U(<B_sFsy11N*F8
zGtP#h1#1P;p)+5tS`U)M>#K=8H?Ix6Djjjg!KW7AIn}7GtH!Z7{*1QsLEqA2y;*HN
zV}Gl3dD1bL>S)+EOgu7_D?mv8hUTDl_i@ABRkcJ9h{@wt{6>)b%xV!uMQL^2h*wO6
z{O&kA9=i9+6UCPq496K~(@{I2ne!*h@+S{AtCCUPx83SF30F4l#+JoX4nO~vQhY3e
z0oV5Qm9~Ej_i}Oxs}Z#Z8F=`ghHj<1KPHl}S`8)&+$rkirWs8o$W3aXwVjdYlpG6|
z+7=lb5_u`fO@m}1tSeXWVOehhl+Qj%j+#>LpzTP|g(f<KRXP6HPPFh1D|Z)v-0Z8U
zjE}b(KZYtvPL*X;*}dRC&{rK{82OMe>^k3&JRTlu9#37tc4~oyX(XFip~Fw02Gv>H
zxvoS)nMlWP9jU-jU<(XclamyIr@a5=+~qcj(_hm%ZVpb6fRus?5`0Ps0^w4E4M2z#
zjB=E~)Db>=yuvYF;qXRZo%)sZcc3FXc~n&+cdK6EgsyP!fF~Ys!zWxI5T=t0Fhx{z
zcXM)g1ETPmDoEYcP1DTL5q3qP;NS*@I=I`z5%4hlEe&&l$8oRHYT9_gDWq)N;A!CK
z?>wO{s;2f(Eg3y60Q5bx?+Mg_KHO3h>gMjGW@c*+AhAH|AQzA$@UsNbf;2%;kQ>My
z<OF90!f^UU4aBb4NWt73en^C6=57OXvvIg$3E<JMsHIi(mA-337|sHL9eDgzVuIgF
ztmfoq<LKZD;IF|crJdXyeii~Kq?yaFh=!G`%CCsDi-YuE5eK)wBFbhk*IyV_D>si{
z5gB{f?Ozc<kAJb2GPkq(p@{EV0%^!eNdwXVz5@_Q!-AI9!qMGK!tpIUdUeUUIQ$1p
z3ih9LQZ5!++752A^cpaD-Tu0yU>3Ch1lMqdxn054y<id=zsNB>pyqClF1JnHOyMQC
z5>nkt-Swwcz{7B2;0+fWqztwE&gO5~Y5}f^f67+V9QGZq?qV*X59e@o;hDQQI_X+N
zfyxCe)W*T;r}}W<2n|3cDMvRqM|+r~gVm2DSU)jv5q^VX|AcGUSXuv$!2F2-Wcx)A
zZ!3t~-(~pWnn3vZzG_D|u5dU%G6i1Z0Y6$F_7x1?KB=!L$^MKZe!hyMUp;{b_{vHF
zM-KeL_|ZrJgT0dA%N0}}bj#8bz`%ef;A{ad@DE5{M&>UF<O*&8Jb%*gUP0iN{{wQx
z^B9PO;4SO&A1}lYaP&W-F8|-)u5<xs4ezMHS21{p1vsAIkE=K*JOn}jf5*b*hD#2&
zwJU8Pp<O|Kv|<Da01Vte(o(}izwsi6M-i2P$M>?sqo6A{UOW)M1bP=okUhv0<O+mb
zfVVAhJHSccbbq^kgZ<+02gz>)zu-T_gvTA+Vemc?UR)G2M|TGc*T1!Ob2lykccln;
z1Nmiz0Pt^C43hd~?Ql_mzTuZKU&T>eVK(MaR~?u#yg7pZ$Orif2Y?BH8}%xpaQnBs
zP_0}X-JSjbp*XtOSlRsQX=OCw+|{mN01s?acQ;2lr~}l+)D3C@06<#aPCq{s7~hHE
z5I9D`-ij7@{eNA4M0Xe1AD^2m<^Ks$akcvMlZ0XlbJH@l`hyC`914SJLA~4*T;;V?
zlz(=5Xg|S!5Tjc=y7)-KY^;823io^A<$r>KlA~HcElu68I$?AVsEgY_kn8*e|4EK%
zW+m+ib9DJlx%l7tOUeC007*cqjt+2Lqq{je0UvW$=<mH81`Oy9{{xC;cGZ3U2OJZq
zV(Y(?U$s$Yct*h28Zc+^y{qu|wu^ri27KgKRB*@jcZ2@ka^dtKY$o6VZz{RpZ}3|X
zm<<R5E?`o?rTeeT_g|Oqzb@Z@UB3UieE)U%{_FDn*X8@K%lBWG@4qhJe_g)+_qlw(
z&!MgZQzH<_7`TC172s$ENrEf@r-d2d8l?rCrPe?g?!<7t3ONB3*Zv0zT97pGqXj`g
zoFFa`Kb-ORoW6TVP_G;mKwiK`C?#t*Hz%Q6w;WtKOyL`gILsaGZ+V$I-Qwclyaf^w
z_i{2dw}ZOTnn3~YfGFK=+jBZv8w*i7U0xMV6(?z^wT--w3slobRm<GR&Ro!fPF##u
z#7oG_-pL;7W=iX24|8x8@)D)HVlD)P;ow_zv{xi<cA|7wn|)~YRMcsu9bKTbyc~S&
z=3LwYwETh`T)ct;5FR%8_9nhtoPxKwc-VohOq{^ZCNA0^7afqBi-o0-#%<Xjc>ys|
zx*vt|^z`KL<mPa6vAV@2C@6S~6LJdzVFxJKUA-OLOug70T<L#uxD9nRcd@zh5Yxgr
z0^Uz|H&Hr3((gsEcT!RL#rPk!Wp58J*A=y^n~VpL_`lPwD}0iFO9Kk5Si6`*Wjvq`
zZuCEsTbTb!>jbztt_ombehUhN+5=>+K;3Zt%F5~IMzCK={t)gL`l>>IW&l*rKa>Bg
zc{m|ZV4>TN=I-!36>k5mLJLQ88w;UdY=t=axH)+&1O?d51b8{wxw!bv*-b6@1ldh_
zxJ~)FAcB@$d}cqnDLA;gnL3z5;oJcJ95w(aQ>Y*>x0x9ayQQE7FFOw>#FE_<VrIr}
z#%~EVHx+~k@Nn|~O#j^<WeWRUDt?Hx47UtFw~Q2oQvkwyo10rofR|U0Uyxhiwje(@
zCmpSYxsau!i@hmOAvX4=R?u6vPEad4+P{i$<yuj3w1A4zasLiikd_9P8Z2#K0OCpn
zA!!#V-~a=B;{XJ{$Bvzomz|4GiwoFb2mA@%<ODX`0XYI?69V|zSbF~_>5uJre~<!A
z!UFKO|4+p5mUUGt@;0u3i{AT(?Q24ve}rH*v{#lVWNHpy=@6xJHT8g6(ER|~{DbzP
z5N-h|)B?)RX(7PF&I1wPViz#u1+>q{X~|~_6@Wl^On;{L1ibTq7W;2y`JT6{qotdt
zsS8xn3b31>?OXk)mHyLq#h)3NTbnvqL4nTY7TvA?$0hpT+0%DX|Nk!0EqKTBy}EAw
zy(a%M$Dh_M3A7Y=J-hzUg_Nn)FRh62N=Zu!a&qx-N%05@@JsUWKqLWUmzI^{zs<)h
zEx<2wl^4tgNO2YVp7_>(pUV~HZyn*!#6a%~5B}=b#eR0b|Gxj#z`q*!R|EfQ;9m{=
ztAYQEH1OBN5b6L7*gS!0-#?z*Ktq9Fz!MD%4HXRw2LlZa0|yTqIE;af_rE!K0Y(Q-
zeqf+uqN8KtU}9t9;KNUD{5Z1lzdyMFjt9s8?c@d-aB|}bFfm5`{on=&2^kRq1q}Le
zasvSY@pmk+WcAz04FoVE{Nx4-DkAVea0MeE;v<2OfukFecTfmTfukElkc2!`;_oLX
zR=7#b_843q?lVgBXeK_XGk5Lcz0H)AU(a_<%fhXDVioO15IP1aS#Yw9Y(az0q&748
z!P;l|=?$oRNXqvU9RI}u4gq;RYp?M1l9qwl563Km3i>wQ5gDbegL5BGScMb~Y<(g#
z%bpIs**yJz(gP708904{gocP{f3*Y$KWrk2d<T#i#W^qm*!jOl^kRI4UW!=5%w?aO
zfk*lwNunm>6Z5(*RM!dK)!RYWw32`tAtk%PCqvF;;ik=hkYC@;%rd$5IXJnX;ZKoe
ze>-*Z`=OIRWd3hN{_}9ix_7<hNGQi>79Z=@T)kP<e-W4(O^a;I%<wL8)~UHIB1M7_
z{8b=ab-Ve~FhhcBfJGiX;RBT#-lydwx=_$@PA!Sce0CX5|4rnr2<0@((JVy6ddtzs
zHa^&F`OiS%Ts?HP(sH=arB)gaGtT0JY0uSL_Wlu2zXV;5{ez4w9<aGuU4Sz&JOD5t
z7UjA_MN$lt6SAOF%)zxk7@)7}r<B8QHnO@Qsy5~{NeA*g*^LYUp){OwaUGp%#m;V$
zYriQjDVB^-Hn1YDy!pA0@X$QYxcOvFzO!e(91uru9xfQwe+rhC?pt>n;A}ysl*SxM
z=_z?I?0n>GL0^}H1M{M>KK7?{V6$MU0Mr@wQ^LPQy&V5rap3y7D#dpiJz`=ehcJHF
zHG5K3ZamCLC+z0~m!R_0l^z#Wt`BN_PI35OQ5oy$!V>gES&6nK-?U6T#%0=V$*sa<
ze3uYm+qB-gsjzvi36+&JlfdRk>X0n0a#EVo%=E#*5(vc1sctPue)xfly93R{MsZxu
zcH2lMIkw#uG$S?5sZ(<2uEZI}B$v1<PtY<K(Wgcqvl$EFTQ~WTg!%N44wrBKRQKO1
zvuraqqkJW1xQeYO1+7f8zezN7cnj1cO?`K^m~}g#x$DlS>0TSE`&>P$9NX=viuMr`
zPg+6+>3bV|*hW)bY8r&Uo5paj!Dw2_cSE_H_y<K1!3hD=vFs9@5!TkDClEl*U3j}j
zq2)xxfJ6J0sgPU$O^t+J2!y7gze&t07vcIIql{5x(mD5&37hLda;uwWu&lf<{xTgT
zVvi#qf4$F5NV|nrc>l{hAzOttQGkbt3aT1na!<&OfZ9)QaR=6r*w&LYr6o|N_ebv*
zYp$M}h|(7)nRaN+iQuAu_)mn--xFAs(goko*6XYN#%^#iqBQfd=k6m)zo#2mB?m-Z
zMiLH%&ttW@dOU|Z$2{3JeV+lGo;&svfwtRrQ_+N}GXey|dsFNkp5%1<9WOk^$<V8X
zw?^ha4E%>_Fx_M`i}%D~m?4$|(;f=s+?=Eor$l~Ewvv-l#XP%kr>xuWV{{=GWx7S|
zdaTTx*6?UZ<*z1HF=us?*#C0!N~^(eJ?8zyX<Rk^{_g&1iDk={5wap_${Cx@Oj&HB
zGpxb!&R3d|^#1DNNd1}i45k`_*!l_u^4MT8CNMFv?Uq(5N}Fz{Sz5FF0X~@VrVKU6
zT!&_{B1u~vVd{>Cuh_Sbya%cI*C$Qiqb-DgpxD=vd1N_-ck_|zyn~NU(Ie7lf#ypE
zsEcaGVHzEmpm*k`Qd_oCeGQiMeuGaUFF}1RbCkZ4By~C|Tc}Pbwy|N|-7G^fiw<*k
znEXYG-_RaR3ni?+w6(dYLbjTXm%+hsI}~a(?1Ay`bsjk7uC)ROtmuy^r_zH4LzQ+l
z@~KAsL-}F%9k<jLV~TAZ6N(ZkS>ldmO`c?p`5v6G5XqG852TvWV!AU6Y6P_kWbt}X
zu$=Ap5J*(hzZEjqSKRSgLCbC`3SF8jT}wwa@&@1cy~~7MgFgp_)Qzgzn)PLlX7Qrj
zR2@xIUa*UlU<VsLpI)Z)(d0B>_f=gZ@x_$=GBmuKUMZ$mQ&ev$=v#Wm`?WXRNm!j~
ze`&2cl&@nhNPULn1*60e8hy3vN{q9t7?tD*+C|G}SqhWQH>_R*s7_k-&;;cQb|QGC
zeeYm&?!vS$r~X#4zxwpbGVVvLtiGHpPhwvZ68TfsF>icXC1?ww8Cf0$PQ7stzp%So
zaJ07kv74fhODK{5=3eP1HGhwnadmDB<VKm9rSV=Ca+A$`1A)DGVTWDJ>tf^ioaaih
zPrcJCl>Io9Z<23GY~S5^f8>(tjEQbRT}-tW`yBTcVQgapeaq?MYQ~#qiweaz#4U?Y
zbWvEkDRBgpW*+GZCXM+So-~h8P{4>0*f@zFzx59Zpf`D6;^QC?t)QhjWo9dl;l@jG
zc<MYk%2r1wr<<@)Yd*d3MSL^&jI@Cyyz;s%Hyc-58fZLHb1UduYeLCNwlAAuAAb4n
zZCo)1q=>zGl5$!a(S3Bnpt46PqC#5V3|FGM6zP&$#fg2U<0JzarRz1?=Vv$KG@~BU
zqUGfI+d@I=hq=X}>go?3EIP}f6inpomsO|`X=!qz^TMz^iKu$zTK7JkXTZXaVnoAW
zUZLxeAw2uSSjs(iy)kMJFF}vyFn8Hn)IKZ8j6Wd#Dkd-$^LSM}mbtcUw`o!0<Kc!?
zwMv*HEafZL+og90)_W>RtKtpvv*tMGo&s+vw`Y&v?Nhz%?nXfCNG5SQD&jdde|bUS
z_9-T>N^v$}+(D0YNAw`h$exnj^6T*0S}IA_<NAd)yQfRV^OY`xBEI}p`gsUBxSJ!M
zy{U)wRMR%g%z;_U-6V*1RG(a-*%fRoS1mqGGsVcMmy^k7b7`t?W5NA{s~Ms2S9p(5
z`>WUSznuQ7`~Bl<Ye8<NAy{l65TlS1LcnGG>W%pr&4I5=ktg%Suv|h`ikgo3^0}7L
zYqr|?G-efFAFLPNxH_794+W|>i`-iwq}F?@fn2LG1gNrG>U9bqa_Q;Ul1$HTuI)a&
z1B$IsFmIt|I8O*4rv0Md#8ZiCi!=MQJ~hH_IN(cRb@&-Qk2C|lAof5+?z-cFK2^cQ
zV&$`Yn2ng4ww|^L^CvYgr+6GH4RAyr$9{>6x^CRG)>YOLnlV_Ay8gv4EJp3kB`D-Y
zAHgdkXWis-seGT3652C9%eSvslpe?xGbs5pBG(WYE;P7{#T5<tCxeyQGZ&L4eNeEq
z=Vx<D6Gb^<cvoju4%4PkbD>OMO1kDt@`H)C3R3ooMbbX3&ZQ+GS&5#IY8pY?8Fp##
z#)Hj!wl&X0%VU}!+EDhCD8(FqnV-dJ;nq~ekzoeY9^)Gn;f__%bx>NZ7u-o$Gpi~-
zi9e1z=)ih^Uy7?&2z!sj{+6B1+Qr3d*G8|pGM2rfZ?P7Qt?9(ExXNBIzOVK#72i)Z
zmdreSL7k708DUPxQhH&)-#L1r!AF=Cl_e+Em@?$S8xte8qhG%7=rz+j@D?>gNj1i!
zt0GUXQSW>sJ^GDzllrSW!^JU9$DgY2DGCdEyS-;nRz1haE&j$wZ0z^IlKqPfV&>;m
zAD5Fd-1=yU#f<{F7t#Bjn22tz`L}7v=;sMpE1w3b`Ir@<=oIuPP{kegKTM{Su>630
zQ~B8dPSa$!9}5osuCl2?PACqZ0@J+^HFcp2(kE}6iRc}%P-*XBoFKK_mS1*Ey;p<^
zgYaD-5_$!8-FS@h&`2i>ivKW!Um%M^nWR-3iX*6(N7Ofo-MCje$sCEX+OSOCja{3{
zD^lS+bP3{4w5E&F_pUb!V4Dnmf6IBF`D6nM(v~x_w`EqHtv^*^4b^N~eQxcqY^M$r
z_UwBg_~00XRT!^GJPjXCO#K@D0wd1X|7iN`_LvJsa#;84@sPPF1;-d-->mE!dy^)I
zzqqh<AL)2Cd3;*oR8FEmwJKb7Xy?{-HXamH6BU_@L6kE{rO;KB$5_A+!h?7Ud@E7B
zGo3IFmV&3IRw>iJ-D?2n?Tx;&*`N<2GLs8s#vi&j`))Nx_H;ONzja*(luPTzKIg2U
zcN^p2czK)V5nT+quiRE#{f^qbVj7IsYT5&NvsxG9A2S!oy;bRhA3|wWzVac~d72_$
zKfLI?*(xg8t-`LM6jk1tEFZ)s;kZ}qUs%&bJ5onFXiF65co5Ee^o1ofA*FHBss;G3
z0VcWjZT#f7Vo#c4)8&G<>$M6zsSXSCWsR%W4T3&=-an%^4N3c4(VH9(tj!QDJr_R`
zWEiu5bCabi!oWy&AC=xj+h!!rW5D=qB9^>th03ryaXS7IR5r)Ffn<w&`e?b*%l7Wu
z>A^4870}Beg<8j8<)jl?0{hm4@d2i9N%M3fkCYxfw!rYa1oaE~ryVYr>2-z%4u$#5
zyw5JSc~6*w%1>H(3QA`JwK)i9>JnrG!BjlnwEI(DW9n+>qv}IUcQ&Z0RO?dPtg=D>
zu-@M;r5@;&f`r%?poO~@(#%&QNTd=`C`lK#TSeM7W4>&Hc9D*tf%45xdhgNUp1{NV
za~L~{MU(6bj1$$(Zx*~ft58!Xrg8QIrAUJM9?jZza^A?=LJg(;AUk9;rI9kvMj-lu
zi)zp&l(PrvMh?rEE<q{>Q=u>=rAB*a(HF!os}R-zM0S6>G-o3^WiO2rg3zGc557*6
z0YT4KLN%C+=Di-xqR4DQj!8-}Bs(@*f=nWWD6!^}NFpi(7Hj*fc-G%MZA_MNp3}2u
zg|&<rhfb45pfX^_rQxG2?p=Z$bXB^c&=p&hrefXYD&1ikm1kVV#A)nrhKGRh_|@FX
z=htZO-sQ|+!-QXRvGN-Cpoc{_c(A{5;;_RO?s1>p5)Z8C=SWOIT^*vFycQ#I)3{$5
zlTl*zeYj|xFHK2FsC-LI4sqOMU^V@*jHj6(ZmOGTX)I*&<sBkZiszsByR>jKa~jl~
zA*_)>HKgY31$%Ynvfc<j4#+~9cw=EVbM*)wW`}QgC^Sai&OaIkH5THWqnIA4GG{}Q
zTQg{CBZg_sPz@WfqahL>c`AF!2F&_`Qp7#v_s_Gh`3r6G*Xn)jDkr^7!1sa_@!s(@
zk$IGlOGbXOV+_4gb&qfw+3#T`>Yd!3=mK5Gu{811S3pX&)wLX{XyuX>q1|1Nu!zap
zXk?mf7-du9iKL5mlA2G{XeZiP$XbPM+@k9Jwn};@`?E7SbM?GS|AoVa@+SWSo#vMF
z)mvnp*R7K4lP^K6yiAczXieih=iHN=x2c^PN;gODCyHks)g!&4<g!2*93D+}z3l+2
zu@@gsLs*>{(jvAsTG$<@FQdBz)u%oapL!XET#fdjC^We^pl53f3uj`$`xPU(ZZ1MQ
z2@lO~OT4oY*P80{ZowEGIu`<^WNsrqiD8m?k9h>OYhAu-201lvZkK#)6gClzA1^}(
zf$u%CE5=|P=uPaDFOowD_Cu_^|CR;&rtHUd(Qlkfo3!N@)m<`t#U`RPO<Kp1H9T7`
z%?uQ15EXfp;BD!MS|lx)|0|ewVo3Q>+x;0lQ|Y_y=*8xf7$uy%%N_LBkK;JzL#aAn
zC?i{2qZ*u<*och^fhD)qV99!em`v&_d=~;JPX08-$OG~Vu~{a9!n+w<M3W3eEmWcC
zeiz1Zv9#R~y0yXE(Kfv}H(dJaw&t{ltB8>oYx%?wNw$?0Z_{t>8cDOg-J9Lf7{SKT
z2e}JM&ojIQ`Bbqvr?0Kd-$c`=n48nLs&0bmz1|_Kd#S^603WMdnfLP_E`qB`&0j`c
z`(eR|Ka`vEXi(M&LO}Tfbv^g>$HsS^IkY^B>NhDZUe?Wb)19{j%2JCRQ$zImH@Uow
zZMA!~LvTFs<EL##o~lt_g7O9sC-H<_j;qJl6IpVSlM%8zf{YSBd5Yved|RqB8{moR
z*zn*R`@sn3sIyC~AP$e(<G^lQ9>d1QkkXw``(GER>QRxPMH3@^I`ZO((<C^0JzH`g
zeQ=XYZ^RJ#6&JmKzl=-Gaig+@r%28>ag)ay<B_(?O9fVa8Tpd^5#}L{aEM5ET)K|J
z{i*p?4V+o>axw<oaO{YF1s2`wo}!$O&eZV-Ka8b`+O&(g4Qwz4Op0)}I%Gshh+8>K
zf9*xe&2+1F_%d*6TieI{Ei1efqkyaU)z+%YhU#rrdPdLHLyG&^<L?I?T3gqsJ5iJ^
zmYr1>op0oA3gLux(@lE!y~bhH8dx6>pc36D{=8TYs>DQGc%AEbyulEdChHu56}rmZ
zQ^{ZH>(O;`eVsh`p@{6Vcq%<=I;_gWin6U*qwxYpz(Ma(U;&vdqh2BsREVJLP9h`f
zur8V3ZP}g#3*pJm&penW_2e;4&h*RE+(IEy&e{@wMEgaM;0<=+P6Ozuv<NxNxp{)q
zXc~3-#Fvv|ET|pT)}Jz4iXkAeF?ZpR6#td+C*uwivt~%8{M}hy(Qd8DX62z^7%Bxr
zkEd2bGGfa-!n5*uJa5u9JEOs9o1Rp=^)l#Q9~ll0Vk-VK$bDXC`9n`SS6#MJs=9!I
z0<v33k5fg88F@ZMYcV;`6KlvBp;`$OdG%vG&66**i>bm$#-PMhIdEQoYs=;3LhG>d
z+{hDuzB<%C^bS)K8#8#=BhIM13O2lq3I4*L1x(swkLsb5Kb$8&96*0FR>0E~zERRL
zh#!6LEflLL7$!^ie6do<d~A&J6OXqDmO$-*5yT9sRoj_(A=~@GioI1z);2YxFWLtu
z#|$g)t^9l~8G06~4{D483W$>lyK9k3JV~A7P3tkQhKr1|kYv+n<31~3c{$Ri(V_X=
zi#Otn!I*Ij*X(9||5lc#<de}uZ{lbJn5_rzjmN4gR?$Yc?_`(oR1+$mSw^AJaYZ*>
zFV=2SlCP?=O7%R{b4K()EVjkn*zZ(+teamDK0WVZtLAsMGH<}xvPy68ML5x)d=(;<
zSgHeV3$T_rA|mcLy#AuuRaB&1+459<FFBIIM&{m8EBRUTwtq^(%_N^!gKKWmwQRz%
zFY2F+np*WG7WKQMu43HZ4RjzGSAX^xBW{Ct`P}kM@a6gtJ>Aw@Hr+R$GYow0B<J!h
zR002cC9{^^kux8XdiPngco-~o*;dGnwoE{Hhe+4wzI`yaos-s{ju=XMpR34|3|aAB
z21-XBx1voU#Q6)GL7WV?HIHa@jc9aQ8o#{^-YgBdl7^G2Su1l_b8gUcoO7ZvnjB#Z
z7iT;Nw%Wbrg1T~r=mvwM<FGr2Ugqz@@w{dn!rGlggMEpd9YbQLKH%EwVz)C|C%<k7
zQ<H_tKXs%FNo6d<RZip+J63dfMNn{@EjAN|CufU)h!vv3B1;dck$qu1%9_7a>dt@X
zUOwhrnM*->ZO_Sun;DX~(8wIyL|GpWdL&xJaSdI)xO9)#YRDQwz_p}2(4hdDC?O(7
z{WvvkFm~yonL{MXtdXV97|a*aT{}CofdfW&hn|GH>6(b}_i2(+l^=Da4&$~{n6D&0
zdE&%czDzCTTgwR3#x;uYAcrN?5>87Q9MI!0P~O$)A)WEf_7*zVdVZgM*P}eM&2sjg
z+dRWcqIc?NteTsd$-T7xgg+dlI#<r)upchFzneBrYhAyQ_O)xhxYS>I1>z-kxG3cE
z1AOg5$E6su@%T(!Yqwrdo-!ZYpp{!+?(af%8Ac0!_%<`X^o}y-NPq+ntxhra;U{NG
z{=9OX=so(`^#?8<)f(bDat#nFu~a$NZ{mFF>3ni3OU3KGHax?gMBq<q>4LmbnSIg$
zHfyud;ScUPCrO63C0o)s54Nt}3EY&mSrZOcph#$oD_OoyH3%ypVL0Ai3-O#8mkP-V
z&s+Af59LRbESZfC+uT=hW(n_`m?BVzHBbwNRb+RhM>XG6K+AbKU>M`EdR%WHG(SgA
zlzO06r*_bn<>E-m+?aR?(tm1aOoCgv=K#59M6e0wdDl6P!p;#<v58;rtd|$#)r;X5
z&r(-*2}-#HA%8nzobc_YP6KvQ-7i+bc=M#|2@<jz_NG^?Ox!lNUq$hO$!*0u?_bUz
zyfln<^Lxen2wO6wr(~1?Pk#Sd&<e4%?8hchL?L^<gY5LjCIw#o(T3(zk90qKj!jJ`
zOnQcd)5i{?=NB*W<dEJb($gMQO$|8^H~La)a1&Y(Nf|aIR74|Fv|OaGIEv;G^q?yq
zeLPQJPqhfY-SAN{w(*6~z1OBsH9ww)ucIeF4$eEfhx-}IO^dj&u@<8%YnrDx@uu%v
zs|<4)4T^E(dL+p#_}nIhj~r&;R9MbGozdD;dB(dP>YRq$W#8O;k8%dTH)(=nVYnn-
zeins)Lkc5l(N0tO{pVUXwTQv$^g<jmg>sMLP^oMZzf-r7QRZADdwB-5*b>c@xCBKm
z%|ml;$l~o61W#HGosGkMX^_Y29xWYBYcFv~u9&L7NG`4Piv>rA(0+NLxK@em>%wF<
zA1NXcd|j$25}hjI)4?g%N_wJ=;?WBR#15X4?!FP5fXyfP^QE8Wn>4Q*Kb<V%XtQ5S
zoyr?9Ora!=7OU)v%r@XC?#4$XLJDkRbUS#P&g8?9DP|a3+=NUYk@x9gCf`jB1tvV^
z&fQR^d~6G^A}A@oKciR}8<r=HL#q}&!-`XSg1MD$H%Ic&Xb8g=e4_bcPTyPaYNSH*
zyF>P`vCGxxpe%t?7ir~Xj<ezpn)IDuy&JDJDQ5WEQ>s$25_%p)JZ{gHkLO}*S}2j9
zQ=?TNzzIMZ*eP@{P3WXSa}4;l*N2%eCt*#BAm&v$B<+soL7&3>z?^?EKdSeIfcplS
zSr~f$bjF3gd}W~$*?9!+H_j>*Z~U6=)A~mj`dn(&hH-OH@lZFCLSQFg><v!PXDsfx
zCEwHm;u@C5@MbaL<_B+0G9OdbLaaT9AQsV9J%-oG(x(hr9Lb5$rQ~|&F^k_4RSJYs
z$_V3Pk#CeKoN_*0m$%g|Hchs5uSpfd^JH(~RD{%NluyS6hZjZ5fI;>NH$U-UjkG^S
zoahj|+0xwNqOJ4j82PYken5h$*frBMF(*8nGCgvx)-lNM3<e%V$tZ5Qo_$Ah;j4ft
zNe02A6o)UuCLgY2h$rjhnhYi<bP>>7hag0$2H4-d1c{Jrn$<I4C@}R*zv-X}wNrAY
z*A7v4@Oxz%c`x+vUVL8lC$h9BlL<i_PmGRj=?@z$2G3^AsQAT9-@lpnE23rqC-9f}
zrr35ib9M#mzMG+|K8n>XUe|x$!8~(cQ<loxlaxFR#hsK~X4Ululhrl-@Oz}hb?KE{
zTILaJGcd;PK-w+sZu>MNlYR@z^bDbvH#1zQY^GK&B5(S!%FH`E4Qu<|moDgwm>9Y4
z&SrNvcieV${lbN)EIgDV%NcXj&-o<UF;tI==Op}5jQTsXU~RjI6>NR_?tNe&T+;|l
z@hYy?&v1YD1pi@Ck!@_$4EQrQ`S9fV1Y^2lt&fY{*Jy>`9`D=^%{N(%SutXX2*Ydt
z#tAJ&r$u#gEt_0_l&^-sXj#(gyuzdJ|8A>~%3&2^eIx3EOzrSx<^xtM&VzN7;Srs)
zu|YCnH(s*I7geSk-7EIX{&sO$-m|chBDx-G33pBDsIPtTVnH3Yy!5t?o$ApsDjlz!
zjZpd7FF|SVL!)yaq8y{RA-YouZB&cM<2XQWCF-nZ#k`pBVC=6g4qcRSQqFh1mxbRv
zjJM+x`DKSi&9|$4A(zjk4@`k4Y_{KH^L)T@l02x;CxBIL?*;u*F}1}#pGPue=GT~;
zc5Ky#sr-q}XfZIz&wOhQxh`U#Z@3!chO}TLwV>9%Oys0VSfS~S+vdm~xNz7_@P72P
zqGH~DE&eO0l~!~9#)VnThjV1~JEsSDUvTU)V+3Z~D5ss7mfB)xLppOQ%r>V<Q~D({
z5VI^Rq<l2wI79oREk!Jb3*vZX`qxmzX^qlDU+Ua7=5ma-&*hRqJbi~%o4}z%8em9I
z5FZ)2de~#^%_|lyomGOO_k<2rti)SIbrD75OKI;C&y5Ia)t2aB-MG*>6OJS?4s_t3
zoSbU9@J*3Ea>yu81osSb3p!K3w;URcLOB4IPI2I?w}AiZyX*GvpW*K-u(gp*#SvBL
zkp^Qy(t*zMafC)AW47;$2L#j#a=I<)pJR?4-r!H1yUV;pNA$Q`h?V?x#*lATxeRP#
zcHz+VCE@M@)}~GsHG_{|F8W!$Yk3-JtmHr_8M0!+-Q&qv(uty!Q9kQAhhAF23NxEK
zflNrp2=}u|yNggVBn`L<RhLC(Y|ZO4!WW5(Ob779?aU7;vCatZXo!9-!c7L>T|0h@
zN_l^Wyxk|#vZ4(wCyiy3RM!W8ciESUrU&O-7-v?C5kyR(&P=1`OM%oGDlT+R8f)TN
z8aK#amtjB<RAR=G=@>!L=(Ea~z$4!%oU_!yM3M}72s*u)LzV4Ay8n3v=TUGYguayR
z)(BoG)^lrjvR4l33^A&Ut|gn}p*kGMo@6iGnK2aml8;8k9^Ea)6?XlM8LXCQ6g)#A
z_~F4fCyMP@>k|ZA=M1Bm#&lILMto~!ufD)z`$*=&G-Euk@>Zw*Nfy~Pq9VzmaN7*K
z8D7YgW8h#P#V}bt7E-GdcDAC<Y9oy-tIz5+)D=>*<q8oY4d14(B@t+-J*$46qgm|5
z>B;Zd3+&;(`lvrvpzr<gO#XAt&X#+<qib2{M&t22W9E@m;aTn4S)44Z;k_W6cWX_x
z^BUM<w#gP(Y{64543Q9g{jJ=inWTqFwRO@6a`b>~O}Gb#HoG7Z^9CYY<l#u$;dWYP
zMeWjSCTK-VP~^5+aR<5>)&4c&i`Kx>*m*%O#zw}ZTbk0%503R+q}-RXbmyxmRI@wi
z@3hMZf7>hCb726_^CZot*@Z7MhDza*Pc#sbiVfR534a`s?!1>P{Fd3I{PTmx5~>=b
z#~25a&mHl6w!fOhI3sRQShdhUBZt~Xks*IYeUQT~PyfKkgQ@jvSL*AxcJ!{(Yc$Ve
zJfY&Z5Ch!&ImJp2p6IJ#NpHP8ym{}SC9~4+^OMn3vi)dvx_5&U(kOb$>+!SKY|;DU
zi|0yLJxc~us~zOcUuWsQ?@)2qAJJyNqY~mmT(-m(^+KL!Z#Pq*PkqQl5=od=GN5uh
zmI$N2|JK45%6l^5{o*+1z=DkRyYwq}*IG|DoKP)WZSzA{Q4VVezwREdjqP@DVm-Au
z6&e^=oS=1#?MaFA^>g7c!mchEHZoaQ4X`k(P!;s9H*v{bTUkalB9svJc)?VJ+_EVm
zY>_uAT6k-ZQ+Oy8Hdi;3@oO38SHS;=<L+v!#vki3@NE#OTvsc^_Il+A*xW@IcNay<
zG}BZ{v->+#p5NMOr+CR&QaR7(mlnTdB+`>_{x<2EUF)ZZLGv_5%Dxg_UTgiY7!&YZ
zv1DFcJQmU0jc6BpG#8ev$017wQs*v*?0#l?7jj_unXx5N2;=@rK>$@&f6+N4TOIcu
z6}Zq<Gf5HZN`Wdyc5KZMgN)O;J!R%nh;Tq$ExC++mv=*6c%tEgG`S`+fF$d%Qq`Q&
zZC&n;1wm4ljOjq&L~<cIsjzI=X5ApUpk5)dMWyF?B9~<_s7<roznSn0ISCG0{(}LE
zxU>^FrpO1>^1~<3(io24ni@^`b8Qm5peR`2ps(tQWqZEW4=nCL<L9<>o_q<UB+Udb
z`0nkFG_$VvPbIZdiRlgNiPaW6i|XbHy47XG3Q|{?<Kxk<cNZZ6AC*<RP*0t2j3z?5
z;N*o3WoQitiLa&Xl*Dim^EIlzbo+q7H&dMgD@_7e71*^==G0teTqoCVQh0kUc%ZT(
zI=Vg&MQ9O!cCN==+o>_uDk$LUe5S_uF`v4rIExQfJJ$AnbHi_YCVqOX{;bU(n;X3K
zYjxngxnXxTn=z)bBELh*Qpd59k;alH)*$Vc=SU8<8txr*&(jAsl%Jl7g*7HCV5n~m
zq4oC7TUbfFCRpvIw3k43k)bT7+re3mg}DnHTl!OQh36X&Wk1D&<?ww>&*}fvS3A#p
zBAKspe3HlbfPHzn2{qNCSRH-2zsPunh{@-u2yYlG@pT;paZcE>WD|=6)zciy*UcfR
zb0M^^;48(u6vi<6Dc?G_qs(`?Hg0D}CT*vxd4WfrapflgPb*y63MJUe1o$pN)-c?;
zZg8yG6MpDhi;nx;j2I|A?jN5kV+-|3mIs4iaz;U;RkmwWUy$--w`<CRUO#8-Ds8;~
z()_gzB6Z+X8s9P>7i^cN7l`<q32Kd%f;&b^)T<3VAJr(0Z-l8%meL2jhoW}K&`-Zd
z+D}Q=33i+Tzj9^R9+I>Aq!_d|W|1GN1r|n9GyzKzySo!AD*DRpb=tE&ifW=8IZqDo
zA?Z8t_#|^;DIWmteI%vEsL6=zwPpaNvGY%5@Q$30YZQhuX!8nKbM9MuL_c8EhT={V
z^&zdwa7o-Z5mT<sAk<uF!SaAT3(AU_8vej-A5q&y8HIpc%79S}rf#XIb2pM>3ollx
zd});wR$w@qZaF9r0`J(bKGj!iPD6s;a=^Zf|6yCu)pn;!Zp;3buN0U&mL2M^$rlZ7
zobi6#&0$jOAgJ`2F%kWoa3Xc9ViVgITd-2{D;fL4jn67i`CNU89D{0{KfjEkl+9O)
z^?fIMK7Lq7@7I=b{(#yTJj7EpAB|`#n8_(md-nECWb9n!D+F{TNF;_E75WK*6H_kw
z*KU@;YQ@;uIAS7O$IKX2aIfjB7ip7nnZZuqB#ux`19`E@Zy>A^V>0v3FSmA!eG%Aa
zzq#N^_8?Wgha>Q7mBKoMQ%*Yc&22=9{a7@_$$EU9;^#NI^jDkH0<2qDo3?Q8Xs&H1
z4YwH@CdyOlVR#IjZwEUgfW+Ss5Ah22yz8y`DmYu$*;n{#G%QPRymN~*ZI2k`v4>fF
z&-mWG8X~;=nbdOoFPg18@(ePyGTlx&8JgA)D}5og+&0Pi3k1WFFjUD#5ge4|n(k}$
z@rl+pYxDSa{>tBs??=}tU&E!np=)^kHJ!ELPJf_En^}ya`U8PCE6Cv>Ho-KmAw&!l
za7uNR?K{F`PR$hJp6wVdwxv!7=SGGxlYucg#M(_cBg)c|37ePR1P{_5Dtu+Ubu|B8
z*}>4S=;R%A<z4ZYfv*GKvLOfcX1&kmfVTbFa!8=u8?XW6WS4_j_;~G~b~^pGB@ABo
z&_Lt5TD{kg@rRvOQ}x4d-@DIzdtl=J`bkJto3)`Sy;Joop?m3v(2l67@E|$|92aAV
znw)NJQZ6CWs_RoHf+u6T@no&Nw=nRdRlF?K#c?&(4_^jhOuE~(^SL*+gLO>`GS?^2
zC!p^Rr&ew>=CKc5Q)COu$Az&@@bXW*v!jyVD=lzsJy!9-s^-a0a`J?Z=vi7Emlnq|
zyz^n^rJlv#(MwrXsFr+AxEuFwlYiG%VS#y{EF_7zuiQgDgFqW<AGaJnvMsIJUMt=E
zfznyST8w=ZQV?eU)Uuk#f=%-=I-+4Aw|sZ8BK19yn@=-BU#bn`IMA=@6iw$9fvw}4
zdxVZRnq(z*Hu{76<IN@|-9_cY>%It2`aPut?Jaio)NQXBtamvmCetD>*atULJYqP1
zG-q+c&i#>Csbs1wh#0Z)X5d2Ur<o4S1ZLH#qO-T?3YwFU>mA#Kb26QkvJ9g$)T4JF
zd(e)~ZYw_%m`Ey*MeSg^vzCe`dg@Nbs>=O(=5?DnX66`_q(~H%UNg!mxtN3Wi*~GN
z|8t{j&U*$;jA-S)wMuJBn!73T3t{b>oaUs$!aS`Hwsv<Fgf~XBAos-DHh!%${}HJE
z;Rg8ggYbt9*cOJ9N-&Hq9AdW4a>NKa&R?VAW?p3$g1%RpJC$Dz8Q!E@DCrMod;if$
zn$f0rx??TpqDwn<VoAalBk0b-E3ubCRwf73HN4m)0@)X*^Iu(V4d+{SxZ;mK#^-f`
zoHQsC(%B`kWFQ4#(M=zgI99$PQzze{&MMs>1kqMqXAPQiA7QKKWaw>1Yr_1pC?|uk
z^w#Hf4vEwQuEUj_j)Dnfl1&VJ4R7~u;o+O!<4;l$5!aL>?#?b+e=D3cE{KThr{ceJ
zp(?<;4_O(0mFF-R`ZWMLwjf((7(=?1yT$TZpkT&~x2lr>l@(7cRv$IU$O*Tce(?Hv
zrZWcW7RKQvh$Rat>%>A;*{f||y}#=HDn`54C5Yo*7M8Md-`hqBMaW`;0%Yj$Uc;jB
z>qm<n*<gC`;8)ZmkE-*%sKba@OM`=jSl+y2kM&-U7mx3{Sl=^al|N&QlR<2z9J6(r
z%86xp!kFSkP7^*wES&IpuPZ9;xI_l!Y+EyG(4}Oga$mD$Q{f13HP@8wI7SD}!hBIf
z?~uAWq^dleyB5Ce#K(lOgELhqXFiECG}>=jA}U%MQm@o*r!5)_HIJ|!ye@BLI&U7{
zHdAEi-xxvNnnc>d{b+mY%kWal?skfi54&GYO23OS`Riz(w;{7;)<Rf%SQTlGPkK1`
z%F%|VUQxJHA2+Zv;~-BPQFE=+-C~f-8uLibkE&|~Wwxjv7iIuEdDC8rt9!uu`TiUs
z{#YgZzC-N4GBFs&>W6H|6A3Z;8Ja9(l6VQM6Tw3qSvC`&D4??%t-?yXX)lthECzB~
z8xk7+Xb_GZ9%<ei_%TG8wV|_-Rgy}wWR%HHs(wh?fur*Fp0a!tN+51-<t+_2EL?RK
zWxRF#?3p1k^NlDgr)7fkR6)^LlOc>|qls6V0t-xgpIzxgk<hynj3EchEgwUY`gP2Q
zqr6tKNJNi1tD=lAL6rU3gA068Ja+k5(}(@K{2u#3beVNHp^t~!IWvXZLejFgv}cp(
zYmPhQ#aG3Lljc^aLY$(sCRf^yGlg1ag(C4YPQ}JK&zBsv6xTZ$pXm*@gwl2r%7VBN
z4dQKWE<qILA)oHhW7o0R9yfaQ7LFI{RM=}9MDo9J#9~WRdmf$ik(;X&Sw==k7uL)l
z6u%@mCW@(I5hnEjt#3++ExXwkwnX0z9&}lh)~z|}9JTUOJartSsk^^s&~;35PvL?b
zg=gOHGo@MhLVSeUt<P$M1ZfzWA)cbIjBvTx<*7t#Ltn0CP@-=e<=YAQ<w@T?p`{<I
zfegqvJx+{r@c1~3RgGO9g(ko0tR?Xzz)z5#K^mN}D07{+945jg#lP2!V{5`V9LwBo
zG7+tg-G1<Jtq!S8>{a+GG9e+7lwmQ9sWo|+g?Ap=*l7QriqEm>10_oTi2m)1aWW*H
z^zfCqDMz@oDD~M)7VwH<`nfCl%66_su)psJ`+c)`?EtG&zpHZSHoo!zCVuKhrIDLd
zaCWu?H|U_D2ZvRc2$9#NJd2-j*q1Yoma;u-c&O;E@k1jPj_tsLxf<2$%y}bX6ERbn
z^_U?~m%P~v_04(caz5rz3@@20h4*N3Vj=Sjj&jNrPNg28NXZTJc-LYDrLG7WO9rka
z)Eph}Xot>a&s-N0PY(`Y2tLM2?)FG5q0R10#!|UvZZb}#%~(Rk%89humh{zRjxuTQ
ze3n3+Uv!U~GVy?jSIYOGrO&R%nZbd}ioS|L&v*ZMZ|Rekn*wW!*qdTr)Yg30J9hf7
z=};Z4o9Lv&PIBWI674J`74NUe48^O6I9<Ho?}`d$NJx{CsR&4}^LnR=B;U}ZFcQ@u
z`*5K)v*opqsV0|gb_xH-a3ukCsU0<6g>~~rpSK>of?RmhNyY*QT$!$1HwvbXvn%H6
z+)$bHS;*vvWCwq(ZU5K}51l091?Cc04!)mWfIk~DkuZr`2&+%F9Hmi$ax-N<MU&S6
zQewlS<1ajjq$mOw<|B`J0~a3i-qkzZjzCN^{>&<fwlsg7f^wHvRjBp<1PTK6{g;O(
z+m^s~ZxWPMYvGDwY}KYmQ<5hg9&Bbu2?awoS?iUWo~|0by~D!Xl=R7Fldd0y9k%)8
zGZl(fjQl2<UQA*`la+%|VrZS7sU7-ApoXuuRFekiat&pwNV^upn6)tK0Xc;%Bs&P^
zjE6f-o=&(N$xoIBH)=-4zdS+iz3>PY&LEjAz-5_(4YtCMtscj&T3rt34*_Cijg*Gp
z3vMZkJjzF2xCVJBO*a`R#D*lHChviJ;_^2mi3Q&>M!~3?D@erLk&CdPz|MEV8s|VL
zwkC1SjX7X&rbV@zHf$|!&6_qV?AfzomuAb&Oi~54m)k7kaZ|R=&6_qXU7I#+QvU$|
z*W`J#X3UyJJ2pC$8|4$+V@TxIY}v3Yvu4eTyEbgt`6=Y#ju})q`T>?iY|bH|a>3sl
zTy-)*m@Dg+4%p1qrdt{CvjtI(*okVKvd5+{<$1Dk5lk{p+;X#K%36tbY}v3OdO1_J
z42JBf>wq%Bp}{EFZpW0zWbQl4)8fS%dX2D|C85Q{$Hyr+>CA?4BypVdu2{IH7nwcs
zy<9vgIYMM-E%U}Zk}w#M<HOgkJSpP^b$oG1z&MR?R6_wwRHhUd0z-xuG^Q3xdgP$f
zob0iVH!S64t_kMs*|TDYX3d)wbu(q=#gnO*m0YY+3w6rPn-(OyHf-3T*|TQFU;o*T
CH{fFc

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 9d1be15272..ec7ad7a6f0 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -793,5 +793,13 @@
     "bio": "Andrew is a software engineer at Google on the Angular Core team.",
     "groups": ["Angular"],
     "lead": "kara"
+  },
+  "kamilmysliwiec": {
+    "name": "Kamil Mysliwiec",
+    "picture": "kamilmysliwiec.jpg",
+    "twitter": "kammysliwiec",
+    "website": "https://github.com/kamilmysliwiec",
+    "bio": "Kamil Mysliwiec is a software engineer truly passionate about Web Technologies. Creator of NestJS, Co-Founder of Trilon.io, speaker, and trainer.",
+    "groups": ["GDE"]
   }
 }

From 8e2e9dcee6dd24cfb4c056a4eca58eda3479b654 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 15 May 2019 19:31:25 +0200
Subject: [PATCH 101/275] test(ivy): move render3 view_container_ref tests to
 acceptance (#30488)

Moves all manual render3 view_container_ref tests that use property
bindings to acceptance tests with TestBed.

Two issues surfaced and refer to a difference between Ivy and View
engine:

* Multi-slot projection is not working with Ivy: FW-1331
* ViewContainerRef throws if index is invalid while View Engine clamped index: FW-1330

PR Close #30488
---
 .../acceptance/view_container_ref_spec.ts     | 1427 +++++++++++++-
 .../test/render3/view_container_ref_spec.ts   | 1642 +----------------
 2 files changed, 1429 insertions(+), 1640 deletions(-)

diff --git a/packages/core/test/acceptance/view_container_ref_spec.ts b/packages/core/test/acceptance/view_container_ref_spec.ts
index 82d08ed6e2..98048b7546 100644
--- a/packages/core/test/acceptance/view_container_ref_spec.ts
+++ b/packages/core/test/acceptance/view_container_ref_spec.ts
@@ -6,8 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, ElementRef, NO_ERRORS_SCHEMA, QueryList, TemplateRef, ViewChild, ViewChildren, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
-import {TestBed} from '@angular/core/testing';
+import {CommonModule, DOCUMENT} from '@angular/common';
+import {Compiler, Component, ComponentFactoryResolver, Directive, DoCheck, ElementRef, EmbeddedViewRef, ErrorHandler, NO_ERRORS_SCHEMA, NgModule, OnInit, Pipe, PipeTransform, QueryList, RendererFactory2, Sanitizer, TemplateRef, ViewChild, ViewChildren, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
+import {Input} from '@angular/core/src/metadata';
+import {ngDevModeResetPerfCounters} from '@angular/core/src/util/ng_dev_mode';
+import {TestBed, TestComponentRenderer} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {ivyEnabled, onlyInIvy} from '@angular/private/testing';
 
@@ -21,6 +25,15 @@ describe('ViewContainerRef', () => {
         '{$startTagDiv}{$closeTagDiv}{$startTagBefore}{$closeTagBefore}'
   };
 
+  /**
+   * Gets the inner HTML of the given element with all HTML comments and Angular internal
+   * reflect attributes omitted. This makes HTML comparisons easier and less verbose.
+   */
+  function getElementHtml(element: Element) {
+    return element.innerHTML.replace(/<!--(\W|\w)*?-->/g, '')
+        .replace(/\sng-reflect-\S*="[^"]*"/g, '');
+  }
+
   beforeEach(() => {
     ɵi18nConfigureLocalize({translations: TRANSLATIONS});
     TestBed.configureTestingModule({
@@ -269,8 +282,1418 @@ describe('ViewContainerRef', () => {
             });
   });
 
+  describe('length', () => {
+    it('should return the number of embedded views', () => {
+      TestBed.configureTestingModule({declarations: [EmbeddedViewInsertionComp, VCRefDirective]});
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(vcRefDir.vcref.length).toEqual(0);
+
+      vcRefDir.createView('A');
+      vcRefDir.createView('B');
+      vcRefDir.createView('C');
+      fixture.detectChanges();
+      expect(vcRefDir.vcref.length).toEqual(3);
+
+      vcRefDir.vcref.detach(1);
+      fixture.detectChanges();
+      expect(vcRefDir.vcref.length).toEqual(2);
+
+      vcRefDir.vcref.clear();
+      fixture.detectChanges();
+      expect(vcRefDir.vcref.length).toEqual(0);
+    });
+  });
+
+  describe('get and indexOf', () => {
+
+    beforeEach(() => {
+      TestBed.configureTestingModule({declarations: [EmbeddedViewInsertionComp, VCRefDirective]});
+    });
+
+    it('should retrieve a ViewRef from its index, and vice versa', () => {
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      vcRefDir.createView('A');
+      vcRefDir.createView('B');
+      vcRefDir.createView('C');
+      fixture.detectChanges();
+
+      let viewRef = vcRefDir.vcref.get(0);
+      expect(vcRefDir.vcref.indexOf(viewRef !)).toEqual(0);
+
+      viewRef = vcRefDir.vcref.get(1);
+      expect(vcRefDir.vcref.indexOf(viewRef !)).toEqual(1);
+
+      viewRef = vcRefDir.vcref.get(2);
+      expect(vcRefDir.vcref.indexOf(viewRef !)).toEqual(2);
+    });
+
+    it('should handle out of bounds cases', () => {
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      vcRefDir.createView('A');
+      fixture.detectChanges();
+
+      expect(vcRefDir.vcref.get(-1)).toBeNull();
+      expect(vcRefDir.vcref.get(42)).toBeNull();
+
+      const viewRef = vcRefDir.vcref.get(0);
+      vcRefDir.vcref.remove(0);
+      expect(vcRefDir.vcref.indexOf(viewRef !)).toEqual(-1);
+    });
+  });
+
+  describe('move', () => {
+    it('should move embedded views and associated DOM nodes without recreating them', () => {
+      TestBed.configureTestingModule({declarations: [EmbeddedViewInsertionComp, VCRefDirective]});
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      vcRefDir.createView('A');
+      vcRefDir.createView('B');
+      vcRefDir.createView('C');
+
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABC');
+
+      // The DOM is manually modified here to ensure that the text node is actually moved
+      fixture.nativeElement.childNodes[2].nodeValue = '**A**';
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>**A**BC');
+
+      let viewRef = vcRefDir.vcref.get(0);
+      vcRefDir.vcref.move(viewRef !, 2);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>BC**A**');
+
+      vcRefDir.vcref.move(viewRef !, 0);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>**A**BC');
+
+      vcRefDir.vcref.move(viewRef !, 1);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>B**A**C');
+
+      // Invalid indices when detaching throws an exception in Ivy: FW-1330.
+      ivyEnabled && expect(() => vcRefDir.vcref.move(viewRef !, -1)).toThrow();
+      ivyEnabled && expect(() => vcRefDir.vcref.move(viewRef !, 42)).toThrow();
+    });
+  });
+
+  describe('getters', () => {
+    it('should work on templates', () => {
+      @Component({
+        template: `
+          <ng-template vcref let-name>{{name}}</ng-template>
+          <footer></footer>
+        `
+      })
+      class TestComponent {
+        @ViewChild(VCRefDirective, {static: true}) vcRefDir !: VCRefDirective;
+      }
+
+      TestBed.configureTestingModule({declarations: [VCRefDirective, TestComponent]});
+      const fixture = TestBed.createComponent(TestComponent);
+      const {vcRefDir} = fixture.componentInstance;
+      fixture.detectChanges();
+
+      expect(vcRefDir.vcref.element.nativeElement.nodeType).toBe(Node.COMMENT_NODE);
+      // In Ivy, the comment for the view container ref has text that implies
+      // that the comment is a placeholder for a container.
+      ivyEnabled && expect(vcRefDir.vcref.element.nativeElement.textContent).toEqual('container');
+
+      expect(vcRefDir.vcref.injector.get(ElementRef).nativeElement.textContent);
+      expect(getElementHtml(vcRefDir.vcref.parentInjector.get(ElementRef).nativeElement))
+          .toBe('<footer></footer>');
+    });
+  });
+
+  describe('detach', () => {
+
+    beforeEach(() => {
+      TestBed.configureTestingModule({declarations: [EmbeddedViewInsertionComp, VCRefDirective]});
+
+      // Tests depend on perf counters when running with Ivy. In order to have
+      // clean perf counters at the beginning of a test, we reset those here.
+      ivyEnabled && ngDevModeResetPerfCounters();
+    });
+
+    it('should detach the right embedded view when an index is specified', () => {
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      const viewA = vcRefDir.createView('A');
+      vcRefDir.createView('B');
+      vcRefDir.createView('C');
+      const viewD = vcRefDir.createView('D');
+      vcRefDir.createView('E');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCDE');
+
+      vcRefDir.vcref.detach(3);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCE');
+      expect(viewD.destroyed).toBeFalsy();
+
+      vcRefDir.vcref.detach(0);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>BCE');
+      expect(viewA.destroyed).toBeFalsy();
+
+      // Invalid indices when detaching throws an exception in Ivy: FW-1330.
+      ivyEnabled && expect(() => vcRefDir.vcref.detach(-1)).toThrow();
+      ivyEnabled && expect(() => vcRefDir.vcref.detach(42)).toThrow();
+      ivyEnabled && expect(ngDevMode !.rendererDestroyNode).toBe(0);
+    });
+
+    it('should detach the last embedded view when no index is specified', () => {
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      vcRefDir.createView('A');
+      vcRefDir.createView('B');
+      vcRefDir.createView('C');
+      vcRefDir.createView('D');
+      const viewE = vcRefDir.createView('E');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCDE');
+
+      vcRefDir.vcref.detach();
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCD');
+      expect(viewE.destroyed).toBeFalsy();
+      ivyEnabled && expect(ngDevMode !.rendererDestroyNode).toBe(0);
+    });
+  });
+
+  describe('remove', () => {
+    beforeEach(() => {
+      TestBed.configureTestingModule({declarations: [EmbeddedViewInsertionComp, VCRefDirective]});
+
+      const _origRendererFactory = TestBed.get(RendererFactory2) as RendererFactory2;
+      const _origCreateRenderer = _origRendererFactory.createRenderer;
+
+      _origRendererFactory.createRenderer = function() {
+        const renderer = _origCreateRenderer.apply(_origRendererFactory, arguments);
+        renderer.destroyNode = () => {};
+        return renderer;
+      };
+
+      // Tests depend on perf counters when running with Ivy. In order to have
+      // clean perf counters at the beginning of a test, we reset those here.
+      ivyEnabled && ngDevModeResetPerfCounters();
+    });
+
+    it('should remove the right embedded view when an index is specified', () => {
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      const viewA = vcRefDir.createView('A');
+      vcRefDir.createView('B');
+      vcRefDir.createView('C');
+      const viewD = vcRefDir.createView('D');
+      vcRefDir.createView('E');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCDE');
+
+      vcRefDir.vcref.remove(3);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCE');
+      expect(viewD.destroyed).toBeTruthy();
+
+      vcRefDir.vcref.remove(0);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>BCE');
+      expect(viewA.destroyed).toBeTruthy();
+
+      // Invalid indices when detaching throws an exception in Ivy: FW-1330.
+      ivyEnabled && expect(() => vcRefDir.vcref.remove(-1)).toThrow();
+      ivyEnabled && expect(() => vcRefDir.vcref.remove(42)).toThrow();
+      ivyEnabled && expect(ngDevMode !.rendererDestroyNode).toBe(2);
+    });
+
+    it('should remove the last embedded view when no index is specified', () => {
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      vcRefDir.createView('A');
+      vcRefDir.createView('B');
+      vcRefDir.createView('C');
+      vcRefDir.createView('D');
+      const viewE = vcRefDir.createView('E');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCDE');
+
+      vcRefDir.vcref.remove();
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>ABCD');
+      expect(viewE.destroyed).toBeTruthy();
+      ivyEnabled && expect(ngDevMode !.rendererDestroyNode).toBe(1);
+    });
+
+    it('should throw when trying to insert a removed or destroyed view', () => {
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      const viewA = vcRefDir.createView('A');
+      const viewB = vcRefDir.createView('B');
+      fixture.detectChanges();
+
+      vcRefDir.vcref.remove();
+      fixture.detectChanges();
+      expect(() => vcRefDir.vcref.insert(viewB)).toThrow();
+
+      viewA.destroy();
+      fixture.detectChanges();
+      expect(() => vcRefDir.vcref.insert(viewA)).toThrow();
+    });
+  });
+
+  describe('createEmbeddedView (incl. insert)', () => {
+    it('should work on elements', () => {
+      @Component({
+        template: `
+        <ng-template #tplRef let-name>{{name}}</ng-template>
+        <header vcref [tplRef]="tplRef"></header>
+        <footer></footer>
+      `,
+      })
+      class TestComponent {
+      }
+
+      TestBed.configureTestingModule({declarations: [TestComponent, VCRefDirective]});
+
+      const fixture = TestBed.createComponent(TestComponent);
+      const vcRef =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header vcref=""></header><footer></footer>');
+
+      vcRef.createView('A');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header vcref=""></header>A<footer></footer>');
+
+      vcRef.createView('B');
+      vcRef.createView('C');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header vcref=""></header>ABC<footer></footer>');
+
+      vcRef.createView('Y', 0);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header vcref=""></header>YABC<footer></footer>');
+
+      // Invalid indices when detaching throws an exception in Ivy: FW-1330.
+      ivyEnabled && expect(() => vcRef.createView('Z', -1)).toThrow();
+      ivyEnabled && expect(() => vcRef.createView('Z', 5)).toThrow();
+    });
+
+    it('should work on components', () => {
+      @Component({selector: 'header-cmp', template: ``})
+      class HeaderComponent {
+      }
+
+      @Component({
+        template: `
+          <ng-template #tplRef let-name>{{name}}</ng-template>
+          <header-cmp vcref [tplRef]="tplRef"></header-cmp>
+          <footer></footer>
+          `,
+      })
+      class TestComponent {
+      }
+
+      TestBed.configureTestingModule(
+          {declarations: [TestComponent, HeaderComponent, VCRefDirective]});
+      const fixture = TestBed.createComponent(TestComponent);
+      const vcRef =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header-cmp vcref=""></header-cmp><footer></footer>');
+
+      vcRef.createView('A');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header-cmp vcref=""></header-cmp>A<footer></footer>');
+
+      vcRef.createView('B');
+      vcRef.createView('C');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header-cmp vcref=""></header-cmp>ABC<footer></footer>');
+
+      vcRef.createView('Y', 0);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<header-cmp vcref=""></header-cmp>YABC<footer></footer>');
+
+      // Invalid indices when detaching throws an exception in Ivy: FW-1330.
+      ivyEnabled && expect(() => vcRef.createView('Z', -1)).toThrow();
+      ivyEnabled && expect(() => vcRef.createView('Z', 5)).toThrow();
+    });
+
+    it('should work with multiple instances of view container refs', () => {
+      @Component({
+        template: `
+          <ng-template #tplRef let-name>{{name}}</ng-template>
+          <div vcref [tplRef]="tplRef"></div>
+          <div vcref [tplRef]="tplRef"></div>
+        `,
+      })
+      class TestComponent {
+      }
+
+      TestBed.configureTestingModule({declarations: [TestComponent, VCRefDirective]});
+      const fixture = TestBed.createComponent(TestComponent);
+      const vcRefs = fixture.debugElement.queryAll(By.directive(VCRefDirective))
+                         .map(debugEl => debugEl.injector.get(VCRefDirective));
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<div vcref=""></div><div vcref=""></div>');
+
+      vcRefs[0].createView('A');
+      vcRefs[1].createView('B');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<div vcref=""></div>A<div vcref=""></div>B');
+    });
+
+    it('should work on templates', () => {
+      @Component({
+        template: `
+          <ng-template vcref #tplRef [tplRef]="tplRef" let-name>{{name}}</ng-template>
+          <footer></footer>
+        `
+      })
+      class TestComponent {
+        @ViewChild(VCRefDirective, {static: true}) vcRef !: VCRefDirective;
+      }
+
+      TestBed.configureTestingModule({declarations: [TestComponent, VCRefDirective]});
+      const fixture = TestBed.createComponent(TestComponent);
+      fixture.detectChanges();
+      const {vcRef} = fixture.componentInstance;
+
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<footer></footer>');
+
+      vcRef.createView('A');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('A<footer></footer>');
+
+      vcRef.createView('B');
+      vcRef.createView('C');
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('ABC<footer></footer>');
+
+      vcRef.createView('Y', 0);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('YABC<footer></footer>');
+
+      // Invalid indices when detaching throws an exception in Ivy: FW-1330.
+      ivyEnabled && expect(() => vcRef !.createView('Z', -1)).toThrow();
+      ivyEnabled && expect(() => vcRef !.createView('Z', 5)).toThrow();
+    });
+
+    it('should apply directives and pipes of the host view to the TemplateRef', () => {
+      @Component({selector: 'child', template: `{{name}}`})
+      class Child {
+        @Input() name: string|undefined;
+      }
+
+      @Pipe({name: 'starPipe'})
+      class StarPipe implements PipeTransform {
+        transform(value: any) { return `**${value}**`; }
+      }
+
+      @Component({
+        template: `
+            <ng-template #foo>
+              <child [name]="'C' | starPipe"></child>
+            </ng-template>
+            <child vcref [tplRef]="foo" [name]="'A' | starPipe"></child>
+            <child [name]="'B' | starPipe"></child>
+          `
+      })
+      class SomeComponent {
+      }
+
+      TestBed.configureTestingModule(
+          {declarations: [Child, StarPipe, SomeComponent, VCRefDirective]});
+      const fixture = TestBed.createComponent(SomeComponent);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      vcRefDir.vcref.createEmbeddedView(vcRefDir.tplRef !);
+      vcRefDir.vcref.createEmbeddedView(vcRefDir.tplRef !);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<child vcref="">**A**</child><child>**C**</child><child>**C**</child><child>**B**</child>');
+    });
+
+  });
+
+  describe('createComponent', () => {
+    let templateExecutionCounter = 0;
+
+    beforeEach(() => templateExecutionCounter = 0);
+
+    it('should work without Injector and NgModuleRef', () => {
+      @Component({selector: 'embedded-cmp', template: `foo`})
+      class EmbeddedComponent implements DoCheck, OnInit {
+        ngOnInit() { templateExecutionCounter++; }
+
+        ngDoCheck() { templateExecutionCounter++; }
+      }
+
+      @NgModule({entryComponents: [EmbeddedComponent], declarations: [EmbeddedComponent]})
+      class EmbeddedComponentModule {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [EmbeddedViewInsertionComp, VCRefDirective],
+        imports: [EmbeddedComponentModule]
+      });
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>');
+      expect(templateExecutionCounter).toEqual(0);
+
+      const componentRef =
+          vcRefDir.vcref.createComponent(vcRefDir.cfr.resolveComponentFactory(EmbeddedComponent));
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
+      expect(templateExecutionCounter).toEqual(2);
+
+      vcRefDir.vcref.detach(0);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>');
+      expect(templateExecutionCounter).toEqual(2);
+
+      vcRefDir.vcref.insert(componentRef.hostView);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
+      expect(templateExecutionCounter).toEqual(3);
+    });
+
+    it('should work with NgModuleRef and Injector', () => {
+      @Component({
+        selector: 'embedded-cmp',
+        template: `foo`,
+      })
+      class EmbeddedComponent implements DoCheck,
+          OnInit {
+        constructor(public s: String) {}
+
+        ngOnInit() { templateExecutionCounter++; }
+
+        ngDoCheck() { templateExecutionCounter++; }
+      }
+
+      @NgModule({entryComponents: [EmbeddedComponent], declarations: [EmbeddedComponent]})
+      class EmbeddedComponentModule {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [EmbeddedViewInsertionComp, VCRefDirective],
+        imports: [EmbeddedComponentModule]
+      });
+
+      @NgModule({
+        providers: [
+          {provide: String, useValue: 'root_module'},
+          // We need to provide the following tokens because otherwise view engine
+          // will throw when creating a component factory in debug mode.
+          {provide: Sanitizer, useValue: TestBed.get(Sanitizer)},
+          {provide: ErrorHandler, useValue: TestBed.get(ErrorHandler)},
+          {provide: RendererFactory2, useValue: TestBed.get(RendererFactory2)},
+        ]
+      })
+      class MyAppModule {
+      }
+
+      @NgModule({providers: [{provide: String, useValue: 'some_module'}]})
+      class SomeModule {
+      }
+
+      // Compile test modules in order to be able to pass the NgModuleRef or the
+      // module injector to the ViewContainerRef create component method.
+      const compiler = TestBed.get(Compiler) as Compiler;
+      const appModuleFactory = compiler.compileModuleSync(MyAppModule);
+      const someModuleFactory = compiler.compileModuleSync(SomeModule);
+      const appModuleRef = appModuleFactory.create(null);
+      const someModuleRef = someModuleFactory.create(null);
+
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>');
+      expect(templateExecutionCounter).toEqual(0);
+
+      let componentRef = vcRefDir.vcref.createComponent(
+          vcRefDir.cfr.resolveComponentFactory(EmbeddedComponent), 0, someModuleRef.injector);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
+      expect(templateExecutionCounter).toEqual(2);
+      expect(componentRef.instance.s).toEqual('some_module');
+
+      componentRef = vcRefDir.vcref.createComponent(
+          vcRefDir.cfr.resolveComponentFactory(EmbeddedComponent), 0, undefined, undefined,
+          appModuleRef);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<p vcref=""></p><embedded-cmp>foo</embedded-cmp><embedded-cmp>foo</embedded-cmp>');
+      expect(componentRef.instance.s).toEqual('root_module');
+      expect(templateExecutionCounter).toEqual(5);
+    });
+
+    it('should support projectable nodes', () => {
+      TestBed.configureTestingModule({
+        declarations: [EmbeddedViewInsertionComp, VCRefDirective],
+        imports: [EmbeddedComponentWithNgZoneModule]
+      });
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>');
+
+      const myNode = document.createElement('div');
+      const myText = document.createTextNode('bar');
+      const myText2 = document.createTextNode('baz');
+      myNode.appendChild(myText);
+      myNode.appendChild(myText2);
+
+      vcRefDir.vcref.createComponent(
+          vcRefDir.cfr.resolveComponentFactory(EmbeddedComponentWithNgContent), 0, undefined,
+          [[myNode]]);
+      fixture.detectChanges();
+
+      // With Ivy the projected content is inserted into the last ng-content container,
+      // while with View Engine the content is projected into the first ng-content slot.
+      // View Engine correctly respects the passed index of "projectedNodes". See: FW-1331.
+      if (ivyEnabled) {
+        expect(getElementHtml(fixture.nativeElement))
+            .toEqual(
+                '<p vcref=""></p><embedded-cmp-with-ngcontent><hr><div>barbaz</div></embedded-cmp-with-ngcontent>');
+      } else {
+        expect(getElementHtml(fixture.nativeElement))
+            .toEqual(
+                '<p vcref=""></p><embedded-cmp-with-ngcontent><div>barbaz</div><hr></embedded-cmp-with-ngcontent>');
+      }
+    });
+
+    it('should support reprojection of projectable nodes', () => {
+      @Component({
+        selector: 'reprojector',
+        template:
+            `<embedded-cmp-with-ngcontent><ng-content></ng-content></embedded-cmp-with-ngcontent>`,
+      })
+      class Reprojector {
+      }
+
+      @NgModule({
+        exports: [Reprojector, EmbeddedComponentWithNgContent],
+        declarations: [Reprojector, EmbeddedComponentWithNgContent],
+        entryComponents: [Reprojector]
+      })
+      class ReprojectorModule {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [EmbeddedViewInsertionComp, VCRefDirective],
+        imports: [ReprojectorModule]
+      });
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>');
+
+      const myNode = document.createElement('div');
+      const myText = document.createTextNode('bar');
+      const myText2 = document.createTextNode('baz');
+      myNode.appendChild(myText);
+      myNode.appendChild(myText2);
+
+      vcRefDir.vcref.createComponent(
+          vcRefDir.cfr.resolveComponentFactory(Reprojector), 0, undefined, [[myNode]]);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<p vcref=""></p><reprojector><embedded-cmp-with-ngcontent><hr><div>barbaz</div></embedded-cmp-with-ngcontent></reprojector>');
+    });
+
+    it('should support many projectable nodes with many slots', () => {
+      TestBed.configureTestingModule({
+        declarations: [EmbeddedViewInsertionComp, VCRefDirective],
+        imports: [EmbeddedComponentWithNgZoneModule]
+      });
+      const fixture = TestBed.createComponent(EmbeddedViewInsertionComp);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement)).toEqual('<p vcref=""></p>');
+
+      vcRefDir.vcref.createComponent(
+          vcRefDir.cfr.resolveComponentFactory(EmbeddedComponentWithNgContent), 0, undefined, [
+            [document.createTextNode('1'), document.createTextNode('2')],
+            [document.createTextNode('3'), document.createTextNode('4')]
+          ]);
+      fixture.detectChanges();
+
+      // With Ivy multi-slot projection is currently not working. This is a bug that
+      // is tracked with FW-1333.
+      if (ivyEnabled) {
+        expect(getElementHtml(fixture.nativeElement))
+            .toEqual(
+                '<p vcref=""></p><embedded-cmp-with-ngcontent><hr>12</embedded-cmp-with-ngcontent>');
+      } else {
+        expect(getElementHtml(fixture.nativeElement))
+            .toEqual(
+                '<p vcref=""></p><embedded-cmp-with-ngcontent>12<hr>34</embedded-cmp-with-ngcontent>');
+      }
+    });
+  });
+
+  describe('insertion points and declaration points', () => {
+    @Directive({selector: '[tplDir]'})
+    class InsertionDir {
+      @Input()
+      set tplDir(tpl: TemplateRef<any>|null) {
+        tpl ? this.vcr.createEmbeddedView(tpl) : this.vcr.clear();
+      }
+
+      constructor(public vcr: ViewContainerRef) {}
+    }
+
+    // see running stackblitz example: https://stackblitz.com/edit/angular-w3myy6
+    it('should work with a template declared in a different component view from insertion', () => {
+      @Component({selector: 'child', template: `<div [tplDir]="tpl">{{name}}</div>`})
+      class Child {
+        @Input() tpl: TemplateRef<any>|null = null;
+        name = 'Child';
+      }
+
+      @Component({
+        template: `
+          <ng-template #foo>
+            <div>{{name}}</div>
+          </ng-template>
+          
+          <child [tpl]="foo"></child>
+        `
+      })
+      class Parent {
+        name = 'Parent';
+      }
+
+      TestBed.configureTestingModule({declarations: [Child, Parent, InsertionDir]});
+      const fixture = TestBed.createComponent(Parent);
+      const child = fixture.debugElement.query(By.directive(Child)).componentInstance;
+      fixture.detectChanges();
+
+      // Context should be inherited from the declaration point, not the
+      // insertion point, so the template should read 'Parent'.
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(`<child><div>Child</div><div>Parent</div></child>`);
+
+      child.tpl = null;
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toEqual(`<child><div>Child</div></child>`);
+    });
+
+    // see running stackblitz example: https://stackblitz.com/edit/angular-3vplec
+    it('should work with nested for loops with different declaration / insertion points', () => {
+      @Component({
+        selector: 'loop-comp',
+        template: `
+          <ng-template ngFor [ngForOf]="rows" [ngForTemplate]="tpl">
+          </ng-template>
+        `,
+      })
+      class LoopComp {
+        @Input() tpl !: TemplateRef<any>;
+        @Input() rows !: any[];
+        name = 'Loop';
+      }
+
+      @Component({
+        template: `
+          <ng-template #rowTemplate let-row>
+            <ng-template #cellTemplate let-cell>
+              <div>{{cell}} - {{row.value}} - {{name}}</div>
+            </ng-template>
+            
+            <loop-comp [tpl]="cellTemplate" [rows]="row.data"></loop-comp>
+          </ng-template>
+          
+          <loop-comp [tpl]="rowTemplate" [rows]="rows"></loop-comp>
+        `,
+      })
+      class Parent {
+        name = 'Parent';
+        rows = [{data: ['1', '2'], value: 'one'}, {data: ['3', '4'], value: 'two'}];
+      }
+
+      TestBed.configureTestingModule({declarations: [LoopComp, Parent], imports: [CommonModule]});
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<loop-comp>' +
+              '<loop-comp><div>1 - one - Parent</div><div>2 - one - Parent</div></loop-comp>' +
+              '<loop-comp><div>3 - two - Parent</div><div>4 - two - Parent</div></loop-comp>' +
+              '</loop-comp>');
+
+      fixture.componentInstance.rows =
+          [{data: ['5', '6'], value: 'three'}, {data: ['7'], value: 'four'}];
+      fixture.componentInstance.name = 'New name!';
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<loop-comp>' +
+              '<loop-comp><div>5 - three - New name!</div><div>6 - three - New name!</div></loop-comp>' +
+              '<loop-comp><div>7 - four - New name!</div></loop-comp>' +
+              '</loop-comp>');
+    });
+
+  });
+
+  describe('lifecycle hooks', () => {
+
+    // Angular 5 reference: https://stackblitz.com/edit/lifecycle-hooks-vcref
+    const log: string[] = [];
+
+    @Component({selector: 'hooks', template: `{{name}}`})
+    class ComponentWithHooks {
+      @Input() name: string|undefined;
+
+      private log(msg: string) { log.push(msg); }
+
+      ngOnChanges() { this.log('onChanges-' + this.name); }
+      ngOnInit() { this.log('onInit-' + this.name); }
+      ngDoCheck() { this.log('doCheck-' + this.name); }
+
+      ngAfterContentInit() { this.log('afterContentInit-' + this.name); }
+      ngAfterContentChecked() { this.log('afterContentChecked-' + this.name); }
+
+      ngAfterViewInit() { this.log('afterViewInit-' + this.name); }
+      ngAfterViewChecked() { this.log('afterViewChecked-' + this.name); }
+
+      ngOnDestroy() { this.log('onDestroy-' + this.name); }
+    }
+
+    @NgModule({
+      declarations: [ComponentWithHooks],
+      exports: [ComponentWithHooks],
+      entryComponents: [ComponentWithHooks]
+    })
+    class ComponentWithHooksModule {
+    }
+
+    it('should call all hooks in correct order when creating with createEmbeddedView', () => {
+      @Component({
+        template: `
+          <ng-template #foo>
+            <hooks [name]="'C'"></hooks>
+          </ng-template>
+          <hooks vcref [tplRef]="foo" [name]="'A'"></hooks>
+          <hooks [name]="'B'"></hooks>
+        `
+      })
+      class SomeComponent {
+      }
+
+      log.length = 0;
+
+      TestBed.configureTestingModule({
+        declarations: [SomeComponent, ComponentWithHooks, VCRefDirective],
+      });
+      const fixture = TestBed.createComponent(SomeComponent);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'onChanges-A', 'onInit-A', 'doCheck-A', 'onChanges-B', 'onInit-B', 'doCheck-B',
+        'afterContentInit-A', 'afterContentChecked-A', 'afterContentInit-B',
+        'afterContentChecked-B', 'afterViewInit-A', 'afterViewChecked-A', 'afterViewInit-B',
+        'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      vcRefDir.vcref.createEmbeddedView(vcRefDir.tplRef !);
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<hooks vcref="">A</hooks><hooks></hooks><hooks>B</hooks>');
+      expect(log).toEqual([]);
+
+      log.length = 0;
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<hooks vcref="">A</hooks><hooks>C</hooks><hooks>B</hooks>');
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'onChanges-C', 'onInit-C', 'doCheck-C', 'afterContentInit-C',
+        'afterContentChecked-C', 'afterViewInit-C', 'afterViewChecked-C', 'afterContentChecked-A',
+        'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'doCheck-C', 'afterContentChecked-C', 'afterViewChecked-C',
+        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      const viewRef = vcRefDir.vcref.detach(0);
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      vcRefDir.vcref.insert(viewRef !);
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'doCheck-C', 'afterContentChecked-C', 'afterViewChecked-C',
+        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      vcRefDir.vcref.remove(0);
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'onDestroy-C', 'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+    });
+
+    it('should call all hooks in correct order when creating with createComponent', () => {
+      @Component({
+        template: `
+          <hooks vcref [name]="'A'"></hooks>
+          <hooks [name]="'B'"></hooks>
+        `
+      })
+      class SomeComponent {
+      }
+
+      log.length = 0;
+
+      TestBed.configureTestingModule(
+          {declarations: [SomeComponent, VCRefDirective], imports: [ComponentWithHooksModule]});
+      const fixture = TestBed.createComponent(SomeComponent);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'onChanges-A', 'onInit-A', 'doCheck-A', 'onChanges-B', 'onInit-B', 'doCheck-B',
+        'afterContentInit-A', 'afterContentChecked-A', 'afterContentInit-B',
+        'afterContentChecked-B', 'afterViewInit-A', 'afterViewChecked-A', 'afterViewInit-B',
+        'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      const componentRef =
+          vcRefDir.vcref.createComponent(vcRefDir.cfr.resolveComponentFactory(ComponentWithHooks));
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<hooks vcref="">A</hooks><hooks></hooks><hooks>B</hooks>');
+      expect(log).toEqual([]);
+
+      componentRef.instance.name = 'D';
+      log.length = 0;
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<hooks vcref="">A</hooks><hooks>D</hooks><hooks>B</hooks>');
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'onInit-D', 'doCheck-D', 'afterContentInit-D',
+        'afterContentChecked-D', 'afterViewInit-D', 'afterViewChecked-D', 'afterContentChecked-A',
+        'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'doCheck-D', 'afterContentChecked-D', 'afterViewChecked-D',
+        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      const viewRef = vcRefDir.vcref.detach(0);
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      vcRefDir.vcref.insert(viewRef !);
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'doCheck-A', 'doCheck-B', 'doCheck-D', 'afterContentChecked-D', 'afterViewChecked-D',
+        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+
+      log.length = 0;
+      vcRefDir.vcref.remove(0);
+      fixture.detectChanges();
+      expect(log).toEqual([
+        'onDestroy-D', 'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
+        'afterViewChecked-A', 'afterViewChecked-B'
+      ]);
+    });
+  });
+
+  describe('host bindings', () => {
+
+    it('should support host bindings on dynamically created components', () => {
+      @Component(
+          {selector: 'host-bindings', host: {'id': 'attribute', '[title]': 'title'}, template: ``})
+      class HostBindingCmpt {
+        title = 'initial';
+      }
+
+      @Component({template: `<ng-template vcref></ng-template>`})
+      class TestComponent {
+        @ViewChild(VCRefDirective, {static: true}) vcRefDir !: VCRefDirective;
+      }
+
+      @NgModule({declarations: [HostBindingCmpt], entryComponents: [HostBindingCmpt]})
+      class TestModule {
+      }
+
+      TestBed.configureTestingModule(
+          {declarations: [TestComponent, VCRefDirective], imports: [TestModule]});
+      const fixture = TestBed.createComponent(TestComponent);
+      const {vcRefDir} = fixture.componentInstance;
+
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement)).toBe('');
+
+      const componentRef =
+          vcRefDir.vcref.createComponent(vcRefDir.cfr.resolveComponentFactory(HostBindingCmpt));
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.children[0].tagName).toBe('HOST-BINDINGS');
+      expect(fixture.nativeElement.children[0].getAttribute('id')).toBe('attribute');
+      expect(fixture.nativeElement.children[0].getAttribute('title')).toBe('initial');
+
+      componentRef.instance.title = 'changed';
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.children[0].tagName).toBe('HOST-BINDINGS');
+      expect(fixture.nativeElement.children[0].getAttribute('id')).toBe('attribute');
+      expect(fixture.nativeElement.children[0].getAttribute('title')).toBe('changed');
+    });
+
+  });
+
+  describe('projection', () => {
+
+    it('should project the ViewContainerRef content along its host, in an element', () => {
+      @Component({selector: 'child', template: '<div><ng-content></ng-content></div>'})
+      class Child {
+      }
+
+      @Component({
+        selector: 'parent',
+        template: `
+          <ng-template #foo>
+            <span>{{name}}</span>
+          </ng-template>
+          
+          <child>
+            <header vcref [tplRef]="foo" [name]="name">blah</header>
+          </child>`
+      })
+      class Parent {
+        name: string = 'bar';
+      }
+
+      TestBed.configureTestingModule({declarations: [Child, Parent, VCRefDirective]});
+      const fixture = TestBed.createComponent(Parent);
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<child><div><header vcref="">blah</header></div></child>');
+
+      vcRefDir.vcref.createEmbeddedView(vcRefDir.tplRef !);
+      fixture.detectChanges();
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual('<child><div><header vcref="">blah</header><span>bar</span></div></child>');
+    });
+
+    it('should project the ViewContainerRef content along its host, in a view', () => {
+      @Component({
+        selector: 'child-with-view',
+        template: `Before (inside)-<ng-content *ngIf="show"></ng-content>-After (inside)`
+      })
+      class ChildWithView {
+        show: boolean = true;
+      }
+
+      @Component({
+        selector: 'parent',
+        template: `
+          <ng-template #foo>
+            <span>{{name}}</span>
+          </ng-template>
+          <child-with-view>
+            Before projected
+            <header vcref [tplRef]="foo" [name]="name">blah</header>
+            After projected
+          </child-with-view>`
+      })
+      class Parent {
+        name: string = 'bar';
+      }
+
+      TestBed.configureTestingModule({declarations: [ChildWithView, Parent, VCRefDirective]});
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+      const vcRefDir =
+          fixture.debugElement.query(By.directive(VCRefDirective)).injector.get(VCRefDirective);
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<child-with-view>Before (inside)- Before projected <header vcref="">blah</header> After projected -After (inside)</child-with-view>');
+
+      vcRefDir.vcref.createEmbeddedView(vcRefDir.tplRef !);
+      fixture.detectChanges();
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<child-with-view>Before (inside)- Before projected <header vcref="">blah</header><span>bar</span> After projected -After (inside)</child-with-view>');
+    });
+
+    describe('with select', () => {
+
+      @Component({
+        selector: 'child-with-selector',
+        template: `
+          <p class="a"><ng-content select="header"></ng-content></p>
+          <p class="b"><ng-content></ng-content></p>`,
+      })
+      class ChildWithSelector {
+      }
+
+      it('should project the ViewContainerRef content along its host, when the host matches a selector',
+         () => {
+           @Component({
+             selector: 'parent',
+             template: `
+            <ng-template #foo>
+              <span>{{name}}</span>
+            </ng-template>
+            <child-with-selector>
+              <header vcref [tplRef]="foo" [name]="name">blah</header>
+            </child-with-selector>
+          `
+           })
+           class Parent {
+             name: string = 'bar';
+           }
+
+           TestBed.configureTestingModule(
+               {declarations: [Parent, ChildWithSelector, VCRefDirective]});
+           const fixture = TestBed.createComponent(Parent);
+           const vcRefDir = fixture.debugElement.query(By.directive(VCRefDirective))
+                                .injector.get(VCRefDirective);
+           fixture.detectChanges();
+
+           expect(getElementHtml(fixture.nativeElement))
+               .toEqual(
+                   '<child-with-selector><p class="a"><header vcref="">blah</header></p><p class="b"></p></child-with-selector>');
+
+           vcRefDir.vcref.createEmbeddedView(vcRefDir.tplRef !);
+           fixture.detectChanges();
+
+           expect(getElementHtml(fixture.nativeElement))
+               .toEqual(
+                   '<child-with-selector><p class="a"><header vcref="">blah</header><span>bar</span></p><p class="b"></p></child-with-selector>');
+         });
+
+      it('should not project the ViewContainerRef content, when the host does not match a selector',
+         () => {
+           @Component({
+             selector: 'parent',
+             template: `
+            <ng-template #foo>
+              <span>{{name}}</span>
+            </ng-template>
+            <child-with-selector>
+              <footer vcref [tplRef]="foo" [name]="name">blah</footer>
+            </child-with-selector>
+          `
+           })
+           class Parent {
+             name: string = 'bar';
+           }
+
+           TestBed.configureTestingModule(
+               {declarations: [Parent, ChildWithSelector, VCRefDirective]});
+           const fixture = TestBed.createComponent(Parent);
+           const vcRefDir = fixture.debugElement.query(By.directive(VCRefDirective))
+                                .injector.get(VCRefDirective);
+           fixture.detectChanges();
+
+           expect(getElementHtml(fixture.nativeElement))
+               .toEqual(
+                   '<child-with-selector><p class="a"></p><p class="b"><footer vcref="">blah</footer></p></child-with-selector>');
+
+           vcRefDir.vcref.createEmbeddedView(vcRefDir.tplRef !);
+           fixture.detectChanges();
+
+           expect(getElementHtml(fixture.nativeElement))
+               .toEqual(
+                   '<child-with-selector><p class="a"></p><p class="b"><footer vcref="">blah</footer><span>bar</span></p></child-with-selector>');
+         });
+    });
+
+  });
+
+  describe('root view container ref', () => {
+    let containerEl: HTMLElement|null = null;
+
+    beforeEach(() => containerEl = null);
+
+    /**
+     * Creates a new test component renderer instance that wraps the root element
+     * in another element. This allows us to test if elements have been inserted into
+     * the parent element of the root component.
+     */
+    function createTestComponentRenderer(document: any): TestComponentRenderer {
+      return {
+        insertRootElement(rootElementId: string) {
+          const rootEl = document.createElement('div');
+          rootEl.id = rootElementId;
+
+          containerEl = document.createElement('div');
+          document.body.appendChild(containerEl);
+          containerEl !.appendChild(rootEl);
+        }
+      };
+    }
+
+    const TEST_COMPONENT_RENDERER = {
+      provide: TestComponentRenderer,
+      useFactory: createTestComponentRenderer,
+      deps: [DOCUMENT]
+    };
+
+    it('should check bindings for components dynamically created by root component', () => {
+      @Component({
+        selector: 'dynamic-cmpt-with-bindings',
+        template: `check count: {{checkCount}}`,
+      })
+      class DynamicCompWithBindings implements DoCheck {
+        checkCount = 0;
+
+        ngDoCheck() { this.checkCount++; }
+      }
+
+      @Component({template: ``})
+      class TestComp {
+        constructor(public vcRef: ViewContainerRef, public cfResolver: ComponentFactoryResolver) {}
+      }
+
+      @NgModule(
+          {entryComponents: [DynamicCompWithBindings], declarations: [DynamicCompWithBindings]})
+      class DynamicCompWithBindingsModule {
+      }
+
+
+      TestBed.configureTestingModule({
+        declarations: [TestComp],
+        imports: [DynamicCompWithBindingsModule],
+        providers: [TEST_COMPONENT_RENDERER]
+      });
+      const fixture = TestBed.createComponent(TestComp);
+      const {vcRef, cfResolver} = fixture.componentInstance;
+      fixture.detectChanges();
+
+      // Ivy inserts a comment for the root view container ref instance. This is not
+      // the case for view engine and we need to adjust the assertions.
+      expect(containerEl !.childNodes.length).toBe(ivyEnabled ? 2 : 1);
+      ivyEnabled && expect(containerEl !.childNodes[1].nodeType).toBe(Node.COMMENT_NODE);
+
+      expect((containerEl !.childNodes[0] as Element).tagName).toBe('DIV');
+
+      vcRef.createComponent(cfResolver.resolveComponentFactory(DynamicCompWithBindings));
+      fixture.detectChanges();
+
+      expect(containerEl !.childNodes.length).toBe(ivyEnabled ? 3 : 2);
+      expect(containerEl !.childNodes[1].textContent).toBe('check count: 1');
+
+      fixture.detectChanges();
+
+      expect(containerEl !.childNodes.length).toBe(ivyEnabled ? 3 : 2);
+      expect(containerEl !.childNodes[1].textContent).toBe('check count: 2');
+    });
+
+    it('should create deep DOM tree immediately for dynamically created components', () => {
+      @Component({template: ``})
+      class TestComp {
+        constructor(public vcRef: ViewContainerRef, public cfResolver: ComponentFactoryResolver) {}
+      }
+
+      @Component({selector: 'child', template: `<div>{{name}}</div>`})
+      class Child {
+        name = 'text';
+      }
+
+      @Component({selector: 'dynamic-cmpt-with-children', template: `<child></child>`})
+      class DynamicCompWithChildren {
+      }
+
+      @NgModule({
+        entryComponents: [DynamicCompWithChildren],
+        declarations: [DynamicCompWithChildren, Child]
+      })
+      class DynamicCompWithChildrenModule {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [TestComp],
+        imports: [DynamicCompWithChildrenModule],
+        providers: [TEST_COMPONENT_RENDERER]
+      });
+
+      const fixture = TestBed.createComponent(TestComp);
+      const {vcRef, cfResolver} = fixture.componentInstance;
+      fixture.detectChanges();
+
+      // Ivy inserts a comment for the root view container ref instance. This is not
+      // the case for view engine and we need to adjust the assertions.
+      expect(containerEl !.childNodes.length).toBe(ivyEnabled ? 2 : 1);
+      ivyEnabled && expect(containerEl !.childNodes[1].nodeType).toBe(Node.COMMENT_NODE);
+
+      expect((containerEl !.childNodes[0] as Element).tagName).toBe('DIV');
+
+      vcRef.createComponent(cfResolver.resolveComponentFactory(DynamicCompWithChildren));
+
+      expect(containerEl !.childNodes.length).toBe(ivyEnabled ? 3 : 2);
+      expect(getElementHtml(containerEl !.childNodes[1] as Element))
+          .toBe('<child><div></div></child>');
+
+      fixture.detectChanges();
+
+      expect(containerEl !.childNodes.length).toBe(ivyEnabled ? 3 : 2);
+      expect(getElementHtml(containerEl !.childNodes[1] as Element))
+          .toBe(`<child><div>text</div></child>`);
+    });
+  });
 });
 
+@Component({
+  template: `
+    <ng-template #tplRef let-name>{{name}}</ng-template>
+    <p vcref [tplRef]="tplRef"></p>
+  `,
+})
+class EmbeddedViewInsertionComp {
+}
+
+@Directive({
+  selector: '[vcref]',
+})
+class VCRefDirective {
+  @Input() tplRef: TemplateRef<any>|undefined;
+  @Input() name: string = '';
+
+  // Injecting the ViewContainerRef to create a dynamic container in which
+  // embedded views will be created
+  constructor(public vcref: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
+
+  createView(s: string, index?: number): EmbeddedViewRef<any> {
+    if (!this.tplRef) {
+      throw new Error('No template reference passed to directive.');
+    }
+
+    return this.vcref.createEmbeddedView(this.tplRef, {$implicit: s}, index);
+  }
+}
+
+@Component({
+  selector: `embedded-cmp-with-ngcontent`,
+  template: `<ng-content></ng-content><hr><ng-content></ng-content>`
+})
+class EmbeddedComponentWithNgContent {
+}
+
+@NgModule({
+  exports: [EmbeddedComponentWithNgContent],
+  entryComponents: [EmbeddedComponentWithNgContent],
+  declarations: [EmbeddedComponentWithNgContent],
+})
+class EmbeddedComponentWithNgZoneModule {
+}
+
 @Component({
   selector: 'view-container-ref-comp',
   template: `
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index d0c1462cd7..bfdadb8472 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -6,23 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ComponentRef, ΔdefineInjector, ElementRef, EmbeddedViewRef, NgModuleRef, Pipe, PipeTransform, QueryList, RendererFactory2, TemplateRef, ViewContainerRef, ViewRef, ɵAPP_ROOT as APP_ROOT, ɵNgModuleDef as NgModuleDef,} from '../../src/core';
-import {createInjector} from '../../src/di/r3_injector';
+import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ComponentRef, ElementRef, QueryList, TemplateRef, ViewContainerRef, ViewRef,} from '../../src/core';
 import {ViewEncapsulation} from '../../src/metadata';
-import {AttributeMarker, ΔdefineComponent, ΔdefineDirective, ΔdefinePipe, injectComponentFactoryResolver, Δlistener, ΔloadViewQuery, ΔNgOnChangesFeature, ΔqueryRefresh, ΔviewQuery,} from '../../src/render3/index';
+import {injectComponentFactoryResolver, ΔdefineComponent, ΔdefineDirective, Δlistener, ΔloadViewQuery, ΔqueryRefresh, ΔviewQuery,} from '../../src/render3/index';
 
-import {ΔallocHostVars, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementHostAttrs, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δinterpolation3, ΔnextContext, Δprojection, ΔprojectionDef, Δreference, Δtemplate, Δtext, ΔtextBinding,} from '../../src/render3/instructions/all';
+import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtemplate, Δtext,} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {RElement} from '../../src/render3/interfaces/renderer';
-import {NgModuleFactory} from '../../src/render3/ng_module_ref';
-import {Δpipe, ΔpipeBind1} from '../../src/render3/pipe';
 import {getLView} from '../../src/render3/state';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
-import {ΔtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
-import {NgForOf} from '../../test/render3/common_with_def';
-
-import {getRendererFactory2} from './imported_renderer2';
-import {ComponentFixture, createComponent, getDirectiveOnNode, TemplateFixture,} from './render_util';
+import {ComponentFixture, createComponent, TemplateFixture,} from './render_util';
 
 const Component: typeof _Component = function(...args: any[]): any {
   // In test we use @Component for documentation only so it's safe to mock out the implementation.
@@ -56,184 +49,8 @@ describe('ViewContainerRef', () => {
   }
 
   describe('API', () => {
-    /**
-     * {{name}}
-     */
-    function embeddedTemplate(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        Δtext(0);
-      }
-      if (rf & RenderFlags.Update) {
-        ΔtextBinding(0, Δbind(ctx.name));
-      }
-    }
-
-    function createView(s: string, index?: number): EmbeddedViewRef<any> {
-      return directiveInstance !.vcref.createEmbeddedView(
-          directiveInstance !.tplRef, {name: s}, index);
-    }
-
-    /**
-     * <ng-template #tplRef>{{name}}</ng-template>
-     * <p vcref [tplRef]="tplRef"></p>
-     */
-    function createTemplate() {
-      Δtemplate(
-          0, embeddedTemplate, 1, 1, 'ng-template', null, ['tplRef', ''], ΔtemplateRefExtractor);
-      Δelement(2, 'p', ['vcref', '']);
-    }
-
-    function updateTemplate() {
-      const tplRef = Δreference(1);
-      ΔelementProperty(2, 'tplRef', Δbind(tplRef));
-    }
 
     describe('createEmbeddedView (incl. insert)', () => {
-      it('should work on elements', () => {
-        /**
-         * <ng-template #tplRef>{{name}}</ng-template>
-         * <header vcref [tplRef]="tplRef"></header>
-         * <footer></footer>
-         */
-        function createTemplate() {
-          Δtemplate(
-              0, embeddedTemplate, 1, 1, 'ng-template', null, ['tplRef', ''],
-              ΔtemplateRefExtractor);
-          Δelement(2, 'header', ['vcref', '']);
-          Δelement(3, 'footer');
-        }
-
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 4, 1, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<header vcref=""></header><footer></footer>');
-
-        createView('A');
-        fixture.update();
-        expect(fixture.html).toEqual('<header vcref=""></header>A<footer></footer>');
-
-        createView('B');
-        createView('C');
-        fixture.update();
-        expect(fixture.html).toEqual('<header vcref=""></header>ABC<footer></footer>');
-
-        createView('Y', 0);
-        fixture.update();
-        expect(fixture.html).toEqual('<header vcref=""></header>YABC<footer></footer>');
-
-        expect(() => { createView('Z', -1); }).toThrow();
-        expect(() => { createView('Z', 5); }).toThrow();
-      });
-
-      it('should work on components', () => {
-        const HeaderComponent =
-            createComponent('header-cmp', function(rf: RenderFlags, ctx: any) {});
-
-        /**
-         * <ng-template #tplRef>{{name}}</ng-template>
-         * <header-cmp vcref [tplRef]="tplRef"></header-cmp>
-         * <footer></footer>
-         */
-        function createTemplate() {
-          Δtemplate(
-              0, embeddedTemplate, 1, 1, 'ng-template', [], ['tplRef', ''], ΔtemplateRefExtractor);
-          Δelement(2, 'header-cmp', ['vcref', '']);
-          Δelement(3, 'footer');
-        }
-
-        const fixture = new TemplateFixture(
-            createTemplate, updateTemplate, 4, 1, [HeaderComponent, DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<header-cmp vcref=""></header-cmp><footer></footer>');
-
-        createView('A');
-        fixture.update();
-        expect(fixture.html).toEqual('<header-cmp vcref=""></header-cmp>A<footer></footer>');
-
-        createView('B');
-        createView('C');
-        fixture.update();
-        expect(fixture.html).toEqual('<header-cmp vcref=""></header-cmp>ABC<footer></footer>');
-
-        createView('Y', 0);
-        fixture.update();
-        expect(fixture.html).toEqual('<header-cmp vcref=""></header-cmp>YABC<footer></footer>');
-
-        expect(() => { createView('Z', -1); }).toThrow();
-        expect(() => { createView('Z', 5); }).toThrow();
-      });
-
-      it('should work with multiple instances with vcrefs', () => {
-        let firstDir: DirectiveWithVCRef;
-        let secondDir: DirectiveWithVCRef;
-
-        /**
-         * <ng-template #tplRef>{{name}}</ng-template>
-         * <div vcref [tplRef]="tplRef"></div>
-         * <div vcref [tplRef]="tplRef"></div>
-         */
-        function createTemplate() {
-          Δtemplate(
-              0, embeddedTemplate, 1, 1, 'ng-template', null, ['tplRef', ''],
-              ΔtemplateRefExtractor);
-          Δelement(2, 'div', ['vcref', '']);
-          Δelement(3, 'div', ['vcref', '']);
-
-          // for testing only:
-          firstDir = getDirectiveOnNode(2);
-          secondDir = getDirectiveOnNode(3);
-        }
-
-        function update() {
-          const tplRef = Δreference(1);
-          ΔelementProperty(2, 'tplRef', Δbind(tplRef));
-          ΔelementProperty(3, 'tplRef', Δbind(tplRef));
-        }
-
-        const fixture = new TemplateFixture(createTemplate, update, 4, 2, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<div vcref=""></div><div vcref=""></div>');
-
-        firstDir !.vcref.createEmbeddedView(firstDir !.tplRef, {name: 'A'});
-        secondDir !.vcref.createEmbeddedView(secondDir !.tplRef, {name: 'B'});
-        fixture.update();
-        expect(fixture.html).toEqual('<div vcref=""></div>A<div vcref=""></div>B');
-      });
-
-      it('should work on templates', () => {
-        /**
-         * <ng-template vcref #tplRef>{{name}}</ng-template>
-         * <footer></footer>
-         */
-        function createTemplate() {
-          Δtemplate(
-              0, embeddedTemplate, 1, 1, 'ng-template', ['vcref', ''], ['tplRef', ''],
-              ΔtemplateRefExtractor);
-          Δelement(2, 'footer');
-        }
-
-        function updateTemplate() {
-          const tplRef = Δreference(1);
-          ΔelementProperty(0, 'tplRef', Δbind(tplRef));
-        }
-
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<footer></footer>');
-
-        createView('A');
-        fixture.update();
-        expect(fixture.html).toEqual('A<footer></footer>');
-
-        createView('B');
-        createView('C');
-        fixture.update();
-        expect(fixture.html).toEqual('ABC<footer></footer>');
-
-        createView('Y', 0);
-        fixture.update();
-        expect(fixture.html).toEqual('YABC<footer></footer>');
-
-        expect(() => { createView('Z', -1); }).toThrow();
-        expect(() => { createView('Z', 5); }).toThrow();
-      });
 
       it('should add embedded views at the right position in the DOM tree (ng-template next to other ng-template)',
          () => {
@@ -411,646 +228,11 @@ describe('ViewContainerRef', () => {
            expect(fixture.html).toEqual('before|AAB|after');
          });
 
-      it('should apply directives and pipes of the host view to the TemplateRef', () => {
-        @Component({selector: 'child', template: `{{name}}`})
-        class Child {
-          // TODO(issue/24571): remove '!'.
-          name !: string;
-
-          static ngComponentDef = ΔdefineComponent({
-            type: Child,
-            encapsulation: ViewEncapsulation.None,
-            selectors: [['child']],
-            factory: () => new Child(),
-            consts: 1,
-            vars: 1,
-            template: (rf: RenderFlags, cmp: Child) => {
-              if (rf & RenderFlags.Create) {
-                Δtext(0);
-              }
-              if (rf & RenderFlags.Update) {
-                ΔtextBinding(0, Δinterpolation1('', cmp.name, ''));
-              }
-            },
-            inputs: {name: 'name'}
-          });
-        }
-
-        @Pipe({name: 'starPipe'})
-        class StarPipe implements PipeTransform {
-          transform(value: any) { return `**${value}**`; }
-
-          static ngPipeDef = ΔdefinePipe({
-            name: 'starPipe',
-            type: StarPipe,
-            factory: function StarPipe_Factory() { return new StarPipe(); },
-          });
-        }
-
-        function SomeComponent_Template_0(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δelement(0, 'child');
-            Δpipe(1, 'starPipe');
-          }
-          if (rf & RenderFlags.Update) {
-            ΔelementProperty(0, 'name', Δbind(ΔpipeBind1(1, 1, 'C')));
-          }
-        }
-
-        @Component({
-          template: `
-            <ng-template #foo>
-              <child [name]="'C' | starPipe"></child>
-            </ng-template>
-            <child vcref [tplRef]="foo" [name]="'A' | starPipe"></child>
-            <child [name]="'B' | starPipe"></child>
-          `
-        })
-        class SomeComponent {
-          static ngComponentDef = ΔdefineComponent({
-            type: SomeComponent,
-            encapsulation: ViewEncapsulation.None,
-            selectors: [['some-comp']],
-            factory: () => new SomeComponent(),
-            consts: 6,
-            vars: 7,
-            template: (rf: RenderFlags, cmp: SomeComponent) => {
-              if (rf & RenderFlags.Create) {
-                Δtemplate(
-                    0, SomeComponent_Template_0, 2, 3, 'ng-template', [], ['foo', ''],
-                    ΔtemplateRefExtractor);
-                Δpipe(2, 'starPipe');
-                Δelement(3, 'child', ['vcref', '']);
-                Δpipe(4, 'starPipe');
-                Δelement(5, 'child');
-              }
-              if (rf & RenderFlags.Update) {
-                const tplRef = Δreference(1);
-                ΔelementProperty(3, 'tplRef', Δbind(tplRef));
-                ΔelementProperty(3, 'name', Δbind(ΔpipeBind1(2, 3, 'A')));
-                ΔelementProperty(5, 'name', Δbind(ΔpipeBind1(4, 5, 'B')));
-              }
-            },
-            directives: [Child, DirectiveWithVCRef],
-            pipes: [StarPipe]
-          });
-        }
-
-        const fixture = new ComponentFixture(SomeComponent);
-        directiveInstance !.vcref.createEmbeddedView(directiveInstance !.tplRef, fixture.component);
-        directiveInstance !.vcref.createEmbeddedView(directiveInstance !.tplRef, fixture.component);
-        fixture.update();
-        expect(fixture.html)
-            .toEqual(
-                '<child vcref="">**A**</child><child>**C**</child><child>**C**</child><child>**B**</child>');
-      });
-    });
-
-    describe('insertion points and declaration points', () => {
-      class InsertionDir {
-        // @Input()
-        set tplDir(tpl: TemplateRef<any>|null) {
-          tpl ? this.vcr.createEmbeddedView(tpl) : this.vcr.clear();
-        }
-
-        constructor(public vcr: ViewContainerRef) {}
-
-        static ngDirectiveDef = ΔdefineDirective({
-          type: InsertionDir,
-          selectors: [['', 'tplDir', '']],
-          factory: () => new InsertionDir(ΔdirectiveInject(ViewContainerRef as any)),
-          inputs: {tplDir: 'tplDir'}
-        });
-      }
-
-      // see running stackblitz example: https://stackblitz.com/edit/angular-w3myy6
-      it('should work with a template declared in a different component view from insertion',
-         () => {
-           let child: Child|null = null;
-
-           /**
-            * <div [tplDir]="tpl">{{ name }}</div>
-            * // template insertion point
-            */
-           class Child {
-             name = 'Child';
-             tpl: TemplateRef<any>|null = null;
-
-             static ngComponentDef = ΔdefineComponent({
-               type: Child,
-               encapsulation: ViewEncapsulation.None,
-               selectors: [['child']],
-               factory: () => child = new Child(),
-               consts: 2,
-               vars: 2,
-               template: function(rf: RenderFlags, ctx: any) {
-                 if (rf & RenderFlags.Create) {
-                   ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'tplDir']);
-                   { Δtext(1); }
-                   ΔelementEnd();
-                 }
-                 if (rf & RenderFlags.Update) {
-                   ΔelementProperty(0, 'tplDir', Δbind(ctx.tpl));
-                   ΔtextBinding(1, Δbind(ctx.name));
-                 }
-               },
-               inputs: {tpl: 'tpl'},
-               directives: () => [InsertionDir]
-             });
-           }
-
-           /**
-            * // template declaration point
-            * <ng-template #foo>
-            *     <div> {{ name }} </div>
-            * </ng-template>
-            *
-            * <child [tpl]="foo"></child>                           <-- template insertion inside
-            */
-           const Parent = createComponent('parent', function(rf: RenderFlags, parent: any) {
-             if (rf & RenderFlags.Create) {
-               Δtemplate(
-                   0, fooTemplate, 2, 1, 'ng-template', null, ['foo', ''], ΔtemplateRefExtractor);
-               Δelement(2, 'child');
-             }
-
-             if (rf & RenderFlags.Update) {
-               const tplRef = Δreference(1);
-               ΔelementProperty(2, 'tpl', Δbind(tplRef));
-             }
-
-           }, 3, 1, [Child]);
-
-           function fooTemplate(rf1: RenderFlags, ctx: any) {
-             if (rf1 & RenderFlags.Create) {
-               ΔelementStart(0, 'div');
-               { Δtext(1); }
-               ΔelementEnd();
-             }
-             if (rf1 & RenderFlags.Update) {
-               const parent = ΔnextContext();
-               ΔtextBinding(1, Δbind(parent.name));
-             }
-           }
-
-           const fixture = new ComponentFixture(Parent);
-           fixture.component.name = 'Parent';
-           fixture.update();
-
-           // Context should be inherited from the declaration point, not the insertion point,
-           // so the template should read 'Parent'.
-           expect(fixture.html).toEqual(`<child><div>Child</div><div>Parent</div></child>`);
-
-           child !.tpl = null;
-           fixture.update();
-           expect(fixture.html).toEqual(`<child><div>Child</div></child>`);
-         });
-
-      // see running stackblitz example: https://stackblitz.com/edit/angular-3vplec
-      it('should work with nested for loops with different declaration / insertion points', () => {
-        /**
-         * <ng-template ngFor [ngForOf]="rows" [ngForTemplate]="tpl">
-         *     // insertion point for templates (both row and cell)
-         * </ng-template>
-         */
-        class LoopComp {
-          name = 'Loop';
-
-          // @Input()
-          tpl !: TemplateRef<any>;
-
-          // @Input()
-          rows !: any[];
-
-          static ngComponentDef = ΔdefineComponent({
-            type: LoopComp,
-            encapsulation: ViewEncapsulation.None,
-            selectors: [['loop-comp']],
-            factory: () => new LoopComp(),
-            consts: 1,
-            vars: 2,
-            template: function(rf: RenderFlags, loop: any) {
-              if (rf & RenderFlags.Create) {
-                Δtemplate(0, null, 0, 0, 'ng-template', [AttributeMarker.Bindings, 'ngForOf']);
-              }
-
-              if (rf & RenderFlags.Update) {
-                ΔelementProperty(0, 'ngForOf', Δbind(loop.rows));
-                ΔelementProperty(0, 'ngForTemplate', Δbind(loop.tpl));
-              }
-            },
-            inputs: {tpl: 'tpl', rows: 'rows'},
-            directives: () => [NgForOf]
-          });
-        }
-
-        /**
-         * // row declaration point
-         * <ng-template #rowTemplate let-row>
-         *
-         *   // cell declaration point
-         *   <ng-template #cellTemplate let-cell>
-         *     <div> {{ cell }} - {{ row.value }} - {{ name }} </div>
-         *   </ng-template>
-         *
-         *   <loop-comp [tpl]="cellTemplate" [rows]="row.data"></loop-comp>  <-- cell insertion
-         * </ng-template>
-         *
-         * <loop-comp [tpl]="rowTemplate" [rows]="rows">                      <-- row insertion
-         * </loop-comp>
-         */
-        const Parent = createComponent('parent', function(rf: RenderFlags, parent: any) {
-          if (rf & RenderFlags.Create) {
-            Δtemplate(
-                0, rowTemplate, 3, 2, 'ng-template', null, ['rowTemplate', ''],
-                ΔtemplateRefExtractor);
-            Δelement(2, 'loop-comp');
-          }
-
-          if (rf & RenderFlags.Update) {
-            const rowTemplateRef = Δreference(1);
-            ΔelementProperty(2, 'tpl', Δbind(rowTemplateRef));
-            ΔelementProperty(2, 'rows', Δbind(parent.rows));
-          }
-
-        }, 3, 2, [LoopComp]);
-
-        function rowTemplate(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            Δtemplate(
-                0, cellTemplate, 2, 3, 'ng-template', null, ['cellTemplate', ''],
-                ΔtemplateRefExtractor);
-            Δelement(2, 'loop-comp');
-          }
-
-          if (rf & RenderFlags.Update) {
-            const row = ctx.$implicit as any;
-            const cellTemplateRef = Δreference(1);
-            ΔelementProperty(2, 'tpl', Δbind(cellTemplateRef));
-            ΔelementProperty(2, 'rows', Δbind(row.data));
-          }
-        }
-
-        function cellTemplate(rf: RenderFlags, ctx: any) {
-          if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'div');
-            { Δtext(1); }
-            ΔelementEnd();
-          }
-
-          if (rf & RenderFlags.Update) {
-            const cell = ctx.$implicit as any;
-            const row = ΔnextContext().$implicit as any;
-            const parent = ΔnextContext();
-            ΔtextBinding(1, Δinterpolation3('', cell, ' - ', row.value, ' - ', parent.name, ''));
-          }
-        }
-
-        const fixture = new ComponentFixture(Parent);
-        fixture.component.name = 'Parent';
-        fixture.component.rows =
-            [{data: ['1', '2'], value: 'one'}, {data: ['3', '4'], value: 'two'}];
-        fixture.update();
-
-        expect(fixture.html)
-            .toEqual(
-                '<loop-comp>' +
-                '<loop-comp><div>1 - one - Parent</div><div>2 - one - Parent</div></loop-comp>' +
-                '<loop-comp><div>3 - two - Parent</div><div>4 - two - Parent</div></loop-comp>' +
-                '</loop-comp>');
-
-        fixture.component.rows = [{data: ['5', '6'], value: 'three'}, {data: ['7'], value: 'four'}];
-        fixture.component.name = 'New name!';
-        fixture.update();
-
-        expect(fixture.html)
-            .toEqual(
-                '<loop-comp>' +
-                '<loop-comp><div>5 - three - New name!</div><div>6 - three - New name!</div></loop-comp>' +
-                '<loop-comp><div>7 - four - New name!</div></loop-comp>' +
-                '</loop-comp>');
-      });
-    });
-
-    const rendererFactory = getRendererFactory2(document);
-
-    describe('detach', () => {
-      it('should detach the right embedded view when an index is specified', () => {
-        const fixture = new TemplateFixture(
-            createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef], null, null,
-            rendererFactory);
-        const viewA = createView('A');
-        createView('B');
-        createView('C');
-        const viewD = createView('D');
-        createView('E');
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
-
-        directiveInstance !.vcref.detach(3);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCE');
-        expect(viewD.destroyed).toBeFalsy();
-
-        directiveInstance !.vcref.detach(0);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>BCE');
-        expect(viewA.destroyed).toBeFalsy();
-
-        expect(() => { directiveInstance !.vcref.detach(-1); }).toThrow();
-        expect(() => { directiveInstance !.vcref.detach(42); }).toThrow();
-        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 0});
-      });
-
-
-      it('should detach the last embedded view when no index is specified', () => {
-        const fixture = new TemplateFixture(
-            createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef], null, null,
-            rendererFactory);
-        createView('A');
-        createView('B');
-        createView('C');
-        createView('D');
-        const viewE = createView('E');
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
-
-        directiveInstance !.vcref.detach();
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCD');
-        expect(viewE.destroyed).toBeFalsy();
-        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 0});
-      });
-    });
-
-    describe('remove', () => {
-      it('should remove the right embedded view when an index is specified', () => {
-        const fixture = new TemplateFixture(
-            createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef], null, null,
-            rendererFactory);
-        const viewA = createView('A');
-        createView('B');
-        createView('C');
-        const viewD = createView('D');
-        createView('E');
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
-
-        directiveInstance !.vcref.remove(3);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCE');
-        expect(viewD.destroyed).toBeTruthy();
-
-        directiveInstance !.vcref.remove(0);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>BCE');
-        expect(viewA.destroyed).toBeTruthy();
-
-        expect(() => { directiveInstance !.vcref.remove(-1); }).toThrow();
-        expect(() => { directiveInstance !.vcref.remove(42); }).toThrow();
-        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 2});
-      });
-
-      it('should remove the last embedded view when no index is specified', () => {
-        const fixture = new TemplateFixture(
-            createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef], null, null,
-            rendererFactory);
-        createView('A');
-        createView('B');
-        createView('C');
-        createView('D');
-        const viewE = createView('E');
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCDE');
-
-        directiveInstance !.vcref.remove();
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABCD');
-        expect(viewE.destroyed).toBeTruthy();
-        expect(ngDevMode).toHaveProperties({rendererDestroyNode: 1});
-      });
-
-      it('should throw when trying to insert a removed or destroyed view', () => {
-        const fixture = new TemplateFixture(
-            createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef], null, null,
-            rendererFactory);
-        const viewA = createView('A');
-        const viewB = createView('B');
-        fixture.update();
-
-        directiveInstance !.vcref.remove();
-        fixture.update();
-        expect(() => directiveInstance !.vcref.insert(viewB)).toThrow();
-
-        viewA.destroy();
-        fixture.update();
-        expect(() => directiveInstance !.vcref.insert(viewA)).toThrow();
-      });
-    });
-
-    describe('length', () => {
-      it('should return the number of embedded views', () => {
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        expect(directiveInstance !.vcref.length).toEqual(0);
-
-        createView('A');
-        createView('B');
-        createView('C');
-        fixture.update();
-        expect(directiveInstance !.vcref.length).toEqual(3);
-
-        directiveInstance !.vcref.detach(1);
-        fixture.update();
-        expect(directiveInstance !.vcref.length).toEqual(2);
-
-        directiveInstance !.vcref.clear();
-        fixture.update();
-        expect(directiveInstance !.vcref.length).toEqual(0);
-      });
-    });
-
-    describe('get and indexOf', () => {
-      it('should retrieve a ViewRef from its index, and vice versa', () => {
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        createView('A');
-        createView('B');
-        createView('C');
-        fixture.update();
-
-        let viewRef = directiveInstance !.vcref.get(0);
-        expect(directiveInstance !.vcref.indexOf(viewRef !)).toEqual(0);
-
-        viewRef = directiveInstance !.vcref.get(1);
-        expect(directiveInstance !.vcref.indexOf(viewRef !)).toEqual(1);
-
-        viewRef = directiveInstance !.vcref.get(2);
-        expect(directiveInstance !.vcref.indexOf(viewRef !)).toEqual(2);
-      });
-
-      it('should handle out of bounds cases', () => {
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        createView('A');
-        fixture.update();
-
-        expect(directiveInstance !.vcref.get(-1)).toBeNull();
-        expect(directiveInstance !.vcref.get(42)).toBeNull();
-
-        const viewRef = directiveInstance !.vcref.get(0);
-        directiveInstance !.vcref.remove(0);
-        expect(directiveInstance !.vcref.indexOf(viewRef !)).toEqual(-1);
-      });
-    });
-
-    describe('move', () => {
-      it('should move embedded views and associated DOM nodes without recreating them', () => {
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        createView('A');
-        createView('B');
-        createView('C');
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>ABC');
-
-        // The DOM is manually modified here to ensure that the text node is actually moved
-        fixture.hostElement.childNodes[2].nodeValue = '**A**';
-        expect(fixture.html).toEqual('<p vcref=""></p>**A**BC');
-
-        let viewRef = directiveInstance !.vcref.get(0);
-        directiveInstance !.vcref.move(viewRef !, 2);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>BC**A**');
-
-        directiveInstance !.vcref.move(viewRef !, 0);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>**A**BC');
-
-        directiveInstance !.vcref.move(viewRef !, 1);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>B**A**C');
-
-        expect(() => { directiveInstance !.vcref.move(viewRef !, -1); }).toThrow();
-        expect(() => { directiveInstance !.vcref.move(viewRef !, 42); }).toThrow();
-      });
     });
 
     describe('createComponent', () => {
       let templateExecutionCounter = 0;
 
-      it('should work without Injector and NgModuleRef', () => {
-        class EmbeddedComponent {
-          constructor() {}
-
-          static ngComponentDef = ΔdefineComponent({
-            type: EmbeddedComponent,
-            encapsulation: ViewEncapsulation.None,
-            selectors: [['embedded-cmp']],
-            factory: () => new EmbeddedComponent(),
-            consts: 1,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: EmbeddedComponent) => {
-              templateExecutionCounter++;
-              if (rf & RenderFlags.Create) {
-                Δtext(0, 'foo');
-              }
-            }
-          });
-        }
-
-        templateExecutionCounter = 0;
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<p vcref=""></p>');
-        expect(templateExecutionCounter).toEqual(0);
-
-        const componentRef = directiveInstance !.vcref.createComponent(
-            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponent));
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
-        expect(templateExecutionCounter).toEqual(2);
-
-        directiveInstance !.vcref.detach(0);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p>');
-        expect(templateExecutionCounter).toEqual(2);
-
-        directiveInstance !.vcref.insert(componentRef.hostView);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
-        expect(templateExecutionCounter).toEqual(3);
-      });
-
-      it('should work with NgModuleRef and Injector', () => {
-        class EmbeddedComponent {
-          constructor(public s: String) {}
-
-          static ngComponentDef = ΔdefineComponent({
-            type: EmbeddedComponent,
-            encapsulation: ViewEncapsulation.None,
-            selectors: [['embedded-cmp']],
-            factory: () => new EmbeddedComponent(ΔdirectiveInject(String)),
-            consts: 1,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: EmbeddedComponent) => {
-              templateExecutionCounter++;
-              if (rf & RenderFlags.Create) {
-                Δtext(0, 'foo');
-              }
-            }
-          });
-        }
-
-        class MyAppModule {
-          static ngInjectorDef = ΔdefineInjector({
-            factory: () => new MyAppModule(),
-            imports: [],
-            providers: [
-              {provide: APP_ROOT, useValue: true},
-              {provide: RendererFactory2, useValue: getRendererFactory2(document)},
-              {provide: String, useValue: 'module'}
-            ]
-          });
-          static ngModuleDef: NgModuleDef<any> = { bootstrap: [] } as any;
-        }
-        const myAppModuleFactory = new NgModuleFactory(MyAppModule);
-        const ngModuleRef = myAppModuleFactory.create(null);
-
-        class SomeModule {
-          static ngInjectorDef = ΔdefineInjector({
-            factory: () => new SomeModule(),
-            providers: [
-              {provide: NgModuleRef, useValue: ngModuleRef},
-              {provide: String, useValue: 'injector'}
-            ]
-          });
-        }
-        const injector = createInjector(SomeModule);
-
-        templateExecutionCounter = 0;
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<p vcref=""></p>');
-        expect(templateExecutionCounter).toEqual(0);
-
-        const componentRef = directiveInstance !.vcref.createComponent(
-            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponent), 0, injector);
-        fixture.update();
-        expect(fixture.html).toEqual('<p vcref=""></p><embedded-cmp>foo</embedded-cmp>');
-        expect(templateExecutionCounter).toEqual(2);
-        expect(componentRef.instance.s).toEqual('injector');
-
-        directiveInstance !.vcref.createComponent(
-            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponent), 0, undefined,
-            undefined, ngModuleRef);
-        fixture.update();
-        expect(fixture.html)
-            .toEqual(
-                '<p vcref=""></p><embedded-cmp>foo</embedded-cmp><embedded-cmp>foo</embedded-cmp>');
-        expect(templateExecutionCounter).toEqual(5);
-      });
-
       describe('ComponentRef', () => {
         let dynamicComp !: DynamicComp;
 
@@ -1129,101 +311,6 @@ describe('ViewContainerRef', () => {
 
         });
       });
-
-      class EmbeddedComponentWithNgContent {
-        static ngComponentDef = ΔdefineComponent({
-          type: EmbeddedComponentWithNgContent,
-          encapsulation: ViewEncapsulation.None,
-          selectors: [['embedded-cmp-with-ngcontent']],
-          factory: () => new EmbeddedComponentWithNgContent(),
-          consts: 3,
-          vars: 0,
-          template: (rf: RenderFlags, cmp: EmbeddedComponentWithNgContent) => {
-            if (rf & RenderFlags.Create) {
-              ΔprojectionDef();
-              Δprojection(0, 0);
-              Δelement(1, 'hr');
-              Δprojection(2, 1);
-            }
-          }
-        });
-      }
-
-      it('should support projectable nodes', () => {
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<p vcref=""></p>');
-
-        const myNode = document.createElement('div');
-        const myText = document.createTextNode('bar');
-        const myText2 = document.createTextNode('baz');
-        myNode.appendChild(myText);
-        myNode.appendChild(myText2);
-
-        directiveInstance !.vcref.createComponent(
-            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponentWithNgContent), 0,
-            undefined, [[myNode]]);
-        fixture.update();
-        expect(fixture.html)
-            .toEqual(
-                '<p vcref=""></p><embedded-cmp-with-ngcontent><div>barbaz</div><hr></embedded-cmp-with-ngcontent>');
-      });
-
-      it('should support reprojection of projectable nodes', () => {
-        class Reprojector {
-          static ngComponentDef = ΔdefineComponent({
-            type: Reprojector,
-            encapsulation: ViewEncapsulation.None,
-            selectors: [['reprojector']],
-            factory: () => new Reprojector(),
-            consts: 2,
-            vars: 0,
-            template: (rf: RenderFlags, cmp: Reprojector) => {
-              if (rf & RenderFlags.Create) {
-                ΔprojectionDef();
-                ΔelementStart(0, 'embedded-cmp-with-ngcontent');
-                { Δprojection(1, 0); }
-                ΔelementEnd();
-              }
-            },
-            directives: [EmbeddedComponentWithNgContent]
-          });
-        }
-
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<p vcref=""></p>');
-
-        const myNode = document.createElement('div');
-        const myText = document.createTextNode('bar');
-        const myText2 = document.createTextNode('baz');
-        myNode.appendChild(myText);
-        myNode.appendChild(myText2);
-
-        directiveInstance !.vcref.createComponent(
-            directiveInstance !.cfr.resolveComponentFactory(Reprojector), 0, undefined, [[myNode]]);
-        fixture.update();
-        expect(fixture.html)
-            .toEqual(
-                '<p vcref=""></p><reprojector><embedded-cmp-with-ngcontent><div>barbaz</div><hr></embedded-cmp-with-ngcontent></reprojector>');
-      });
-
-      it('should support many projectable nodes with many slots', () => {
-        const fixture =
-            new TemplateFixture(createTemplate, updateTemplate, 3, 1, [DirectiveWithVCRef]);
-        expect(fixture.html).toEqual('<p vcref=""></p>');
-
-        directiveInstance !.vcref.createComponent(
-            directiveInstance !.cfr.resolveComponentFactory(EmbeddedComponentWithNgContent), 0,
-            undefined, [
-              [document.createTextNode('1'), document.createTextNode('2')],
-              [document.createTextNode('3'), document.createTextNode('4')]
-            ]);
-        fixture.update();
-        expect(fixture.html)
-            .toEqual(
-                '<p vcref=""></p><embedded-cmp-with-ngcontent>12<hr>34</embedded-cmp-with-ngcontent>');
-      });
     });
 
     describe('getters', () => {
@@ -1261,657 +348,9 @@ describe('ViewContainerRef', () => {
             .toEqual('header-cmp');
         expect(() => directiveInstance !.vcref.parentInjector.get(ElementRef)).toThrow();
       });
-
-      it('should work on templates', () => {
-        function createTemplate() {
-          Δtemplate(0, embeddedTemplate, 1, 1, 'ng-template', ['vcref', '']);
-          Δelement(1, 'footer');
-        }
-
-        new TemplateFixture(createTemplate, () => {}, 2, 0, [DirectiveWithVCRef]);
-        expect(directiveInstance !.vcref.element.nativeElement.textContent).toEqual('container');
-        expect(directiveInstance !.vcref.injector.get(ElementRef).nativeElement.textContent)
-            .toEqual('container');
-        expect(() => directiveInstance !.vcref.parentInjector.get(ElementRef)).toThrow();
-      });
     });
   });
 
-  describe('projection', () => {
-    function embeddedTemplate(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'span');
-        Δtext(1);
-        ΔelementEnd();
-      }
-      if (rf & RenderFlags.Update) {
-        ΔtextBinding(1, ctx.name);
-      }
-    }
-
-    it('should project the ViewContainerRef content along its host, in an element', () => {
-      @Component({selector: 'child', template: '<div><ng-content></ng-content></div>'})
-      class Child {
-        static ngComponentDef = ΔdefineComponent({
-          type: Child,
-          encapsulation: ViewEncapsulation.None,
-          selectors: [['child']],
-          factory: () => new Child(),
-          consts: 2,
-          vars: 0,
-          template: (rf: RenderFlags, cmp: Child) => {
-            if (rf & RenderFlags.Create) {
-              ΔprojectionDef();
-              ΔelementStart(0, 'div');
-              { Δprojection(1); }
-              ΔelementEnd();
-            }
-          }
-        });
-      }
-
-      @Component({
-        selector: 'parent',
-        template: `
-          <ng-template #foo>
-              <span>{{name}}</span>
-          </ng-template>
-          <child><header vcref [tplRef]="foo" [name]="name">blah</header></child>`
-      })
-      class Parent {
-        name: string = 'bar';
-        static ngComponentDef = ΔdefineComponent({
-          type: Parent,
-          encapsulation: ViewEncapsulation.None,
-          selectors: [['parent']],
-          factory: () => new Parent(),
-          consts: 5,
-          vars: 2,
-          template: (rf: RenderFlags, cmp: Parent) => {
-            if (rf & RenderFlags.Create) {
-              Δtemplate(
-                  0, embeddedTemplate, 2, 1, 'ng-template', null, ['foo', ''],
-                  ΔtemplateRefExtractor);
-              ΔelementStart(2, 'child');
-              {
-                ΔelementStart(3, 'header', ['vcref', '']);
-                { Δtext(4, 'blah'); }
-                ΔelementEnd();
-              }
-              ΔelementEnd();
-            }
-            let tplRef: any;
-            if (rf & RenderFlags.Update) {
-              tplRef = Δreference(1);
-              ΔelementProperty(3, 'tplRef', Δbind(tplRef));
-              ΔelementProperty(3, 'name', Δbind(cmp.name));
-            }
-          },
-          directives: [Child, DirectiveWithVCRef]
-        });
-      }
-
-      const fixture = new ComponentFixture(Parent);
-      expect(fixture.html).toEqual('<child><div><header vcref="">blah</header></div></child>');
-
-      directiveInstance !.vcref.createEmbeddedView(directiveInstance !.tplRef, fixture.component);
-      fixture.update();
-      expect(fixture.html)
-          .toEqual('<child><div><header vcref="">blah</header><span>bar</span></div></child>');
-    });
-
-    it('should project the ViewContainerRef content along its host, in a view', () => {
-      @Component({
-        selector: 'child-with-view',
-        template: `
-          Before (inside)-
-          % if (show) {
-            <ng-content></ng-content>
-          % }
-          After (inside)
-        `
-      })
-      class ChildWithView {
-        show: boolean = true;
-        static ngComponentDef = ΔdefineComponent({
-          type: ChildWithView,
-          encapsulation: ViewEncapsulation.None,
-          selectors: [['child-with-view']],
-          factory: () => new ChildWithView(),
-          consts: 3,
-          vars: 0,
-          template: (rf: RenderFlags, cmp: ChildWithView) => {
-            if (rf & RenderFlags.Create) {
-              ΔprojectionDef();
-              Δtext(0, 'Before (inside)-');
-              Δcontainer(1);
-              Δtext(2, 'After (inside)');
-            }
-            if (rf & RenderFlags.Update) {
-              ΔcontainerRefreshStart(1);
-              if (cmp.show) {
-                let rf0 = ΔembeddedViewStart(0, 1, 0);
-                if (rf0 & RenderFlags.Create) {
-                  Δprojection(0);
-                }
-                ΔembeddedViewEnd();
-              }
-              ΔcontainerRefreshEnd();
-            }
-          }
-        });
-      }
-
-      @Component({
-        selector: 'parent',
-        template: `
-          <ng-template #foo>
-              <span>{{name}}</span>
-          </ng-template>
-          <child-with-view>
-            Before projected
-            <header vcref [tplRef]="foo" [name]="name">blah</header>
-            After projected
-          </child-with-view>`
-      })
-      class Parent {
-        name: string = 'bar';
-        static ngComponentDef = ΔdefineComponent({
-          type: Parent,
-          encapsulation: ViewEncapsulation.None,
-          selectors: [['parent']],
-          factory: () => new Parent(),
-          consts: 7,
-          vars: 2,
-          template: (rf: RenderFlags, cmp: Parent) => {
-            if (rf & RenderFlags.Create) {
-              Δtemplate(
-                  0, embeddedTemplate, 2, 1, 'ng-template', undefined, ['foo', ''],
-                  ΔtemplateRefExtractor);
-              ΔelementStart(2, 'child-with-view');
-              Δtext(3, 'Before projected');
-              ΔelementStart(4, 'header', ['vcref', '']);
-              Δtext(5, 'blah');
-              ΔelementEnd();
-              Δtext(6, 'After projected-');
-              ΔelementEnd();
-            }
-            if (rf & RenderFlags.Update) {
-              const tplRef = Δreference(1);
-              ΔelementProperty(4, 'tplRef', Δbind(tplRef));
-              ΔelementProperty(4, 'name', Δbind(cmp.name));
-            }
-          },
-          directives: [ChildWithView, DirectiveWithVCRef]
-        });
-      }
-
-      const fixture = new ComponentFixture(Parent);
-      expect(fixture.html)
-          .toEqual(
-              '<child-with-view>Before (inside)-Before projected<header vcref="">blah</header>After projected-After (inside)</child-with-view>');
-
-      directiveInstance !.vcref.createEmbeddedView(directiveInstance !.tplRef, fixture.component);
-      fixture.update();
-      expect(fixture.html)
-          .toEqual(
-              '<child-with-view>Before (inside)-Before projected<header vcref="">blah</header><span>bar</span>After projected-After (inside)</child-with-view>');
-    });
-
-    describe('with select', () => {
-      @Component({
-        selector: 'child-with-selector',
-        template: `
-          <first><ng-content select="header"></ng-content></first>
-          <second><ng-content></ng-content></second>`
-      })
-      class ChildWithSelector {
-        static ngComponentDef = ΔdefineComponent({
-          type: ChildWithSelector,
-          encapsulation: ViewEncapsulation.None,
-          selectors: [['child-with-selector']],
-          factory: () => new ChildWithSelector(),
-          consts: 4,
-          vars: 0,
-          template: (rf: RenderFlags, cmp: ChildWithSelector) => {
-            if (rf & RenderFlags.Create) {
-              ΔprojectionDef([[['header']]]);
-              ΔelementStart(0, 'first');
-              { Δprojection(1, 1); }
-              ΔelementEnd();
-              ΔelementStart(2, 'second');
-              { Δprojection(3); }
-              ΔelementEnd();
-            }
-          },
-          directives: [ChildWithSelector, DirectiveWithVCRef]
-        });
-      }
-
-      it('should project the ViewContainerRef content along its host, when the host matches a selector',
-         () => {
-           @Component({
-             selector: 'parent',
-             template: `
-            <ng-template #foo>
-                <span>{{name}}</span>
-              </ng-template>
-            <child-with-selector><header vcref [tplRef]="foo" [name]="name">blah</header></child-with-selector>`
-           })
-           class Parent {
-             name: string = 'bar';
-             static ngComponentDef = ΔdefineComponent({
-               type: Parent,
-               encapsulation: ViewEncapsulation.None,
-               selectors: [['parent']],
-               factory: () => new Parent(),
-               consts: 5,
-               vars: 2,
-               template: (rf: RenderFlags, cmp: Parent) => {
-                 let tplRef: any;
-                 if (rf & RenderFlags.Create) {
-                   Δtemplate(
-                       0, embeddedTemplate, 2, 1, 'ng-template', null, ['foo', ''],
-                       ΔtemplateRefExtractor);
-                   ΔelementStart(2, 'child-with-selector');
-                   ΔelementStart(3, 'header', ['vcref', '']);
-                   Δtext(4, 'blah');
-                   ΔelementEnd();
-                   ΔelementEnd();
-                 }
-                 if (rf & RenderFlags.Update) {
-                   tplRef = Δreference(1);
-                   ΔelementProperty(3, 'tplRef', Δbind(tplRef));
-                   ΔelementProperty(3, 'name', Δbind(cmp.name));
-                 }
-               },
-               directives: [ChildWithSelector, DirectiveWithVCRef]
-             });
-           }
-
-           const fixture = new ComponentFixture(Parent);
-           expect(fixture.html)
-               .toEqual(
-                   '<child-with-selector><first><header vcref="">blah</header></first><second></second></child-with-selector>');
-
-           directiveInstance !.vcref.createEmbeddedView(
-               directiveInstance !.tplRef, fixture.component);
-           fixture.update();
-           expect(fixture.html)
-               .toEqual(
-                   '<child-with-selector><first><header vcref="">blah</header><span>bar</span></first><second></second></child-with-selector>');
-         });
-
-      it('should not project the ViewContainerRef content, when the host does not match a selector',
-         () => {
-           @Component({
-             selector: 'parent',
-             template: `
-            <ng-template #foo>
-                <span>{{name}}</span>
-              </ng-template>
-            <child-with-selector><footer vcref [tplRef]="foo" [name]="name">blah</footer></child-with-selector>`
-           })
-           class Parent {
-             name: string = 'bar';
-             static ngComponentDef = ΔdefineComponent({
-               type: Parent,
-               encapsulation: ViewEncapsulation.None,
-               selectors: [['parent']],
-               factory: () => new Parent(),
-               consts: 5,
-               vars: 2,
-               template: (rf: RenderFlags, cmp: Parent) => {
-                 let tplRef: any;
-                 if (rf & RenderFlags.Create) {
-                   Δtemplate(
-                       0, embeddedTemplate, 2, 1, 'ng-template', null, ['foo', ''],
-                       ΔtemplateRefExtractor);
-                   ΔelementStart(2, 'child-with-selector');
-                   ΔelementStart(3, 'footer', ['vcref', '']);
-                   Δtext(4, 'blah');
-                   ΔelementEnd();
-                   ΔelementEnd();
-                 }
-                 if (rf & RenderFlags.Update) {
-                   tplRef = Δreference(1);
-                   ΔelementProperty(3, 'tplRef', Δbind(tplRef));
-                   ΔelementProperty(3, 'name', Δbind(cmp.name));
-                 }
-               },
-               directives: [ChildWithSelector, DirectiveWithVCRef]
-             });
-           }
-
-           const fixture = new ComponentFixture(Parent);
-           expect(fixture.html)
-               .toEqual(
-                   '<child-with-selector><first></first><second><footer vcref="">blah</footer></second></child-with-selector>');
-
-           directiveInstance !.vcref.createEmbeddedView(
-               directiveInstance !.tplRef, fixture.component);
-           fixture.update();
-           expect(fixture.html)
-               .toEqual(
-                   '<child-with-selector><first></first><second><footer vcref="">blah</footer><span>bar</span></second></child-with-selector>');
-         });
-    });
-  });
-
-  describe('life cycle hooks', () => {
-
-    // Angular 5 reference: https://stackblitz.com/edit/lifecycle-hooks-vcref
-    const log: string[] = [];
-
-    @Component({selector: 'hooks', template: `{{name}}`})
-    class ComponentWithHooks {
-      // TODO(issue/24571): remove '!'.
-      name !: string;
-
-      private log(msg: string) { log.push(msg); }
-
-      ngOnChanges() { this.log('onChanges-' + this.name); }
-      ngOnInit() { this.log('onInit-' + this.name); }
-      ngDoCheck() { this.log('doCheck-' + this.name); }
-
-      ngAfterContentInit() { this.log('afterContentInit-' + this.name); }
-      ngAfterContentChecked() { this.log('afterContentChecked-' + this.name); }
-
-      ngAfterViewInit() { this.log('afterViewInit-' + this.name); }
-      ngAfterViewChecked() { this.log('afterViewChecked-' + this.name); }
-
-      ngOnDestroy() { this.log('onDestroy-' + this.name); }
-
-      static ngComponentDef = ΔdefineComponent({
-        type: ComponentWithHooks,
-        encapsulation: ViewEncapsulation.None,
-        selectors: [['hooks']],
-        factory: () => new ComponentWithHooks(),
-        consts: 1,
-        vars: 1,
-        template: (rf: RenderFlags, cmp: ComponentWithHooks) => {
-          if (rf & RenderFlags.Create) {
-            Δtext(0);
-          }
-          if (rf & RenderFlags.Update) {
-            ΔtextBinding(0, Δinterpolation1('', cmp.name, ''));
-          }
-        },
-        features: [ΔNgOnChangesFeature()],
-        inputs: {name: 'name'}
-      });
-    }
-
-    it('should call all hooks in correct order when creating with createEmbeddedView', () => {
-      function SomeComponent_Template_0(rf: RenderFlags, ctx: any) {
-        if (rf & RenderFlags.Create) {
-          Δelement(0, 'hooks');
-        }
-        if (rf & RenderFlags.Update) {
-          ΔelementProperty(0, 'name', Δbind('C'));
-        }
-      }
-
-      @Component({
-        template: `
-          <ng-template #foo>
-            <hooks [name]="'C'"></hooks>
-          </ng-template>
-          <hooks vcref [tplRef]="foo" [name]="'A'"></hooks>
-          <hooks [name]="'B'"></hooks>
-        `
-      })
-      class SomeComponent {
-        static ngComponentDef = ΔdefineComponent({
-          type: SomeComponent,
-          selectors: [['some-comp']],
-          factory: () => new SomeComponent(),
-          consts: 4,
-          vars: 3,
-          template: (rf: RenderFlags, cmp: SomeComponent) => {
-            if (rf & RenderFlags.Create) {
-              Δtemplate(
-                  0, SomeComponent_Template_0, 1, 1, 'ng-template', [], ['foo', ''],
-                  ΔtemplateRefExtractor);
-              Δelement(2, 'hooks', ['vcref', '']);
-              Δelement(3, 'hooks');
-            }
-            if (rf & RenderFlags.Update) {
-              const tplRef = Δreference(1);
-              ΔelementProperty(2, 'tplRef', Δbind(tplRef));
-              ΔelementProperty(2, 'name', Δbind('A'));
-              ΔelementProperty(3, 'name', Δbind('B'));
-            }
-          },
-          directives: [ComponentWithHooks, DirectiveWithVCRef],
-          features: [ΔNgOnChangesFeature()],
-        });
-      }
-
-      log.length = 0;
-
-      const fixture = new ComponentFixture(SomeComponent);
-      expect(log).toEqual([
-        'onChanges-A', 'onInit-A', 'doCheck-A', 'onChanges-B', 'onInit-B', 'doCheck-B',
-        'afterContentInit-A', 'afterContentChecked-A', 'afterContentInit-B',
-        'afterContentChecked-B', 'afterViewInit-A', 'afterViewChecked-A', 'afterViewInit-B',
-        'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
-        'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      directiveInstance !.vcref.createEmbeddedView(directiveInstance !.tplRef, fixture.component);
-      expect(fixture.html).toEqual('<hooks vcref="">A</hooks><hooks></hooks><hooks>B</hooks>');
-      expect(log).toEqual([]);
-
-      log.length = 0;
-      fixture.update();
-      expect(fixture.html).toEqual('<hooks vcref="">A</hooks><hooks>C</hooks><hooks>B</hooks>');
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'onChanges-C', 'onInit-C', 'doCheck-C', 'afterContentInit-C',
-        'afterContentChecked-C', 'afterViewInit-C', 'afterViewChecked-C', 'afterContentChecked-A',
-        'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'doCheck-C', 'afterContentChecked-C', 'afterViewChecked-C',
-        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      const viewRef = directiveInstance !.vcref.detach(0);
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
-        'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      directiveInstance !.vcref.insert(viewRef !);
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'doCheck-C', 'afterContentChecked-C', 'afterViewChecked-C',
-        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      directiveInstance !.vcref.remove(0);
-      fixture.update();
-      expect(log).toEqual([
-        'onDestroy-C', 'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
-        'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-    });
-
-    it('should call all hooks in correct order when creating with createComponent', () => {
-      @Component({
-        template: `
-          <hooks vcref [name]="'A'"></hooks>
-          <hooks [name]="'B'"></hooks>
-        `
-      })
-      class SomeComponent {
-        static ngComponentDef = ΔdefineComponent({
-          type: SomeComponent,
-          encapsulation: ViewEncapsulation.None,
-          selectors: [['some-comp']],
-          factory: () => new SomeComponent(),
-          consts: 2,
-          vars: 2,
-          template: (rf: RenderFlags, cmp: SomeComponent) => {
-            if (rf & RenderFlags.Create) {
-              Δelement(0, 'hooks', ['vcref', '']);
-              Δelement(1, 'hooks');
-            }
-            if (rf & RenderFlags.Update) {
-              ΔelementProperty(0, 'name', Δbind('A'));
-              ΔelementProperty(1, 'name', Δbind('B'));
-            }
-          },
-          directives: [ComponentWithHooks, DirectiveWithVCRef],
-          features: [ΔNgOnChangesFeature()],
-        });
-      }
-
-      log.length = 0;
-
-      const fixture = new ComponentFixture(SomeComponent);
-      expect(log).toEqual([
-        'onChanges-A', 'onInit-A', 'doCheck-A', 'onChanges-B', 'onInit-B', 'doCheck-B',
-        'afterContentInit-A', 'afterContentChecked-A', 'afterContentInit-B',
-        'afterContentChecked-B', 'afterViewInit-A', 'afterViewChecked-A', 'afterViewInit-B',
-        'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
-        'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      const componentRef = directiveInstance !.vcref.createComponent(
-          directiveInstance !.cfr.resolveComponentFactory(ComponentWithHooks));
-      expect(fixture.html).toEqual('<hooks vcref="">A</hooks><hooks></hooks><hooks>B</hooks>');
-      expect(log).toEqual([]);
-
-      componentRef.instance.name = 'D';
-      log.length = 0;
-      fixture.update();
-      expect(fixture.html).toEqual('<hooks vcref="">A</hooks><hooks>D</hooks><hooks>B</hooks>');
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'onInit-D', 'doCheck-D', 'afterContentInit-D',
-        'afterContentChecked-D', 'afterViewInit-D', 'afterViewChecked-D', 'afterContentChecked-A',
-        'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'doCheck-D', 'afterContentChecked-D', 'afterViewChecked-D',
-        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      const viewRef = directiveInstance !.vcref.detach(0);
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
-        'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      directiveInstance !.vcref.insert(viewRef !);
-      fixture.update();
-      expect(log).toEqual([
-        'doCheck-A', 'doCheck-B', 'doCheck-D', 'afterContentChecked-D', 'afterViewChecked-D',
-        'afterContentChecked-A', 'afterContentChecked-B', 'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-
-      log.length = 0;
-      directiveInstance !.vcref.remove(0);
-      fixture.update();
-      expect(log).toEqual([
-        'onDestroy-D', 'doCheck-A', 'doCheck-B', 'afterContentChecked-A', 'afterContentChecked-B',
-        'afterViewChecked-A', 'afterViewChecked-B'
-      ]);
-    });
-  });
-
-  describe('host bindings', () => {
-
-    it('should support host bindings on dynamically created components', () => {
-
-      @Component(
-          {selector: 'host-bindings', host: {'id': 'attribute', '[title]': 'title'}, template: ``})
-      class HostBindingCmpt {
-        title = 'initial';
-
-        static ngComponentDef = ΔdefineComponent({
-          type: HostBindingCmpt,
-          selectors: [['host-bindings']],
-          factory: () => new HostBindingCmpt(),
-          consts: 0,
-          vars: 0,
-          template: (rf: RenderFlags, cmp: HostBindingCmpt) => {},
-          hostBindings: function(rf: RenderFlags, ctx: HostBindingCmpt, elIndex: number) {
-            if (rf & RenderFlags.Create) {
-              ΔelementHostAttrs(['id', 'attribute']);
-              ΔallocHostVars(1);
-            }
-            if (rf & RenderFlags.Update) {
-              ΔelementProperty(elIndex, 'title', Δbind(ctx.title));
-            }
-          },
-        });
-      }
-
-      @Component({
-        template: `
-          <ng-template vcref></ng-template>
-        `
-      })
-      class AppCmpt {
-        static ngComponentDef = ΔdefineComponent({
-          type: AppCmpt,
-          selectors: [['app']],
-          factory: () => new AppCmpt(),
-          consts: 1,
-          vars: 0,
-          template: (rf: RenderFlags, cmp: AppCmpt) => {
-            if (rf & RenderFlags.Create) {
-              Δtemplate(0, null, 0, 0, 'ng-template', ['vcref', '']);
-            }
-          },
-          directives: [HostBindingCmpt, DirectiveWithVCRef]
-        });
-      }
-
-      const fixture = new ComponentFixture(AppCmpt);
-      expect(fixture.html).toBe('');
-
-      const componentRef = directiveInstance !.vcref.createComponent(
-          directiveInstance !.cfr.resolveComponentFactory(HostBindingCmpt));
-      fixture.update();
-      expect(fixture.html).toBe('<host-bindings id="attribute" title="initial"></host-bindings>');
-
-
-      componentRef.instance.title = 'changed';
-      fixture.update();
-      expect(fixture.html).toBe('<host-bindings id="attribute" title="changed"></host-bindings>');
-    });
-
-  });
-
   describe('view engine compatibility', () => {
 
     @Component({selector: 'app', template: ''})
@@ -1977,79 +416,6 @@ describe('ViewContainerRef', () => {
          expect(parentInjector.get('foo')).toEqual('bar');
        });
 
-    it('should check bindings for components dynamically created by root component', () => {
-      class DynamicCompWithBindings {
-        checkCount = 0;
-
-        ngDoCheck() { this.checkCount++; }
-
-        /** check count: {{ checkCount }} */
-        static ngComponentDef = ΔdefineComponent({
-          type: DynamicCompWithBindings,
-          selectors: [['dynamic-cmpt-with-bindings']],
-          factory: () => new DynamicCompWithBindings(),
-          consts: 1,
-          vars: 1,
-          template: (rf: RenderFlags, ctx: DynamicCompWithBindings) => {
-            if (rf & RenderFlags.Create) {
-              Δtext(0);
-            }
-            if (rf & RenderFlags.Update) {
-              ΔtextBinding(0, Δinterpolation1('check count: ', ctx.checkCount, ''));
-            }
-          }
-        });
-      }
-
-      const fixture = new ComponentFixture(AppCmpt);
-      expect(fixture.outerHtml).toBe('<div host="mark"></div>');
-
-      fixture.component.insert(DynamicCompWithBindings);
-      fixture.update();
-      expect(fixture.outerHtml)
-          .toBe(
-              '<div host="mark"></div><dynamic-cmpt-with-bindings>check count: 1</dynamic-cmpt-with-bindings>');
-
-      fixture.update();
-      expect(fixture.outerHtml)
-          .toBe(
-              '<div host="mark"></div><dynamic-cmpt-with-bindings>check count: 2</dynamic-cmpt-with-bindings>');
-    });
-
-    it('should create deep DOM tree immediately for dynamically created components', () => {
-      let name = 'text';
-      const Child = createComponent('child', (rf: RenderFlags, ctx: any) => {
-        if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'div');
-          { Δtext(1); }
-          ΔelementEnd();
-        }
-        if (rf & RenderFlags.Update) {
-          ΔtextBinding(1, Δbind(name));
-        }
-      }, 2, 1);
-
-      const DynamicCompWithChildren =
-          createComponent('dynamic-cmpt-with-children', (rf: RenderFlags, ctx: any) => {
-            if (rf & RenderFlags.Create) {
-              Δelement(0, 'child');
-            }
-          }, 1, 0, [Child]);
-
-      const fixture = new ComponentFixture(AppCmpt);
-      expect(fixture.outerHtml).toBe('<div host="mark"></div>');
-
-      fixture.component.insert(DynamicCompWithChildren);
-      expect(fixture.outerHtml)
-          .toBe(
-              '<div host="mark"></div><dynamic-cmpt-with-children><child><div></div></child></dynamic-cmpt-with-children>');
-
-      fixture.update();
-      expect(fixture.outerHtml)
-          .toBe(
-              '<div host="mark"></div><dynamic-cmpt-with-children><child><div>text</div></child></dynamic-cmpt-with-children>');
-    });
-
     it('should support view queries for dynamically created components', () => {
       let dynamicComp !: DynamicCompWithViewQueries;
       let fooEl !: RElement;

From a39f4e230162c160e4099c35b7c7d3f3f0739630 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 17 May 2019 08:57:19 +0200
Subject: [PATCH 102/275] test: fix paths tests to work cross platform (#30472)

In Windows when `/test.txt` is resolved it will be resolved to `[DRIVE]:/test.txt`

PR Close #30472
---
 packages/compiler-cli/src/ngtsc/path/test/types_spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/path/test/types_spec.ts b/packages/compiler-cli/src/ngtsc/path/test/types_spec.ts
index 41f7582987..18910ceaca 100644
--- a/packages/compiler-cli/src/ngtsc/path/test/types_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/path/test/types_spec.ts
@@ -11,7 +11,7 @@ import {AbsoluteFsPath} from '../src/types';
 describe('path types', () => {
   describe('AbsoluteFsPath', () => {
     it('should not throw when creating one from an absolute path',
-       () => { expect(AbsoluteFsPath.from('/test.txt')).toEqual('/test.txt'); });
+       () => { expect(() => AbsoluteFsPath.from('/test.txt')).not.toThrow(); });
     it('should not throw when creating one from a windows absolute path',
        () => { expect(AbsoluteFsPath.from('C:\\test.txt')).toEqual('C:/test.txt'); });
     it('should not throw when creating one from a windows absolute path with POSIX separators',

From ab4a23d0e03c62cbd0ebce60f1e0df2342f1de01 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 17 May 2019 09:03:05 +0200
Subject: [PATCH 103/275] ci: update windows docker image for codefresh
 (#30472)

This commit changes a couple of things

1) Sets the escape character to backtick. Setting the escape character to backtick is especially useful on Windows where `\` is the directory path separator.
2) Install Python since it is a requirement for certain bazel tool chains that are now used.
3) Install VS Build Tools with C++ components as they C++ compilation is required for certain bazel tools chains.
4) Removes Visual C++ Redistributable as it seems that is no longer required because of the VS Builds Tools

PR Close #30472
---
 .codefresh/Dockerfile.win-1809 | 118 +++++++++++++++++++--------------
 1 file changed, 70 insertions(+), 48 deletions(-)

diff --git a/.codefresh/Dockerfile.win-1809 b/.codefresh/Dockerfile.win-1809
index c5169f97eb..44202e0ec1 100644
--- a/.codefresh/Dockerfile.win-1809
+++ b/.codefresh/Dockerfile.win-1809
@@ -1,3 +1,5 @@
+# escape=`
+
 ARG core=mcr.microsoft.com/windows/servercore:1809
 ARG target=mcr.microsoft.com/powershell:windowsservercore-1809
 
@@ -10,57 +12,57 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 ENV GPG_VERSION 2.3.4
 
-RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -UseBasicParsing ; \
+RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg4win.exe' -UseBasicParsing ; `
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
-RUN @( \
-    '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-    'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-    '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-    'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-    '77984A986EBC2AA786BC0F66B01FBB92821C587A', \
-    '8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600', \
-    '4ED778F539E3634C779C87C6D7062848A1AB005C', \
-    'A48C2BEE680E841632CD4E44F07496B3EB3C1762', \
-    'B9E2F5981AA6E0CD28160D9FF13993A75599653C' \
-    ) | foreach { \
-      gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
+RUN @( `
+    '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', `
+    'FD3A5288F042B6850C66B31F09FE44734EB7990E', `
+    '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', `
+    'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', `
+    'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', `
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', `
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A', `
+    '8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600', `
+    '4ED778F539E3634C779C87C6D7062848A1AB005C', `
+    'A48C2BEE680E841632CD4E44F07496B3EB3C1762', `
+    'B9E2F5981AA6E0CD28160D9FF13993A75599653C' `
+    ) | foreach { `
+      gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; `
     }
 
 ENV NODE_VERSION=$node_version
 
-RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
+RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; `
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc
 
-RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
-    $sum = $(cat SHASUMS256.txt.asc | sls $('  node-v{0}-win-x64.zip' -f $env:NODE_VERSION)) -Split ' ' ; \
-    if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $sum[0]) { Write-Error 'SHA256 mismatch' } ; \
-    Expand-Archive node.zip -DestinationPath C:\ ; \
+RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; `
+    $sum = $(cat SHASUMS256.txt.asc | sls $('  node-v{0}-win-x64.zip' -f $env:NODE_VERSION)) -Split ' ' ; `
+    if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $sum[0]) { Write-Error 'SHA256 mismatch' } ; `
+    Expand-Archive node.zip -DestinationPath C:\ ; `
     Rename-Item -Path $('C:\node-v{0}-win-x64' -f $env:NODE_VERSION) -NewName 'C:\nodejs'
 
 ENV YARN_VERSION=$yarn_version
 
-RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
-    Invoke-WebRequest $('https://yarnpkg.com/downloads/{0}/yarn-{0}.msi' -f $env:YARN_VERSION) -OutFile yarn.msi -UseBasicParsing ; \
-    $sig = Get-AuthenticodeSignature yarn.msi ; \
-    if ($sig.Status -ne 'Valid') { Write-Error 'Authenticode signature is not valid' } ; \
-    Write-Output $sig.SignerCertificate.Thumbprint ; \
-    if (@( \
-      '7E253367F8A102A91D04829E37F3410F14B68A5F', \
-      'AF764E1EA56C762617BDC757C8B0F3780A0CF5F9' \
-      ) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; \
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
+    Invoke-WebRequest $('https://yarnpkg.com/downloads/{0}/yarn-{0}.msi' -f $env:YARN_VERSION) -OutFile yarn.msi -UseBasicParsing ; `
+    $sig = Get-AuthenticodeSignature yarn.msi ; `
+    if ($sig.Status -ne 'Valid') { Write-Error 'Authenticode signature is not valid' } ; `
+    Write-Output $sig.SignerCertificate.Thumbprint ; `
+    if (@( `
+      '7E253367F8A102A91D04829E37F3410F14B68A5F', `
+      'AF764E1EA56C762617BDC757C8B0F3780A0CF5F9' `
+      ) -notcontains $sig.SignerCertificate.Thumbprint) { Write-Error 'Unknown signer certificate' } ; `
     Start-Process msiexec.exe -ArgumentList '/i', 'yarn.msi', '/quiet', '/norestart' -NoNewWindow -Wait
 
 ENV GIT_VERSION 2.20.1
 ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-busybox-64-bit.zip
 ENV GIT_SHA256 9817ab455d9cbd0b09d8664b4afbe4bbf78d18b556b3541d09238501a749486c
 
-RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
-    Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; \
-    if ((Get-FileHash git.zip -Algorithm sha256).Hash -ne $env:GIT_SHA256) {exit 1} ; \
-    Expand-Archive git.zip -DestinationPath C:\git; \
+RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
+    Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; `
+    if ((Get-FileHash git.zip -Algorithm sha256).Hash -ne $env:GIT_SHA256) {exit 1} ; `
+    Expand-Archive git.zip -DestinationPath C:\git; `
     Remove-Item git.zip
 
 FROM $target as baseimage
@@ -74,26 +76,46 @@ COPY --from=download /git /git
 ARG SETX=/M
 RUN setx %SETX% PATH "%PATH%;C:\nodejs;C:\yarn\bin;C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin"
 
-CMD [ "node.exe" ]        
+CMD [ "node.exe" ]
 
 FROM baseimage
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-RUN Invoke-WebRequest -UseBasicParsing 'https://www.7-zip.org/a/7z1805-x64.exe' -OutFile 7z.exe; \
-    Start-Process -FilePath 'C:\\7z.exe' -ArgumentList '/S', '/D=C:\\7zip0' -NoNewWindow -Wait; \
-    Invoke-WebRequest -UseBasicParsing 'http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz' -OutFile msys2.tar.xz; \
-    Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'e', 'msys2.tar.xz' -Wait; \
-    Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'x', 'msys2.tar', '-oC:\\' -Wait; \
-    Remove-Item msys2.tar.xz; \
-    Remove-Item msys2.tar; \
-    Remove-Item 7z.exe; \
-    Remove-Item -Recurse 7zip; \
-    [Environment]::SetEnvironmentVariable('Path', $env:Path + ';C:\msys64\usr\bin', [System.EnvironmentVariableTarget]::Machine); \
-    [Environment]::SetEnvironmentVariable('BAZEL_SH', 'C:\msys64\usr\bin\bash.exe', [System.EnvironmentVariableTarget]::Machine); \
-    Invoke-WebRequest -UseBasicParsing 'https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe' -OutFile vc_redist.x64.exe; \
-    Start-Process 'c:\\vc_redist.x64.exe' -ArgumentList '/Install', '/Passive', '/NoRestart' -NoNewWindow -Wait; \
-    Remove-Item vc_redist.x64.exe
+RUN Invoke-WebRequest -UseBasicParsing 'https://www.7-zip.org/a/7z1805-x64.exe' -OutFile 7z.exe; `
+    Start-Process -FilePath 'C:\\7z.exe' -ArgumentList '/S', '/D=C:\\7zip0' -NoNewWindow -Wait; `
+    Invoke-WebRequest -UseBasicParsing 'http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz' -OutFile msys2.tar.xz; `
+    Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'e', 'msys2.tar.xz' -Wait; `
+    Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'x', 'msys2.tar', '-oC:\\' -Wait; `
+    Remove-Item msys2.tar.xz; `
+    Remove-Item msys2.tar; `
+    Remove-Item 7z.exe; `
+    Remove-Item -Recurse 7zip; `
+    [Environment]::SetEnvironmentVariable('Path', $env:Path + ';C:\msys64\usr\bin', [System.EnvironmentVariableTarget]::Machine); `
+    [Environment]::SetEnvironmentVariable('BAZEL_SH', 'C:\msys64\usr\bin\bash.exe', [System.EnvironmentVariableTarget]::Machine)
+
+# Install VS Build Tools
+RUN Invoke-WebRequest -UseBasicParsing https://download.visualstudio.microsoft.com/download/pr/df649173-11e9-4af2-8eb7-0eb02ba8958a/cadb5bdac41e55bb8f6a6b7c45273370/vs_buildtools.exe -OutFile vs_BuildTools.exe; `
+    # Installer won't detect DOTNET_SKIP_FIRST_TIME_EXPERIENCE if ENV is used, must use setx /M
+    setx /M DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1; `
+    Start-Process vs_BuildTools.exe `
+        -ArgumentList `
+            '--add', 'Microsoft.VisualStudio.Workload.VCTools', `
+            '--add', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', `
+            '--add', 'Microsoft.Component.VC.Runtime.UCRTSDK', `
+            '--add', 'Microsoft.VisualStudio.Component.Windows10SDK.17763', `
+            '--quiet', '--norestart', '--nocache' `
+        -NoNewWindow -Wait; `
+    Remove-Item -Force vs_buildtools.exe; `
+    Remove-Item -Force -Recurse \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\"; `
+    Remove-Item -Force -Recurse ${Env:TEMP}\*; `
+    Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"; `
+    [Environment]::SetEnvironmentVariable('BAZEL_VC', \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools\VC\", [System.EnvironmentVariableTarget]::Machine)
+
+# Install Python
+RUN Invoke-WebRequest -UseBasicParsing https://www.python.org/ftp/python/3.5.1/python-3.5.1.exe -OutFile python-3.5.1.exe; `
+    Start-Process python-3.5.1.exe -ArgumentList '/quiet InstallAllUsers=1 PrependPath=1' -Wait; `
+    Remove-Item -Force python-3.5.1.exe
 
 # Add a fix for https://github.com/docker/for-win/issues/2920 as entry point to the container.
 SHELL ["cmd", "/c"]

From 7d31f7b5406f8bd3098e0d8c3b9a2b6f6948738f Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 17 May 2019 13:50:24 +0200
Subject: [PATCH 104/275] ci: include more tests in windows ci (#30472)

We added most of the tests excluded the once which are tagged with `browser:chromium-local` as they are currently not working in CI but work locally.

The `--test_tag_filters` option is now passed via command line as it seems that it has no effect as it is passed in both RC and command line. IE command line options are not merged with the RC options but rather overridden.

PR Close #30472
---
 .codefresh/bazel.rc      | 5 -----
 .codefresh/codefresh.yml | 9 ++++++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.codefresh/bazel.rc b/.codefresh/bazel.rc
index 5a2fa5ca6d..43b19f4b47 100644
--- a/.codefresh/bazel.rc
+++ b/.codefresh/bazel.rc
@@ -35,8 +35,3 @@ build --verbose_failures=true
 # https://github.com/bazelbuild/rules_typescript/pull/356
 build --action_env=PATH
 test --action_env=PATH --test_env=PATH
-
-# Exclude tests known to not work on Windows.
-
-# Chrome web tests are currently broken.
-test --test_tag_filters=-browser:chromium-local
diff --git a/.codefresh/codefresh.yml b/.codefresh/codefresh.yml
index fd74b0f32f..c1550040f9 100644
--- a/.codefresh/codefresh.yml
+++ b/.codefresh/codefresh.yml
@@ -12,7 +12,7 @@ steps:
     dockerfile: ./Dockerfile.win-1809
 
   RunTests:
-    title: Run Example
+    title: Run Tests
     image: ${{BuildImage}}
     commands:
     # Install dependencies
@@ -20,5 +20,8 @@ steps:
     # Add Bazel CI config
     - copy .codefresh\bazel.rc %ProgramData%\bazel.bazelrc
     # Run tests
-    - yarn test-ivy-aot //packages/animations/test //packages/common/test //packages/forms/test //packages/http/test //packages/platform-browser/test //packages/platform-browser-dynamic/test //packages/router/test
-    - yarn bazel test //tools/ts-api-guardian:all //tools/public_api_guard/... //packages/language-service/test //packages/compiler-cli/ngcc/test:test //packages/compiler-cli/integrationtest:integrationtest //packages/compiler-cli/test/compliance:compliance //packages/compiler/test //packages/compiler-cli/test:ngc //packages/compiler-cli/test/ngtsc:ngtsc
+    # At the moment 'browser:chromium-local' are broken in CI while locally they work
+    # VE
+    - yarn bazel test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-browser:chromium-local //...
+    # Ivy
+    - yarn bazel test --define=compile=aot --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local //...

From 660a091f411b0e56eae1a7840f936a33c333741f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 17 May 2019 17:24:42 +0200
Subject: [PATCH 105/275] ci: increase codefresh memory limit to decrease
 flakyness of known big tests (#30472)

Such tests are:
```
//packages/language-service/test:test
//packages/bazel/test/ngc-wrapped:ngc_test
```

PR Close #30472
---
 .codefresh/bazel.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.codefresh/bazel.rc b/.codefresh/bazel.rc
index 43b19f4b47..b75f7287e4 100644
--- a/.codefresh/bazel.rc
+++ b/.codefresh/bazel.rc
@@ -23,7 +23,7 @@ build --announce_rc
 # Bazel doesn't calculate the memory ceiling correctly when running under Docker.
 # Limit Bazel to consuming resources that fit in CodeFresh VMs
 # TODO(filipesilva): determine the correct memory limit
-build --local_resources=8000,8.0,1.0
+build --local_resources=10240,8.0,1.0
 
 # Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309
 test --flaky_test_attempts=2

From 661a57d9e23334683fd78a5690a57485b40493cc Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Thu, 9 May 2019 15:56:24 -0500
Subject: [PATCH 106/275] docs: update docs example dependencies to version 8
 (#30385)

PR Close #30385
---
 aio/content/examples/.gitignore               |    3 +
 .../bootstrapping/e2e/src/app.e2e-spec.ts     |    2 +-
 .../examples/elements/example-config.json     |    3 -
 .../feature-modules/e2e/src/app.e2e-spec.ts   |    2 +-
 .../e2e/src/app.e2e-spec.ts                   |    2 +-
 .../providers/e2e/src/app.e2e-spec.ts         |    2 +-
 .../e2e/src/app.e2e-spec.ts                   |    2 +-
 .../universal/{src => }/tsconfig.server.json  |    4 +-
 aio/tools/examples/README.md                  |   38 +-
 aio/tools/examples/example-boilerplate.js     |   10 +-
 aio/tools/examples/run-example-e2e.js         |    5 -
 .../examples/shared/boilerplate/.gitignore    |    2 +
 .../shared/boilerplate/UPDATING_CLI.md        |   78 +-
 .../shared/boilerplate/cli/.editorconfig      |    2 +-
 .../shared/boilerplate/cli/.gitignore         |    7 +
 .../shared/boilerplate/cli/angular.json       |   43 +-
 .../shared/boilerplate/cli/browserslist       |   15 +
 .../boilerplate/cli/e2e/protractor.conf.js    |    8 +-
 .../shared/boilerplate/cli/e2e/src/app.po.ts  |    6 +-
 .../e2e/{tsconfig.e2e.json => tsconfig.json}  |    2 +-
 .../boilerplate/cli/{src => }/karma.conf.js   |    7 +-
 .../shared/boilerplate/cli/package.json       |   39 +-
 .../shared/boilerplate/cli/src/browserslist   |   11 -
 .../shared/boilerplate/cli/src/polyfills.ts   |   55 +-
 .../boilerplate/cli/src/tsconfig.app.json     |   21 -
 .../boilerplate/cli/src/tsconfig.spec.json    |   18 -
 .../shared/boilerplate/cli/src/tslint.json    |   17 -
 .../shared/boilerplate/cli/tsconfig.app.json  |   24 +
 .../shared/boilerplate/cli/tsconfig.json      |    5 +-
 .../shared/boilerplate/cli/tsconfig.spec.json |   18 +
 .../shared/boilerplate/cli/tslint.json        |  124 +-
 .../shared/boilerplate/elements/tsconfig.json |   20 -
 .../shared/boilerplate/i18n/angular.json      |   52 +-
 .../shared/boilerplate/i18n/package.json      |   38 +-
 .../boilerplate/ivy/cli/src/tsconfig.app.json |   25 -
 .../boilerplate/ivy/cli/tsconfig.app.json     |   27 +
 .../ivy/systemjs/tsconfig-aot.json            |   10 +-
 .../boilerplate/schematics/angular.json       |   43 +-
 .../boilerplate/service-worker/angular.json   |   43 +-
 .../boilerplate/service-worker/package.json   |   40 +-
 .../shared/boilerplate/testing/angular.json   |   56 +-
 .../shared/boilerplate/universal/angular.json |   60 +-
 .../shared/boilerplate/universal/package.json |   46 +-
 aio/tools/examples/shared/package.json        |   52 +-
 aio/tools/examples/shared/yarn.lock           | 2737 ++++++++---------
 45 files changed, 1743 insertions(+), 2081 deletions(-)
 rename aio/content/examples/universal/{src => }/tsconfig.server.json (69%)
 create mode 100644 aio/tools/examples/shared/boilerplate/.gitignore
 create mode 100644 aio/tools/examples/shared/boilerplate/cli/browserslist
 rename aio/tools/examples/shared/boilerplate/cli/e2e/{tsconfig.e2e.json => tsconfig.json} (85%)
 rename aio/tools/examples/shared/boilerplate/cli/{src => }/karma.conf.js (82%)
 delete mode 100644 aio/tools/examples/shared/boilerplate/cli/src/browserslist
 delete mode 100644 aio/tools/examples/shared/boilerplate/cli/src/tsconfig.app.json
 delete mode 100644 aio/tools/examples/shared/boilerplate/cli/src/tsconfig.spec.json
 delete mode 100644 aio/tools/examples/shared/boilerplate/cli/src/tslint.json
 create mode 100644 aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json
 create mode 100644 aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json
 delete mode 100644 aio/tools/examples/shared/boilerplate/elements/tsconfig.json
 delete mode 100644 aio/tools/examples/shared/boilerplate/ivy/cli/src/tsconfig.app.json
 create mode 100644 aio/tools/examples/shared/boilerplate/ivy/cli/tsconfig.app.json

diff --git a/aio/content/examples/.gitignore b/aio/content/examples/.gitignore
index 905ed736fe..22dcf835a8 100644
--- a/aio/content/examples/.gitignore
+++ b/aio/content/examples/.gitignore
@@ -23,6 +23,9 @@
 **/bs-config.e2e.json
 **/bs-config.json
 **/package.json
+**/tsconfig.json
+**/tsconfig.app.json
+**/tsconfig.spec.json
 **/tslint.json
 **/karma-test-shim.js
 **/browser-test-shim.js
diff --git a/aio/content/examples/bootstrapping/e2e/src/app.e2e-spec.ts b/aio/content/examples/bootstrapping/e2e/src/app.e2e-spec.ts
index cd4922ccd3..676d41469c 100644
--- a/aio/content/examples/bootstrapping/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/bootstrapping/e2e/src/app.e2e-spec.ts
@@ -9,6 +9,6 @@ describe('feature-modules App', () => {
 
   it('should display message saying app works', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('app works!');
+    expect(page.getTitleText()).toEqual('app works!');
   });
 });
diff --git a/aio/content/examples/elements/example-config.json b/aio/content/examples/elements/example-config.json
index cc42921173..e69de29bb2 100644
--- a/aio/content/examples/elements/example-config.json
+++ b/aio/content/examples/elements/example-config.json
@@ -1,3 +0,0 @@
-{
-  "projectType": "elements"
-}
diff --git a/aio/content/examples/feature-modules/e2e/src/app.e2e-spec.ts b/aio/content/examples/feature-modules/e2e/src/app.e2e-spec.ts
index 899a1ad037..fbc7dc198a 100644
--- a/aio/content/examples/feature-modules/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/feature-modules/e2e/src/app.e2e-spec.ts
@@ -9,7 +9,7 @@ describe('feature-modules App', () => {
 
   it('should display message saying app works', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('app works!');
+    expect(page.getTitleText()).toEqual('app works!');
   });
 });
 
diff --git a/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts b/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts
index 121d100ccb..c064e540e8 100644
--- a/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts
@@ -15,7 +15,7 @@ describe('providers App', () => {
 
   it('should display message saying app works', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Lazy loading feature modules');
+    expect(page.getTitleText()).toEqual('Lazy loading feature modules');
   });
 
   describe('Customers list', function() {
diff --git a/aio/content/examples/providers/e2e/src/app.e2e-spec.ts b/aio/content/examples/providers/e2e/src/app.e2e-spec.ts
index 46108fd9dc..758c5fa0e5 100644
--- a/aio/content/examples/providers/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/providers/e2e/src/app.e2e-spec.ts
@@ -23,7 +23,7 @@ describe('providers App', () => {
 
   it('should display header that says Users list', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Users list');
+    expect(page.getTitleText()).toEqual('Users list');
   });
 
 
diff --git a/aio/content/examples/service-worker-getting-started/e2e/src/app.e2e-spec.ts b/aio/content/examples/service-worker-getting-started/e2e/src/app.e2e-spec.ts
index c221f0ebb6..033a0af6aa 100755
--- a/aio/content/examples/service-worker-getting-started/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/service-worker-getting-started/e2e/src/app.e2e-spec.ts
@@ -11,7 +11,7 @@ describe('sw-example App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to Service Workers!');
+    expect(page.getTitleText()).toEqual('Welcome to Service Workers!');
   });
 
   it('should display the Angular logo', () => {
diff --git a/aio/content/examples/universal/src/tsconfig.server.json b/aio/content/examples/universal/tsconfig.server.json
similarity index 69%
rename from aio/content/examples/universal/src/tsconfig.server.json
rename to aio/content/examples/universal/tsconfig.server.json
index 4401f4ca65..5a3e958cb0 100644
--- a/aio/content/examples/universal/src/tsconfig.server.json
+++ b/aio/content/examples/universal/tsconfig.server.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "baseUrl": "./",
@@ -11,6 +11,6 @@
     "**/*.spec.ts"
   ],
   "angularCompilerOptions": {
-    "entryModule": "app/app.server.module#AppServerModule"
+    "entryModule": "src/app/app.server.module#AppServerModule"
   }
 }
diff --git a/aio/tools/examples/README.md b/aio/tools/examples/README.md
index 786216ec7f..22d712698c 100644
--- a/aio/tools/examples/README.md
+++ b/aio/tools/examples/README.md
@@ -17,21 +17,23 @@ As mentioned, many of the documentation pages contain snippets extracted from re
 To achieve that, all those applications needs to contain a basic boilerplate. E.g. a `node_modules`
 folder, `package.json` with scripts, etc.
 
-No one wants to maintain the boilerplate on each example, so the goal of this tool is to provide a
-set of boilerplates that works in all the examples.
+No one wants to maintain the boilerplate on each example, so the goal of this tool is to provide a set of files that works across all the examples.
 
 ### Boilerplate files
 
-Inside `/aio/tools/examples/shared/boilerplate` you will find a set of folders representing each
-boilerplate.
+Inside `/aio/tools/examples/shared/boilerplate` you will find a set of folders representing each project type.
 
-Currently you will find the next boilerplates:
+Currently you will find the next project types:
 
-
-* CLI - For CLI based examples. This is the default one, to be used in the majority of the examples.
+* cli - For CLI based examples. This is the default one, to be used in the majority of the examples.
+* getting-started - CLI-based with its own set of styles.
+* i18n - CLI-based with additional scripts for internationalization.
+* ivy - CLI-based with additional configuration for running the examples with the Ivy renderer and ngstc compiler.
+* schematics - CLI-based with additional scripts for building schematics.
+* service-worker - CLI-based with additional packages and configuration for service workers.
 * systemjs - Currently in deprecation, only used in a few examples.
-* i18n - Based on the CLI one, features a few scripts for i18n.
-* universal - Based on the cli with a extra server for universal.
+* testing - CLI-based with additional styles for jasmine testing.
+* universal - CLI-based with an extra server target.
 
 There is also a `common` folder that contains files used in all different examples.
 
@@ -41,11 +43,14 @@ Each example is identified by an **example-config.json** configuration file in i
 This configuration file indicates what type of boilerplate this example needs. E.g.
 
 ```json
-{ projectType: 'universal' }
+{
+  "projectType": "cli",
+  "useCommonBoilerplate": true
+}
 ```
 
 If the file is empty then the default type of cli is assumed.
-When the boilerplate tooling runs, it will copy into the example folder all of the appropriate boilerplate files.
+When the boilerplate tooling runs, it will copy into the example folder all of the appropriate files based on the project type.
 
 ### A node_modules to share
 
@@ -89,4 +94,13 @@ that name.
 It also has an optional `--setup` flag to run the `example-boilerplate.js` script and install
 the latest `webdriver`.
 
-It will create a `/aio/protractor-results-txt` file when it finishes running tests.
+It will create a `/aio/protractor-results.txt` file when it finishes running tests.
+
+### Updating example dependencies
+
+With every major release, we update the examples to be on the latest version. The following steps to update are:
+
+* In the `shared/package.json` file, bump all the `@angular/*`, `@angular-devkit/*`, `rxjs`, `typescript`, and `zone.js` package versions to the version that corresponds with the [framework version](../../../package.json).
+* In the `shared` folder, run `yarn` to update the dependencies for the shared `node_modules` and the `yarn.lock` file.
+* In the `boilerplate` folder, go through each sub-folder and update the `package.json` dependencies if one is present.
+* Follow the [update guide](./shared/boilerplate/UPDATING_CLI.md) to update the common files used in the examples based on project type.
\ No newline at end of file
diff --git a/aio/tools/examples/example-boilerplate.js b/aio/tools/examples/example-boilerplate.js
index cd34a0bed3..84f0892696 100644
--- a/aio/tools/examples/example-boilerplate.js
+++ b/aio/tools/examples/example-boilerplate.js
@@ -13,9 +13,9 @@ const EXAMPLES_BASE_PATH = path.resolve(__dirname, '../../content/examples');
 const BOILERPLATE_PATHS = {
   cli: [
     'src/environments/environment.prod.ts', 'src/environments/environment.ts',
-    'src/assets/.gitkeep', 'src/browserslist', 'src/favicon.ico', 'src/karma.conf.js',
-    'src/polyfills.ts', 'src/test.ts', 'src/tsconfig.app.json', 'src/tsconfig.spec.json',
-    'src/tslint.json', 'e2e/src/app.po.ts', 'e2e/protractor.conf.js', 'e2e/tsconfig.e2e.json',
+    'src/assets/.gitkeep', 'browserslist', 'src/favicon.ico', 'karma.conf.js',
+    'src/polyfills.ts', 'src/test.ts', 'tsconfig.app.json', 'tsconfig.spec.json',
+    'tslint.json', 'e2e/src/app.po.ts', 'e2e/protractor.conf.js', 'e2e/tsconfig.json',
     '.editorconfig', 'angular.json', 'package.json', 'tsconfig.json', 'tslint.json'
   ],
   systemjs: [
@@ -29,8 +29,6 @@ const BOILERPLATE_PATHS = {
 // This maps the CLI files that exists in a parent folder
 const cliRelativePath = BOILERPLATE_PATHS.cli.map(file => `../cli/${file}`);
 
-BOILERPLATE_PATHS.elements = [...cliRelativePath, 'tsconfig.json'];
-
 BOILERPLATE_PATHS.i18n = [...cliRelativePath, 'angular.json', 'package.json'];
 
 BOILERPLATE_PATHS['service-worker'] = [...cliRelativePath, 'angular.json', 'package.json'];
@@ -51,7 +49,7 @@ BOILERPLATE_PATHS['getting-started'] = [
 
 BOILERPLATE_PATHS.ivy = {
   systemjs: ['rollup-config.js', 'tsconfig-aot.json'],
-  cli: ['src/tsconfig.app.json']
+  cli: ['tsconfig.app.json']
 };
 
 BOILERPLATE_PATHS.schematics = [
diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js
index e420b7752b..f0c1f6770d 100644
--- a/aio/tools/examples/run-example-e2e.js
+++ b/aio/tools/examples/run-example-e2e.js
@@ -26,11 +26,6 @@ const IGNORED_EXAMPLES = [
 const fixmeIvyExamples = [
   // fixmeIvy('unknown') app fails at runtime due to missing external service (goog is undefined)
   'i18n',
-  // Needs a Angular CLI synced with the Ivy loadChildren: string support after
-  // https://github.com/angular/angular/pull/28685
-  'lazy-loading-ngmodules',
-  'router',
-  'ngmodules',
 ];
 
 if (argv.ivy) {
diff --git a/aio/tools/examples/shared/boilerplate/.gitignore b/aio/tools/examples/shared/boilerplate/.gitignore
new file mode 100644
index 0000000000..ceed8f2aed
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/.gitignore
@@ -0,0 +1,2 @@
+**/yarn.lock
+**/package-lock.json
\ No newline at end of file
diff --git a/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md b/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
index 8092025c30..3e0dee3883 100644
--- a/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
+++ b/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
@@ -1,56 +1,50 @@
-# How to update the CLI boilerplate
+# How to update the CLI project 
 
-The boilerplate is updated by hand so you normally update it every minor version unless there is a major bug to fix.
+The Angular CLI default setup is updated using `ng update`. Any necessary file changes will be done automatically through migration schematics.
 
-## Getting a new boilerplate
-
-The first thing would be updating the CLI globally
+In the `cli` folder, update the Angular CLI depedencies to the latest version:
 
 ```
-npm i -g @angular/cli
+ng update @angular/cli --next
 ```
 
-Then create a new dummy project in a temporary folder outside angular
+Then update the Angular Framework dependencies to the latest version:
 
 ```
-ng new dummy
+ng update @angular/core --next
 ```
 
-Now you have a fresh application to get our new boilerplate files.
+Commit any changes to the `cli` folder to the repository.
 
-## Updating files
+## Updating other CLI-based projects
 
-From `dummy` you can replace the following files into `aio/tools/examples/shared/boilerplate/cli`:
+Along with the boilerplate files for the `cli` folder, the other cli-based projects need to be updated also. Each cli-based project has slightly modified files specific to the project type. Make sure any necessary changes to these projects are made also to be in alignment with the `cli` project files.
 
-* .editorconfig
-* angular.json
-* package.json
-* tsconfig.json
-* tslint.json
-* e2e/src/app.po.ts
-* e2e/protractor.conf.js
-* e2e/tsconfig.e2e.json
-* src/environments/environment.prod.ts
-* src/environments/environment.ts
-* src/browserslist
-* src/favicon.ico
-* src/karma.conf.js
-* src/polyfills.js
-* src/styles.css
-* src/test.ts
-* src/tsconfig.app.json
-* src/tsconfig.spec.json
-* src/tslint.json
-* src/typings.d.ts
+The specific changes to each project type are listed below:
 
-### angular.json
-
-Update the `project > name` to `angular.io-example`.
-
-### package.json
-
-Update the `name` to `angular.io-example`.
-
-### src/tsconfig.app.json
-
-This file is small enough and there are a few new excludes, update by hand.
+* i18n
+  - angular.json
+    - Includes additional configurations for `build`, `serve`, and `e2e` for different locales
+  - package.json
+    - Includes custom scripts for building and serving different locales
+* ivy
+  - cli/tsconfig.app.json
+    - Includes an `angularCompilerOptions` object with `enableIvy` set to `true`
+* schematics
+  - angular.json
+    - Includes a `my-lib` project that contains a library with example schematics
+* service-worker
+  - angular.json
+    - Has `serviceWorker` set to `true` in the `production` build target
+  - package.json
+    - Includes `@angular/service-worker` in `dependencies`
+* testing
+  - angular.json
+    - Includes `src/test.css` in the `styles` for the `test` target
+* universal
+  - angular.json
+    - Includes a `server` target in the `build` architect runners
+  - package.json
+    - Includes custom scripts for building the `server`
+    - Includes additional `dependencies` on `@nguniversal/common`, `@nguniversal/express-engine`, and `@nguniversal/module-map-ngfactory-loader`
+    - Includes `devDependencies` on `@angular/platform-server`, and `ts-loader`
diff --git a/aio/tools/examples/shared/boilerplate/cli/.editorconfig b/aio/tools/examples/shared/boilerplate/cli/.editorconfig
index 6e87a003da..e89330a618 100644
--- a/aio/tools/examples/shared/boilerplate/cli/.editorconfig
+++ b/aio/tools/examples/shared/boilerplate/cli/.editorconfig
@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]
diff --git a/aio/tools/examples/shared/boilerplate/cli/.gitignore b/aio/tools/examples/shared/boilerplate/cli/.gitignore
index ee5c9d8336..f4f46a5fee 100644
--- a/aio/tools/examples/shared/boilerplate/cli/.gitignore
+++ b/aio/tools/examples/shared/boilerplate/cli/.gitignore
@@ -4,10 +4,16 @@
 /dist
 /tmp
 /out-tsc
+# Only exists if Bazel was run
+/bazel-out
 
 # dependencies
 /node_modules
 
+# profiling files
+chrome-profiler-events.json
+speed-measure-plugin.json
+
 # IDEs and editors
 /.idea
 .project
@@ -23,6 +29,7 @@
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
 # misc
 /.sass-cache
diff --git a/aio/tools/examples/shared/boilerplate/cli/angular.json b/aio/tools/examples/shared/boilerplate/cli/angular.json
index 3735b82a1b..51a129b26c 100644
--- a/aio/tools/examples/shared/boilerplate/cli/angular.json
+++ b/aio/tools/examples/shared/boilerplate/cli/angular.json
@@ -4,11 +4,11 @@
   "newProjectRoot": "projects",
   "projects": {
     "angular.io-example": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,7 +17,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -76,37 +76,31 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "angular.io-example-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "prefix": "",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -118,15 +112,6 @@
               "devServerTarget": "angular.io-example:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
diff --git a/aio/tools/examples/shared/boilerplate/cli/browserslist b/aio/tools/examples/shared/boilerplate/cli/browserslist
new file mode 100644
index 0000000000..b23d6dc5bd
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/cli/browserslist
@@ -0,0 +1,15 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+# Googlebot uses an older version of Chrome
+# For additional information see: https://developers.google.com/search/docs/guides/rendering
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
diff --git a/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js b/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
index 98b6d13e75..c8a6464753 100644
--- a/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
+++ b/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
@@ -1,15 +1,19 @@
+// @ts-check
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
 const { SpecReporter } = require('jasmine-spec-reporter');
 
+/**
+ * @type { import("protractor").Config }
+ */
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
     './src/**/*.e2e-spec.ts'
   ],
   capabilities: {
-    'browserName': 'chrome',
+    'browserName': 'chrome'
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
@@ -21,7 +25,7 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: require('path').join(__dirname, './tsconfig.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }
diff --git a/aio/tools/examples/shared/boilerplate/cli/e2e/src/app.po.ts b/aio/tools/examples/shared/boilerplate/cli/e2e/src/app.po.ts
index 82ea75ba50..5776aa9eb8 100644
--- a/aio/tools/examples/shared/boilerplate/cli/e2e/src/app.po.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/e2e/src/app.po.ts
@@ -2,10 +2,10 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get(browser.baseUrl) as Promise<any>;
   }
 
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+  getTitleText() {
+    return element(by.css('app-root h1')).getText() as Promise<string>;
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.e2e.json b/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.json
similarity index 85%
rename from aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.e2e.json
rename to aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.json
index 77d311e88d..39b800f789 100644
--- a/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.e2e.json
+++ b/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../out-tsc/app",
+    "outDir": "../out-tsc/e2e",
     "module": "commonjs",
     "target": "es5",
     "types": [
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/karma.conf.js b/aio/tools/examples/shared/boilerplate/cli/karma.conf.js
similarity index 82%
rename from aio/tools/examples/shared/boilerplate/cli/src/karma.conf.js
rename to aio/tools/examples/shared/boilerplate/cli/karma.conf.js
index 4a9730b9b6..f439e1ec78 100644
--- a/aio/tools/examples/shared/boilerplate/cli/src/karma.conf.js
+++ b/aio/tools/examples/shared/boilerplate/cli/karma.conf.js
@@ -16,8 +16,8 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '../coverage'),
-      reports: ['html', 'lcovonly'],
+      dir: require('path').join(__dirname, './coverage/angular.io-example'),
+      reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
     reporters: ['progress', 'kjhtml'],
@@ -26,6 +26,7 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
-    singleRun: false
+    singleRun: false,
+    restartOnFileChange: true
   });
 };
diff --git a/aio/tools/examples/shared/boilerplate/cli/package.json b/aio/tools/examples/shared/boilerplate/cli/package.json
index f1e44a1384..c152cc733e 100644
--- a/aio/tools/examples/shared/boilerplate/cli/package.json
+++ b/aio/tools/examples/shared/boilerplate/cli/package.json
@@ -12,40 +12,41 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.0",
-    "@angular/common": "^7.0.0",
-    "@angular/compiler": "^7.0.0",
-    "@angular/core": "^7.0.0",
-    "@angular/forms": "^7.0.0",
-    "@angular/platform-browser": "^7.0.0",
-    "@angular/platform-browser-dynamic": "^7.0.0",
-    "@angular/router": "^7.0.0",
+    "@angular/animations": "^8.0.0-rc",
+    "@angular/common": "^8.0.0-rc",
+    "@angular/compiler": "^8.0.0-rc",
+    "@angular/core": "^8.0.0-rc",
+    "@angular/forms": "^8.0.0-rc",
+    "@angular/platform-browser": "^8.0.0-rc",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc",
+    "@angular/router": "^8.0.0-rc",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
+    "tslib": "^1.9.0",
     "web-animations-js": "^2.3.1",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.10.0",
-    "@angular/cli": "^7.0.0",
-    "@angular/compiler-cli": "^7.0.0",
-    "@angular/language-service": "^7.0.0",
-    "@types/jasmine": "~2.8.8",
+    "@angular-devkit/build-angular": "^0.800.0-rc",
+    "@angular/cli": "^8.0.0-rc",
+    "@angular/compiler-cli": "^8.0.0-rc",
+    "@angular/language-service": "^8.0.0-rc",
+    "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~5.0.0",
     "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1"
+    "tslint": "~5.15.0",
+    "typescript": "~3.4.4"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/browserslist b/aio/tools/examples/shared/boilerplate/cli/src/browserslist
deleted file mode 100644
index c6cb1d38d7..0000000000
--- a/aio/tools/examples/shared/boilerplate/cli/src/browserslist
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-#
-# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
-
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
-not IE 9-11
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
index 5efc9c9c5e..246bab0c51 100644
--- a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
@@ -18,29 +18,6 @@
  * BROWSER POLYFILLS
  */
 
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
-// import 'core-js/es6/set';
-
-/**
- * If the application will be indexed by Google Search, the following is required.
- * Googlebot uses a renderer based on Chrome 41.
- * https://developers.google.com/search/docs/guides/rendering
- **/
-// import 'core-js/es6/array';
-
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
@@ -58,31 +35,39 @@ import 'core-js/es7/reflect';
  * Web Animations `@angular/platform-browser/animations`
  * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
  * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- **/
+ */
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags.ts';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
  */
 
- // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
- // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
-
- /*
- * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
- * with the following flag, it will bypass `zone.js` patch for IE/Edge
- */
-// (window as any).__Zone_enable_cross_context_check = true;
-
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
 import 'zone.js/dist/zone';  // Included with Angular CLI.
 
 
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.app.json b/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.app.json
deleted file mode 100644
index dbbf994fa4..0000000000
--- a/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.app.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "types": []
-  },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts",
-    "**/*.avoid.ts",
-    "**/*.0.ts",
-    "**/*.1.ts",
-    "**/*.1b.ts",
-    "**/*.2.ts",
-    "**/*.3.ts",
-    "**/*.4.ts",
-    "**/*.5.ts",
-    "**/*.6.ts",
-    "**/*.7.ts"
-  ]
-}
\ No newline at end of file
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.spec.json b/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.spec.json
deleted file mode 100644
index de7733630e..0000000000
--- a/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.spec.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/spec",
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  },
-  "files": [
-    "test.ts",
-    "polyfills.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/tslint.json b/aio/tools/examples/shared/boilerplate/cli/src/tslint.json
deleted file mode 100644
index 52e2c1a5a7..0000000000
--- a/aio/tools/examples/shared/boilerplate/cli/src/tslint.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "extends": "../tslint.json",
-    "rules": {
-        "directive-selector": [
-            true,
-            "attribute",
-            "app",
-            "camelCase"
-        ],
-        "component-selector": [
-            true,
-            "element",
-            "app",
-            "kebab-case"
-        ]
-    }
-}
diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json
new file mode 100644
index 0000000000..f0259083da
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json
@@ -0,0 +1,24 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": []
+  },
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "src/test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.avoid.ts",
+    "src/**/*.0.ts",
+    "src/**/*.1.ts",
+    "src/**/*.1b.ts",
+    "src/**/*.2.ts",
+    "src/**/*.3.ts",
+    "src/**/*.4.ts",
+    "src/**/*.5.ts",
+    "src/**/*.6.ts",
+    "src/**/*.7.ts"
+  ]
+}
diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
index 46aeded1b2..6ec9ceb174 100644
--- a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
@@ -5,11 +5,12 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
-    "module": "es2015",
+    "module": "esnext",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es5",
+    "importHelpers": true,
+    "target": "es2015",
     "typeRoots": [
       "node_modules/@types"
     ],
diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json
new file mode 100644
index 0000000000..6400fde7d5
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json
@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts",
+    "src/polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/aio/tools/examples/shared/boilerplate/cli/tslint.json b/aio/tools/examples/shared/boilerplate/cli/tslint.json
index 2f3c13be4a..188bd78d32 100644
--- a/aio/tools/examples/shared/boilerplate/cli/tslint.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tslint.json
@@ -1,32 +1,32 @@
 {
-  "rulesDirectory": [
-    "node_modules/codelyzer"
-  ],
+  "extends": "tslint:recommended",
   "rules": {
-    "arrow-return-shorthand": true,
-    "callable-types": true,
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "curly": true,
+    "array-type": false,
+    "arrow-parens": false,
     "deprecation": {
       "severity": "warn"
     },
-    "eofline": true,
-    "forin": true,
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ],
     "import-blacklist": [
       true,
       "rxjs/Rx"
     ],
-    "import-spacing": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "interface-over-type-literal": true,
-    "label-position": true,
+    "interface-name": false,
+    "max-classes-per-file": false,
     "max-line-length": [
       true,
       140
@@ -43,8 +43,7 @@
         ]
       }
     ],
-    "no-arg": true,
-    "no-bitwise": true,
+    "no-consecutive-blank-lines": false,
     "no-console": [
       true,
       "debug",
@@ -53,78 +52,41 @@
       "timeEnd",
       "trace"
     ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-super": true,
     "no-empty": false,
-    "no-empty-interface": true,
-    "no-eval": true,
     "no-inferrable-types": [
       true,
       "ignore-params"
     ],
-    "no-misused-new": true,
     "no-non-null-assertion": true,
     "no-redundant-jsdoc": true,
-    "no-shadowed-variable": true,
-    "no-string-literal": false,
-    "no-string-throw": true,
     "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": true,
-    "no-unnecessary-initializer": true,
-    "no-unused-expression": true,
-    "no-var-keyword": true,
-    "object-literal-sort-keys": false,
-    "one-line": [
+    "no-use-before-declare": true,
+    "no-var-requires": false,
+    "object-literal-key-quotes": [
       true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
+      "as-needed"
     ],
-    "prefer-const": true,
+    "object-literal-sort-keys": false,
+    "ordered-imports": false,
     "quotemark": [
       true,
       "single"
     ],
-    "radix": true,
-    "semicolon": [
-      true,
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "unified-signatures": true,
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
-    "no-output-on-prefix": true,
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
+    "trailing-comma": false,
+    "no-conflicting-lifecycle": true,
+    "no-host-metadata-property": true,
     "no-input-rename": true,
+    "no-inputs-metadata-property": true,
+    "no-output-native": true,
+    "no-output-on-prefix": true,
     "no-output-rename": true,
-    "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "component-class-suffix": true,
-    "directive-class-suffix": true
-  }
-}
+    "no-outputs-metadata-property": true,
+    "template-banana-in-box": true,
+    "template-no-negated-async": true,
+    "use-lifecycle-interface": true,
+    "use-pipe-transform-interface": true
+  },
+  "rulesDirectory": [
+    "codelyzer"
+  ]
+}
\ No newline at end of file
diff --git a/aio/tools/examples/shared/boilerplate/elements/tsconfig.json b/aio/tools/examples/shared/boilerplate/elements/tsconfig.json
deleted file mode 100644
index 1a4f29fa89..0000000000
--- a/aio/tools/examples/shared/boilerplate/elements/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "target": "es2015",  // Custom Elements require ES2015 classes (or polyfill).
-    "skipLibCheck": true,
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
-  }
-}
diff --git a/aio/tools/examples/shared/boilerplate/i18n/angular.json b/aio/tools/examples/shared/boilerplate/i18n/angular.json
index e1dd5c6641..696875fcb7 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/angular.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/angular.json
@@ -4,11 +4,11 @@
   "newProjectRoot": "projects",
   "projects": {
     "angular.io-example": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,7 +17,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -43,7 +43,14 @@
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
             },
             "production-fr": {
               "fileReplacements": [
@@ -102,37 +109,31 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "angular.io-example-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "prefix": "",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -144,15 +145,6 @@
               "devServerTarget": "angular.io-example:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
diff --git a/aio/tools/examples/shared/boilerplate/i18n/package.json b/aio/tools/examples/shared/boilerplate/i18n/package.json
index 118df056e3..244ec7ffca 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/package.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/package.json
@@ -15,14 +15,14 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.0",
-    "@angular/common": "^7.0.0",
-    "@angular/compiler": "^7.0.0",
-    "@angular/core": "^7.0.0",
-    "@angular/forms": "^7.0.0",
-    "@angular/platform-browser": "^7.0.0",
-    "@angular/platform-browser-dynamic": "^7.0.0",
-    "@angular/router": "^7.0.0",
+    "@angular/animations": "^8.0.0-rc",
+    "@angular/common": "^8.0.0-rc",
+    "@angular/compiler": "^8.0.0-rc",
+    "@angular/core": "^8.0.0-rc",
+    "@angular/forms": "^8.0.0-rc",
+    "@angular/platform-browser": "^8.0.0-rc",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc",
+    "@angular/router": "^8.0.0-rc",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
@@ -30,25 +30,25 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.10.0",
-    "@angular/cli": "^7.0.0",
-    "@angular/compiler-cli": "^7.0.0",
-    "@angular/language-service": "^7.0.0",
-    "@types/jasmine": "~2.8.8",
+    "@angular-devkit/build-angular": "^0.800.0-rc",
+    "@angular/cli": "^8.0.0-rc",
+    "@angular/compiler-cli": "^8.0.0-rc",
+    "@angular/language-service": "^8.0.0-rc",
+    "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~5.0.0",
     "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1"
+    "tslint": "~5.15.0",
+    "typescript": "~3.4.4"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/ivy/cli/src/tsconfig.app.json b/aio/tools/examples/shared/boilerplate/ivy/cli/src/tsconfig.app.json
deleted file mode 100644
index d4d4aad743..0000000000
--- a/aio/tools/examples/shared/boilerplate/ivy/cli/src/tsconfig.app.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "types": []
-  },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts",
-    "**/*.avoid.ts",
-    "**/*.0.ts",
-    "**/*.1.ts",
-    "**/*.1b.ts",
-    "**/*.2.ts",
-    "**/*.3.ts",
-    "**/*.4.ts",
-    "**/*.5.ts",
-    "**/*.6.ts",
-    "**/*.7.ts"
-  ],
-  "angularCompilerOptions": {
-    "enableIvy": "ngtsc",
-    "allowEmptyCodegenFiles": true
-  }
-}
diff --git a/aio/tools/examples/shared/boilerplate/ivy/cli/tsconfig.app.json b/aio/tools/examples/shared/boilerplate/ivy/cli/tsconfig.app.json
new file mode 100644
index 0000000000..43709e42fe
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/ivy/cli/tsconfig.app.json
@@ -0,0 +1,27 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": []
+  },
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "src/test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.avoid.ts",
+    "src/**/*.0.ts",
+    "src/**/*.1.ts",
+    "src/**/*.1b.ts",
+    "src/**/*.2.ts",
+    "src/**/*.3.ts",
+    "src/**/*.4.ts",
+    "src/**/*.5.ts",
+    "src/**/*.6.ts",
+    "src/**/*.7.ts"
+  ],
+  "angularCompilerOptions": {
+    "enableIvy": true
+  }
+}
diff --git a/aio/tools/examples/shared/boilerplate/ivy/systemjs/tsconfig-aot.json b/aio/tools/examples/shared/boilerplate/ivy/systemjs/tsconfig-aot.json
index b113b6cade..d68fa9f6ec 100644
--- a/aio/tools/examples/shared/boilerplate/ivy/systemjs/tsconfig-aot.json
+++ b/aio/tools/examples/shared/boilerplate/ivy/systemjs/tsconfig-aot.json
@@ -7,13 +7,17 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "lib": [
-      "es2015",
+      "es2018",
       "dom"
     ],
     "removeComments": false,
     "noImplicitAny": true,
     "skipLibCheck": true,
-    "suppressImplicitAnyIndexErrors": true
+    "suppressImplicitAnyIndexErrors": true,
+    "importHelpers": true,
+    "typeRoots": [
+      "node_modules/@types"
+    ]
   },
   "files": [
     "app/app.module.ts",
@@ -21,6 +25,6 @@
   ],
   "angularCompilerOptions": {
     "skipMetadataEmit": true,
-    "enableIvy": "ngtsc"
+    "enableIvy": true
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/schematics/angular.json b/aio/tools/examples/shared/boilerplate/schematics/angular.json
index 7923d1b35f..8975dbd47e 100644
--- a/aio/tools/examples/shared/boilerplate/schematics/angular.json
+++ b/aio/tools/examples/shared/boilerplate/schematics/angular.json
@@ -4,11 +4,11 @@
   "newProjectRoot": "projects",
   "projects": {
     "angular.io-example": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,7 +17,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -76,37 +76,31 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "angular.io-example-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "prefix": "",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -118,15 +112,6 @@
               "devServerTarget": "angular.io-example:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
diff --git a/aio/tools/examples/shared/boilerplate/service-worker/angular.json b/aio/tools/examples/shared/boilerplate/service-worker/angular.json
index ba4dc645a4..5dba12fc05 100644
--- a/aio/tools/examples/shared/boilerplate/service-worker/angular.json
+++ b/aio/tools/examples/shared/boilerplate/service-worker/angular.json
@@ -4,11 +4,11 @@
   "newProjectRoot": "projects",
   "projects": {
     "angular.io-example": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,7 +17,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -77,37 +77,31 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "angular.io-example-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "prefix": "",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -119,15 +113,6 @@
               "devServerTarget": "angular.io-example:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
diff --git a/aio/tools/examples/shared/boilerplate/service-worker/package.json b/aio/tools/examples/shared/boilerplate/service-worker/package.json
index 4080f13b61..8f526d530d 100644
--- a/aio/tools/examples/shared/boilerplate/service-worker/package.json
+++ b/aio/tools/examples/shared/boilerplate/service-worker/package.json
@@ -12,15 +12,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.0",
-    "@angular/common": "^7.0.0",
-    "@angular/compiler": "^7.0.0",
-    "@angular/core": "^7.0.0",
-    "@angular/forms": "^7.0.0",
-    "@angular/platform-browser": "^7.0.0",
-    "@angular/platform-browser-dynamic": "^7.0.0",
-    "@angular/router": "^7.0.0",
-    "@angular/service-worker": "^7.0.0",
+    "@angular/animations": "^8.0.0-rc",
+    "@angular/common": "^8.0.0-rc",
+    "@angular/compiler": "^8.0.0-rc",
+    "@angular/core": "^8.0.0-rc",
+    "@angular/forms": "^8.0.0-rc",
+    "@angular/platform-browser": "^8.0.0-rc",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc",
+    "@angular/router": "^8.0.0-rc",
+    "@angular/service-worker": "^8.0.0-rc",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
@@ -28,25 +28,25 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.10.0",
-    "@angular/cli": "^7.0.0",
-    "@angular/compiler-cli": "^7.0.0",
-    "@angular/language-service": "^7.0.0",
-    "@types/jasmine": "~2.8.8",
+    "@angular-devkit/build-angular": "^0.800.0-rc",
+    "@angular/cli": "^8.0.0-rc",
+    "@angular/compiler-cli": "^8.0.0-rc",
+    "@angular/language-service": "^8.0.0-rc",
+    "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~5.0.0",
     "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1"
+    "tslint": "~5.15.0",
+    "typescript": "~3.4.4"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/testing/angular.json b/aio/tools/examples/shared/boilerplate/testing/angular.json
index 6d8dda4e1e..d04996cbb7 100644
--- a/aio/tools/examples/shared/boilerplate/testing/angular.json
+++ b/aio/tools/examples/shared/boilerplate/testing/angular.json
@@ -4,11 +4,11 @@
   "newProjectRoot": "projects",
   "projects": {
     "angular.io-example": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,14 +17,13 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
-              "src/styles.css",
-              "src/test.css"
+              "src/styles.css"
             ],
             "scripts": []
           },
@@ -44,7 +43,14 @@
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
             }
           }
         },
@@ -70,37 +76,32 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "src/styles.css",
+              "src/test.css"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "angular.io-example-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "prefix": "",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -112,15 +113,6 @@
               "devServerTarget": "angular.io-example:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
diff --git a/aio/tools/examples/shared/boilerplate/universal/angular.json b/aio/tools/examples/shared/boilerplate/universal/angular.json
index d8a77a38e4..babe0fcedb 100644
--- a/aio/tools/examples/shared/boilerplate/universal/angular.json
+++ b/aio/tools/examples/shared/boilerplate/universal/angular.json
@@ -4,11 +4,11 @@
   "newProjectRoot": "projects",
   "projects": {
     "angular.io-example": {
+      "projectType": "application",
+      "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
       "prefix": "app",
-      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,7 +17,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -43,7 +43,14 @@
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
             }
           }
         },
@@ -69,45 +76,31 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
-            ]
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
         },
-        "server": {
-          "builder": "@angular-devkit/build-angular:server",
-          "options": {
-            "outputPath": "dist/server",
-            "main": "src/main.server.ts",
-            "tsConfig": "src/tsconfig.server.json"
-          }
-        }
-      }
-    },
-    "angular.io-example-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "prefix": "",
-      "architect": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -120,13 +113,12 @@
             }
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+        "server": {
+          "builder": "@angular-devkit/build-angular:server",
           "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "outputPath": "dist/server",
+            "main": "src/main.server.ts",
+            "tsConfig": "tsconfig.server.json"
           }
         }
       }
diff --git a/aio/tools/examples/shared/boilerplate/universal/package.json b/aio/tools/examples/shared/boilerplate/universal/package.json
index e94fc915d6..818d95bb51 100644
--- a/aio/tools/examples/shared/boilerplate/universal/package.json
+++ b/aio/tools/examples/shared/boilerplate/universal/package.json
@@ -16,18 +16,18 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.0",
-    "@angular/common": "^7.0.0",
-    "@angular/compiler": "^7.0.0",
-    "@angular/core": "^7.0.0",
-    "@angular/forms": "^7.0.0",
-    "@angular/http": "^7.0.0",
-    "@angular/platform-browser": "^7.0.0",
-    "@angular/platform-browser-dynamic": "^7.0.0",
-    "@angular/router": "^7.0.0",
-    "@nguniversal/common": "^7.0.0",
-    "@nguniversal/express-engine": "^7.0.0",
-    "@nguniversal/module-map-ngfactory-loader": "^7.0.0",
+    "@angular/animations": "^8.0.0-rc",
+    "@angular/common": "^8.0.0-rc",
+    "@angular/compiler": "^8.0.0-rc",
+    "@angular/core": "^8.0.0-rc",
+    "@angular/forms": "^8.0.0-rc",
+    "@angular/http": "^8.0.0-rc",
+    "@angular/platform-browser": "^8.0.0-rc",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc",
+    "@angular/router": "^8.0.0-rc",
+    "@nguniversal/common": "^8.0.0-rc",
+    "@nguniversal/express-engine": "^8.0.0-rc",
+    "@nguniversal/module-map-ngfactory-loader": "^8.0.0-rc",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
@@ -35,28 +35,28 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.10.0",
-    "@angular/cli": "^7.0.0",
-    "@angular/compiler-cli": "^7.0.0",
-    "@angular/language-service": "^7.0.0",
-    "@angular/platform-server": "^7.0.0",
-    "@types/jasmine": "~2.8.8",
+    "@angular-devkit/build-angular": "^0.800.0-rc",
+    "@angular/cli": "^8.0.0-rc",
+    "@angular/compiler-cli": "^8.0.0-rc",
+    "@angular/language-service": "^8.0.0-rc",
+    "@angular/platform-server": "^8.0.0-rc",
+    "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~5.0.0",
     "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.4.0",
     "ts-loader": "^4.2.0",
     "ts-node": "~7.0.0",
     "tslint": "~5.11.0",
-    "typescript": "~3.1.1",
+    "typescript": "~3.4.3",
     "webpack-cli": "^3.1.0"
   }
 }
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index c439800643..efe7754660 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -18,35 +18,35 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "^7.1.0",
-    "@angular/common": "^7.1.0",
-    "@angular/compiler": "^7.1.0",
-    "@angular/core": "^7.1.0",
-    "@angular/elements": "^7.1.0",
-    "@angular/forms": "^7.1.0",
-    "@angular/http": "^7.1.0",
-    "@angular/platform-browser": "^7.1.0",
-    "@angular/platform-browser-dynamic": "^7.1.0",
-    "@angular/router": "^7.1.0",
-    "@angular/service-worker": "^7.1.0",
-    "@angular/upgrade": "^7.1.0",
-    "@nguniversal/common": "^7.1.0",
-    "@nguniversal/express-engine": "^7.1.0",
-    "@nguniversal/module-map-ngfactory-loader": "^7.1.0",
+    "@angular/animations": "8.0.0-rc.2",
+    "@angular/common": "8.0.0-rc.2",
+    "@angular/compiler": "8.0.0-rc.2",
+    "@angular/core": "8.0.0-rc.2",
+    "@angular/elements": "8.0.0-rc.2",
+    "@angular/forms": "8.0.0-rc.2",
+    "@angular/platform-browser": "8.0.0-rc.2",
+    "@angular/platform-browser-dynamic": "8.0.0-rc.2",
+    "@angular/router": "8.0.0-rc.2",
+    "@angular/service-worker": "8.0.0-rc.2",
+    "@angular/upgrade": "8.0.0-rc.2",
+    "@nguniversal/common": "8.0.0-rc.0",
+    "@nguniversal/express-engine": "8.0.0-rc.0",
+    "@nguniversal/module-map-ngfactory-loader": "^8.0.0-rc.0",
     "angular-in-memory-web-api": "github:brandonroberts/in-memory-web-api-bazel#50a34d8",
     "core-js": "^2.5.4",
     "express": "^4.14.1",
     "rxjs": "^6.5.1",
     "systemjs": "0.19.39",
     "web-animations-js": "^2.3.1",
+    "tslib": "^1.9.0",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.11.0",
-    "@angular/cli": "^7.1.0",
-    "@angular/compiler-cli": "^7.1.0",
-    "@angular/language-service": "^7.1.0",
-    "@angular/platform-server": "^7.1.0",
+    "@angular-devkit/build-angular": "0.800.0-rc.3",
+    "@angular/cli": "8.0.0-rc.3",
+    "@angular/compiler-cli": "8.0.0-rc.2",
+    "@angular/language-service": "8.0.0-rc.2",
+    "@angular/platform-server": "8.0.0-rc.2",
     "@types/angular": "^1.6.47",
     "@types/angular-animate": "^1.5.10",
     "@types/angular-mocks": "^1.6.0",
@@ -60,13 +60,13 @@
     "canonical-path": "1.0.0",
     "concurrently": "^3.0.0",
     "http-server": "^0.11.1",
-    "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-core": "~3.4.0",
+    "jasmine-marbles": "^0.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "lite-server": "^2.2.2",
     "lodash": "^4.16.2",
@@ -79,8 +79,8 @@
     "source-map-explorer": "^1.3.2",
     "ts-loader": "^4.2.0",
     "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1",
+    "tslint": "~5.15.0",
+    "typescript": "~3.4.3",
     "webpack-cli": "^3.1.0"
   },
   "repository": {}
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index d74a31dac5..2b11c26ce5 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -2,165 +2,151 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.11.4":
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.11.4.tgz#f0cc3b4f1dd0128f6b41d3bb760bcf4c324cd063"
-  integrity sha512-2zi6S9tPlk52vyqN67IvFoeNgd0uxtrPlwl3TdvJ3wrH7sYGJnkQ+EzAE7cKUGWAV989BbNtx2YxhRDHnN21Fg==
+"@angular-devkit/architect@0.800.0-rc.3":
+  version "0.800.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.0-rc.3.tgz#71043979d63bbf45d5b1cfd3d0d6feaee6399388"
+  integrity sha512-nX3sIDj7J3y5R6Hzsf052tfs5Fx+QE3KBv7u1prfaqVX9i5EnBJZeHAbwmBFPLUlhgrqp0azwwD4L2RHpPuicA==
   dependencies:
-    "@angular-devkit/core" "7.1.4"
-    rxjs "6.3.3"
+    "@angular-devkit/core" "8.0.0-rc.3"
+    rxjs "6.4.0"
 
-"@angular-devkit/architect@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.1.tgz#39597ce94f72d89bdd89ee567cb937cff4c13b98"
-  integrity sha512-QDmIbqde75ZZSEFbw6Q6kQWq4cY6C7D67yujXw6XTyubDNAs1tyXJyxTIB8vjSlEKwRizTTDd/B0ZXVcke3Mvw==
+"@angular-devkit/build-angular@0.800.0-rc.3":
+  version "0.800.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.0-rc.3.tgz#e71b2362d66d5dbd6f13766481abbb1b160939f0"
+  integrity sha512-MlKd3nMYixXgH7DgS+eO2zBzOA/GHSuEslycH2aAmLmTRYpnLaICTMenJWB2WRkndhaYlY7SEDV2nY4jQPal0g==
   dependencies:
-    "@angular-devkit/core" "7.3.1"
-    rxjs "6.3.3"
-
-"@angular-devkit/build-angular@^0.11.0":
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.11.4.tgz#795084e29c66a71da15227cf2ac29794aa807c7c"
-  integrity sha512-5WQAQB4heDqAotqjU3Tl8Ons0S/e16dKwVkQFdqfKPyBgmu4CyUH35eTV+i6i7un1Elg65U5GnA4MiUtApqVyw==
-  dependencies:
-    "@angular-devkit/architect" "0.11.4"
-    "@angular-devkit/build-optimizer" "0.11.4"
-    "@angular-devkit/build-webpack" "0.11.4"
-    "@angular-devkit/core" "7.1.4"
-    "@ngtools/webpack" "7.1.4"
-    ajv "6.5.3"
-    autoprefixer "9.3.1"
+    "@angular-devkit/architect" "0.800.0-rc.3"
+    "@angular-devkit/build-optimizer" "0.800.0-rc.3"
+    "@angular-devkit/build-webpack" "0.800.0-rc.3"
+    "@angular-devkit/core" "8.0.0-rc.3"
+    "@ngtools/webpack" "8.0.0-rc.3"
+    ajv "6.10.0"
+    autoprefixer "9.5.1"
+    browserslist "4.5.5"
+    caniuse-api "3.0.0"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
-    copy-webpack-plugin "4.5.4"
-    file-loader "2.0.0"
+    copy-webpack-plugin "5.0.2"
+    core-js "3.0.1"
+    file-loader "3.0.1"
     glob "7.1.3"
-    istanbul "0.4.5"
     istanbul-instrumenter-loader "3.0.1"
-    karma-source-map-support "1.3.0"
-    less "3.8.1"
+    karma-source-map-support "1.4.0"
+    less "3.9.0"
     less-loader "4.1.0"
-    license-webpack-plugin "2.0.2"
-    loader-utils "1.1.0"
-    mini-css-extract-plugin "0.4.4"
+    license-webpack-plugin "2.1.1"
+    loader-utils "1.2.3"
+    mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    opn "5.3.0"
+    open "6.2.0"
     parse5 "4.0.0"
-    portfinder "1.0.17"
-    postcss "7.0.5"
-    postcss-import "12.0.0"
+    postcss "7.0.14"
+    postcss-import "12.0.1"
     postcss-loader "3.0.0"
-    raw-loader "0.5.1"
-    rxjs "6.3.3"
+    raw-loader "1.0.0"
+    rxjs "6.4.0"
+    sass "1.19.0"
     sass-loader "7.1.0"
-    semver "5.5.1"
+    semver "6.0.0"
     source-map-loader "0.2.4"
-    source-map-support "0.5.9"
-    speed-measure-webpack-plugin "1.2.3"
+    source-map-support "0.5.12"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
     stylus-loader "3.0.2"
-    terser-webpack-plugin "1.1.0"
-    tree-kill "1.2.0"
-    webpack "4.23.1"
-    webpack-dev-middleware "3.4.0"
-    webpack-dev-server "3.1.10"
-    webpack-merge "4.1.4"
+    terser-webpack-plugin "1.2.3"
+    tree-kill "1.2.1"
+    webpack "4.30.0"
+    webpack-dev-middleware "3.6.2"
+    webpack-dev-server "3.3.1"
+    webpack-merge "4.2.1"
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
-  optionalDependencies:
-    node-sass "4.10.0"
+    worker-plugin "3.1.0"
 
-"@angular-devkit/build-optimizer@0.11.4":
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.11.4.tgz#d96b0e16a76f3825f173220a2de5f376fc5abaee"
-  integrity sha512-tAAWWFCcl918Q1JivlLvLFer8Qm4/THWbEneMwk5fQvG6/NgJLoa3itP/MCUq4qL6YHmp2DWkdWnWfRQCgHeFA==
+"@angular-devkit/build-optimizer@0.800.0-rc.3":
+  version "0.800.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.0-rc.3.tgz#d320cea2c07f373dd618f75d0dd60a29e5d5f578"
+  integrity sha512-pCKssuGq/YX6AyG8od8t781PbpQhJl3bH8trKYRuTkfNnrErN13Ebl1WMngu0cs4BnVsreUnI6x9ZZv8YxD4Ng==
   dependencies:
-    loader-utils "1.1.0"
+    loader-utils "1.2.3"
     source-map "0.5.6"
-    typescript "3.1.6"
-    webpack-sources "1.2.0"
+    typescript "3.4.4"
+    webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.11.4":
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.11.4.tgz#1397b21b6187eab0641830ece4c3b9faba00855e"
-  integrity sha512-4nEDXSbv3oDu27Rw5s2DMKmcOZYVAt76bryVF2SycSkDq3eAIiqmgw3G3CJJ4LTulXzDpaIpk02MvgbYkX+hvw==
+"@angular-devkit/build-webpack@0.800.0-rc.3":
+  version "0.800.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.0-rc.3.tgz#b35eb5ba98f7744737be884e1e38d4e707bb9dc7"
+  integrity sha512-h4gCBu6wENyetAxHCGT09UGXUTM+4doWLAo7n/MjEylZEfOX82xo6ylQUPzCEEiSJ6wHd+Zvcsl98ftbRPa7KA==
   dependencies:
-    "@angular-devkit/architect" "0.11.4"
-    "@angular-devkit/core" "7.1.4"
-    rxjs "6.3.3"
+    "@angular-devkit/architect" "0.800.0-rc.3"
+    "@angular-devkit/core" "8.0.0-rc.3"
+    rxjs "6.4.0"
+    webpack-merge "4.2.1"
 
-"@angular-devkit/core@7.1.4":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.1.4.tgz#4d903fd2ecc259b716ae76da19695d03993e583c"
-  integrity sha512-3cBVHjSQjMyE/mIyOX82ekdybNRQlN+kUfmdZS6oVW9aV48vdxcVbEGdl8t1H4enMf89u8kXiAAET9jFaqWopg==
+"@angular-devkit/core@8.0.0-rc.3":
+  version "8.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0-rc.3.tgz#a5e10e941d8a046abda9046e816d45694703c695"
+  integrity sha512-5PmX42/XOzPSqhIZBtXyozBN01Qpagj3YO0+ToKPDY+veGEUonPhz1jBiJ639NBldlGW1BBdQczpGZNg3uJj9A==
   dependencies:
-    ajv "6.5.3"
-    chokidar "2.0.4"
+    ajv "6.10.0"
     fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.1.tgz#d92f6545796579cabdcfc29579a2c977f7a96c6c"
-  integrity sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ==
+"@angular-devkit/schematics@8.0.0-rc.3":
+  version "8.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0-rc.3.tgz#754db2735863393066a7dd88915b5b594ccde4b8"
+  integrity sha512-u08GNDCRbm4fYYilmnT27Pp6QW/FxD7W9bpUH8Kp4i6r0f4uBuYQiQT1x6celTwj8Bh1fQqCq/kM/lAG0dd5Zg==
   dependencies:
-    ajv "6.7.0"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
+    "@angular-devkit/core" "8.0.0-rc.3"
+    rxjs "6.4.0"
 
-"@angular-devkit/schematics@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.1.tgz#7dc704005b966ea6c1ee62f380120183bb76eee6"
-  integrity sha512-cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg==
-  dependencies:
-    "@angular-devkit/core" "7.3.1"
-    rxjs "6.3.3"
-
-"@angular/animations@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.4.tgz#4d0a0b9f14d6bfc38ca773613b61729d020435e6"
-  integrity sha512-Wx6cqU6koFOASlyl4aCygtbtROoehU6OKwV2EZTkfzHx6Eu/QyTiSa5kyoApVM5LMmCNeb8SxJMSAnKXztNl0A==
+"@angular/animations@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-rc.2.tgz#aef2683aba35498fe26253bf8f461a1658864e49"
+  integrity sha512-XTT7Eif6Km6MSbLr6qlCmx8vjRgx/Hp5Hv1WnnPtRFt8XeidYGGYIq2si3CxQ2xBjEO3OpNbPqtYvZKH1yuBdA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.1.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.1.tgz#a18acdec84deb03a1fae79cae415bbc8f9c87ffa"
-  integrity sha512-8EvXYRhTqTaTk5PKv7VZxIWJiyG51R9RC9gtpRFx4bbnurqBHdEUxGMmaRsGT8QDbfvVsWnuakE0eeW1CrfZAQ==
+"@angular/cli@8.0.0-rc.3":
+  version "8.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.0-rc.3.tgz#88f030c3ed682717ea318210f4460e9fdc4a9799"
+  integrity sha512-yY72F9wnsvrtgSkmNA1KIyx6eTRUkLaOcpyfzSPNiIHxWCy8pZvA6TbY49bBNFUatV677RuyMS0XVjww0viVxw==
   dependencies:
-    "@angular-devkit/architect" "0.13.1"
-    "@angular-devkit/core" "7.3.1"
-    "@angular-devkit/schematics" "7.3.1"
-    "@schematics/angular" "7.3.1"
-    "@schematics/update" "0.13.1"
+    "@angular-devkit/architect" "0.800.0-rc.3"
+    "@angular-devkit/core" "8.0.0-rc.3"
+    "@angular-devkit/schematics" "8.0.0-rc.3"
+    "@schematics/angular" "8.0.0-rc.3"
+    "@schematics/update" "0.800.0-rc.3"
     "@yarnpkg/lockfile" "1.1.0"
+    debug "^4.1.1"
     ini "1.3.5"
-    inquirer "6.2.1"
+    inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    opn "5.4.0"
-    pacote "9.4.0"
-    semver "5.6.0"
+    open "6.2.0"
+    pacote "9.5.0"
+    semver "6.0.0"
     symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
 
-"@angular/common@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.4.tgz#9f1ed530e5dc7613a263e015c203ead390d50336"
-  integrity sha512-3/i8RtnLTx/90gJHk5maE8zwsSiHgHvLItaa0qVfNlWiU0eCId/PL6TgDkut5vN9SQYL0oxhxFaVd35HmwsmuQ==
+"@angular/common@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-rc.2.tgz#77b2da22cb11bf2039799d56ec2fb7c4f51a1374"
+  integrity sha512-/MUZhebMAkAwV8jkimBONN2eOQ2/5qO54ZvPypyy2tEHk69JRNLFjREaR+VU8yGlS/1MU6jTYxyfRW2c8ggLzA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.4.tgz#3de23fd5f558a859a444c58dab18f2981c9c2937"
-  integrity sha512-UhLosSeuwFIfaGqGcYOh9WSOuzEpeuhIRAOt81MeqOQEqkoreUjfxrQq8XWNkdqsPZHtiptF5ZwXlMBxlj9jJg==
+"@angular/compiler-cli@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-rc.2.tgz#a3ef74f3e4ea448ccf1387c18c32fc664b67b2e1"
+  integrity sha512-lLhedaTQ08/i4aysCPpTYbAP0/8T5/EHE79FByp/7XxqRuQxcXkFJujQT1Q/KReKa0gA9JEYD4I1eBJpNYyMLQ==
   dependencies:
     canonical-path "1.0.0"
-    chokidar "^1.4.2"
+    chokidar "^2.1.1"
     convert-source-map "^1.5.1"
     dependency-graph "^0.7.2"
     magic-string "^0.25.0"
@@ -169,89 +155,82 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
-"@angular/compiler@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.4.tgz#133eb97fc3169ec9ff84f134eb9e3497fa37537e"
-  integrity sha512-+zyMzPCL45ePEV9nrnYJvhAVgp2Y19bDaq0f0YdZAqAjgDqHzXGGR6wX8GueyJWmUYWx5vwK6Apla4HwDrYA1w==
+"@angular/compiler@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-rc.2.tgz#8395c20d2d7e93c6941a45b039e03ae7a6277797"
+  integrity sha512-/NR0EN6wjit2mfgOhWirOjKp+s7lO1QSKhzK3TjYCda1L7Pijo29s3BGMWUSPCRno8zNH5o7Q0mWCC55MBGB4w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.4.tgz#a6c84940c8edcfa37158f666a1f99c6e4a97bf95"
-  integrity sha512-kfAxhIxl89PmB7y81FR/RAv0yWRFcEYxEnTwV+o8jKGfemAXtQ0g/Vh+lJR0SD/TBgFilMxotN1mhwH4A8GShw==
+"@angular/core@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-rc.2.tgz#800fd49bbc176f7ee064375b726503c5e6c8387c"
+  integrity sha512-ImXzoQk8U3IiL75dJWnO/aIGfaExgiqDc6GJYgQ8PvB7ZUkdUOj/a+jd6asMvE52VZJkof5XShhdonTScPcdUA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/elements@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-7.2.4.tgz#4b77cb0f815deb3fd83d8a3c9a807bcca11c2373"
-  integrity sha512-5V4kFmpncQTJEVdREaSBb4DVjZz88eLQBjzzvEUM3r7szhbQ1DYuubG7Sj2a1iIYSI/HTkPPvX57rQk3vq6AEw==
+"@angular/elements@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-rc.2.tgz#84ca2aadff66bfcd3c8042492a0c6b87a6a749fa"
+  integrity sha512-7KVPDSGXo33WD+ZQHjmvSXyBa6az6MHIQo3I+wRKUB9pBZNqMa2Dcb7FQp7fq3tQTEpOW6fO52ozxAZ/ybozxA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.4.tgz#be89cf83ad16fa3c813c12e4cff85da5409cf7a0"
-  integrity sha512-DAtOrdlTRsgvmZrsvczCAkY8dhTwZb5DXBmPuSXh0UR9lvEiCgNHGbwEiIiIkAHpw1wSeXZrq0qyy/oJRvf18g==
+"@angular/forms@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-rc.2.tgz#f4db4653470b74cd55508aa83da761309a1d341d"
+  integrity sha512-rjjGNVaxwOayuZCpsG8V13RK/h7S6v5ItzG6Ai1agO/em4/riNhEP3+BvxM4Rs1v4AfGOd+LhOeLt5qptj0JKA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.4.tgz#fc151ac15c8c7542cb7242a430ad2319655c2ff5"
-  integrity sha512-kazJREm7MtSCYbE+9zU/CcUXI5Csu53PooeQlAp80/TOHqry6fVKIMHCI892Db9ScY2ds0SzbyTmrxEQo7PP1A==
+"@angular/language-service@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0-rc.2.tgz#5b8fd13b7cd9e7cc1c097f92749f05e72b1c7e47"
+  integrity sha512-PXsntGd053iiM9lJPo7jmjhd5dp6AxugEC4WDTXimZ3vK2Hzv53CnKuVTUGcTWjwazbKAEyG0jiUl4VXptwTAA==
+
+"@angular/platform-browser-dynamic@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-rc.2.tgz#86e8e227f19aa9c6ef4439623ce6cf7f2b0cd3b1"
+  integrity sha512-c4QXgAikQx25AOnNiQUOe/yNJunR95rfTJ5yApcNU76eeCMG9KLFNGGQTg+PmcxZ6UMcw9zp2Tck9vjSb2BZYg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.4.tgz#db72460040b070410cbff678410c142f4d682af8"
-  integrity sha512-A9Rud/27hHMSUUjpgn57nVeLsoYgdvFwJhtlZA/oCuSpmlD+LqqBsEpPhivwn++u44+DSrFXsic29jlFnsBotw==
-
-"@angular/platform-browser-dynamic@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.4.tgz#24dce1bb0d9dab541b3b1b3eda3084a732f11b64"
-  integrity sha512-J/xWlmaYOPUoCHZ5TiIRiyYa4uRMtCz3aGdBfY8k/NWtNo8SCYaS3aut7Sk4RS5rK8aAVi+aYFlY5YOrlW+Hbg==
+"@angular/platform-browser@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-rc.2.tgz#b40fa05fd32422be499ab3986bc3031374f7c5bc"
+  integrity sha512-ErzIDckIqic9rmqMFk4scRX+lo7AWifOP+IOCot1KGPdQ7+CP/h/neJ9fiIzYTSDYUm5xk5i+2aW+2SWRJYQdA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.4.tgz#2cf5305878d0620d6b8c02eff00ac3ca8dbc5970"
-  integrity sha512-Klt8aKR5SP9bqfMfpSY5vQOY7AQEs8JGuZOk5Bfc2dUtYT2IEIvK2IqO8v2rcFRVO13HOPUxl328efyHqLgI7g==
+"@angular/platform-server@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-rc.2.tgz#3f583f4e4fd393218b9e14ab68b179279e9aa86d"
+  integrity sha512-5MVHNrazIw/WJ7ODah8kUY3AwXvw2HGscUUCW+sfkzJ7QqkWet7B1EExVEp708g/kooqyl92hjbFzTScXv4OCA==
   dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-server@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.4.tgz#276803cc7cac8da54d1ad2f05e052e4f8af64a85"
-  integrity sha512-3KbLHw7xMbkxun93HeYX8pSiPmFWim3ftvKbfPlB01fjhdZvhHpf39Dn4T7iyT1vrZMccXL87psv4/lJkTf04A==
-  dependencies:
-    domino "^2.1.0"
+    domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.4.tgz#83f1997c2a4e6acda93b991b8d7f3dad2b3f91f0"
-  integrity sha512-T8Uqf2H1SV1MQI38WwYJ4aa+4NNnvlp2Tp/rkfg6tKcp/cLkKqE6OOfiy9lmW+i/624v8tMgYoBMOUNBjAG23g==
+"@angular/router@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-rc.2.tgz#e0e4636f56fc08760863486f45f203bb9b00543e"
+  integrity sha512-7NnRdEykm0FJf/SHjUWz3cgGDtW5KM2gKm8it8V8azr3vIiMRYyqhDqCKkhutjt7C+yKNotB5M7Da9uYf0n/xQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.4.tgz#d16d6d08c0d5c29c93e9f80cddc4013c9b8859fb"
-  integrity sha512-IYsHshkgCYYmWLwtP7wwk8tfwphE4IJrkUitEu+ST6x+er/K9LyLo09WQeEZHIwDaPm9icoqc3TJJdXI46mrmg==
+"@angular/service-worker@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-rc.2.tgz#e73374fe4ccd8c15790f007832a5e60576ed85d9"
+  integrity sha512-uudl7+P9Xov9naoW7Ruv0rvvp+jYWe3P3OOpRul8X6tTYarKnorj3F44Y5GoNO5Xxjp0psPSD558rXrrIBt98w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/upgrade@^7.1.0":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-7.2.4.tgz#49ecce8f8a6c290599179d5d96d19812a496145a"
-  integrity sha512-sRDXl2Uy9fZrMROfe7eNZDWwb1fgoWYzJ8VrviUCRakTJf3ZQLuEf4ToTc3KY/KGxEubA4jiuI8LXbyTTmRMQw==
+"@angular/upgrade@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-8.0.0-rc.2.tgz#b95187a355afc3814bcb7d23d1af428047745850"
+  integrity sha512-I89l3PlrCRDDJyETbDs3BkUuLcjcLsITp4zI0SnriyYPHqKxaaC2QjCpJ/CYdk8LAuiQBIv9M/tK3o6Ow1d9qQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -333,53 +312,52 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@ngtools/webpack@7.1.4":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.1.4.tgz#632ece6ed8e05fe743554cc935be36a653376f01"
-  integrity sha512-8A15TPJzg3g7yI70QvBzJ253P32WAgCVre9nMaDdd22UmlbvN8Ke4RuQY7vYVTECLL+bWpFJEFXL+ThzCRUgeA==
+"@ngtools/webpack@8.0.0-rc.3":
+  version "8.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.0-rc.3.tgz#9bbc52ecec8edf54e41f94935b9f4a05cb29d71c"
+  integrity sha512-XD2S0t1MhvXTJ3mksIgiSqFeUkXlWcN0hVQVjAxrUIthNI87asirYtcPryDDz+zmrhLM0f2HGJ8cU9bZgmyQ0Q==
   dependencies:
-    "@angular-devkit/core" "7.1.4"
+    "@angular-devkit/core" "8.0.0-rc.3"
     enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
-    tree-kill "1.2.0"
-    webpack-sources "1.2.0"
+    rxjs "6.4.0"
+    tree-kill "1.2.1"
+    webpack-sources "1.3.0"
 
-"@nguniversal/common@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-7.1.0.tgz#bd53e16a1dfce040413a6e3a3931fbc7ad2c8bb3"
-  integrity sha512-uEIJPzPk3u0MeOh2UhyDMsFlNemm1hHhvLaT5AJBBenoWcGkPRFuMilkZw7O12qStdthEZedfZYkOft2Fftpzg==
+"@nguniversal/common@8.0.0-rc.0":
+  version "8.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-8.0.0-rc.0.tgz#92ea2dbe02a72c0c20b9be9172f4c329f0492ed4"
+  integrity sha512-i9DnPuQC2bixU1p7wBl1Cb9DJGy+o4YVMrunRWUqqwVXx/7TjMQDVQV4J9Cy1uUCJ1mQ2TkmM41BRAiBJbCojQ==
 
-"@nguniversal/express-engine@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-7.1.0.tgz#d48b1a821036382d62e4d4b122b5e44790c41c3f"
-  integrity sha512-otOA3WTjb+XnEDiyhwkvP0hE1gC7PiJrDoDFs5Q77SQ0ZAjuGzAIIgpQrPE8B+v0zmVj2oucDNCSZlmYWb1P/Q==
+"@nguniversal/express-engine@8.0.0-rc.0":
+  version "8.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-8.0.0-rc.0.tgz#ecf86f8cb433e28a29af3cf6a01cc6b6dc00e32c"
+  integrity sha512-iSDeu5TwNw7KjQQu5N+UUa4ie04gpa0LpBFPkci9ZRGgaiRbwV4Z/qNmHe2MWI7o4k6xaZddDKC5ixGZ7Lo1Cw==
 
-"@nguniversal/module-map-ngfactory-loader@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@nguniversal/module-map-ngfactory-loader/-/module-map-ngfactory-loader-7.1.0.tgz#70ea905c1b32c2edc484cb77aa7a3f3208069966"
-  integrity sha512-GYfb24OLJKBY58CgUsIsGgci5ceZAt4+GrVKh7RZRIHtZ/bjdGsvpIbfE9udqsnSowxIxHA5KzYHbC1x6AAB0A==
+"@nguniversal/module-map-ngfactory-loader@^8.0.0-rc.0":
+  version "8.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/module-map-ngfactory-loader/-/module-map-ngfactory-loader-8.0.0-rc.0.tgz#888d9c3ec5498acc4c6357eac7bcdcd436007558"
+  integrity sha512-Z9WbOr3XcNeLNeg7P3VBKVJN2yEM9zYlr+Nvdxhw28k1xJa0gH42G35jb9mETgbWVqOq0njT5++fouhdzEwaOQ==
 
-"@schematics/angular@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.1.tgz#6fcd7004210fa9305310c3109c084df5c5521776"
-  integrity sha512-0Ne8APPlTAjKg5CSZqluwCuW/5yPjr3ALCWzqwPxN0suE745usThtasBmqrjw0RMIt8nRqRgtg54Z7lCPO9ZFg==
+"@schematics/angular@8.0.0-rc.3":
+  version "8.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0-rc.3.tgz#26f253e882173a78858e999409e64844b7030ddd"
+  integrity sha512-IuunKeNof7QL7aj3X56lS5KP28asmN18G9js2m/XTpyIKOX053kGppwWfBULmDnGMd4UR1+XU/xmIFQUq7vurQ==
   dependencies:
-    "@angular-devkit/core" "7.3.1"
-    "@angular-devkit/schematics" "7.3.1"
-    typescript "3.2.4"
+    "@angular-devkit/core" "8.0.0-rc.3"
+    "@angular-devkit/schematics" "8.0.0-rc.3"
 
-"@schematics/update@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.1.tgz#481475aee18b4a9472a06512b2e4d6429af68231"
-  integrity sha512-EHOqolT/d/jRGuVTCUESLpk8JNpuaPlsVHfeK7Kdp/t0wSEnmtOelZX4+leS25lGXDaDUF3138ntjrZR4n6bGw==
+"@schematics/update@0.800.0-rc.3":
+  version "0.800.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.0-rc.3.tgz#2cd33c21ed2ef82320f43ae3701945737f994e1a"
+  integrity sha512-H7beN0qLdqNX9WbgvBVwVN/WwXhmbBaZEDkclzMz8RivjBwX08ZA5HbDvwPU7oU5pYT2hpdaYpNuZFHxfz5EFg==
   dependencies:
-    "@angular-devkit/core" "7.3.1"
-    "@angular-devkit/schematics" "7.3.1"
+    "@angular-devkit/core" "8.0.0-rc.3"
+    "@angular-devkit/schematics" "8.0.0-rc.3"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
-    pacote "9.4.0"
-    rxjs "6.3.3"
-    semver "5.6.0"
+    pacote "9.5.0"
+    rxjs "6.4.0"
+    semver "6.0.0"
     semver-intersect "1.4.0"
 
 "@types/angular-animate@^1.5.10":
@@ -422,6 +400,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
 "@types/express-serve-static-core@*":
   version "4.0.55"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.0.55.tgz#f53868838a955f98b380819ec9134f5df7d9482f"
@@ -436,6 +419,15 @@
     "@types/express-serve-static-core" "*"
     "@types/serve-static" "*"
 
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/jasmine@*":
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.2.tgz#6e6d4cb183cd55c7a1ad6270bced10fdd5367a3c"
@@ -458,6 +450,11 @@
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
 
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
 "@types/node@*":
   version "8.0.47"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
@@ -490,156 +487,174 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@webassemblyjs/ast@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a"
-  integrity sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew==
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
+
+"@types/webpack-sources@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
+  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/wast-parser" "1.7.10"
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.6.1"
 
-"@webassemblyjs/floating-point-hex-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9"
-  integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ==
-
-"@webassemblyjs/helper-api-error@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198"
-  integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw==
-
-"@webassemblyjs/helper-buffer@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b"
-  integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA==
-
-"@webassemblyjs/helper-code-frame@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce"
-  integrity sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw==
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.7.10"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
 
-"@webassemblyjs/helper-fsm@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64"
-  integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA==
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
 
-"@webassemblyjs/helper-module-context@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755"
-  integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ==
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
 
-"@webassemblyjs/helper-wasm-bytecode@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0"
-  integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg==
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
 
-"@webassemblyjs/helper-wasm-section@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e"
-  integrity sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g==
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
+    "@webassemblyjs/wast-printer" "1.8.5"
 
-"@webassemblyjs/ieee754@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df"
-  integrity sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ==
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6"
-  integrity sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw==
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
   dependencies:
-    "@xtuc/long" "4.2.1"
+    "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a"
-  integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ==
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
 
-"@webassemblyjs/wasm-edit@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092"
-  integrity sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA==
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/helper-wasm-section" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-    "@webassemblyjs/wasm-opt" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
-    "@webassemblyjs/wast-printer" "1.7.10"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
 
-"@webassemblyjs/wasm-gen@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174"
-  integrity sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw==
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/ieee754" "1.7.10"
-    "@webassemblyjs/leb128" "1.7.10"
-    "@webassemblyjs/utf8" "1.7.10"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
 
-"@webassemblyjs/wasm-opt@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a"
-  integrity sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg==
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
 
-"@webassemblyjs/wasm-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65"
-  integrity sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA==
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-api-error" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/ieee754" "1.7.10"
-    "@webassemblyjs/leb128" "1.7.10"
-    "@webassemblyjs/utf8" "1.7.10"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
 
-"@webassemblyjs/wast-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264"
-  integrity sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw==
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.10"
-    "@webassemblyjs/helper-api-error" "1.7.10"
-    "@webassemblyjs/helper-code-frame" "1.7.10"
-    "@webassemblyjs/helper-fsm" "1.7.10"
-    "@xtuc/long" "4.2.1"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b"
-  integrity sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/wast-parser" "1.7.10"
-    "@xtuc/long" "4.2.1"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  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":
   version "1.1.0"
@@ -658,10 +673,6 @@ abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-abbrev@1.0.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-
 accepts@1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
@@ -683,21 +694,12 @@ accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  dependencies:
-    acorn "^5.0.0"
+acorn-dynamic-import@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7"
-
-acorn@^5.6.2:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
-
-acorn@^6.1.1:
+acorn@^6.0.5, acorn@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
@@ -735,19 +737,10 @@ ajv-keywords@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
 
-ajv@6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
-  integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==
+ajv@6.10.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -810,9 +803,10 @@ ansi-colors@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.1.0.tgz#dcfaacc90ef9187de413ec3ef8d5eb981a98808f"
 
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -830,10 +824,10 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^1.1.0:
   version "1.1.0"
@@ -910,10 +904,6 @@ arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -922,10 +912,6 @@ array-flatten@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
 
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -998,15 +984,16 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@1.5.2, async@1.x, async@^1.4.0, async@^1.5.2:
+async@1.5.2, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -1024,16 +1011,16 @@ atob@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
 
-autoprefixer@9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
-  integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.3.3"
-    caniuse-lite "^1.0.30000898"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.5"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.6.0:
@@ -1183,6 +1170,11 @@ big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 binary-extensions@^1.0.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
@@ -1231,6 +1223,22 @@ body-parser@1.18.2, body-parser@^1.16.1:
     raw-body "2.3.2"
     type-is "~1.6.15"
 
+body-parser@1.18.3:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
+  dependencies:
+    bytes "3.0.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "~1.6.3"
+    iconv-lite "0.4.23"
+    on-finished "~2.3.0"
+    qs "6.5.2"
+    raw-body "2.3.3"
+    type-is "~1.6.16"
+
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
@@ -1267,12 +1275,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  dependencies:
-    expand-range "^0.1.0"
-
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
@@ -1297,7 +1299,7 @@ braces@^2.3.0:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^2.3.1:
+braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   dependencies:
@@ -1417,14 +1419,23 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^4.3.3:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
-  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
   dependencies:
-    caniuse-lite "^1.0.30000929"
-    electron-to-chromium "^1.3.103"
-    node-releases "^1.1.3"
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
+
+browserslist@^4.0.0, browserslist@^4.5.4:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"
+  integrity sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==
+  dependencies:
+    caniuse-lite "^1.0.30000963"
+    electron-to-chromium "^1.3.127"
+    node-releases "^1.1.17"
 
 browserstack@^1.5.1:
   version "1.5.1"
@@ -1485,25 +1496,7 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
-cacache@^11.0.1, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.3.1, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -1560,21 +1553,10 @@ callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
 camelcase@^1.0.2, camelcase@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
@@ -1583,15 +1565,25 @@ camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
-caniuse-lite@^1.0.30000898:
-  version "1.0.30000935"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000935.tgz#d1b59df00b46f4921bb84a8a34c1d172b346df59"
-  integrity sha512-1Y2uJ5y56qDt3jsDTdBHL1OqiImzjoQcBG6Yl3Qizq8mcc2SgCFpi+ZwLLqkztYnk9l87IYqRlNBnPSOTbFkXQ==
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30000929:
-  version "1.0.30000932"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000932.tgz#d01763e9ce77810962ca7391ff827b5949ce4272"
-  integrity sha512-4bghJFItvzz8m0T3lLZbacmEY9X1Z2AtIzTr7s7byqZIOumASfr4ynDx7rtm0J85nDmx8vsgR6vnaSoeU8Oh0A==
+caniuse-api@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960, caniuse-lite@^1.0.30000963:
+  version "1.0.30000967"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"
+  integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -1658,7 +1650,7 @@ chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
 
-chokidar@1.7.0, chokidar@^1.4.2:
+chokidar@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1673,25 +1665,6 @@ chokidar@1.7.0, chokidar@^1.4.2:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chokidar@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
-    glob-parent "^3.1.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    lodash.debounce "^4.0.8"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.5"
-  optionalDependencies:
-    fsevents "^1.2.2"
-
 chokidar@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.0.tgz#6686313c541d3274b2a5c01233342037948c911b"
@@ -1727,6 +1700,25 @@ chokidar@^2.0.2, chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.1.2"
 
+chokidar@^2.1.1, chokidar@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -1753,10 +1745,6 @@ circular-dependency-plugin@5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
 
-circular-json@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.5.tgz#64182ef359042d37cd8e767fc9de878b1e9447d3"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -1856,12 +1844,6 @@ colors@1.1.2, colors@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  dependencies:
-    lodash "^4.5.0"
-
 combined-stream@1.0.6, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
@@ -1882,14 +1864,15 @@ commander@^2.12.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
+commander@^2.19.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
 commander@^2.2.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -1918,22 +1901,24 @@ component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
 
-compressible@~2.0.11:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66"
+compressible@~2.0.16:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
+  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
   dependencies:
-    mime-db ">= 1.30.0 < 2"
+    mime-db ">= 1.40.0 < 2"
 
-compression@^1.5.2:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
-    accepts "~1.3.4"
+    accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.11"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
-    safe-buffer "5.1.1"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
     vary "~1.1.2"
 
 concat-map@0.0.1:
@@ -1961,10 +1946,15 @@ concurrently@^3.0.0:
     supports-color "^3.2.3"
     tree-kill "^1.1.0"
 
-connect-history-api-fallback@^1.1.0, connect-history-api-fallback@^1.2.0, connect-history-api-fallback@^1.3.0:
+connect-history-api-fallback@^1.1.0, connect-history-api-fallback@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.4.0.tgz#3db24f973f4b923b0e82f619ce0df02411ca623d"
 
+connect-history-api-fallback@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+
 connect-logger@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/connect-logger/-/connect-logger-0.0.1.tgz#4d999978a1d20bb4608e7cd434d741652255174b"
@@ -2050,18 +2040,27 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-copy-webpack-plugin@4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
+copy-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
     serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
+
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
 
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.1"
@@ -2119,21 +2118,6 @@ 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@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 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"
@@ -2175,12 +2159,6 @@ css-parse@1.7.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  dependencies:
-    array-find-index "^1.0.1"
-
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
@@ -2199,9 +2177,10 @@ date-fns@^1.23.0:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
 
-date-format@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+date-format@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.0.0.tgz#7cf7b172f1ec564f0003b39ea302c5498fb98c8f"
+  integrity sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==
 
 date-now@^0.1.4:
   version "0.1.4"
@@ -2243,16 +2222,24 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.5:
+debug@^3.0.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
@@ -2276,15 +2263,12 @@ deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     ip-regex "^2.1.0"
 
 default-require-extensions@^2.0.0:
@@ -2324,16 +2308,18 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+del@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
+    "@types/glob" "^7.1.1"
     globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -2376,9 +2362,10 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
-detect-node@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
+detect-node@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 dev-ip@^1.0.1:
   version "1.0.1"
@@ -2445,9 +2432,10 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domino@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
+domino@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601"
+  integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg==
 
 duplexify@^3.1.2, duplexify@^3.4.2:
   version "3.5.1"
@@ -2490,10 +2478,10 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-electron-to-chromium@^1.3.103:
-  version "1.3.109"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.109.tgz#ee04a55a5157a5580a5ea88e526b02c84a3a7bc8"
-  integrity sha512-1qhgVZD9KIULMyeBkbjU/dWmm30zpPUfdWZfVO3nPhbtqMHJqHr4Ua5wBcWtAymVFrUCuAJxjMF1OhG+bR21Ow==
+electron-to-chromium@^1.3.124, electron-to-chromium@^1.3.127:
+  version "1.3.133"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz#c47639c19b91feee3e22fad69f5556142007008c"
+  integrity sha512-lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg==
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2511,6 +2499,11 @@ emitter-steward@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/emitter-steward/-/emitter-steward-1.0.0.tgz#f3411ade9758a7565df848b2da0cbbd1b46cbd64"
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -2671,17 +2664,6 @@ escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@1.8.x:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-  dependencies:
-    esprima "^2.7.1"
-    estraverse "^1.9.1"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.2.0"
-
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
@@ -2689,10 +2671,6 @@ eslint-scope@^4.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-esprima@2.7.x, esprima@^2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-
 esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
@@ -2704,10 +2682,6 @@ esrecurse@^4.1.0:
     estraverse "^4.1.0"
     object-assign "^4.0.1"
 
-estraverse@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-
 estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
@@ -2734,6 +2708,11 @@ eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
 
+eventemitter3@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
+
 events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
@@ -2764,12 +2743,13 @@ execa@^0.10.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
     is-stream "^1.1.0"
     npm-run-path "^2.0.0"
     p-finally "^1.0.0"
@@ -2780,14 +2760,6 @@ exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
 
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -2806,13 +2778,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -2863,38 +2828,39 @@ express@^4.14.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.16.2:
-  version "4.16.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
+express@^4.16.4:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
+  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
   dependencies:
-    accepts "~1.3.4"
+    accepts "~1.3.5"
     array-flatten "1.1.1"
-    body-parser "1.18.2"
+    body-parser "1.18.3"
     content-disposition "0.5.2"
     content-type "~1.0.4"
     cookie "0.3.1"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.1"
-    encodeurl "~1.0.1"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.1.0"
+    finalhandler "1.1.1"
     fresh "0.5.2"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
     parseurl "~1.3.2"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.2"
-    qs "6.5.1"
+    proxy-addr "~2.0.4"
+    qs "6.5.2"
     range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.1"
-    serve-static "1.13.1"
+    safe-buffer "5.1.2"
+    send "0.16.2"
+    serve-static "1.13.2"
     setprototypeof "1.1.0"
-    statuses "~1.3.1"
-    type-is "~1.6.15"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
     utils-merge "1.0.1"
     vary "~1.1.2"
 
@@ -2919,9 +2885,10 @@ extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
-external-editor@^3.0.0:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -2962,10 +2929,6 @@ fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
 
-fast-levenshtein@~2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -2989,9 +2952,10 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
+file-loader@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
+  integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
@@ -3048,18 +3012,6 @@ finalhandler@1.0.6:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.3.1"
-    unpipe "~1.0.0"
-
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
@@ -3072,14 +3024,6 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
 find-cache-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
@@ -3095,18 +3039,17 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
   dependencies:
     locate-path "^3.0.0"
 
+flatted@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
+  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
+
 flush-write-stream@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
@@ -3114,6 +3057,13 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+follow-redirects@^1.0.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
+  integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
+  dependencies:
+    debug "^3.2.6"
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -3209,6 +3159,15 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
+fs-extra@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -3242,12 +3201,13 @@ fsevents@^1.1.2:
     nan "^2.3.0"
     node-pre-gyp "^0.6.39"
 
-fsevents@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+fsevents@^1.2.7:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
   dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
 
 fstream-ignore@^1.0.5:
   version "1.0.5"
@@ -3279,12 +3239,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
-  dependencies:
-    globule "^1.0.0"
-
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
@@ -3294,15 +3248,16 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
-get-stream@^4.1.0:
+get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -3361,27 +3316,7 @@ glob@7.1.3, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^5.0.15:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3436,14 +3371,6 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globule@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.4"
-    minimatch "~3.0.2"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -3453,19 +3380,10 @@ graceful-fs@^4.1.15:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-handle-thing@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
-
-handlebars@^4.0.1:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
+handle-thing@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
+  integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.0.11:
   version "4.0.12"
@@ -3659,9 +3577,10 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.2.0:
+html-entities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 http-cache-semantics@^3.8.1:
   version "3.8.1"
@@ -3681,6 +3600,16 @@ http-errors@1.6.2, http-errors@~1.6.1, http-errors@~1.6.2:
     setprototypeof "1.0.3"
     statuses ">= 1.3.1 < 2"
 
+http-errors@1.6.3, http-errors@~1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-errors@~1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
@@ -3701,14 +3630,15 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
   dependencies:
-    http-proxy "^1.16.2"
+    http-proxy "^1.17.0"
     is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
 
 http-proxy@1.15.2:
   version "1.15.2"
@@ -3717,13 +3647,22 @@ http-proxy@1.15.2:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
-http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.8.1:
+http-proxy@^1.13.0, http-proxy@^1.8.1:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
   dependencies:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
+http-proxy@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
+  dependencies:
+    eventemitter3 "^3.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
 http-server@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
@@ -3776,6 +3715,13 @@ iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -3839,16 +3785,6 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
-
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -3877,31 +3813,32 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+internal-ip@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
 
 interpret@^1.0.0, interpret@^1.1.0:
   version "1.1.0"
@@ -3929,17 +3866,14 @@ ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
-ipaddr.js@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
-
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
 
-ipaddr.js@^1.5.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
+ipaddr.js@1.9.0, ipaddr.js@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -4078,10 +4012,6 @@ is-number-like@^1.0.3:
   dependencies:
     lodash.isfinite "^3.3.2"
 
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4114,18 +4044,42 @@ is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
 
+is-path-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
+  integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
+
 is-path-in-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
   dependencies:
     is-path-inside "^1.0.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+  dependencies:
+    is-path-inside "^2.1.0"
+
 is-path-inside@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
   dependencies:
     path-is-inside "^1.0.1"
 
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+  dependencies:
+    path-is-inside "^1.0.2"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -4286,36 +4240,19 @@ istanbul-reports@^2.0.1:
   dependencies:
     handlebars "^4.0.11"
 
-istanbul@0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
-  dependencies:
-    abbrev "1.0.x"
-    async "1.x"
-    escodegen "1.8.x"
-    esprima "2.7.x"
-    glob "^5.0.15"
-    handlebars "^4.0.1"
-    js-yaml "3.x"
-    mkdirp "0.5.x"
-    nopt "3.x"
-    once "1.x"
-    resolve "1.1.x"
-    supports-color "^3.1.0"
-    which "^1.1.1"
-    wordwrap "^1.0.0"
+jasmine-core@^3.3, jasmine-core@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
 
-jasmine-core@~2.99.1:
-  version "2.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
-
-jasmine-marbles@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.4.0.tgz#de72331d189d4968e4b1e78b638e51654040c755"
+jasmine-marbles@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.5.0.tgz#5d4c51082fcf619bb8dbc85583cb11718a32b200"
+  integrity sha512-hkSYy7VJpcxaKE48s/CasVpGyheElp5ZegguFi5kpYAaUWsyOko6RnMZS1kv14ThMtlJVNqCW5z16f1q6HqbEg==
   dependencies:
     lodash "^4.5.0"
 
@@ -4337,10 +4274,6 @@ jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
 
-js-base64@^2.1.8:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
-
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -4349,13 +4282,6 @@ js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@3.x:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^3.12.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
@@ -4363,9 +4289,10 @@ js-yaml@^3.12.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.7.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+js-yaml@^3.13.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4416,12 +4343,26 @@ json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -4474,36 +4415,41 @@ karma-jasmine@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf"
 
-karma-jasmine@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
+karma-jasmine@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
+  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
+  dependencies:
+    jasmine-core "^3.3"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
-karma@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-3.0.0.tgz#6da83461a8a28d8224575c3b5b874e271b4730c3"
+karma@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
+  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
+    braces "^2.3.2"
     chokidar "^2.0.3"
     colors "^1.1.0"
-    combine-lists "^1.0.0"
     connect "^3.6.0"
     core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
+    flatted "^2.0.0"
     glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.4"
-    log4js "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
     optimist "^0.6.1"
@@ -4514,11 +4460,12 @@ karma@~3.0.0:
     socket.io "2.1.1"
     source-map "^0.6.1"
     tmp "0.0.33"
-    useragent "2.2.1"
+    useragent "2.3.0"
 
-killable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
+killable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -4570,9 +4517,10 @@ less-loader@4.1.0:
     loader-utils "^1.1.0"
     pify "^3.0.0"
 
-less@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
+less@3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
+  integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==
   dependencies:
     clone "^2.1.2"
   optionalDependencies:
@@ -4585,17 +4533,12 @@ less@3.8.1:
     request "^2.83.0"
     source-map "~0.6.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-license-webpack-plugin@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687"
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
+    "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
 
 lie@~3.1.0:
@@ -4628,20 +4571,20 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -4658,13 +4601,6 @@ localtunnel@1.8.3:
     request "2.81.0"
     yargs "3.29.0"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -4672,35 +4608,33 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-
 lodash.isfinite@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
 
-lodash.mergewith@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.16.2, lodash@^4.17.4, lodash@^4.5.0, lodash@^4.5.1, lodash@~4.17.4:
+lodash@^4.11.1, lodash@^4.16.2, lodash@^4.17.4, lodash@^4.5.0, lodash@^4.5.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4708,23 +4642,30 @@ lodash@^4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
+lodash@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
 lodash@^4.17.5:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-log4js@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.5.tgz#b80146bfebad68b430d4f3569556d8a6edfef303"
+log4js@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.1.tgz#48ebed51e6989557b8a991c48f01879e82773545"
+  integrity sha512-tSQUF9bBMdcBtuLD6vD7hBM9Ci6Lng/NVHZEq4YbuRGo7ObmLiZuhxz33HKAmJItit74pAjvZgirqYX2LRaoGA==
   dependencies:
-    circular-json "^0.5.5"
-    date-format "^1.2.0"
-    debug "^3.1.0"
+    date-format "^2.0.0"
+    debug "^4.1.1"
+    flatted "^2.0.0"
     rfdc "^1.1.2"
-    streamroller "0.7.0"
+    streamroller "^1.0.4"
 
-loglevel@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.1.tgz#189078c94ab9053ee215a0acdbf24244ea0f6502"
+loglevel@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
 longest@^1.0.1:
   version "1.0.1"
@@ -4736,25 +4677,7 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lru-cache@2.2.x:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
-
-lru-cache@^4.0.1, lru-cache@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^4.1.2:
+lru-cache@4.1.x, lru-cache@^4.1.2:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -4776,19 +4699,19 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-magic-string@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
-  dependencies:
-    sourcemap-codec "^1.4.1"
-
-magic-string@^0.25.1:
+magic-string@0.25.2, magic-string@^0.25.1:
   version "0.25.2"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
   integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
   dependencies:
     sourcemap-codec "^1.4.4"
 
+magic-string@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
 make-dir@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
@@ -4822,6 +4745,11 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
@@ -4832,10 +4760,6 @@ map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -4853,12 +4777,6 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  dependencies:
-    mimic-fn "^1.0.0"
-
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
@@ -4867,28 +4785,13 @@ mem@^4.0.0:
     mimic-fn "^1.0.0"
     p-is-promise "^1.1.0"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -4915,7 +4818,7 @@ micromatch@2.3.11, micromatch@^2.1.5:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.10, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
@@ -4958,9 +4861,10 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.30.0 < 2":
-  version "1.31.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.31.0.tgz#a49cd8f3ebf3ed1a482b60561d9105ad40ca74cb"
+"mime-db@>= 1.40.0 < 2":
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
 mime-db@~1.30.0:
   version "1.30.0"
@@ -5011,12 +4915,13 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
-mini-css-extract-plugin@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
-  integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -5028,7 +4933,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -5038,7 +4943,7 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -5074,21 +4979,6 @@ minizlib@^1.1.1:
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -5183,18 +5073,15 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+nan@^2.12.1:
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
 nan@^2.3.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
-nan@^2.9.2:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-
 nanomatch@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
@@ -5257,26 +5144,10 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-forge@0.6.33:
-  version "0.6.33"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
-
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
+node-forge@0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
 node-libs-browser@^2.0.0:
   version "2.0.0"
@@ -5306,9 +5177,10 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+node-pre-gyp@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -5352,39 +5224,14 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-releases@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.6.tgz#47d160033e24a64e79487a62de63cf691052ec54"
-  integrity sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==
+node-releases@^1.1.14, node-releases@^1.1.17:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.18.tgz#cc98fd75598a324a77188ebddf6650e9cbd8b1d5"
+  integrity sha512-/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA==
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4"
-  integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.10.0"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
-"nopt@2 || 3", nopt@3.0.x, nopt@3.x:
+nopt@3.0.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -5397,7 +5244,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -5422,10 +5269,24 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
+normalize-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
@@ -5482,7 +5343,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -5554,21 +5415,27 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-obuf@^1.0.0, obuf@^1.1.1:
+obuf@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
 
+obuf@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -5584,6 +5451,13 @@ open@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"
 
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opener@~1.4.0:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
@@ -5599,22 +5473,10 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@5.3.0:
-  version "5.3.0"
-  resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  dependencies:
-    is-wsl "^1.1.0"
-
-opn@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
-  dependencies:
-    is-wsl "^1.1.0"
-
-opn@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519"
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -5625,17 +5487,6 @@ optimist@0.6.x, optimist@^0.6.1, optimist@~0.6.0:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
 options@>=0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
@@ -5661,14 +5512,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
@@ -5677,11 +5520,20 @@ os-locale@^3.0.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
+os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@0, osenv@^0.1.4:
+osenv@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
   dependencies:
@@ -5707,27 +5559,18 @@ p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
 
-p-limit@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
-  dependencies:
-    p-try "^1.0.0"
-
-p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
-
 p-limit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+p-limit@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
-    p-limit "^1.1.0"
+    p-try "^2.0.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
@@ -5735,22 +5578,19 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -5880,9 +5720,10 @@ path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
@@ -5909,12 +5750,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -5947,6 +5782,11 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -5957,27 +5797,13 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
   dependencies:
     find-up "^3.0.0"
 
-portfinder@1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
-portfinder@^1.0.13:
+portfinder@^1.0.13, portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -5986,14 +5812,6 @@ portfinder@^1.0.13:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
-portfinder@^1.0.9:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
 portscanner@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
@@ -6005,9 +5823,10 @@ posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
 
-postcss-import@12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
+postcss-import@12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
+  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
   dependencies:
     postcss "^7.0.1"
     postcss-value-parser "^3.2.3"
@@ -6039,15 +5858,7 @@ postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.5.0"
-
-postcss@^7.0.5:
+postcss@7.0.14:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -6056,9 +5867,27 @@ postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+postcss@^7.0.0, postcss@^7.0.1:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.5.0"
+
+postcss@^7.0.14:
+  version "7.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
+  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
 preserve@^0.2.0:
   version "0.2.0"
@@ -6068,10 +5897,6 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-
 process@^0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -6122,13 +5947,6 @@ protractor@~5.4.0:
     webdriver-js-extender "2.1.0"
     webdriver-manager "^12.0.6"
 
-proxy-addr@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.5.2"
-
 proxy-addr@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
@@ -6136,6 +5954,14 @@ proxy-addr@~2.0.3:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
+proxy-addr@~2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.0"
+
 prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -6165,13 +5991,6 @@ pump@^1.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pump@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -6223,6 +6042,11 @@ qs@6.5.1, "qs@>= 0.4.0", qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
+qs@6.5.2, qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
 qs@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
@@ -6231,9 +6055,14 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
 
 querystring-es3@^0.2.0:
   version "0.2.1"
@@ -6274,9 +6103,23 @@ raw-body@2.3.2:
     iconv-lite "0.4.19"
     unpipe "1.0.0"
 
-raw-loader@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+raw-body@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
+  dependencies:
+    bytes "3.0.0"
+    http-errors "1.6.3"
+    iconv-lite "0.4.23"
+    unpipe "1.0.0"
+
+raw-loader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
+  integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
 
 rc@^1.1.7:
   version "1.2.2"
@@ -6309,13 +6152,6 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -6324,15 +6160,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
@@ -6344,17 +6172,14 @@ read-pkg@^2.0.0:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.3.0:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+readable-stream@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
 readable-stream@~2.0.6:
   version "2.0.6"
@@ -6376,19 +6201,21 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   dependencies:
     resolve "^1.1.6"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
 reflect-metadata@^0.1.2:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
@@ -6424,10 +6251,6 @@ repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
@@ -6519,7 +6342,7 @@ request@^2.83.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@^2.87.0, request@^2.88.0:
+request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   dependencies:
@@ -6556,6 +6379,11 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 requires-port@1.x.x, requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -6574,10 +6402,6 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@1.1.x:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
 resolve@^1.1.6, resolve@^1.1.7:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
@@ -6635,6 +6459,13 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
@@ -6708,19 +6539,14 @@ rx@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-rxjs@6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+rxjs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.2.tgz#6a688b16c4e6e980e62ea805ec30648e1c60907f"
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.5.1:
+rxjs@^6.4.0, rxjs@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
   integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
@@ -6731,9 +6557,10 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-safe-buffer@^5.1.2:
+safe-buffer@5.1.2, safe-buffer@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
@@ -6745,15 +6572,6 @@ safe-regex@^1.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sass-graph@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^7.0.0"
-
 sass-loader@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
@@ -6765,6 +6583,13 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+  dependencies:
+    chokidar "^2.0.0"
+
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
@@ -6785,13 +6610,6 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4, schema-utils@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -6800,13 +6618,6 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -6820,11 +6631,12 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.9.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz#bf8cb7b83256c4551e31347c6311778db99eec52"
+selfsigned@^1.10.4:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
   dependencies:
-    node-forge "0.6.33"
+    node-forge "0.7.5"
 
 semver-intersect@1.4.0:
   version "1.4.0"
@@ -6836,22 +6648,19 @@ semver-intersect@1.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-semver@5.5.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-
-semver@5.6.0, semver@^5.4.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+semver@6.0.0, semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
 
 semver@^5.0.0, semver@^5.0.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+semver@^5.4.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 send@0.15.2:
   version "0.15.2"
@@ -6871,24 +6680,6 @@ send@0.15.2:
     range-parser "~1.2.0"
     statuses "~1.3.1"
 
-send@0.16.1:
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.1"
-    destroy "~1.0.4"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.3.1"
-
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -6923,9 +6714,10 @@ serve-index@1.8.0:
     mime-types "~2.1.11"
     parseurl "~1.3.1"
 
-serve-index@^1.7.2:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -6944,15 +6736,6 @@ serve-static@1.12.2:
     parseurl "~1.3.1"
     send "0.15.2"
 
-serve-static@1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
-  dependencies:
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.1"
-
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
@@ -7220,6 +7003,13 @@ socks@~2.2.0:
     ip "^1.1.5"
     smart-buffer "4.0.2"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
@@ -7258,7 +7048,15 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.9, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.6:
+source-map-support@0.5.12, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@^0.5.5, source-map-support@^0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
   dependencies:
@@ -7289,12 +7087,6 @@ source-map@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
 
-source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -7303,9 +7095,9 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-source-map@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
@@ -7336,33 +7128,33 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
-spdy-transport@^2.0.18:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d"
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
   dependencies:
-    debug "^2.6.8"
-    detect-node "^2.0.3"
+    debug "^4.1.0"
+    detect-node "^2.0.4"
     hpack.js "^2.1.6"
-    obuf "^1.1.1"
-    readable-stream "^2.2.9"
-    safe-buffer "^5.0.1"
-    wbuf "^1.7.2"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
 
-spdy@^3.4.1:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+spdy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
+  integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
   dependencies:
-    debug "^2.6.8"
-    handle-thing "^1.2.5"
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
     http-deceiver "^1.2.7"
-    safe-buffer "^5.0.1"
     select-hose "^2.0.0"
-    spdy-transport "^2.0.18"
+    spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
-  integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 
@@ -7390,12 +7182,6 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -7419,16 +7205,15 @@ stats-webpack-plugin@0.7.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
 
+"statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
 statuses@~1.3.0, statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
-stdout-stream@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
-  dependencies:
-    readable-stream "^2.0.1"
-
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -7464,14 +7249,21 @@ stream-throttle@^0.1.3:
     commander "^2.2.0"
     limiter "^1.0.5"
 
-streamroller@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+streamroller@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.4.tgz#d485c7624796d5e2eb34190c79afcbf006afb5e6"
+  integrity sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==
   dependencies:
-    date-format "^1.2.0"
+    async "^2.6.1"
+    date-format "^2.0.0"
     debug "^3.1.0"
-    mkdirp "^0.5.1"
-    readable-stream "^2.3.0"
+    fs-extra "^7.0.0"
+    lodash "^4.17.10"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
@@ -7488,19 +7280,29 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -7526,12 +7328,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -7547,12 +7349,6 @@ strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  dependencies:
-    get-stdin "^4.0.1"
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -7592,7 +7388,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.2.3:
+supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -7604,12 +7400,6 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
-  dependencies:
-    has-flag "^2.0.0"
-
 supports-color@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
@@ -7660,7 +7450,7 @@ tar-pack@^3.4.0:
     tar "^2.2.1"
     uid-number "^0.0.6"
 
-tar@^2.0.0, tar@^2.2.1:
+tar@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
@@ -7700,26 +7490,28 @@ temp@^0.8.3:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
-terser-webpack-plugin@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
+terser-webpack-plugin@1.2.3, terser-webpack-plugin@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
     schema-utils "^1.0.0"
     serialize-javascript "^1.4.0"
     source-map "^0.6.1"
-    terser "^3.8.1"
+    terser "^3.16.1"
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.8.1:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.2.tgz#48b880f949f8d038aca4dfd00a37c53d96ecf9fb"
+terser@^3.16.1:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
   dependencies:
-    commander "~2.17.1"
+    commander "^2.19.0"
     source-map "~0.6.1"
-    source-map-support "~0.5.6"
+    source-map-support "~0.5.10"
 
 tfunk@^3.0.1:
   version "3.1.0"
@@ -7820,24 +7612,19 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tree-kill@1.2.0, tree-kill@^1.1.0:
+tree-kill@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
+  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
+
+tree-kill@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
-"true-case-path@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
-  dependencies:
-    glob "^6.0.4"
-
 ts-loader@^4.2.0:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.4.1.tgz#c93a46eea430ebce1f790dfe438caefb8670d365"
@@ -7869,9 +7656,10 @@ tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
-tslint@~5.11.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
+tslint@~5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -7879,16 +7667,18 @@ tslint@~5.11.0:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
+    mkdirp "^0.5.1"
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.8.0"
-    tsutils "^2.27.2"
+    tsutils "^2.29.0"
 
-tsutils@^2.27.2:
+tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
@@ -7906,12 +7696,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-is@~1.6.15:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
@@ -7930,32 +7714,21 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
 
-typescript@3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
-  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
-
-typescript@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"
+typescript@~3.4.3:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
 
 ua-parser-js@0.7.12:
   version "0.7.12"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
 
-uglify-es@^3.3.4:
-  version "3.3.8"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.8.tgz#f2c68e6cff0d0f9dc9577e4da207151c2e753b7e"
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
-
-uglify-js@^2.6, uglify-js@^2.6.1:
+uglify-js@^2.6.1:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -7975,19 +7748,6 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-uglifyjs-webpack-plugin@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043"
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    schema-utils "^0.4.5"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    uglify-es "^3.3.4"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -8042,6 +7802,15 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
@@ -8057,10 +7826,15 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.0.0, upath@^1.0.5:
+upath@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
+upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+
 uri-js@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
@@ -8105,14 +7879,15 @@ use@^2.0.0:
     isobject "^3.0.0"
     lazy-cache "^2.0.2"
 
-useragent@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
+useragent@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
   dependencies:
-    lru-cache "2.2.x"
+    lru-cache "4.1.x"
     tmp "0.0.x"
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
@@ -8189,12 +7964,19 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-wbuf@^1.1.0, wbuf@^1.7.2:
+wbuf@^1.1.0:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
   dependencies:
     minimalistic-assert "^1.0.0"
 
+wbuf@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
+  dependencies:
+    minimalistic-assert "^1.0.0"
+
 web-animations-js@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
@@ -8244,49 +8026,51 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+webpack-dev-middleware@3.6.2, webpack-dev-middleware@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
-    memory-fs "~0.4.1"
+    memory-fs "^0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.10:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b"
-  integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==
+webpack-dev-server@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
+    http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^3.0.1"
+    internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
-    spdy "^3.4.1"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
-    webpack-dev-middleware "3.4.0"
+    spdy "^4.0.0"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -8295,19 +8079,13 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
+webpack-merge@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
+  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@1.2.0, webpack-sources@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 webpack-sources@1.3.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
@@ -8323,23 +8101,30 @@ webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
+webpack-sources@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.23.1:
-  version "4.23.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239"
-  integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-module-context" "1.7.10"
-    "@webassemblyjs/wasm-edit" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.0.5"
+    acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
     chrome-trace-event "^1.0.0"
@@ -8353,9 +8138,9 @@ webpack@4.23.1:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
-    uglifyjs-webpack-plugin "^1.2.4"
+    terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
@@ -8394,7 +8179,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9:
+which@^1.2.1, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -8429,10 +8214,6 @@ wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@^1.0.0, wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
@@ -8444,6 +8225,13 @@ worker-farm@^1.5.2:
     errno "^0.1.4"
     xtend "^4.0.1"
 
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -8527,30 +8315,35 @@ yargs-parser@^10.1.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^13.0.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
+  integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
   dependencies:
     camelcase "^3.0.0"
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  dependencies:
-    camelcase "^3.0.0"
-
-yargs-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@12.0.2, yargs@^12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+yargs@12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^2.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -8560,7 +8353,24 @@ yargs@12.0.2, yargs@^12.0.2:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
+    yargs-parser "^11.1.1"
+
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yargs@3.29.0:
   version "3.29.0"
@@ -8592,41 +8402,22 @@ yargs@6.4.0:
     y18n "^3.2.1"
     yargs-parser "^4.1.0"
 
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+yargs@^12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
   dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
     get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
+    os-locale "^3.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
     string-width "^2.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
-
-yargs@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
 
 yargs@~3.10.0:
   version "3.10.0"

From 95830ee5843a64d60731a3d4ae0e0fc7dba3f4d6 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Fri, 26 Apr 2019 11:37:53 +0200
Subject: [PATCH 107/275] feat(common): stricter types for SlicePipe (#30156)

Adds overloads to the `transform` methods of `SlicePipe`,
to have better types than `any` for `value` and `any` as a return.
With this commit, using `slice` in an `ngFor` still allow to type-check the content of the `ngFor`
with `fullTemplateTypeCheck` enabled in Ivy:

    <div *ngFor="let user of users | slice:0:2">{{ user.typo }}</div>
                                                        |
                                                        `typo` does not exist on type `UserModel`

whereas it is currently not catched (as the return of `slice` is `any`) neither in VE nor in Ivy.

BREAKING CHANGE
`SlicePipe` now only accepts an array of values, a string, null or undefined.
This was already the case in practice, and it still throws at runtime if another type is given.
But it is now a compilation error to try to call it with an unsupported type.

PR Close #30156
---
 packages/common/src/pipes/slice_pipe.ts       | 4 ++++
 packages/common/test/pipes/slice_pipe_spec.ts | 9 ++++++++-
 tools/public_api_guard/common/common.d.ts     | 5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/common/src/pipes/slice_pipe.ts b/packages/common/src/pipes/slice_pipe.ts
index 63adc0ad58..bf591c7868 100644
--- a/packages/common/src/pipes/slice_pipe.ts
+++ b/packages/common/src/pipes/slice_pipe.ts
@@ -62,6 +62,10 @@ export class SlicePipe implements PipeTransform {
    *   - **if positive**: return all items before `end` index of the list or string.
    *   - **if negative**: return all items before `end` index from the end of the list or string.
    */
+  transform<T>(value: ReadonlyArray<T>, start: number, end?: number): Array<T>;
+  transform(value: string, start: number, end?: number): string;
+  transform(value: null, start: number, end?: number): null;
+  transform(value: undefined, start: number, end?: number): undefined;
   transform(value: any, start: number, end?: number): any {
     if (value == null) return value;
 
diff --git a/packages/common/test/pipes/slice_pipe_spec.ts b/packages/common/test/pipes/slice_pipe_spec.ts
index 8ed5c41bb2..63c79f1880 100644
--- a/packages/common/test/pipes/slice_pipe_spec.ts
+++ b/packages/common/test/pipes/slice_pipe_spec.ts
@@ -26,9 +26,13 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
     describe('supports', () => {
       it('should support strings', () => { expect(() => pipe.transform(str, 0)).not.toThrow(); });
       it('should support lists', () => { expect(() => pipe.transform(list, 0)).not.toThrow(); });
+      it('should support readonly lists',
+         () => { expect(() => pipe.transform(list as ReadonlyArray<number>, 0)).not.toThrow(); });
 
       it('should not support other objects',
-         () => { expect(() => pipe.transform({}, 0)).toThrow(); });
+         // this would not compile
+         // so we cast as `any` to check that it throws for unsupported objects
+         () => { expect(() => pipe.transform({} as any, 0)).toThrow(); });
     });
 
     describe('transform', () => {
@@ -36,6 +40,9 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
       it('should return null if the value is null',
          () => { expect(pipe.transform(null, 1)).toBe(null); });
 
+      it('should return undefined if the value is undefined',
+         () => { expect(pipe.transform(undefined, 1)).toBe(undefined); });
+
       it('should return all items after START index when START is positive and END is omitted',
          () => {
            expect(pipe.transform(list, 3)).toEqual([4, 5]);
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts
index b8a8fc5b57..3cded495d8 100644
--- a/tools/public_api_guard/common/common.d.ts
+++ b/tools/public_api_guard/common/common.d.ts
@@ -410,7 +410,10 @@ export interface PopStateEvent {
 export declare function registerLocaleData(data: any, localeId?: string | any, extraData?: any): void;
 
 export declare class SlicePipe implements PipeTransform {
-    transform(value: any, start: number, end?: number): any;
+    transform<T>(value: ReadonlyArray<T>, start: number, end?: number): Array<T>;
+    transform(value: string, start: number, end?: number): string;
+    transform(value: null, start: number, end?: number): null;
+    transform(value: undefined, start: number, end?: number): undefined;
 }
 
 export declare type Time = {

From 1114053daa3621a7820af1d9573c5e04707677a0 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 15 May 2019 23:01:52 +0300
Subject: [PATCH 108/275] build: remove obsolete `branchPattern` field from
 `package.json` (#30493)

PR Close #30493
---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index c3cfaa216c..28c06982d9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
   "name": "angular-srcs",
   "version": "8.0.0-rc.0",
   "private": true,
-  "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
   "homepage": "https://github.com/angular/angular",
   "bugs": "https://github.com/angular/angular/issues",

From c1135ee18f4961055b79e924757f87d944ea55db Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 15 May 2019 23:02:15 +0300
Subject: [PATCH 109/275] build: update version to 8.0.0-rc.4 in `package.json`
 (#30493)

PR Close #30493
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 28c06982d9..c53d4fb0f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "8.0.0-rc.0",
+  "version": "8.0.0-rc.4",
   "private": true,
   "description": "Angular - a web framework for modern web apps",
   "homepage": "https://github.com/angular/angular",

From 28ae22ecb9cbd836e781fb0e0f7522a63e9f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Fri, 17 May 2019 15:37:39 -0700
Subject: [PATCH 110/275] refactor(ivy): move `renderTemplate` into
 render_util.ts because it is only used in tests (#30548)

PR Close #30548
---
 .../core/src/render3/instructions/shared.ts   | 41 +---------------
 packages/core/test/render3/render_util.ts     | 48 +++++++++++++++++--
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index d3a849e7a0..7a4d9ed171 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -30,7 +30,7 @@ import {StylingContext} from '../interfaces/styling';
 import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_VIEW, ExpandoInstructions, FLAGS, HEADER_OFFSET, HOST, INJECTOR, InitPhaseState, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, RootContext, RootContextFlags, SANITIZER, TData, TVIEW, TView, T_HOST} from '../interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from '../node_assert';
 import {isNodeMatchingSelectorList} from '../node_selector_matcher';
-import {enterView, getBindingsEnabled, getCheckNoChangesMode, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, incrementActiveDirectiveId, isCreationMode, leaveView, resetComponentState, setActiveHostElement, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode, setSelectedIndex, ΔnamespaceHTML} from '../state';
+import {enterView, getBindingsEnabled, getCheckNoChangesMode, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, incrementActiveDirectiveId, isCreationMode, leaveView, setActiveHostElement, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode, setSelectedIndex, ΔnamespaceHTML} from '../state';
 import {initializeStaticContext as initializeStaticStylingContext} from '../styling/class_and_style_bindings';
 import {ANIMATION_PROP_PREFIX, isAnimationProp} from '../styling/util';
 import {NO_CHANGE} from '../tokens';
@@ -342,43 +342,6 @@ export function allocExpando(view: LView, numSlotsToAlloc: number) {
 //// Render
 //////////////////////////
 
-/**
- *
- * @param hostNode Existing node to render into.
- * @param templateFn Template function with the instructions.
- * @param consts The number of nodes, local refs, and pipes in this template
- * @param context to pass into the template.
- * @param providedRendererFactory renderer factory to use
- * @param host The host element node to use
- * @param directives Directive defs that should be used for matching
- * @param pipes Pipe defs that should be used for matching
- */
-export function renderTemplate<T>(
-    hostNode: RElement, templateFn: ComponentTemplate<T>, consts: number, vars: number, context: T,
-    providedRendererFactory: RendererFactory3, componentView: LView | null,
-    directives?: DirectiveDefListOrFactory | null, pipes?: PipeDefListOrFactory | null,
-    sanitizer?: Sanitizer | null): LView {
-  if (componentView === null) {
-    resetComponentState();
-    const renderer = providedRendererFactory.createRenderer(null, null);
-
-    // We need to create a root view so it's possible to look up the host element through its index
-    const hostLView = createLView(
-        null, createTView(-1, null, 1, 0, null, null, null, null), {},
-        LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null, providedRendererFactory, renderer);
-    enterView(hostLView, null);  // SUSPECT! why do we need to enter the View?
-
-    const componentTView =
-        getOrCreateTView(templateFn, consts, vars, directives || null, pipes || null, null, null);
-    const hostTNode = createNodeAtIndex(0, TNodeType.Element, hostNode, null, null);
-    componentView = createLView(
-        hostLView, componentTView, context, LViewFlags.CheckAlways, hostNode, hostTNode,
-        providedRendererFactory, renderer, sanitizer);
-  }
-  renderComponentOrTemplate(componentView, context, templateFn);
-  return componentView;
-}
-
 /**
  * Used for creating the LViewNode of a dynamic embedded view,
  * either through ViewContainerRef.createEmbeddedView() or TemplateRef.createEmbeddedView().
@@ -450,7 +413,7 @@ export function renderEmbeddedTemplate<T>(viewToRender: LView, tView: TView, con
   }
 }
 
-function renderComponentOrTemplate<T>(
+export function renderComponentOrTemplate<T>(
     hostView: LView, context: T, templateFn?: ComponentTemplate<T>) {
   const rendererFactory = hostView[RENDERER_FACTORY];
   const oldView = enterView(hostView, hostView[T_HOST]);
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index f52e1e6409..8f5c7b9584 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -12,8 +12,9 @@ import {ElementRef} from '@angular/core/src/linker/element_ref';
 import {TemplateRef} from '@angular/core/src/linker/template_ref';
 import {ViewContainerRef} from '@angular/core/src/linker/view_container_ref';
 import {Renderer2} from '@angular/core/src/render/api';
-import {renderTemplate} from '@angular/core/src/render3/instructions/shared';
-import {getLView} from '@angular/core/src/render3/state';
+import {createLView, createNodeAtIndex, createTView, getOrCreateTView, renderComponentOrTemplate} from '@angular/core/src/render3/instructions/shared';
+import {TNodeType} from '@angular/core/src/render3/interfaces/node';
+import {enterView, getLView, resetComponentState} from '@angular/core/src/render3/state';
 import {stringifyElement} from '@angular/platform-browser/testing/src/browser_util';
 
 import {SWITCH_CHANGE_DETECTOR_REF_FACTORY__POST_R3__ as R3_CHANGE_DETECTOR_REF_FACTORY} from '../../src/change_detection/change_detector_ref';
@@ -28,10 +29,10 @@ import {getDirectivesAtNodeIndex, getLContext, isComponentInstance} from '../../
 import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
 import {NG_ELEMENT_ID} from '../../src/render3/fields';
 import {ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, RenderFlags, renderComponent as _renderComponent, tick, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
-import {DirectiveDefList, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
+import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {PlayerHandler} from '../../src/render3/interfaces/player';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, RendererFactory3, RendererStyleFlags3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
-import {HEADER_OFFSET, LView} from '../../src/render3/interfaces/view';
+import {HEADER_OFFSET, LView, LViewFlags} from '../../src/render3/interfaces/view';
 import {destroyLView} from '../../src/render3/node_manipulation';
 import {getRootView} from '../../src/render3/util/view_traversal_utils';
 import {Sanitizer} from '../../src/sanitization/security';
@@ -230,6 +231,45 @@ export function resetDOM() {
   // TODO: assert that the global state is clean (e.g. ngData, previousOrParentNode, etc)
 }
 
+
+/**
+ *
+ * @param hostNode Existing node to render into.
+ * @param templateFn Template function with the instructions.
+ * @param consts The number of nodes, local refs, and pipes in this template
+ * @param context to pass into the template.
+ * @param providedRendererFactory renderer factory to use
+ * @param host The host element node to use
+ * @param directives Directive defs that should be used for matching
+ * @param pipes Pipe defs that should be used for matching
+ */
+export function renderTemplate<T>(
+    hostNode: RElement, templateFn: ComponentTemplate<T>, consts: number, vars: number, context: T,
+    providedRendererFactory: RendererFactory3, componentView: LView | null,
+    directives?: DirectiveDefListOrFactory | null, pipes?: PipeDefListOrFactory | null,
+    sanitizer?: Sanitizer | null): LView {
+  if (componentView === null) {
+    resetComponentState();
+    const renderer = providedRendererFactory.createRenderer(null, null);
+
+    // We need to create a root view so it's possible to look up the host element through its index
+    const hostLView = createLView(
+        null, createTView(-1, null, 1, 0, null, null, null, null), {},
+        LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null, providedRendererFactory, renderer);
+    enterView(hostLView, null);  // SUSPECT! why do we need to enter the View?
+
+    const componentTView =
+        getOrCreateTView(templateFn, consts, vars, directives || null, pipes || null, null, null);
+    const hostTNode = createNodeAtIndex(0, TNodeType.Element, hostNode, null, null);
+    componentView = createLView(
+        hostLView, componentTView, context, LViewFlags.CheckAlways, hostNode, hostTNode,
+        providedRendererFactory, renderer, sanitizer);
+  }
+  renderComponentOrTemplate(componentView, context, templateFn);
+  return componentView;
+}
+
+
 /**
  * @deprecated use `TemplateFixture` or `ComponentFixture`
  */

From 6454f76cf610406f2f7a499868dc22092e1b8154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Fri, 17 May 2019 16:25:09 -0700
Subject: [PATCH 111/275] refactor(ivy): remove ngPrivateData megamorphic prop
 access (#30548)

PR Close #30548
---
 packages/core/src/render3/component.ts        |  7 +--
 packages/core/src/render3/definition.ts       |  1 +
 .../core/src/render3/instructions/shared.ts   | 30 +++--------
 .../core/src/render3/interfaces/definition.ts |  9 +++-
 packages/core/src/render3/interfaces/view.ts  |  2 +-
 packages/core/src/render3/jit/module.ts       |  2 +-
 .../core/test/acceptance/integration_spec.ts  | 17 +++++++
 .../test/linker/ng_module_integration_spec.ts |  2 +-
 .../core/test/render3/integration_spec.ts     | 50 -------------------
 packages/core/test/render3/render_util.ts     | 16 ++++--
 10 files changed, 50 insertions(+), 86 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index ea31239937..7682ce0b6c 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -174,11 +174,8 @@ export function createRootComponentView(
   const tView = rootView[TVIEW];
   const tNode: TElementNode = createNodeAtIndex(0, TNodeType.Element, rNode, null, null);
   const componentView = createLView(
-      rootView, getOrCreateTView(
-                    def.template, def.consts, def.vars, def.directiveDefs, def.pipeDefs,
-                    def.viewQuery, def.schemas),
-      null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, rootView[HEADER_OFFSET], tNode,
-      rendererFactory, renderer, sanitizer);
+      rootView, getOrCreateTView(def), null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
+      rootView[HEADER_OFFSET], tNode, rendererFactory, renderer, sanitizer);
 
   if (tView.firstTemplatePass) {
     diPublicInInjector(getOrCreateNodeInjectorForNode(tNode, rootView), rootView, def.type);
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index 7d08c94d23..6e3126fd20 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -285,6 +285,7 @@ export function ΔdefineComponent<T>(componentDefinition: {
     _: null as never,
     setInput: null,
     schemas: componentDefinition.schemas || null,
+    tView: null,
   };
   def._ = noSideEffects(() => {
     const directiveTypes = componentDefinition.directives !;
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 7a4d9ed171..14ad2b880a 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -548,29 +548,13 @@ function saveResolvedLocalsInData(
  * Gets TView from a template function or creates a new TView
  * if it doesn't already exist.
  *
- * @param templateFn The template from which to get static data
- * @param consts The number of nodes, local refs, and pipes in this view
- * @param vars The number of bindings and pure function bindings in this view
- * @param directives Directive defs that should be saved on TView
- * @param pipes Pipe defs that should be saved on TView
- * @param viewQuery View query that should be saved on TView
- * @param schemas Schemas that should be saved on TView
+ * @param def ComponentDef
  * @returns TView
  */
-export function getOrCreateTView(
-    templateFn: ComponentTemplate<any>, consts: number, vars: number,
-    directives: DirectiveDefListOrFactory | null, pipes: PipeDefListOrFactory | null,
-    viewQuery: ViewQueriesFunction<any>| null, schemas: SchemaMetadata[] | null): TView {
-  // TODO(misko): reading `ngPrivateData` here is problematic for two reasons
-  // 1. It is a megamorphic call on each invocation.
-  // 2. For nested embedded views (ngFor inside ngFor) the template instance is per
-  //    outer template invocation, which means that no such property will exist
-  // Correct solution is to only put `ngPrivateData` on the Component template
-  // and not on embedded templates.
-
-  return templateFn.ngPrivateData ||
-      (templateFn.ngPrivateData = createTView(
-           -1, templateFn, consts, vars, directives, pipes, viewQuery, schemas) as never);
+export function getOrCreateTView(def: ComponentDef<any>): TView {
+  return def.tView || (def.tView = createTView(
+                           -1, def.template, def.consts, def.vars, def.directiveDefs, def.pipeDefs,
+                           def.viewQuery, def.schemas));
 }
 
 /**
@@ -1262,9 +1246,7 @@ function addComponentLogic<T>(
     lView: LView, previousOrParentTNode: TNode, def: ComponentDef<T>): void {
   const native = getNativeByTNode(previousOrParentTNode, lView);
 
-  const tView = getOrCreateTView(
-      def.template, def.consts, def.vars, def.directiveDefs, def.pipeDefs, def.viewQuery,
-      def.schemas);
+  const tView = getOrCreateTView(def);
 
   // Only component views should be added to the view tree directly. Embedded views are
   // accessed through their containers because they may be removed / re-added later.
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 76c04bc0ae..04816932f2 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -10,6 +10,7 @@ import {SchemaMetadata, ViewEncapsulation} from '../../core';
 import {ProcessProvidersFunction} from '../../di/interface/provider';
 import {Type} from '../../interface/type';
 import {CssSelectorList} from './projection';
+import {TView} from './view';
 
 
 /**
@@ -19,7 +20,7 @@ export type ComponentTemplate<T> = {
   // Note: the ctx parameter is typed as T|U, as using only U would prevent a template with
   // e.g. ctx: {} from being assigned to ComponentTemplate<any> as TypeScript won't infer U = any
   // in that scenario. By including T this incompatibility is resolved.
-  <U extends T>(rf: RenderFlags, ctx: T | U): void; ngPrivateData?: never;
+  <U extends T>(rf: RenderFlags, ctx: T | U): void;
 };
 
 /**
@@ -302,6 +303,12 @@ export interface ComponentDef<T> extends DirectiveDef<T> {
    */
   schemas: SchemaMetadata[]|null;
 
+  /**
+   * Ivy runtime uses this place to store the computed tView for the component. This gets filled on
+   * the first run of component.
+   */
+  tView: TView|null;
+
   /**
    * Used to store the result of `noSideEffects` function so that it is not removed by closure
    * compiler. The property should never be read.
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 9383153210..acf341ca0b 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -327,7 +327,7 @@ export interface ExpandoInstructions extends Array<number|HostBindingsFunction<a
  * The static data for an LView (shared between all templates of a
  * given type).
  *
- * Stored on the template function as ngPrivateData.
+ * Stored on the `ComponentDef.tView`.
  */
 export interface TView {
   /**
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 324eef50e8..4d35a0ec89 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -361,7 +361,7 @@ export function patchComponentDefWithScope<C>(
   // may face a problem where previously compiled defs available to a given Component/Directive
   // are cached in TView and may become stale (in case any of these defs gets recompiled). In
   // order to avoid this problem, we force fresh TView to be created.
-  componentDef.template.ngPrivateData = undefined;
+  componentDef.tView = null;
 }
 
 /**
diff --git a/packages/core/test/acceptance/integration_spec.ts b/packages/core/test/acceptance/integration_spec.ts
index f211d2ce18..be4b6b58cc 100644
--- a/packages/core/test/acceptance/integration_spec.ts
+++ b/packages/core/test/acceptance/integration_spec.ts
@@ -7,6 +7,7 @@
  */
 import {CommonModule} from '@angular/common';
 import {Component, ContentChild, Directive, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnInit, Output, QueryList, TemplateRef, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
+import {ngDevModeResetPerfCounters} from '@angular/core/src/util/ng_dev_mode';
 import {TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
@@ -29,11 +30,17 @@ describe('acceptance integration tests', () => {
     });
 
     it('should render and update basic "Hello, World" template', () => {
+      ngDevModeResetPerfCounters();
       @Component({template: '<h1>Hello, {{name}}!</h1>'})
       class App {
         name = '';
       }
 
+      onlyInIvy('perf counters').expectPerfCounters({
+        tView: 0,
+        tNode: 0,
+      });
+
       TestBed.configureTestingModule({declarations: [App]});
       const fixture = TestBed.createComponent(App);
 
@@ -41,11 +48,21 @@ describe('acceptance integration tests', () => {
       fixture.detectChanges();
 
       expect(fixture.nativeElement.innerHTML).toEqual('<h1>Hello, World!</h1>');
+      onlyInIvy('perf counters').expectPerfCounters({
+        tView: 2,  // Host view + App
+        tNode: 4,  // Host Node + App Node + <span> + #text
+      });
 
       fixture.componentInstance.name = 'New World';
       fixture.detectChanges();
 
       expect(fixture.nativeElement.innerHTML).toEqual('<h1>Hello, New World!</h1>');
+      // Assert that the tView/tNode count does not increase (they are correctly cached)
+      onlyInIvy('perf counters').expectPerfCounters({
+        tView: 2,
+        tNode: 4,
+      });
+
     });
   });
 
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index f1961bd8ce..6017ee8bef 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -142,7 +142,7 @@ function declareTests(config?: {useJit: boolean}) {
         // may face a problem where previously compiled defs available to a given
         // Component/Directive are cached in TView and may become stale (in case any of these defs
         // gets recompiled). In order to avoid this problem, we force fresh TView to be created.
-        componentDef.template.ngPrivateData = null;
+        componentDef.TView = null;
       }
 
       const ngModule = createModule(moduleType, injector);
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 9af14ac2b4..6994ec97bf 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -196,56 +196,6 @@ describe('render3 integration test', () => {
 
 });
 
-describe('template data', () => {
-
-  it('should re-use template data and node data', () => {
-    /**
-     *  % if (condition) {
-     *    <div></div>
-     *  % }
-     */
-    function Template(rf: RenderFlags, ctx: any) {
-      if (rf & RenderFlags.Create) {
-        Δcontainer(0);
-      }
-      if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
-        {
-          if (ctx.condition) {
-            let rf1 = ΔembeddedViewStart(0, 1, 0);
-            if (rf1 & RenderFlags.Create) {
-              Δelement(0, 'div');
-            }
-            ΔembeddedViewEnd();
-          }
-        }
-        ΔcontainerRefreshEnd();
-      }
-    }
-
-    expect((Template as any).ngPrivateData).toBeUndefined();
-
-    renderToHtml(Template, {condition: true}, 1);
-
-    const oldTemplateData = (Template as any).ngPrivateData;
-    const oldContainerData = (oldTemplateData as any).data[HEADER_OFFSET];
-    const oldElementData = oldContainerData.tViews[0][HEADER_OFFSET];
-    expect(oldContainerData).not.toBeNull();
-    expect(oldElementData).not.toBeNull();
-
-    renderToHtml(Template, {condition: false}, 1);
-    renderToHtml(Template, {condition: true}, 1);
-
-    const newTemplateData = (Template as any).ngPrivateData;
-    const newContainerData = (oldTemplateData as any).data[HEADER_OFFSET];
-    const newElementData = oldContainerData.tViews[0][HEADER_OFFSET];
-    expect(newTemplateData === oldTemplateData).toBe(true);
-    expect(newContainerData === oldContainerData).toBe(true);
-    expect(newElementData === oldElementData).toBe(true);
-  });
-
-});
-
 describe('component styles', () => {
   it('should pass in the component styles directly into the underlying renderer', () => {
     class StyledComp {
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 8f5c7b9584..37c836b80a 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -28,7 +28,7 @@ import {CreateComponentOptions} from '../../src/render3/component';
 import {getDirectivesAtNodeIndex, getLContext, isComponentInstance} from '../../src/render3/context_discovery';
 import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
 import {NG_ELEMENT_ID} from '../../src/render3/fields';
-import {ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, RenderFlags, renderComponent as _renderComponent, tick, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
+import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, RenderFlags, renderComponent as _renderComponent, tick, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
 import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {PlayerHandler} from '../../src/render3/interfaces/player';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, RendererFactory3, RendererStyleFlags3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
@@ -258,8 +258,18 @@ export function renderTemplate<T>(
         LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null, providedRendererFactory, renderer);
     enterView(hostLView, null);  // SUSPECT! why do we need to enter the View?
 
-    const componentTView =
-        getOrCreateTView(templateFn, consts, vars, directives || null, pipes || null, null, null);
+    const def: ComponentDef<any> = ΔdefineComponent({
+      factory: () => null,
+      selectors: [],
+      type: Object,
+      template: templateFn,
+      consts: consts,
+      vars: vars,
+    });
+    def.directiveDefs = directives || null;
+    def.pipeDefs = pipes || null;
+
+    const componentTView = getOrCreateTView(def);
     const hostTNode = createNodeAtIndex(0, TNodeType.Element, hostNode, null, null);
     componentView = createLView(
         hostLView, componentTView, context, LViewFlags.CheckAlways, hostNode, hostTNode,

From f78bda9ff09ab0cb884bdd83be75bcc1b3646e1f Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 14 May 2019 11:48:16 +0300
Subject: [PATCH 112/275] build: add recommended config files for VSCode remote
 development (#30450)

Add some recommended config files to use (as is or as basis) for setting
up [remote development using docker containers][1] with VSCode. This is
an opt-in feature. See `.devcontainer/README.md` for more info.

The configuration can be further tweaked/improved, but is a good
starting point.

[1]: https://code.visualstudio.com/docs/remote/containers

PR Close #30450
---
 .devcontainer/recommended-Dockerfile        | 22 +++++++++++++++++++++
 .devcontainer/recommended-devcontainer.json | 16 +++++++++++++++
 .github/CODEOWNERS                          |  1 +
 .gitignore                                  |  4 +++-
 .vscode/extensions.json                     |  3 +++
 5 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 .devcontainer/recommended-Dockerfile
 create mode 100644 .devcontainer/recommended-devcontainer.json

diff --git a/.devcontainer/recommended-Dockerfile b/.devcontainer/recommended-Dockerfile
new file mode 100644
index 0000000000..a004714591
--- /dev/null
+++ b/.devcontainer/recommended-Dockerfile
@@ -0,0 +1,22 @@
+# Image metadata and config.
+FROM circleci/node:10-browsers
+
+LABEL name="Angular dev environment" \
+      description="This image can be used to create a dev environment for building Angular." \
+      vendor="angular" \
+      version="1.0"
+
+EXPOSE 4000 4200 4433 5000 8080 9876
+
+
+# Switch to `root` (CircleCI images use `circleci` as the user).
+USER root
+
+
+# Configure `Node.js`/`npm` and install utilities.
+RUN npm config --global set user root
+RUN npm install --global yarn@1.13.0  # This needs to be in sync with what we use on CI.
+
+
+# Go! (And keep going.)
+CMD ["tail", "--follow", "/dev/null"]
diff --git a/.devcontainer/recommended-devcontainer.json b/.devcontainer/recommended-devcontainer.json
new file mode 100644
index 0000000000..fa6320461b
--- /dev/null
+++ b/.devcontainer/recommended-devcontainer.json
@@ -0,0 +1,16 @@
+// Reference: https://code.visualstudio.com/docs/remote/containers#_devcontainerjson-reference
+{
+  "name": "Angular dev container",
+  "dockerFile": "Dockerfile",
+  "appPort": [4000, 4200, 4433, 5000, 8080, 9876],
+  "postCreateCommand": "yarn install",
+  "extensions": [
+    "devondcarew.bazel-code",
+    "gkalpak.aio-docs-utils",
+    "ms-vscode.vscode-typescript-tslint-plugin",
+    "xaver.clang-format",
+    // The following extensions are useful when working on angular.io (i.e. inside the `aio/` directory).
+    //"angular.ng-template",
+    //"dbaeumer.vscode-eslint",
+  ],
+}
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5c7fe7b236..b274f730b9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -855,6 +855,7 @@ testing/**                                                      @angular/fw-test
 /.buildkite/**                                                  @angular/fw-dev-infra
 /.circleci/**                                                   @angular/fw-dev-infra
 /.codefresh/**                                                  @angular/fw-dev-infra
+/.devcontainer/**                                               @angular/fw-dev-infra
 /.github/**                                                     @angular/fw-dev-infra
 /.vscode/**                                                     @angular/fw-dev-infra
 /docs/BAZEL.md                                                  @angular/fw-dev-infra
diff --git a/.gitignore b/.gitignore
index d7d46f27fd..68ebb8b13a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,9 @@ tools/gulp-tasks/cldr/cldr-data/
 pubspec.lock
 .c9
 .idea/
-.devcontainer
+.devcontainer/*
+!.devcontainer/recommended-devcontainer.json
+!.devcontainer/recommended-Dockerfile
 .settings/
 .vscode/launch.json
 .vscode/settings.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 5d121aa51d..30c3aca137 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -8,5 +8,8 @@
     "gkalpak.aio-docs-utils",
     "ms-vscode.vscode-typescript-tslint-plugin",
     "xaver.clang-format",
+    // The following extensions are useful when working on angular.io (i.e. inside the `aio/` directory).
+    //"angular.ng-template",
+    //"dbaeumer.vscode-eslint",
   ],
 }

From 1c3ee41902ee742f6c62e053ddf3ee53ac78c7b5 Mon Sep 17 00:00:00 2001
From: jenniferfell <jenniferfell.sf@gmail.com>
Date: Tue, 2 Apr 2019 00:12:55 -0600
Subject: [PATCH 113/275] docs: move old quick start content into new local
 setup guide (#29651)

PR Close #29651
---
 .../cli-quickstart/bs-config.cli.json         |  11 -
 .../cli-quickstart/e2e/src/app.e2e-spec.ts    |  14 --
 .../cli-quickstart/example-config.json        |   4 -
 .../cli-quickstart/src/app/app.component.css  |   6 -
 .../cli-quickstart/src/app/app.component.html |  19 --
 .../src/app/app.component.spec.ts             |  30 ---
 .../cli-quickstart/src/app/app.component.ts   |  16 --
 .../cli-quickstart/src/app/app.module.ts      |  16 --
 .../examples/cli-quickstart/src/index.html    |  14 --
 .../examples/cli-quickstart/src/main.ts       |  11 -
 .../examples/cli-quickstart/zipper.json       |   9 -
 aio/content/guide/attribute-directives.md     |   2 +-
 aio/content/guide/deployment.md               |   4 +-
 aio/content/guide/displaying-data.md          |   3 +-
 aio/content/guide/glossary.md                 |   2 +-
 aio/content/guide/npm-packages.md             |   2 +-
 aio/content/guide/prerequisites-setup.md      | 148 --------------
 aio/content/guide/quickstart.md               | 192 ------------------
 aio/content/guide/setup-local.md              | 129 ++++++++++++
 aio/content/guide/setup.md                    |  79 +++----
 aio/content/guide/visual-studio-2015.md       |  17 +-
 .../guide/cli-quickstart/my-first-app.png     | Bin 19720 -> 0 bytes
 .../quickstart-sourcemap-explorer.png         | Bin
 .../cart-page-checkout-form-empty.png         | Bin 26076 -> 0 bytes
 .../getting-started/cart-page-no-items.png    | Bin 19046 -> 0 bytes
 .../cart-with-shipping-link.png               | Bin 24980 -> 0 bytes
 .../guide/getting-started/new-project.png     | Bin 81884 -> 0 bytes
 .../guide/getting-started/product-details.png | Bin 59429 -> 0 bytes
 .../shipping-prices-via-route.png             | Bin 26896 -> 0 bytes
 .../stackblitz-angular-icon.png               | Bin 5910 -> 0 bytes
 .../stackblitz-icon-only-small.png            | Bin 3284 -> 0 bytes
 .../getting-started/stackblitz-icon-only.png  | Bin 3401 -> 0 bytes
 .../getting-started/stackblitz-icon-small.png | Bin 5664 -> 0 bytes
 .../stackblitz-icon-smallest.png              | Bin 2756 -> 0 bytes
 .../guide/getting-started/stackblitz-icon.png | Bin 7662 -> 0 bytes
 .../starter-app-components.png                | Bin 34373 -> 0 bytes
 .../app-works.png                             | Bin
 .../app-components.png                        | Bin
 .../{getting-started => start}/buy-alert.png  | Bin
 .../cart-empty-with-shipping-prices.png       | Bin
 .../cart-page-full.png                        | Bin
 .../cart-with-items-and-form.png              | Bin
 .../{getting-started => start}/cart-works.png | Bin
 .../generate-component.png                    | Bin
 .../{getting-started => start}/new-app.png    | Bin
 .../product-alert-button.png                  | Bin
 .../product-alert-notification.png            | Bin
 .../product-details-buy.png                   | Bin
 .../product-details-routed.png                | Bin
 .../product-details-works.png                 | Bin
 .../shipping-prices.png                       | Bin
 .../template-syntax-product-anchor.png        | Bin
 .../template-syntax-product-description.png   | Bin
 .../template-syntax-product-names.png         | Bin
 .../template-syntax-product-share-alert.png   | Bin
 .../template-syntax-product-share-button.png  | Bin
 aio/content/marketing/docs.md                 |  70 +++----
 aio/content/marketing/features.html           |   2 +-
 aio/content/marketing/index.html              |   8 +-
 aio/content/navigation.json                   | 188 ++++++++---------
 .../{getting-started => start}/data.md        |  20 +-
 .../{getting-started => start}/deployment.md  |   4 +-
 .../{getting-started => start}/forms.md       |   6 +-
 .../{getting-started => start}/index.md       |  27 ++-
 .../{getting-started => start}/routing.md     |  10 +-
 aio/content/tutorial/index.md                 |  21 +-
 aio/content/tutorial/toh-pt0.md               |  10 +-
 aio/firebase.json                             |  11 +-
 aio/ngsw-config.json                          |   5 +
 .../deployment/e2e/smoke-tests.e2e-spec.ts    |   4 +-
 .../deployment/shared/URLS_TO_REDIRECT.txt    |  12 +-
 aio/tests/e2e/src/app.e2e-spec.ts             |   6 +-
 .../angular-content-package/index.js          |   2 +-
 .../getting-started-package.js                |   2 +-
 aio/tools/transforms/authors-package/index.js |   2 +-
 75 files changed, 388 insertions(+), 750 deletions(-)
 delete mode 100644 aio/content/examples/cli-quickstart/bs-config.cli.json
 delete mode 100644 aio/content/examples/cli-quickstart/e2e/src/app.e2e-spec.ts
 delete mode 100644 aio/content/examples/cli-quickstart/example-config.json
 delete mode 100644 aio/content/examples/cli-quickstart/src/app/app.component.css
 delete mode 100644 aio/content/examples/cli-quickstart/src/app/app.component.html
 delete mode 100644 aio/content/examples/cli-quickstart/src/app/app.component.spec.ts
 delete mode 100644 aio/content/examples/cli-quickstart/src/app/app.component.ts
 delete mode 100644 aio/content/examples/cli-quickstart/src/app/app.module.ts
 delete mode 100644 aio/content/examples/cli-quickstart/src/index.html
 delete mode 100644 aio/content/examples/cli-quickstart/src/main.ts
 delete mode 100644 aio/content/examples/cli-quickstart/zipper.json
 delete mode 100644 aio/content/guide/prerequisites-setup.md
 delete mode 100644 aio/content/guide/quickstart.md
 create mode 100644 aio/content/guide/setup-local.md
 delete mode 100644 aio/content/images/guide/cli-quickstart/my-first-app.png
 rename aio/content/images/guide/{cli-quickstart => deployment}/quickstart-sourcemap-explorer.png (100%)
 delete mode 100644 aio/content/images/guide/getting-started/cart-page-checkout-form-empty.png
 delete mode 100644 aio/content/images/guide/getting-started/cart-page-no-items.png
 delete mode 100644 aio/content/images/guide/getting-started/cart-with-shipping-link.png
 delete mode 100644 aio/content/images/guide/getting-started/new-project.png
 delete mode 100644 aio/content/images/guide/getting-started/product-details.png
 delete mode 100644 aio/content/images/guide/getting-started/shipping-prices-via-route.png
 delete mode 100644 aio/content/images/guide/getting-started/stackblitz-angular-icon.png
 delete mode 100644 aio/content/images/guide/getting-started/stackblitz-icon-only-small.png
 delete mode 100644 aio/content/images/guide/getting-started/stackblitz-icon-only.png
 delete mode 100644 aio/content/images/guide/getting-started/stackblitz-icon-small.png
 delete mode 100644 aio/content/images/guide/getting-started/stackblitz-icon-smallest.png
 delete mode 100644 aio/content/images/guide/getting-started/stackblitz-icon.png
 delete mode 100644 aio/content/images/guide/getting-started/starter-app-components.png
 rename aio/content/images/guide/{cli-quickstart => setup-local}/app-works.png (100%)
 rename aio/content/images/guide/{getting-started => start}/app-components.png (100%)
 rename aio/content/images/guide/{getting-started => start}/buy-alert.png (100%)
 rename aio/content/images/guide/{getting-started => start}/cart-empty-with-shipping-prices.png (100%)
 rename aio/content/images/guide/{getting-started => start}/cart-page-full.png (100%)
 rename aio/content/images/guide/{getting-started => start}/cart-with-items-and-form.png (100%)
 rename aio/content/images/guide/{getting-started => start}/cart-works.png (100%)
 rename aio/content/images/guide/{getting-started => start}/generate-component.png (100%)
 rename aio/content/images/guide/{getting-started => start}/new-app.png (100%)
 rename aio/content/images/guide/{getting-started => start}/product-alert-button.png (100%)
 rename aio/content/images/guide/{getting-started => start}/product-alert-notification.png (100%)
 rename aio/content/images/guide/{getting-started => start}/product-details-buy.png (100%)
 rename aio/content/images/guide/{getting-started => start}/product-details-routed.png (100%)
 rename aio/content/images/guide/{getting-started => start}/product-details-works.png (100%)
 rename aio/content/images/guide/{getting-started => start}/shipping-prices.png (100%)
 rename aio/content/images/guide/{getting-started => start}/template-syntax-product-anchor.png (100%)
 rename aio/content/images/guide/{getting-started => start}/template-syntax-product-description.png (100%)
 rename aio/content/images/guide/{getting-started => start}/template-syntax-product-names.png (100%)
 rename aio/content/images/guide/{getting-started => start}/template-syntax-product-share-alert.png (100%)
 rename aio/content/images/guide/{getting-started => start}/template-syntax-product-share-button.png (100%)
 rename aio/content/{getting-started => start}/data.md (91%)
 rename aio/content/{getting-started => start}/deployment.md (84%)
 rename aio/content/{getting-started => start}/forms.md (91%)
 rename aio/content/{getting-started => start}/index.md (90%)
 rename aio/content/{getting-started => start}/routing.md (88%)

diff --git a/aio/content/examples/cli-quickstart/bs-config.cli.json b/aio/content/examples/cli-quickstart/bs-config.cli.json
deleted file mode 100644
index ac61d35f83..0000000000
--- a/aio/content/examples/cli-quickstart/bs-config.cli.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "open": false,
-  "logLevel": "silent",
-  "port": 8080,
-  "server": {
-    "baseDir": "dist",
-    "middleware": {
-      "0": null
-    }
-  }
-}
diff --git a/aio/content/examples/cli-quickstart/e2e/src/app.e2e-spec.ts b/aio/content/examples/cli-quickstart/e2e/src/app.e2e-spec.ts
deleted file mode 100644
index 3f0760b56e..0000000000
--- a/aio/content/examples/cli-quickstart/e2e/src/app.e2e-spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict'; // necessary for es6 output in node
-
-import { browser, element, by } from 'protractor';
-
-describe('cli-quickstart App', () => {
-  beforeEach(() => {
-    return browser.get('/');
-  });
-
-  it('should display message saying app works', () => {
-    let pageTitle = element(by.css('app-root h1')).getText();
-    expect(pageTitle).toEqual('Welcome to My First Angular App!!');
-  });
-});
diff --git a/aio/content/examples/cli-quickstart/example-config.json b/aio/content/examples/cli-quickstart/example-config.json
deleted file mode 100644
index 313764c3c6..0000000000
--- a/aio/content/examples/cli-quickstart/example-config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "build": "build:cli",
-  "run": "serve:cli"
-}
diff --git a/aio/content/examples/cli-quickstart/src/app/app.component.css b/aio/content/examples/cli-quickstart/src/app/app.component.css
deleted file mode 100644
index a2b21fae82..0000000000
--- a/aio/content/examples/cli-quickstart/src/app/app.component.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* #docregion */
-h1 {
-  color: #369;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 250%;
-}
diff --git a/aio/content/examples/cli-quickstart/src/app/app.component.html b/aio/content/examples/cli-quickstart/src/app/app.component.html
deleted file mode 100644
index 24c56edee4..0000000000
--- a/aio/content/examples/cli-quickstart/src/app/app.component.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--The content below is only a placeholder and can be replaced.-->
-<div style="text-align:center">
-  <h1>
-    Welcome to {{ title }}!
-  </h1>
-  <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
-</div>
-<h2>Here are some links to help you start: </h2>
-<ul>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>
-  </li>
-</ul>
diff --git a/aio/content/examples/cli-quickstart/src/app/app.component.spec.ts b/aio/content/examples/cli-quickstart/src/app/app.component.spec.ts
deleted file mode 100644
index 1f5da50d19..0000000000
--- a/aio/content/examples/cli-quickstart/src/app/app.component.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
-
-  it('should create the app', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  }));
-
-  it(`should have as title 'app'`, async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toMatch(/app/i);
-  }));
-
-  it('should render title in a h1 tag', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toMatch(/app/i);
-  }));
-});
diff --git a/aio/content/examples/cli-quickstart/src/app/app.component.ts b/aio/content/examples/cli-quickstart/src/app/app.component.ts
deleted file mode 100644
index 1c462d321b..0000000000
--- a/aio/content/examples/cli-quickstart/src/app/app.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// #docregion import
-import { Component } from '@angular/core';
-// #enddocregion import
-
-// #docregion metadata, component
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
-})
-// #enddocregion metadata
-// #docregion title, class
-export class AppComponent {
-  title = 'My First Angular App!';
-}
-// #enddocregion title, class, component
diff --git a/aio/content/examples/cli-quickstart/src/app/app.module.ts b/aio/content/examples/cli-quickstart/src/app/app.module.ts
deleted file mode 100644
index f65716351a..0000000000
--- a/aio/content/examples/cli-quickstart/src/app/app.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-
-import { AppComponent } from './app.component';
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
diff --git a/aio/content/examples/cli-quickstart/src/index.html b/aio/content/examples/cli-quickstart/src/index.html
deleted file mode 100644
index 0450fa57c3..0000000000
--- a/aio/content/examples/cli-quickstart/src/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>MyApp</title>
-  <base href="/">
-
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-</head>
-<body>
-  <app-root></app-root>
-</body>
-</html>
diff --git a/aio/content/examples/cli-quickstart/src/main.ts b/aio/content/examples/cli-quickstart/src/main.ts
deleted file mode 100644
index a9ca1caf8c..0000000000
--- a/aio/content/examples/cli-quickstart/src/main.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
-
-if (environment.production) {
-  enableProdMode();
-}
-
-platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/aio/content/examples/cli-quickstart/zipper.json b/aio/content/examples/cli-quickstart/zipper.json
deleted file mode 100644
index 1deb27d7fb..0000000000
--- a/aio/content/examples/cli-quickstart/zipper.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "files":[
-    "!**/*.d.ts",
-    "!**/*.js",
-    "!**/*.[0-9].*",
-    "angular.json",
-    "protractor.conf.js"
-  ]
-}
diff --git a/aio/content/guide/attribute-directives.md b/aio/content/guide/attribute-directives.md
index bc8e3ccacc..3cfcfada88 100644
--- a/aio/content/guide/attribute-directives.md
+++ b/aio/content/guide/attribute-directives.md
@@ -15,7 +15,7 @@ There are three kinds of directives in Angular:
 1. Attribute directives&mdash;change the appearance or behavior of an element, component, or another directive.
 
 *Components* are the most common of the three directives.
-You saw a component for the first time in the [Getting Started](guide/quickstart).
+You saw a component for the first time in the [Getting Started](start "Getting Started with Angular") tutorial.
 
 *Structural Directives* change the structure of the view.
 Two examples are [NgFor](guide/template-syntax#ngFor) and [NgIf](guide/template-syntax#ngIf).
diff --git a/aio/content/guide/deployment.md b/aio/content/guide/deployment.md
index caa0c08a0d..9c66e47139 100644
--- a/aio/content/guide/deployment.md
+++ b/aio/content/guide/deployment.md
@@ -338,10 +338,10 @@ The following example displays the graph for the _main_ bundle.
 The `source-map-explorer` analyzes the source map generated with the bundle and draws a map of all dependencies,
 showing exactly which classes are included in the bundle.
 
-Here's the output for the _main_ bundle of the QuickStart.
+Here's the output for the _main_ bundle of an example app called `cli-quickstart`.
 
 <figure>
-  <img src="generated/images/guide/cli-quickstart/quickstart-sourcemap-explorer.png" alt="quickstart sourcemap explorer">
+  <img src="generated/images/guide/deployment/quickstart-sourcemap-explorer.png" alt="quickstart sourcemap explorer">
 </figure>
 
 {@a base-tag}
diff --git a/aio/content/guide/displaying-data.md b/aio/content/guide/displaying-data.md
index 073b23a59d..85902da4ae 100644
--- a/aio/content/guide/displaying-data.md
+++ b/aio/content/guide/displaying-data.md
@@ -31,8 +31,7 @@ The easiest way to display a component property
 is to bind the property name through interpolation.
 With interpolation, you put the property name in the view template, enclosed in double curly braces: `{{myHero}}`.
 
-Follow the [Getting Started](guide/quickstart) instructions for creating a new project
-named <code>displaying-data</code>.
+Use the CLI command [`ng new displaying-data`](cli/new) to create a workspace and app named `displaying-data`. 
 
 Delete the <code>app.component.html</code> file. It is not needed for this example.
 
diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index 7bbc718f8e..6f37759986 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -176,7 +176,7 @@ In Angular, a set of related [schematics](#schematic) collected in an [npm packa
 
 The [Angular CLI](cli) is a command-line tool for managing the Angular development cycle. Use it to create the initial filesystem scaffolding for a [workspace](#workspace) or [project](#project), and to run [schematics](#schematic) that add and modify code for initial generic versions of various elements. The CLI supports all stages of the development cycle, including building, testing, bundling, and deployment.
 
-* To begin using the CLI for a new project, see [Getting Started](guide/quickstart).
+* To begin using the CLI for a new project, see [Local Environment Setup](guide/setup-local "Setting up for Local Development").
 * To learn more about the full capabilities of the CLI, see the [CLI command reference](cli).
 
 See also [Schematics CLI](#schematics-cli).
diff --git a/aio/content/guide/npm-packages.md b/aio/content/guide/npm-packages.md
index 376b4c03f6..4942d3930a 100644
--- a/aio/content/guide/npm-packages.md
+++ b/aio/content/guide/npm-packages.md
@@ -9,7 +9,7 @@ Alternatively, you can use the [yarn client](https://yarnpkg.com/) for downloadi
 
 <div class="alert is-helpful">
 
-See [Getting Started](guide/quickstart#prerequisites) for information about the required versions and installation of Node.js and npm.
+See [Local Environment Setup](guide/setup-local "Setting up for Local Development") for information about the required versions and installation of `Node.js` and `npm`.
 
 If you already have projects running on your machine that use other versions of Node.js and npm, consider using [nvm](https://github.com/creationix/nvm) to manage the multiple versions of Node.js and npm. 
 
diff --git a/aio/content/guide/prerequisites-setup.md b/aio/content/guide/prerequisites-setup.md
deleted file mode 100644
index 2151f2991f..0000000000
--- a/aio/content/guide/prerequisites-setup.md
+++ /dev/null
@@ -1,148 +0,0 @@
-# Prerequisites and Setup / Creating a workspace / Local development / Local environment 
-
-This guide describes how to get started with local development. 
-
-It includes: 
-* Prerequisites
-* How to install the Angular CLI
-* How to create a workspace and initial app project
-* How to serve an app project locally
-* Additional resources
-
-{@a devenv}
-{@a prerequisites}
-## Prerequisites 
-
-
-{@a nodejs}
-### Node.js
-
-Angular requires `Node.js` version 8.x or 10.x.
-
-* To check your version, run `node -v` in a terminal/console window.
-
-* To get `Node.js`, go to [nodejs.org](https://nodejs.org "Nodejs.org").
-
-{@a npm}
-### npm package manager: npm or yarn
-
-Angular, the Angular CLI, and Angular apps depend on features and functionality provided by libraries that are available as [npm packages](https://docs.npmjs.com/getting-started/what-is-npm). To download and install npm packages, you must have an npm package manager. 
-
-The following package managers have been verified with Angular: 
-
-* The [npm client](https://docs.npmjs.com/cli/npm) command line interface, which is installed with `Node.js` by default. To check if you have the npm client installed, run `npm -v` in a terminal/console window. Most of the documentation for Angular assumes the npm client.
-
-* The [yarn client](https://yarnpkg.com/) command line interface. 
-
-{@a install-cli}
-
-## Step 1: Install the Angular CLI
-
-You use the Angular CLI 
-to create projects, generate application and library code, and perform a variety of ongoing development tasks such as testing, bundling, and deployment.
-
-Install the Angular CLI globally. 
-
-To install the CLI using `npm`, open a terminal/console window and enter the following command:
-
-
-<code-example language="sh" class="code-shell">
-  npm install -g @angular/cli
-
-</code-example>
-
-
-
-{@a create-proj}
-
-## Step 2: Create a workspace and initial application
-
-You develop apps in the context of an Angular [**workspace**](guide/glossary#workspace). A workspace contains the files for one or more [**projects**](guide/glossary/#project). A project is the set of files that comprise an app, a library, or end-to-end (e2e) tests. 
-
-To create a new workspace and initial app project: 
-
-1. Run the CLI command `ng new` and provide the name `my-app`, as shown here: 
-
-    <code-example language="sh" class="code-shell">
-      ng new my-app
-
-    </code-example>
-
-2. The `ng new` command prompts you for information about features to include in the initial app project. Accept the defaults by pressing the Enter or Return key. 
-
-The Angular CLI installs the necessary Angular npm packages and other dependencies. This can take a few minutes. 
-
-It also creates the following workspace and starter project files: 
-
-* A new workspace, with a root folder named `my-app`
-* An initial skeleton app project, also called `my-app` (in the `src` subfolder)
-* An end-to-end test project (in the `e2e` subfolder)
-* Related configuration files
-
-The initial app project contains a simple Welcome app, ready to run. 
-
-{@a serve}
-
-## Step 3: Serve the application
-
-Angular includes a server, so that you can easily build and serve your app locally.
-
-1. Go to the workspace folder (`my-app`).
-
-1. Launch the server by using the CLI command `ng serve`, with the `--open` option.
-
-<code-example language="sh" class="code-shell">
-  cd my-app
-  ng serve --open
-</code-example>
-
-The `ng serve` command launches the server, watches your files,
-and rebuilds the app as you make changes to those files.
-
-The `--open` (or just `-o`) option automatically opens your browser
-to `http://localhost:4200/`.
-
-Your app greets you with a message:
-
-
-<figure>
-  <img src='generated/images/guide/cli-quickstart/app-works.png' alt="Welcome to my-app!">
-</figure>
-
-
-
-
-## Additional resources
-
-If you're new to Angular: 
-
-* The [Getting Started](tutorial/) provides hands-on learning. It walks you through the steps to build your first app in an online environment and then deploy that app to your local system. While building a basic catalog and shopping cart app, you'll be introduced to components (the building blocks of Angular), Angular's HTML template syntax, basic display and navigation between views, using services and external data, and scaling and tuning your app. 
-
-* The [Tour of Heroes tutorial](tutorial "Tour of Heroes tutorial") provides additional hands-on learning. It walks you through the steps to build an app that helps a staffing agency manage a group of superhero employees. All of the steps are done locally. 
- 
-
-* The [Architecture guide](guide/architecture "Architecture guide") describes key concepts such as modules, components, services, and dependency injection (DI). It provides a foundation for more in-depth guides about specific Angular concepts and features.  
-
-After the Tutorial and Architecture guide, you'll be ready to continue exploring Angular on your own through the other guides and references in this documentation set, focusing on the features most important for your apps. 
-
-
-
-
-## Related technologies and tools
-
-Angular assumes specific versions of many related technologies and tools, such as TypeScript, Karma, Protractor, tsickle, zone.js.
-
-The `package.json` is organized into two groups of packages:
-
-* [Dependencies](guide/npm-packages#dependencies) are essential to *running* applications.
-* [DevDependencies](guide/npm-packages#dev-dependencies) are only necessary to *develop* applications.
-
-These packages are described in more detail in [Workspace dependencies](guide/npm-packages).
-
-
-
-{@a others}
-## Managing different development environments
-
-If you already have projects running on your machine that use other versions of Node.js and npm, consider using [nvm](https://github.com/creationix/nvm) on Mac or Linux, or [nvm-windows](https://github.com/coreybutler/nvm-windows) on Windows, to manage the multiple versions of Node.js and npm. 
-
diff --git a/aio/content/guide/quickstart.md b/aio/content/guide/quickstart.md
deleted file mode 100644
index be5dbd2bd6..0000000000
--- a/aio/content/guide/quickstart.md
+++ /dev/null
@@ -1,192 +0,0 @@
-# QuickStart to Local Environment Setup and Development 
-
-Welcome to Angular! Angular helps you build modern applications for the web, mobile, or desktop.  
-
-
-<div class="callout is-helpful">
-<header>Getting Started - Stackblitz</header>
-
-
-We recently introduced a [**new Getting Started**](getting-started) that leverages the [StackBlitz](https://stackblitz.com/) online development environment. 
-We recommend the new Getting Started for anyone who wants to quickly learn the essentials of Angular, in the context of building a basic online store app. 
-
-
-</div> 
-
-
-This guide shows you how to build and run a simple Angular app in your local development environment using the [Angular CLI tool](cli "CLI command reference"). 
-At the end of this guide&mdash;as part of final code review&mdash;there is a link to download a copy of the final application code, so that you can compare your work, validate your local setup, or just explore a simple Angular app. 
-This guide takes less than 30 minutes to complete. 
-
-
-{@a devenv}
-{@a prerequisites}
-## Prerequisites 
-
-Before you begin, make sure your development environment includes `Node.js®` and an npm package manager. 
-
-{@a nodejs}
-### Node.js
-
-Angular requires `Node.js` version 8.x or 10.x.
-
-* To check your version, run `node -v` in a terminal/console window.
-
-* To get `Node.js`, go to [nodejs.org](https://nodejs.org "Nodejs.org").
-
-{@a npm}
-### npm package manager
-
-Angular, the Angular CLI, and Angular apps depend on features and functionality provided by libraries that are available as [npm packages](https://docs.npmjs.com/getting-started/what-is-npm). To download and install npm packages, you must have an npm package manager. 
-
-This Quick Start uses the [npm client](https://docs.npmjs.com/cli/install) command line interface, which is installed with `Node.js` by default. 
-
-To check that you have the npm client installed, run `npm -v` in a terminal/console window.
-
-
-{@a install-cli}
-
-## Step 1: Install the Angular CLI
-
-You use the Angular CLI 
-to create projects, generate application and library code, and perform a variety of ongoing development tasks such as testing, bundling, and deployment.
-
-Install the Angular CLI globally. 
-
-To install the CLI using `npm`, open a terminal/console window and enter the following command:
-
-
-<code-example language="sh" class="code-shell">
-  npm install -g @angular/cli
-
-</code-example>
-
-
-
-{@a create-proj}
-
-## Step 2: Create a workspace and initial application
-
-You develop apps in the context of an Angular [**workspace**](guide/glossary#workspace). A workspace contains the files for one or more [**projects**](guide/glossary/#project). A project is the set of files that comprise an app, a library, or end-to-end (e2e) tests. 
-
-To create a new workspace and initial app project: 
-
-1. Run the CLI command `ng new` and provide the name `my-app`, as shown here: 
-
-    <code-example language="sh" class="code-shell">
-      ng new my-app
-
-    </code-example>
-
-2. The `ng new` command prompts you for information about features to include in the initial app project. Accept the defaults by pressing the Enter or Return key. 
-
-The Angular CLI installs the necessary Angular npm packages and other dependencies. This can take a few minutes. 
-
-It also creates the following workspace and starter project files: 
-
-* A new workspace, with a root folder named `my-app`
-* An initial skeleton app project, also called `my-app` (in the `src` subfolder)
-* An end-to-end test project (in the `e2e` subfolder)
-* Related configuration files
-
-The initial app project contains a simple Welcome app, ready to run. 
-
-{@a serve}
-
-## Step 3: Serve the application
-
-Angular includes a server, so that you can easily build and serve your app locally.
-
-1. Go to the workspace folder (`my-app`).
-
-1. Launch the server by using the CLI command `ng serve`, with the `--open` option.
-
-<code-example language="sh" class="code-shell">
-  cd my-app
-  ng serve --open
-</code-example>
-
-The `ng serve` command launches the server, watches your files,
-and rebuilds the app as you make changes to those files.
-
-The `--open` (or just `-o`) option automatically opens your browser
-to `http://localhost:4200/`.
-
-Your app greets you with a message:
-
-
-<figure>
-  <img src='generated/images/guide/cli-quickstart/app-works.png' alt="Welcome to my-app!">
-</figure>
-
-
-
-{@a first-component}
-
-## Step 4: Edit your first Angular component
-
-[**_Components_**](guide/glossary#component) are the fundamental building blocks of Angular applications. 
-They display data on the screen, listen for user input, and take action based on that input. 
-
-As part of the initial app, the CLI created the first Angular component for you. It is the _root component_, and it is named `app-root`. 
-
-1. Open `./src/app/app.component.ts`. 
-
-2. Change the `title` property from `'my-app'` to `'My First Angular App'`.
-
-    <code-example path="cli-quickstart/src/app/app.component.ts" region="component" header="src/app/app.component.ts" linenums="false"></code-example>
-
-    The browser reloads automatically with the revised title. That's nice, but it could look better.
-
-3. Open `./src/app/app.component.css` and give the component some style.
-
-    <code-example path="cli-quickstart/src/app/app.component.css" header="src/app/app.component.css" linenums="false"></code-example>
-
-Looking good! 
-
-<figure>
-  <img src='generated/images/guide/cli-quickstart/my-first-app.png' alt="Output of Getting Started app">
-</figure>
-
-
-
-
-{@a project-file-review}
-
-## Final code review
-
-You can <a href="generated/zips/cli-quickstart/cli-quickstart.zip" target="_blank">download an example</a> of the app that you created in this Getting Started guide. 
-
-
-<div class="alert is-helpful">
-
-**Tip:** Most Angular guides include links to download example files and run live examples in [Stackblitz](http://www.stackblitz.com), so that you can see Angular concepts and code in action. 
-
-
-</div>
-
-
-For more information about Angular project files and the file structure, see [Workspace and project file structure](guide/file-structure).
-
-
-
-
-## Next steps
-
-Now that you've seen the essentials of an Angular app and the Angular CLI, continue with these other introductory materials: 
-
-* The [Tour of Heroes tutorial](tutorial "Tour of Heroes tutorial") provides additional hands-on learning. It walks you through the steps to build an app that helps a staffing agency manage a group of superhero employees. 
-It has many of the features you'd expect to find in a data-driven application: 
-
-        - Acquiring and displaying a list of items
-
-        - Editing a selected item's detail
-
-        - Navigating among different views of the data
-
-
-* The [Architecture guide](guide/architecture "Architecture guide") describes key concepts such as modules, components, services, and dependency injection (DI). It provides a foundation for more in-depth guides about specific Angular concepts and features.  
-
-After the Tutorial and Architecture guide, you'll be ready to continue exploring Angular on your own through the other guides and references in this documentation set, focusing on the features most important for your apps. 
-
-
diff --git a/aio/content/guide/setup-local.md b/aio/content/guide/setup-local.md
new file mode 100644
index 0000000000..81fe83feb0
--- /dev/null
+++ b/aio/content/guide/setup-local.md
@@ -0,0 +1,129 @@
+# Setting up the Local Environment and Workspace
+
+
+This guide explains how to set up your environment for Angular development using the [Angular CLI tool](cli "CLI command reference"). 
+It includes information about prerequisites, installing the CLI, creating an initial workspace and starter app, and running that app locally to verify your setup. 
+
+
+<div class="callout is-helpful">
+<header>Learning Angular</header>
+
+If you are new to Angular, see [Getting Started](start). Getting Started helps you quickly learn the essentials of Angular, in the context of building a basic online store app. It leverages the [StackBlitz](https://stackblitz.com/) online development environment, so you don't need to set up your local environment until you're ready. 
+
+
+</div> 
+
+
+{@a devenv}
+{@a prerequisites}
+## Prerequisites 
+
+Before you begin, make sure your development environment includes `Node.js®` and an npm package manager. 
+
+{@a nodejs}
+### Node.js
+
+Angular requires `Node.js` version 8.x or 10.x.
+
+* To check your version, run `node -v` in a terminal/console window.
+
+* To get `Node.js`, go to [nodejs.org](https://nodejs.org "Nodejs.org").
+
+{@a npm}
+### npm package manager
+
+Angular, the Angular CLI, and Angular apps depend on features and functionality provided by libraries that are available as [npm packages](https://docs.npmjs.com/getting-started/what-is-npm). To download and install npm packages, you must have an npm package manager. 
+
+This setup guide uses the [npm client](https://docs.npmjs.com/cli/install) command line interface, which is installed with `Node.js` by default. 
+
+To check that you have the npm client installed, run `npm -v` in a terminal/console window.
+
+
+{@a install-cli}
+
+## Step 1: Install the Angular CLI
+
+You use the Angular CLI 
+to create projects, generate application and library code, and perform a variety of ongoing development tasks such as testing, bundling, and deployment.
+
+Install the Angular CLI globally. 
+
+To install the CLI using `npm`, open a terminal/console window and enter the following command:
+
+
+<code-example language="sh" class="code-shell">
+  npm install -g @angular/cli
+
+</code-example>
+
+
+
+{@a create-proj}
+
+## Step 2: Create a workspace and initial application
+
+You develop apps in the context of an Angular [**workspace**](guide/glossary#workspace). 
+
+To create a new workspace and initial starter app: 
+
+1. Run the CLI command `ng new` and provide the name `my-app`, as shown here: 
+
+    <code-example language="sh" class="code-shell">
+      ng new my-app
+
+    </code-example>
+
+2. The `ng new` command prompts you for information about features to include in the initial app. Accept the defaults by pressing the Enter or Return key. 
+
+The Angular CLI installs the necessary Angular npm packages and other dependencies. This can take a few minutes. 
+
+The CLI creates a new workspace and a simple Welcome app, ready to run. 
+
+
+{@a serve}
+
+## Step 3: Run the application
+
+The Angular CLI includes a server, so that you can easily build and serve your app locally.
+
+1. Go to the workspace folder (`my-app`).
+
+1. Launch the server by using the CLI command `ng serve`, with the `--open` option.
+
+<code-example language="sh" class="code-shell">
+  cd my-app
+  ng serve --open
+</code-example>
+
+The `ng serve` command launches the server, watches your files,
+and rebuilds the app as you make changes to those files.
+
+The `--open` (or just `-o`) option automatically opens your browser
+to `http://localhost:4200/`.
+
+Your app greets you with a message:
+
+
+<figure>
+  <img src='generated/images/guide/setup-local/app-works.png' alt="Welcome to my-app!">
+</figure>
+
+
+## Next steps
+
+
+* If you are new to Angular, see the [Getting Started](start) tutorial. Getting Started helps you quickly learn the essentials of Angular, in the context of building a basic online store app. 
+
+  <div class="alert is-helpful">
+  
+  Getting Started assumes the [StackBlitz](https://stackblitz.com/) online development environment. 
+  To learn how to export an app from StackBlitz to your local environment, skip ahead to the [Deployment](start/deployment "Getting Started: Deployment") section. 
+
+  </div>
+
+
+* To learn more about using the Angular CLI, see the [CLI Overview](cli "CLI Overview"). In addition to creating the initial workspace and app scaffolding, you can use the CLI to generate Angular code such as components and services. The CLI supports the full development cycle, including building, testing, bundling, and deployment. 
+
+
+* For more information about the Angular files generated by `ng new`, see [Workspace and Project File Structure](guide/file-structure).
+
diff --git a/aio/content/guide/setup.md b/aio/content/guide/setup.md
index 8c5725fa14..26c98d7d03 100644
--- a/aio/content/guide/setup.md
+++ b/aio/content/guide/setup.md
@@ -1,20 +1,32 @@
-# Setup for local development
+# Setup for Upgrading from AngularJS
 
-{@a develop-locally}
+<!-- 
+Question: Can we remove this file and instead direct readers to https://github.com/angular/quickstart/blob/master/README.md
+-->
 
+<div class="alert is-critical">
+
+**Audience:** Use this guide **only** in the context of  [Upgrading from AngularJS](guide/upgrade "Upgrading from AngularJS to Angular") or [Upgrading for Performance](guide/upgrade-performance "Upgrading for Performance"). 
+Those Upgrade guides refer to this Setup guide for information about using the [deprecated QuickStart GitHub repository](https://github.com/angular/quickstart "Deprecated Angular QuickStart GitHub repository"), which was created prior to the current Angular [CLI](cli "CLI Overview"). 
+
+**For all other scenarios,** see the current instructions in [Local Environment Setup](guide/setup-local "Setting up for Local Development").
+
+
+</div>
+
+<!--
 The <live-example name=quickstart>QuickStart live-coding</live-example> example is an Angular _playground_.
-It's not where you'd develop a real application.
-You [should develop locally](guide/setup#why-locally "Why develop locally") on your own machine ... and that's also how we think you should learn Angular.
+There are also some differences from a local app, to simplify that live-coding experience.
+In particular, the QuickStart live-coding example shows just the AppComponent file; it creates the equivalent of app.module.ts and main.ts internally for the playground only.
+-->
 
-Setting up a new project on your machine is quick and easy with the **QuickStart seed**,
-maintained [on github](https://github.com/angular/quickstart "Install the github QuickStart repo").
+This guide describes how to develop locally on your own machine.
+Setting up a new project on your machine is quick and easy with the [QuickStart seed on github](https://github.com/angular/quickstart "Install the github QuickStart repo").
 
+**Prerequisite:** Make sure you have [Node.js® and npm installed](guide/setup-local#prerequisites "Angular prerequisites").
 
-Make sure you have [Node.js® and npm installed](guide/setup#install-prerequisites "What if you don't have Node.js and npm?").
 
 {@a clone}
-
-
 ## Clone
 
 Perform the _clone-to-launch_ steps with these terminal commands.
@@ -122,9 +134,8 @@ Open a terminal window in the project folder and enter the following commands fo
 
 
 
-The **QuickStart seed** contains the same application as the QuickStart playground.
-But its true purpose is to provide a solid foundation for _local_ development.
-Consequently, there are _many more files_ in the project folder on your machine,
+The **QuickStart seed** provides a basic QuickStart playground application and other files necessary for local development.
+Consequently, there are many files in the project folder on your machine,
 most of which you can [learn about later](guide/file-structure).
 
 
@@ -319,47 +330,17 @@ We recommend [nvm](https://github.com/creationix/nvm) for managing multiple vers
 You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that use other versions of Node.js and npm.
 
 
-{@a why-locally}
 
+## Appendix: Develop locally with IE
 
+If you develop angular locally with `ng serve`, a `websocket` connection is set up automatically between browser and local dev server, so when your code changes, the browser can automatically refresh.
 
-## Appendix: Why develop locally
+In Windows, by default, one application can only have 6 websocket connections, <a href="https://msdn.microsoft.com/library/ee330736%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396#websocket_maxconn" title="MSDN WebSocket settings">MSDN WebSocket Settings</a>.
+So when IE is refreshed (manually or automatically by `ng serve`), sometimes the websocket does not close properly. When websocket connections exceed the limitations, a `SecurityError` will be thrown. This error will not affect the angular application, you can just restart IE to clear this error, or modify the windows registry to update the limitations.
 
-<live-example title="QuickStart Seed in Stackblitz">Live coding</live-example> in the browser is a great way to explore Angular.
+## Appendix: Test using `fakeAsync()/async()`
 
-Links on almost every documentation page open completed samples in the browser.
-You can play with the sample code, share your changes with friends, and download and run the code on your own machine.
-
-The [Getting Started](guide/quickstart "Angular QuickStart Playground") shows just the `AppComponent` file.
-It creates the equivalent of `app.module.ts` and `main.ts` internally _for the playground only_.
-so the reader can discover Angular without distraction.
-The other samples are based on the QuickStart seed.
-
-As much fun as this is ...
-
-* you can't ship your app in Stackblitz
-* you aren't always online when writing code
-* transpiling TypeScript in the browser is slow
-* the type support, refactoring, and code completion only work in your local IDE
-
-Use the <live-example title="QuickStart Seed in Stackblitz">live coding</live-example> environment as a _playground_,
-a place to try the documentation samples and experiment on your own.
-It's the perfect place to reproduce a bug when you want to
-<a href="https://github.com/angular/angular/issues/new" title="File a documentation issue">file a documentation issue</a> or
-<a href="https://github.com/angular/angular/issues/new" title="File an Angular issue">file an issue with Angular itself</a>.
-
-For real development, we strongly recommend [developing locally](guide/setup#develop-locally).
-
-## Appendix: develop locally with IE
-
-If you develop angular locally with `ng serve`, there will be `websocket` connection being setup automatically between browser and local dev server, so when your code change, browser can automatically refresh.
-
-In windows, by default one application can only have 6 websocket connections, <a href="https://msdn.microsoft.com/library/ee330736%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396#websocket_maxconn" title="MSDN WebSocket settings">MSDN WebSocket Settings</a>.
-So if IE was refreshed manunally or automatically by `ng serve`, sometimes, the websocket will not close properly, when websocket connections exceed limitations, `SecurityError` will be thrown, this error will not affect the angular application, you can just restart IE to clear this error, or modify the windows registry to update the limitations.
-
-## Appendix: test using `fakeAsync()/async()`
-
-If you use the `fakeAsync()/async()` helper function to run unit tests (for details, read [testing guide](guide/testing#async-test-with-fakeasync)), you need to import `zone.js/dist/zone-testing` in your test setup file.
+If you use the `fakeAsync()/async()` helper function to run unit tests (for details, read the [Testing guide](guide/testing#async-test-with-fakeasync)), you need to import `zone.js/dist/zone-testing` in your test setup file.
 
 <div class="alert is-important">
 If you create project with `Angular/CLI`, it is already imported in `src/test.ts`.
@@ -376,4 +357,4 @@ import 'zone.js/dist/async-test';
 import 'zone.js/dist/fake-async-test';
 ```
 
-You can still load those files separately, but the order is important, you must import `proxy` before `sync-test`, `async-test`, `fake-async-test` and `jasmine-patch`. And you also need to import `sync-test` before `jasmine-patch`, so it is recommended to just import `zone-testing` instead of loading those separated files.
\ No newline at end of file
+You can still load those files separately, but the order is important, you must import `proxy` before `sync-test`, `async-test`, `fake-async-test` and `jasmine-patch`. And you also need to import `sync-test` before `jasmine-patch`, so it is recommended to just import `zone-testing` instead of loading those separated files.
diff --git a/aio/content/guide/visual-studio-2015.md b/aio/content/guide/visual-studio-2015.md
index 90b18d3872..e09aea2d84 100644
--- a/aio/content/guide/visual-studio-2015.md
+++ b/aio/content/guide/visual-studio-2015.md
@@ -4,15 +4,14 @@
 
 Some developers prefer Visual Studio as their Integrated Development Environment (IDE).
 
-This cookbook describes the steps required to set up and use the
-Angular [Getting Started](guide/quickstart) files in Visual Studio 2015 within an ASP.NET 4.x project.
+This cookbook describes the steps required to set up and use Angular app files in Visual Studio 2015 within an ASP.NET 4.x project.
 
 <div class="alert is-helpful">
 
 
 
 There is no *live example* for this cookbook because it describes Visual Studio, not 
-the Angular Getting Started application itself.
+the Angular application itself. It uses the starter Angular application created by the CLI command [`ng new`](cli/new) as an example. 
 
 
 </div>
@@ -48,7 +47,7 @@ Note that the resulting code does not map to the docs. Adjust accordingly.
 
 Install **[Node.js® and npm](https://nodejs.org/en/download/)**
 if they are not already on your machine.
-See [Getting Started](guide/quickstart) for supported versions and instructions. 
+See [Local Environment Setup](guide/setup-local "Setting up for Local Development") for supported versions and instructions. 
 
 
 
@@ -114,11 +113,13 @@ restart it to make sure everything is clean.
 
 
 <h2 id='download'>
-  Step 1: Download the Angular Getting Started app
+  Step 1: Create a starter Angular app
 </h2>
 
+ 
+ Follow the instructions in [Local Environment Setup](guide/setup-local "Setting up for Local Development") to create a starter Angular app using the CLI command [`ng new`](cli/new). 
 
-Go to the final code review in [Getting Started](guide/quickstart) and download the solution app project. These files contain a starter Angular app.
+ 
 
 
 
@@ -150,10 +151,10 @@ no authentication, and no hosting. Pick the template and options appropriate for
 
 
 <h2 id='copy'>
-  Step 3: Copy the Angular Getting Started project files into the ASP.NET project folder
+  Step 3: Copy the Angular project files into the ASP.NET project folder
 </h2>
 
-Copy the files you downloaded from [Getting Started](guide/quickstart) into the folder containing the `.csproj` file.
+Copy files from the starter Angular app into the folder containing the `.csproj` file.
 Include the files in the Visual Studio project as follows:
 
 * Click the `Show All Files` button in Solution Explorer to reveal all of the hidden files in the project.
diff --git a/aio/content/images/guide/cli-quickstart/my-first-app.png b/aio/content/images/guide/cli-quickstart/my-first-app.png
deleted file mode 100644
index e2346a61116ec186a5f452b322d2b7355a8a8315..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19720
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

diff --git a/aio/content/images/guide/cli-quickstart/quickstart-sourcemap-explorer.png b/aio/content/images/guide/deployment/quickstart-sourcemap-explorer.png
similarity index 100%
rename from aio/content/images/guide/cli-quickstart/quickstart-sourcemap-explorer.png
rename to aio/content/images/guide/deployment/quickstart-sourcemap-explorer.png
diff --git a/aio/content/images/guide/getting-started/cart-page-checkout-form-empty.png b/aio/content/images/guide/getting-started/cart-page-checkout-form-empty.png
deleted file mode 100644
index 6d094aa09111e636e2057091222fc0f9d07d8a4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26076
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
Kp;XQ!=>GtrK9_y~

diff --git a/aio/content/images/guide/getting-started/cart-page-no-items.png b/aio/content/images/guide/getting-started/cart-page-no-items.png
deleted file mode 100644
index 304eda983afe49cd9e81cfe0c3596a11e26ea9f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19046
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

diff --git a/aio/content/images/guide/getting-started/cart-with-shipping-link.png b/aio/content/images/guide/getting-started/cart-with-shipping-link.png
deleted file mode 100644
index 23c78462779ee95fec7d8cb9f1860f53fa04e53f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24980
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

diff --git a/aio/content/images/guide/getting-started/new-project.png b/aio/content/images/guide/getting-started/new-project.png
deleted file mode 100644
index 36878c25c770166f977b26d2475a8919ace7928a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 81884
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
Cc(Psq

diff --git a/aio/content/images/guide/getting-started/product-details.png b/aio/content/images/guide/getting-started/product-details.png
deleted file mode 100644
index 65dd36e72681f94a0c7fd4e76705d0348bde44fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59429
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

diff --git a/aio/content/images/guide/getting-started/shipping-prices-via-route.png b/aio/content/images/guide/getting-started/shipping-prices-via-route.png
deleted file mode 100644
index a7f099d360c6cd29cc6e390ffe6d703142f90038..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26896
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
MPEEF4+Q|R^0LaX#rT_o{

diff --git a/aio/content/images/guide/getting-started/stackblitz-angular-icon.png b/aio/content/images/guide/getting-started/stackblitz-angular-icon.png
deleted file mode 100644
index 75a2daddc0cbe4b1d1fad3fd525791185baae56d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5910
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
Ylb;JeUO8s|`D6M>NlUTxp+(UD0TVX-`2YX_

diff --git a/aio/content/images/guide/getting-started/stackblitz-icon-only-small.png b/aio/content/images/guide/getting-started/stackblitz-icon-only-small.png
deleted file mode 100644
index c6ff5df84eb3c50a316f6cb984ff89d31b1a9374..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3284
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
H!(aa&y9%?~

diff --git a/aio/content/images/guide/getting-started/stackblitz-icon-only.png b/aio/content/images/guide/getting-started/stackblitz-icon-only.png
deleted file mode 100644
index 93bce1aaa66a5faea59698ad0afb1809334b1d33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3401
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
RmYx2*bv2DNUR-gE`ZxT`82tbM

diff --git a/aio/content/images/guide/getting-started/stackblitz-icon-small.png b/aio/content/images/guide/getting-started/stackblitz-icon-small.png
deleted file mode 100644
index edffbd1573e7ed36c0050284bc3f44d323e0a448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5664
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

diff --git a/aio/content/images/guide/getting-started/stackblitz-icon-smallest.png b/aio/content/images/guide/getting-started/stackblitz-icon-smallest.png
deleted file mode 100644
index 33975275109d13b1d5667b118e4988e5e229bfc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2756
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

diff --git a/aio/content/images/guide/getting-started/stackblitz-icon.png b/aio/content/images/guide/getting-started/stackblitz-icon.png
deleted file mode 100644
index d115fd85455e2663082f6950a619102e69089d8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7662
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
LDM?mH7zO?x1yxfb

diff --git a/aio/content/images/guide/getting-started/starter-app-components.png b/aio/content/images/guide/getting-started/starter-app-components.png
deleted file mode 100644
index 2ad108866184b3fd9df072feb2761b5f4d61cccd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34373
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
V&_^y+$^k%sQeyI=HNu8L{}22e)^Pv;

diff --git a/aio/content/images/guide/cli-quickstart/app-works.png b/aio/content/images/guide/setup-local/app-works.png
similarity index 100%
rename from aio/content/images/guide/cli-quickstart/app-works.png
rename to aio/content/images/guide/setup-local/app-works.png
diff --git a/aio/content/images/guide/getting-started/app-components.png b/aio/content/images/guide/start/app-components.png
similarity index 100%
rename from aio/content/images/guide/getting-started/app-components.png
rename to aio/content/images/guide/start/app-components.png
diff --git a/aio/content/images/guide/getting-started/buy-alert.png b/aio/content/images/guide/start/buy-alert.png
similarity index 100%
rename from aio/content/images/guide/getting-started/buy-alert.png
rename to aio/content/images/guide/start/buy-alert.png
diff --git a/aio/content/images/guide/getting-started/cart-empty-with-shipping-prices.png b/aio/content/images/guide/start/cart-empty-with-shipping-prices.png
similarity index 100%
rename from aio/content/images/guide/getting-started/cart-empty-with-shipping-prices.png
rename to aio/content/images/guide/start/cart-empty-with-shipping-prices.png
diff --git a/aio/content/images/guide/getting-started/cart-page-full.png b/aio/content/images/guide/start/cart-page-full.png
similarity index 100%
rename from aio/content/images/guide/getting-started/cart-page-full.png
rename to aio/content/images/guide/start/cart-page-full.png
diff --git a/aio/content/images/guide/getting-started/cart-with-items-and-form.png b/aio/content/images/guide/start/cart-with-items-and-form.png
similarity index 100%
rename from aio/content/images/guide/getting-started/cart-with-items-and-form.png
rename to aio/content/images/guide/start/cart-with-items-and-form.png
diff --git a/aio/content/images/guide/getting-started/cart-works.png b/aio/content/images/guide/start/cart-works.png
similarity index 100%
rename from aio/content/images/guide/getting-started/cart-works.png
rename to aio/content/images/guide/start/cart-works.png
diff --git a/aio/content/images/guide/getting-started/generate-component.png b/aio/content/images/guide/start/generate-component.png
similarity index 100%
rename from aio/content/images/guide/getting-started/generate-component.png
rename to aio/content/images/guide/start/generate-component.png
diff --git a/aio/content/images/guide/getting-started/new-app.png b/aio/content/images/guide/start/new-app.png
similarity index 100%
rename from aio/content/images/guide/getting-started/new-app.png
rename to aio/content/images/guide/start/new-app.png
diff --git a/aio/content/images/guide/getting-started/product-alert-button.png b/aio/content/images/guide/start/product-alert-button.png
similarity index 100%
rename from aio/content/images/guide/getting-started/product-alert-button.png
rename to aio/content/images/guide/start/product-alert-button.png
diff --git a/aio/content/images/guide/getting-started/product-alert-notification.png b/aio/content/images/guide/start/product-alert-notification.png
similarity index 100%
rename from aio/content/images/guide/getting-started/product-alert-notification.png
rename to aio/content/images/guide/start/product-alert-notification.png
diff --git a/aio/content/images/guide/getting-started/product-details-buy.png b/aio/content/images/guide/start/product-details-buy.png
similarity index 100%
rename from aio/content/images/guide/getting-started/product-details-buy.png
rename to aio/content/images/guide/start/product-details-buy.png
diff --git a/aio/content/images/guide/getting-started/product-details-routed.png b/aio/content/images/guide/start/product-details-routed.png
similarity index 100%
rename from aio/content/images/guide/getting-started/product-details-routed.png
rename to aio/content/images/guide/start/product-details-routed.png
diff --git a/aio/content/images/guide/getting-started/product-details-works.png b/aio/content/images/guide/start/product-details-works.png
similarity index 100%
rename from aio/content/images/guide/getting-started/product-details-works.png
rename to aio/content/images/guide/start/product-details-works.png
diff --git a/aio/content/images/guide/getting-started/shipping-prices.png b/aio/content/images/guide/start/shipping-prices.png
similarity index 100%
rename from aio/content/images/guide/getting-started/shipping-prices.png
rename to aio/content/images/guide/start/shipping-prices.png
diff --git a/aio/content/images/guide/getting-started/template-syntax-product-anchor.png b/aio/content/images/guide/start/template-syntax-product-anchor.png
similarity index 100%
rename from aio/content/images/guide/getting-started/template-syntax-product-anchor.png
rename to aio/content/images/guide/start/template-syntax-product-anchor.png
diff --git a/aio/content/images/guide/getting-started/template-syntax-product-description.png b/aio/content/images/guide/start/template-syntax-product-description.png
similarity index 100%
rename from aio/content/images/guide/getting-started/template-syntax-product-description.png
rename to aio/content/images/guide/start/template-syntax-product-description.png
diff --git a/aio/content/images/guide/getting-started/template-syntax-product-names.png b/aio/content/images/guide/start/template-syntax-product-names.png
similarity index 100%
rename from aio/content/images/guide/getting-started/template-syntax-product-names.png
rename to aio/content/images/guide/start/template-syntax-product-names.png
diff --git a/aio/content/images/guide/getting-started/template-syntax-product-share-alert.png b/aio/content/images/guide/start/template-syntax-product-share-alert.png
similarity index 100%
rename from aio/content/images/guide/getting-started/template-syntax-product-share-alert.png
rename to aio/content/images/guide/start/template-syntax-product-share-alert.png
diff --git a/aio/content/images/guide/getting-started/template-syntax-product-share-button.png b/aio/content/images/guide/start/template-syntax-product-share-button.png
similarity index 100%
rename from aio/content/images/guide/getting-started/template-syntax-product-share-button.png
rename to aio/content/images/guide/start/template-syntax-product-share-button.png
diff --git a/aio/content/marketing/docs.md b/aio/content/marketing/docs.md
index 5bc6bafca9..0fed2f5a3a 100644
--- a/aio/content/marketing/docs.md
+++ b/aio/content/marketing/docs.md
@@ -1,50 +1,52 @@
-<h1 class="no-toc">What is Angular?</h1>
+<h1 class="no-toc">Introduction to the Angular Docs</h1>
+
+
+
+These Angular docs help you learn and use the Angular platform and framework, from your first app to optimizing complex enterprise apps. 
+Tutorials and guides include downloadable example to accelerate your projects. 
 
-Angular is a platform that makes it easy to build applications with the web. Angular combines declarative templates, dependency injection, end to end tooling, and integrated best practices to solve development challenges. Angular empowers developers to build applications that live on the web, mobile, or the desktop.
 
 <div class="card-container">
-  <a href="generated/live-examples/toh-pt1/stackblitz.html" target="_blank" class="docs-card"
-    title="Experience Angular in a live coding environment">
-      <section>Get a Glimpse of Angular</section>
-      <p>A quick look at an Angular "hello world" application.</p>
-      <p class="card-footer">Angular in Action</p>
+  <a href="start" class="docs-card" title="Angular Getting Started">
+      <section>Learn</section>
+      <p>Create your first Angular app, without any setup</p>
+      <p class="card-footer">Getting Started</p> 
   </a>
-
-  <a href="guide/quickstart" class="docs-card" title="Angular Getting Started">
-      <section>Get Going with Angular</section>
-      <p>Get going on your own environment with the Getting Started.</p>
-      <p class="card-footer">Quickstart</p>
+  <a href="guide/setup-local" class="docs-card"
+    title="Angular Local Environment Setup">
+      <section>Start Working</section>
+      <p>Set up your local environment with the Angular CLI</p>
+      <p class="card-footer">Local Setup</p>
   </a>
-
   <a href="guide/architecture" class="docs-card" title="Angular Architecture">
-      <section>Fundamentals</section>
-      <p>Learn Angular application fundamentals, starting with an architecture overview.</p>
+      <section>Explore</section>
+      <p>Learn more about Angular apps and framework features</p>
       <p class="card-footer">Architecture</p>
   </a>
 </div>
 
+
 ## Assumptions
-This documentation assumes that you are already familiar with
-[JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript/A_re-introduction_to_JavaScript "Learn JavaScript"),
-and some of the tools from the
-[latest standards](https://babeljs.io/learn-es2015/ "Latest JavaScript standards") such as
-[classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes "ES2015 Classes")
-and [modules](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import "ES2015 Modules").
-The code samples are written using [TypeScript](https://www.typescriptlang.org/ "TypeScript").
-Most Angular code can be written with just the latest JavaScript,
-using [types](https://www.typescriptlang.org/docs/handbook/classes.html "TypeScript Types") for dependency injection,
-and using [decorators](https://www.typescriptlang.org/docs/handbook/decorators.html "Decorators") for metadata.
 
-## Feedback
 
-You can sit with us!
+These docs assume that you are already familiar with HTML, CSS, [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript/A_re-introduction_to_JavaScript "Learn JavaScript"), 
+and some of the tools from the [latest standards](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Language_Resources "Latest JavaScript standards"), such as [classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes "ES2015 Classes") and [modules](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import "ES2015 Modules"). 
+The code samples are written using [TypeScript](https://www.typescriptlang.org/ "TypeScript"). 
+Most Angular code can be written with just the latest JavaScript, using [types](https://www.typescriptlang.org/docs/handbook/classes.html "TypeScript Types") for dependency injection, and using [decorators](https://www.typescriptlang.org/docs/handbook/decorators.html "Decorators") for metadata.
 
-You can file documentation
-[issues](https://github.com/angular/angular/issues "Angular Github issues") and create
+
+## Feedback 
+
+<h4>You can sit with us!</h4>
+
+We want to hear from you. [Report problems or submit suggestions for future docs.](https://github.com/angular/angular/issues/new/choose "Angular GitHub repository new issue form")
+
+Contribute to Angular docs by creating
 [pull requests](https://github.com/angular/angular/pulls "Angular Github pull requests")
 on the Angular Github repository.
-The [contributing guide](https://github.com/angular/angular/blob/master/CONTRIBUTING.md "Contributing guide")
-will help you contribute to the community.
-Our community values  respectful, supportive communication.
-Please consult and adhere to the
-[code of conduct](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md "contributor code of conduct").
+See [Contributing to Angular](https://github.com/angular/angular/blob/master/CONTRIBUTING.md "Contributing guide")
+for information about submission guidelines.  
+
+Our community values respectful, supportive communication.
+Please consult and adhere to the [Code of Conduct](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md "Contributor code of conduct").
+
diff --git a/aio/content/marketing/features.html b/aio/content/marketing/features.html
index a4f5fcd6e9..390a02af44 100755
--- a/aio/content/marketing/features.html
+++ b/aio/content/marketing/features.html
@@ -108,7 +108,7 @@
   </div>
 
   <div class="cta-bar announcement-bar">
-    <a class="button" href="guide/quickstart">Get Started</a>
+    <a class="button" href="start">Get Started</a>
   </div>
 
 </article>
diff --git a/aio/content/marketing/index.html b/aio/content/marketing/index.html
index 8bcdf397aa..50b84b2a52 100755
--- a/aio/content/marketing/index.html
+++ b/aio/content/marketing/index.html
@@ -15,7 +15,7 @@
     <!-- CONTAINER -->
     <div class="homepage-container">
       <div class="hero-headline no-toc">One framework.<br>Mobile &amp; desktop.</div>
-      <a class="button hero-cta" href="guide/quickstart">Get Started</a>
+      <a class="button hero-cta" href="start">Get Started</a>
     </div>
 
   </section>
@@ -102,12 +102,12 @@
 
     <!-- CTA CARDS -->
     <div layout="row" layout-xs="column" class="home-row">
-      <a href="guide/quickstart">
+      <a href="start">
         <div class="card">
-          <img src="generated/images/marketing/home/code-icon.svg" height="70px" alt="Angular quickstart">
+          <img src="generated/images/marketing/home/code-icon.svg" height="70px" alt="Getting Started with Angular">
           <div class="card-text-container">
             <div class="text-headline">Get Started</div>
-            <p>Start building your Angular application.</p>
+            <p>Start building an Angular application.</p>
           </div>
         </div>
       </a>
diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index 9a62adbdfe..ba97ed64cf 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -47,9 +47,9 @@
   "SideNav": [
     {
       "url": "docs",
-      "title": "Docs",
-      "tooltip": "Angular Documentation",
-      "hidden": true
+      "title": "Introduction",
+      "tooltip": "Introduction to the Angular documentation",
+      "hidden": false
     },
     {
       "url": "guide/docs-style-guide",
@@ -62,87 +62,87 @@
       "tooltip": "Learn the basics by building your first Angular application.",
       "children": [
         {
-          "url": "getting-started",
+          "url": "start",
           "title": "Your First App",
-          "tooltip": "Introduction to Angular's component model, template syntax, and component communication"
+          "tooltip": "Introduction to Angular's component model, template syntax, and component communication."
         },
         {
-          "url": "getting-started/routing",
+          "url": "start/routing",
           "title": "Routing",
-          "tooltip": "Introduction to routing between components using the browser's URL"
+          "tooltip": "Introduction to routing between components using the browser's URL."
         },
         {
-          "url": "getting-started/data",
+          "url": "start/data",
           "title": "Managing Data",
-          "tooltip": "Introduction to services, and accessing external data"
+          "tooltip": "Introduction to services and accessing external data via HTTP."
         },
         {
-          "url": "getting-started/forms",
+          "url": "start/forms",
           "title": "Forms",
-          "tooltip": "Learn about fetching and managing data from users with forms"
+          "tooltip": "Learn about fetching and managing data from users with forms."
         },
         {
-          "url": "getting-started/deployment",
+          "url": "start/deployment",
           "title": "Deployment",
-          "tooltip": "Share your application with the world by hosting it on Firebase or your own server"
+          "tooltip": "Move to local development, or deploy your application to Firebase or your own server."
         }
       ]
     },
     {
-      "url": "guide/quickstart",
-      "title": "Environment Quickstart",
-      "tooltip": "A brief introduction to local development with the Angular CLI."
-    },
-    {
-      "title": "Tutorial: Tour of Heroes",
-      "tooltip": "The Tour of Heroes tutorial takes you through the steps of creating an Angular application in TypeScript.",
-      "children": [
-        {
-          "url": "tutorial",
-          "title": "Introduction",
-          "tooltip": "Introduction to the Tour of Heroes tutorial"
-        },
-        {
-          "url": "tutorial/toh-pt0",
-          "title": "The Application Shell",
-          "tooltip": "Creating the application shell"
-        },
-        {
-          "url": "tutorial/toh-pt1",
-          "title": "1. The Hero Editor",
-          "tooltip": "Part 1: Build a simple hero editor"
-        },
-        {
-          "url": "tutorial/toh-pt2",
-          "title": "2. Displaying a List",
-          "tooltip": "Part 2: Build a master/detail page with a list of heroes."
-        },
-        {
-          "url": "tutorial/toh-pt3",
-          "title": "3. Master/Detail Components",
-          "tooltip": "Part 3: Refactor the master/detail view into separate components."
-        },
-        {
-          "url": "tutorial/toh-pt4",
-          "title": "4. Services",
-          "tooltip": "Part 4: Create a reusable service to manage hero data."
-        },
-        {
-          "url": "tutorial/toh-pt5",
-          "title": "5. Routing",
-          "tooltip": "Part 5: Add the Angular router and navigate among the views."
-        },
-        {
-          "url": "tutorial/toh-pt6",
-          "title": "6. HTTP",
-          "tooltip": "Part 6: Use HTTP to retrieve and save hero data."
-        }
-      ]
+      "url": "guide/setup-local",
+      "title": "Setup",
+      "tooltip": "Setting up for local development with the Angular CLI."
     },
     {
       "title": "Fundamentals",
       "tooltip": "The fundamentals of Angular",
       "children": [
+        {
+          "title": "Tour of Heroes App",
+          "tooltip": "The Tour of Heroes app is used as a reference point in many Angular examples.",
+          "children": [
+          {
+            "url": "tutorial",
+            "title": "Introduction",
+            "tooltip": "Introduction to the Tour of Heroes tutorial"
+          },
+          {
+            "url": "tutorial/toh-pt0",
+            "title": "The Application Shell",
+            "tooltip": "Creating the application shell"
+          },
+          {
+            "url": "tutorial/toh-pt1",
+            "title": "1. The Hero Editor",
+            "tooltip": "Part 1: Build a simple hero editor"
+          },
+          {
+            "url": "tutorial/toh-pt2",
+            "title": "2. Displaying a List",
+            "tooltip": "Part 2: Build a master/detail page with a list of heroes."
+          },
+          {
+            "url": "tutorial/toh-pt3",
+            "title": "3. Master/Detail Components",
+            "tooltip": "Part 3: Refactor the master/detail view into separate components."
+          },
+          {
+            "url": "tutorial/toh-pt4",
+            "title": "4. Services",
+            "tooltip": "Part 4: Create a reusable service to manage hero data."
+          },
+          {
+            "url": "tutorial/toh-pt5",
+            "title": "5. Routing",
+            "tooltip": "Part 5: Add the Angular router and navigate among the views."
+          },
+          {
+            "url": "tutorial/toh-pt6",
+            "title": "6. HTTP",
+            "tooltip": "Part 6: Use HTTP to retrieve and save hero data."
+          }
+          ]
+        },
         {
           "title": "Architecture",
           "tooltip": "The basic building blocks of Angular applications.",
@@ -573,35 +573,15 @@
       ]
     },
     {
-      "title": "Setup & Deployment",
-      "tooltip": "Build, testing, and deployment environment, tool, and configuration information.",
+      "title": "Dev Workflow",
+      "tooltip": "Build, testing, and deployment information.",
       "children": [
         {
           "url": "guide/setup",
-          "title": "Setup for local development",
-          "tooltip": "Install the Angular QuickStart seed for faster, more efficient development on your machine.",
+          "title": "Upgrade setup",
+          "tooltip": "How to set up the Angular QuickStart seed in the context of upgrading from AngularJS.",
           "hidden": true
         },
-        {
-          "url": "guide/file-structure",
-          "title": "Project File Structure",
-          "tooltip": "How your Angular workspace looks on your filesystem."
-        },
-        {
-          "url": "guide/workspace-config",
-          "title": "Workspace Configuration",
-          "tooltip": "The \"angular.json\" file contains workspace and project configuration defaults for Angular CLI commands."
-        },
-        {
-          "url": "guide/npm-packages",
-          "title": "npm Dependencies",
-          "tooltip": "Description of npm packages required at development time and at runtime."
-        },
-        {
-          "url": "guide/typescript-configuration",
-          "title": "TypeScript Configuration",
-          "tooltip": "TypeScript configuration for Angular developers."
-        },
         {
           "url": "guide/aot-compiler",
           "title": "Ahead-of-Time Compilation",
@@ -627,11 +607,6 @@
           "title": "Deployment",
           "tooltip": "Learn how to deploy your Angular app."
         },
-        {
-          "url": "guide/browser-support",
-          "title": "Browser Support",
-          "tooltip": "Browser support and polyfills guide."
-        },
         {
           "title": "Dev Tool Integration",
           "tooltip": "Integrate with your development environment and tools.",
@@ -651,6 +626,37 @@
         }
       ]
     },
+    {
+      "title": "Configuration",
+      "tooltip": "Workspace and project structure, configuration files.",
+      "children": [
+        {
+          "url": "guide/file-structure",
+          "title": "Project File Structure",
+          "tooltip": "How your Angular workspace looks on your filesystem."
+        },
+        {
+          "url": "guide/workspace-config",
+          "title": "Workspace Configuration",
+          "tooltip": "The \"angular.json\" file contains workspace and project configuration defaults for Angular CLI commands."
+        },
+        {
+          "url": "guide/npm-packages",
+          "title": "npm Dependencies",
+          "tooltip": "Description of npm packages required at development time and at runtime."
+        },
+        {
+          "url": "guide/typescript-configuration",
+          "title": "TypeScript Configuration",
+          "tooltip": "TypeScript configuration for Angular developers."
+        },
+        {
+          "url": "guide/browser-support",
+          "title": "Browser Support",
+          "tooltip": "Browser support and polyfills guide."
+        }
+      ]
+    },
     {
       "title": "Release Information",
       "tooltip": "Angular release practices, updating, and upgrading.",
diff --git a/aio/content/getting-started/data.md b/aio/content/start/data.md
similarity index 91%
rename from aio/content/getting-started/data.md
rename to aio/content/start/data.md
index 5d2967ee09..a95b48c2cf 100644
--- a/aio/content/getting-started/data.md
+++ b/aio/content/start/data.md
@@ -1,6 +1,6 @@
 # Managing Data
 
-At the end of [Routing](getting-started/routing "Getting Started: Routing"), the online store application has a product catalog with two views: a product list and product details. 
+At the end of [Routing](start/routing "Getting Started: Routing"), the online store application has a product catalog with two views: a product list and product details. 
 Users can click on a product name from the list to see details in a new view, with a distinct URL (route). 
 
 In this section, you'll create the shopping cart. You'll:
@@ -25,7 +25,7 @@ You'll also set up a cart service to store information about products in the car
 
 <div class="alert is-helpful">
 
-Later, in the [Forms](getting-started/forms "Getting Started: Forms") part of this tutorial, this cart service also will be accessed from the page where the user checks out. 
+Later, in the [Forms](start/forms "Getting Started: Forms") part of this tutorial, this cart service also will be accessed from the page where the user checks out. 
 
 </div>
 
@@ -106,13 +106,13 @@ When the "Buy" button is clicked, you'll use the cart service to add the current
 1. To see the new "Buy" button, refresh the application and click on a product's name to display its details.
 
    <figure>
-     <img src='generated/images/guide/getting-started/product-details-buy.png' alt="Display details for selected product with a Buy button">
+     <img src='generated/images/guide/start/product-details-buy.png' alt="Display details for selected product with a Buy button">
    </figure>
  
  1. Click the "Buy" button. The product is added to the stored list of items in the cart, and a message is displayed. 
 
     <figure>
-      <img src='generated/images/guide/getting-started/buy-alert.png' alt="Display details for selected product with a Buy button">
+      <img src='generated/images/guide/start/buy-alert.png' alt="Display details for selected product with a Buy button">
     </figure>
 
 
@@ -151,7 +151,7 @@ We'll create the cart page in two steps:
     (Note: The "Checkout" button that we provided in the top-bar component was already configured with a `routerLink` for `/cart`.)
 
     <figure>
-      <img src='generated/images/guide/getting-started/cart-works.png' alt="Display cart page before customizing">
+      <img src='generated/images/guide/start/cart-works.png' alt="Display cart page before customizing">
     </figure>
 
 
@@ -205,7 +205,7 @@ Services can be used to share data across components:
     1. To add another product, click "My Store" to return to the product list. Repeat the steps above. 
 
     <figure>
-      <img src='generated/images/guide/getting-started/cart-page-full.png' alt="Cart page with products added">
+      <img src='generated/images/guide/start/cart-page-full.png' alt="Cart page with products added">
     </figure>
 
 
@@ -364,13 +364,13 @@ Now that your app can retrieve shipping data, you'll create a shipping component
     Click on the "Checkout" button to see the updated cart. (Remember that changing the app causes the preview to refresh, which empties the cart.)
 
     <figure>
-      <img src='generated/images/guide/getting-started/cart-empty-with-shipping-prices.png' alt="Cart with link to shipping prices">
+      <img src='generated/images/guide/start/cart-empty-with-shipping-prices.png' alt="Cart with link to shipping prices">
     </figure>
 
     Click on the link to navigate to the shipping prices.
 
     <figure>
-      <img src='generated/images/guide/getting-started/shipping-prices.png' alt="Display shipping prices">
+      <img src='generated/images/guide/start/shipping-prices.png' alt="Display shipping prices">
     </figure>
 
 
@@ -379,7 +379,7 @@ Now that your app can retrieve shipping data, you'll create a shipping component
 Congratulations! You have an online store application with a product catalog and shopping cart. You also have the ability to look up and display shipping prices. 
 
 To continue exploring Angular, choose either of the following options:
-* [Continue to the "Forms" section](getting-started/forms "Getting Started: Forms") to finish the app by adding the shopping cart page and a form-based checkout feature. You'll create a form to collect user information as part of checkout. 
-* [Skip ahead to the "Deployment" section](getting-started/deployment "Getting Started: Deployment") to deploy your app to Firebase or move to local development. 
+* [Continue to the "Forms" section](start/forms "Getting Started: Forms") to finish the app by adding the shopping cart page and a form-based checkout feature. You'll create a form to collect user information as part of checkout. 
+* [Skip ahead to the "Deployment" section](start/deployment "Getting Started: Deployment") to move to local development, or deploy your app to Firebase or your own server. 
 
 
diff --git a/aio/content/getting-started/deployment.md b/aio/content/start/deployment.md
similarity index 84%
rename from aio/content/getting-started/deployment.md
rename to aio/content/start/deployment.md
index 0f60f03fe7..e5fa6e971a 100644
--- a/aio/content/getting-started/deployment.md
+++ b/aio/content/start/deployment.md
@@ -6,7 +6,7 @@ To deploy your application, you have to compile it, and then host the JavaScript
 <div class="alert is-helpful">
 
 
-Whether you came here directly from [Your First App](getting-started "Getting Started: Your First App"), or completed the entire online store application through the [Routing](getting-started/routing "Getting Started: Routing"), [Managing Data](getting-started/data "Getting Started: Managing Data"), and [Forms](getting-started/forms "Getting Started: Forms") sections, you have an application that you can deploy by following the instructions in this section. 
+Whether you came here directly from [Your First App](start "Getting Started: Your First App"), or completed the entire online store application through the [Routing](start/routing "Getting Started: Routing"), [Managing Data](start/data "Getting Started: Managing Data"), and [Forms](start/forms "Getting Started: Forms") sections, you have an application that you can deploy by following the instructions in this section. 
 
 
 </div>
@@ -76,7 +76,7 @@ Learn more about development and distribution of your application in the [Buildi
 
 ## Join our community
 
-You are now an Angular developer! [Share this moment](https://twitter.com/intent/tweet?url=https://next.angular.io/getting-started&text=I%20just%20finished%20the%20Angular%20Getting%20Started%20Tutorial "Angular on Twitter"), tell us what you thought of this Getting Started, or submit [suggestions for future editions](https://github.com/angular/angular/issues/new/choose "Angular GitHub repository new issue form"). 
+You are now an Angular developer! [Share this moment](https://twitter.com/intent/tweet?url=https://next.angular.io/start&text=I%20just%20finished%20the%20Angular%20Getting%20Started%20Tutorial "Angular on Twitter"), tell us what you thought of this Getting Started, or submit [suggestions for future editions](https://github.com/angular/angular/issues/new/choose "Angular GitHub repository new issue form"). 
 
 Angular offers many more capabilities, and you now have a foundation that empowers you to build an application and explore those other capabilities:
 
diff --git a/aio/content/getting-started/forms.md b/aio/content/start/forms.md
similarity index 91%
rename from aio/content/getting-started/forms.md
rename to aio/content/start/forms.md
index 922a2f15f3..5cb36dc515 100644
--- a/aio/content/getting-started/forms.md
+++ b/aio/content/start/forms.md
@@ -1,6 +1,6 @@
 # Forms
 
-At the end of [Managing Data](getting-started/data "Getting Started: Managing Data"), the online store application has a product catalog and a shopping cart.
+At the end of [Managing Data](start/data "Getting Started: Managing Data"), the online store application has a product catalog and a shopping cart.
 
 In this section, you'll finish the app by adding a form-based checkout feature. You'll create a form to collect user information as part of checkout. 
 
@@ -75,7 +75,7 @@ Next, you'll add a checkout form at the bottom of the "Cart" page.
 After putting a few items in the cart, users can now review their items, enter name and address, and submit their purchase: 
 
 <figure>
-  <img src='generated/images/guide/getting-started/cart-with-items-and-form.png' alt="Cart page with checkout form">
+  <img src='generated/images/guide/start/cart-with-items-and-form.png' alt="Cart page with checkout form">
 </figure>
 
 
@@ -83,5 +83,5 @@ After putting a few items in the cart, users can now review their items, enter n
 
 Congratulations! You have a complete online store application with a product catalog, a shopping cart, and a checkout function.
 
-[Continue to the "Deployment" section](getting-started/deployment "Getting Started: Deployment") to deploy your app to Firebase or move to local development. 
+[Continue to the "Deployment" section](start/deployment "Getting Started: Deployment") to move to local development, or deploy your app to Firebase or your own server.
 
diff --git a/aio/content/getting-started/index.md b/aio/content/start/index.md
similarity index 90%
rename from aio/content/getting-started/index.md
rename to aio/content/start/index.md
index 639a22c66e..c648a05cdd 100644
--- a/aio/content/getting-started/index.md
+++ b/aio/content/start/index.md
@@ -28,12 +28,9 @@ You'll find many resources to complement the Angular docs. Mozilla's MDN docs in
 StackBlitz creates a starter Angular app. 
 We've seeded this particular app with a top bar&mdash;containing the store name and checkout icon&mdash;and the title for a product list. 
 
-<!-- 
-<img src="generated/images/guide/getting-started/new-project.png" alt="New Angular project in StackBlitz">
--->
 
 <figure>
-    <img src="generated/images/guide/getting-started/new-app.png" alt="Starter online store app">
+    <img src="generated/images/guide/start/new-app.png" alt="Starter online store app">
 </figure>
 
 
@@ -83,7 +80,7 @@ In this section, you'll learn about template syntax by enhancing the "Products"
       The preview pane immediately updates to display the name of each product in the list. 
 
       <figure>
-        <img src="generated/images/guide/getting-started/template-syntax-product-names.png" alt="Product names added to list">
+        <img src="generated/images/guide/start/template-syntax-product-names.png" alt="Product names added to list">
       </figure>
 
 1. In the final app, each product name will be a link to product details. Add the anchor now, and set the anchor's title to be the product's name by using the property binding [ ] syntax, as shown below: 
@@ -98,7 +95,7 @@ In this section, you'll learn about template syntax by enhancing the "Products"
     In the preview pane, hover over the displayed product name to see the bound name property value. They are the same. Interpolation {{ }} lets you render the property value as text; property binding [ ] lets you use the property value in a template expression. 
 
     <figure>
-      <img src="generated/images/guide/getting-started/template-syntax-product-anchor.png" alt="Product name anchor text is product name property">
+      <img src="generated/images/guide/start/template-syntax-product-anchor.png" alt="Product name anchor text is product name property">
     </figure>
 
   
@@ -110,7 +107,7 @@ In this section, you'll learn about template syntax by enhancing the "Products"
     The app now displays the name and description of each product in the list, as shown below. Notice that the final product does not have a description paragraph at all. Because the product's description property is empty, the paragraph element&mdash;including the word "Description"&mdash;is not created.  
 
     <figure>
-      <img src="generated/images/guide/getting-started/template-syntax-product-description.png" alt="Product descriptions added to list">
+      <img src="generated/images/guide/start/template-syntax-product-description.png" alt="Product descriptions added to list">
     </figure>
 
 1. Add a button so users can share a product with friends. Bind the button's `click` event to the `share()` event that we defined for you (in `product-list.component.ts`). Event binding is done by using ( ) around the event, as shown below: 
@@ -121,13 +118,13 @@ In this section, you'll learn about template syntax by enhancing the "Products"
     Each product now has a "Share" button: 
 
     <figure>
-      <img src="generated/images/guide/getting-started/template-syntax-product-share-button.png" alt="Share button added for each product">
+      <img src="generated/images/guide/start/template-syntax-product-share-button.png" alt="Share button added for each product">
     </figure>
 
     Test the "Share" button: 
 
     <figure>
-      <img src="generated/images/guide/getting-started/template-syntax-product-share-alert.png" alt="Alert box indicating product has been shared">
+      <img src="generated/images/guide/start/template-syntax-product-share-alert.png" alt="Alert box indicating product has been shared">
     </figure>
 
 The app now has a product list and sharing feature. 
@@ -180,7 +177,7 @@ An Angular application is composed of a tree of components, in which each Angula
 Currently, our app has three components: 
 
 <figure>
-  <img src="generated/images/guide/getting-started/app-components.png" alt="Online store with three components">
+  <img src="generated/images/guide/start/app-components.png" alt="Online store with three components">
 </figure>
 
 * `app-root` (orange box) is the application shell. This is the first component to load, and the parent of all other components. You can think of it as the base page. 
@@ -210,7 +207,7 @@ We're going to create a new alert feature. The alert feature will take a product
     1. Right click on the `app` folder and use the `Angular Generator` to generate a new component named `product-alerts`.
 
         <figure>
-          <img src="generated/images/guide/getting-started/generate-component.png" alt="StackBlitz command to generate component">
+          <img src="generated/images/guide/start/generate-component.png" alt="StackBlitz command to generate component">
         </figure>
 
         The generator creates starter files for all three parts of the component: 
@@ -259,7 +256,7 @@ We're going to create a new alert feature. The alert feature will take a product
 The new product alert component takes a product as input from the product list. With that input, it shows or hides the "Notify Me" button, based on the price of the product. The Phone XL price is over $700, so the "Notify Me" button appears on that product. 
 
 <figure>
-  <img src="generated/images/guide/getting-started/product-alert-button.png" alt="Product alert button added to products over $700">
+  <img src="generated/images/guide/start/product-alert-button.png" alt="Product alert button added to products over $700">
 </figure>
 
 
@@ -302,7 +299,7 @@ The "Notify Me" button doesn't do anything yet. In this section, you'll set up t
 1. Try out the "Notify Me" button: 
 
     <figure>
-      <img src="generated/images/guide/getting-started/product-alert-notification.png" alt="Product alert notification confirmation dialog">
+      <img src="generated/images/guide/start/product-alert-notification.png" alt="Product alert notification confirmation dialog">
     </figure>
 
 
@@ -323,6 +320,6 @@ You've learned about the foundation of Angular: components and template syntax.
 You've also learned how the component class and template interact, and how components communicate with each other. 
 
 To continue exploring Angular, choose either of the following options:
-* [Continue to the "Routing" section](getting-started/routing "Getting Started: Routing") to create a product details page that can be accessed by clicking a product name and that has its own URL pattern. 
-* [Skip ahead to the "Deployment" section](getting-started/deployment "Getting Started: Deployment") to deploy your app to Firebase or move to local development. 
+* [Continue to the "Routing" section](start/routing "Getting Started: Routing") to create a product details page that can be accessed by clicking a product name and that has its own URL pattern. 
+* [Skip ahead to the "Deployment" section](start/deployment "Getting Started: Deployment") to move to local development, or deploy your app to Firebase or your own server.
 
diff --git a/aio/content/getting-started/routing.md b/aio/content/start/routing.md
similarity index 88%
rename from aio/content/getting-started/routing.md
rename to aio/content/start/routing.md
index 452fbca4e9..7c9c0510cf 100644
--- a/aio/content/getting-started/routing.md
+++ b/aio/content/start/routing.md
@@ -1,6 +1,6 @@
 # Routing
 
-At the end of [Your First App](getting-started "Getting Started: Your First App"), the online store application has a basic product catalog. 
+At the end of [Your First App](start "Getting Started: Your First App"), the online store application has a basic product catalog. 
 The app doesn't have any variable states or navigation. 
 There is one URL, and that URL always displays the "My Store" page with a list of products and their descriptions. 
 
@@ -55,7 +55,7 @@ The app is already set up to use the Angular router and to use routing to naviga
     Notice that the URL in the preview window changes. The final segment is `products/1`.
 
     <figure>
-      <img src="generated/images/guide/getting-started/product-details-works.png" alt="Product details page with updated URL">
+      <img src="generated/images/guide/start/product-details-works.png" alt="Product details page with updated URL">
     </figure>
 
     
@@ -101,7 +101,7 @@ The product details component handles the display of each product. The Angular R
 Now, when the user clicks on a name in the product list, the router navigates you to the distinct URL for the product, swaps out the product list component for the product details component, and displays the product details. 
 
   <figure>
-    <img src="generated/images/guide/getting-started/product-details-routed.png" alt="Product details page with updated URL and full details displayed">
+    <img src="generated/images/guide/start/product-details-routed.png" alt="Product details page with updated URL and full details displayed">
   </figure>
 
 
@@ -121,6 +121,6 @@ Congratulations! You have integrated routing into your online store.
 * Users can click on a product name from the list to see details in a new view, with a distinct URL (route)
 
 To continue exploring Angular, choose either of the following options:
-* [Continue to the "Managing Data" section](getting-started/data "Getting Started: Managing Data") to add the shopping cart feature, using a service to manage the cart data and using HTTP to retrieve external data for shipping prices. 
-* [Skip ahead to the Deployment section](getting-started/deployment "Getting Started: Deployment") to deploy your app to Firebase or move to local development. 
+* [Continue to the "Managing Data" section](start/data "Getting Started: Managing Data") to add the shopping cart feature, using a service to manage the cart data and using HTTP to retrieve external data for shipping prices. 
+* [Skip ahead to the Deployment section](start/deployment "Getting Started: Deployment") to deploy your app to Firebase or move to local development. 
 
diff --git a/aio/content/tutorial/index.md b/aio/content/tutorial/index.md
index 5d4eb677d9..81ef34586f 100644
--- a/aio/content/tutorial/index.md
+++ b/aio/content/tutorial/index.md
@@ -1,19 +1,20 @@
-<h1 class="no-toc">Tutorial: Tour of Heroes</h1>
+<h1 class="no-toc">Tour of Heroes App and Tutorial</h1>
 
-This _Tour of Heroes_ tutorial provides a deep dive into the fundamentals of Angular. 
-It shows you how to set up your local development environment and develop an app using the [Angular CLI tool](cli "CLI command reference"). 
 
 <div class="callout is-helpful">
-<header>Getting Started - Stackblitz</header>
+<header>Getting Started Tutorial</header>
 
 
-We recently introduced a [**new Getting Started**](getting-started) that leverages the [StackBlitz](https://stackblitz.com/) online development environment. 
-We recommend the new Getting Started for anyone who wants to quickly learn the essentials of Angular, in the context of building an online store app. 
-The new Getting Started covers the same major topics as this Tour of Heroes&mdash;components, template syntax, routing, services, and accessing data via HTTP&mdash;in a condensed format.
+If you're new to Angular, see the [**Getting Started tutorial.**](start) 
+The Getting Started tutorial covers the same major topics as this Tour of Heroes&mdash;components, template syntax, routing, services, and accessing data via HTTP&mdash;in a condensed format, following the most current best practices. 
 
+**This Tour of Heroes tutorial** is the conceptual basis for many examples in this documentation set. Reading this introduction page provides sufficient context for working with those examples. You do not need to do this tutorial to understand those other examples. The Tour of Heroes tutorial is maintained here for context and continuity. 
 
 </div> 
 
+This _Tour of Heroes_ tutorial provides an introduction to the fundamentals of Angular. 
+It shows you how to set up your local development environment and develop an app using the [Angular CLI tool](cli "CLI command reference"). 
+
 In this _Tour of Heroes_ tutorial, you will build an app that helps a staffing agency manage its stable of heroes.
 
 This app has many of the features you'd expect to find in a data-driven application.
@@ -34,8 +35,14 @@ By the end of this tutorial you will be able to do the following:
 You'll learn enough Angular to get started and gain confidence that
 Angular can do whatever you need it to do. 
 
+<div class="callout is-helpful">
+<header>Solution</header>
+
 After completing all tutorial steps, the final app will look like this: <live-example name="toh-pt6"></live-example>.
 
+</div>
+
+
 
 ## What you'll build
 
diff --git a/aio/content/tutorial/toh-pt0.md b/aio/content/tutorial/toh-pt0.md
index 0a69dce874..afd3b14a4e 100644
--- a/aio/content/tutorial/toh-pt0.md
+++ b/aio/content/tutorial/toh-pt0.md
@@ -12,15 +12,7 @@ In this part of the tutorial, you'll do the following:
 
 ## Set up your environment
 
-To set up your development environment, follow these instructions in [Getting Started](guide/quickstart):
-
-* [Prerequisites](guide/quickstart#prerequisites)
-* [Install the Angular CLI](guide/quickstart#install-cli)
-
-<div class="alert is-helpful">
-
-**Note:** You do not need to complete the entire Getting Started. After you complete the above two sections of Getting Started, your environment is set up. Continue below to create the Tour of Heroes workspace and an initial app project.
-</div>
+To set up your development environment, follow the instructions in [Local Environment Setup](guide/setup-local "Setting up for Local Development").
 
 
 ## Create a new workspace and an initial application
diff --git a/aio/firebase.json b/aio/firebase.json
index a506a10892..5f3b52588d 100644
--- a/aio/firebase.json
+++ b/aio/firebase.json
@@ -16,18 +16,21 @@
       {"type": 301, "source": "/api/api/:rest*", "destination": "/api/:rest*"},
 
       // Guide renames/removals
-      {"type": 301, "source": "/docs/*/latest/cli-quickstart.html", "destination": "/guide/quickstart"},
+      {"type": 301, "source": "/docs/*/latest/cli-quickstart.html", "destination": "/start"},
       {"type": 301, "source": "/docs/*/latest/glossary.html", "destination": "/guide/glossary"},
-      {"type": 301, "source": "/docs/*/latest/quickstart.html", "destination": "/guide/quickstart"},
+      {"type": 301, "source": "/docs/*/latest/quickstart.html", "destination": "/start"},
       {"type": 301, "source": "/docs/*/latest/guide/server-communication.html", "destination": "/guide/http"},
       {"type": 301, "source": "/docs/*/latest/guide/style-guide.html", "destination": "/guide/styleguide"},
-      {"type": 301, "source": "/guide/cli-quickstart", "destination": "/guide/quickstart"},
+      {"type": 301, "source": "/guide/cli-quickstart", "destination": "/start"},
       {"type": 301, "source": "/guide/service-worker-getstart", "destination": "/guide/service-worker-getting-started"},
       {"type": 301, "source": "/guide/service-worker-comm", "destination": "/guide/service-worker-communications"},
       {"type": 301, "source": "/guide/service-worker-configref", "destination": "/guide/service-worker-config"},
       {"type": 301, "source": "/guide/webpack", "destination": "https://v5.angular.io/guide/webpack"},
       {"type": 301, "source": "/guide/setup-systemjs-anatomy", "destination": "/guide/file-structure"},
       {"type": 301, "source": "/guide/change-log", "destination": "https://github.com/angular/angular/blob/master/CHANGELOG.md"},
+      {"type": 301, "source": "/guide/quickstart", "destination": "/start"},
+      {"type": 301, "source": "/getting-started", "destination": "/start"},
+      {"type": 301, "source": "/getting-started/:rest*", "destination": "/start/:rest*"},
 
       // some top level guide pages on old site were moved below the guide folder
       {"type": 301, "source": "/styleguide", "destination": "/guide/styleguide"},
@@ -108,7 +111,7 @@
       {"type": 301, "source": "/docs/styleguide*", "destination": "/guide/styleguide"},
       {"type": 301, "source": "/guide/metadata", "destination": "/guide/aot-compiler"},
       {"type": 301, "source": "/guide/ngmodule", "destination": "/guide/ngmodules"},
-      {"type": 301, "source": "/guide/learning-angular*", "destination": "/guide/quickstart"},
+      {"type": 301, "source": "/guide/learning-angular*", "destination": "/start"},
       {"type": 301, "source": "/testing", "destination": "/guide/testing"},
       {"type": 301, "source": "/testing/**", "destination": "/guide/testing"},
 
diff --git a/aio/ngsw-config.json b/aio/ngsw-config.json
index 269ad7e6d6..eefdd3d1a9 100644
--- a/aio/ngsw-config.json
+++ b/aio/ngsw-config.json
@@ -95,6 +95,9 @@
     "!/docs/?*",
     "!/docs/*/**",
     "!/guide/change-log",
+    "!/getting-started",
+    "!/getting-started.html",
+    "!/getting-started/**",
     "!/guide/cli-quickstart",
     "!/guide/cli-quickstart.html",
     "!/guide/cli-quickstart/",
@@ -121,6 +124,8 @@
     "!/guide/webpack/",
     "!/guide/setup-systemjs-anatomy",
     "!/guide/setup-systemjs-anatomy.html",
+    "!/guide/quickstart",
+    "!/guide/quickstart.html",
     "!/news",
     "!/news.html",
     "!/news/",
diff --git a/aio/tests/deployment/e2e/smoke-tests.e2e-spec.ts b/aio/tests/deployment/e2e/smoke-tests.e2e-spec.ts
index fe9e8025c8..7c954f9c0d 100644
--- a/aio/tests/deployment/e2e/smoke-tests.e2e-spec.ts
+++ b/aio/tests/deployment/e2e/smoke-tests.e2e-spec.ts
@@ -25,7 +25,7 @@ describe(browser.baseUrl, () => {
     describe('(marketing pages)', () => {
       const textPerUrl: { [key: string]: string } = {
         features: 'features & benefits',
-        docs: 'what is angular?',
+        docs: 'introduction to the angular docs',
         events: 'events',
         resources: 'explore angular resources',
       };
@@ -45,9 +45,9 @@ describe(browser.baseUrl, () => {
         api: 'api list',
         'guide/architecture': 'architecture',
         'guide/http': 'httpclient',
-        'guide/quickstart': 'getting started',
         'guide/security': 'security',
         tutorial: 'tutorial',
+        start: 'getting started',
       };
 
       Object.keys(textPerUrl).forEach(url => {
diff --git a/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt b/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
index 1f86c1ed97..2928dddbbb 100644
--- a/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
+++ b/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
@@ -171,10 +171,16 @@
 /docs/ts/latest/api/platform-browser-dynamic/index/workerAppDynamicPlatform-let.html	/api/platform-browser-dynamic/workerAppDynamicPlatform
 /docs/ts/latest/api/testing/fakeAsync-function.html	/api/core/testing/fakeAsync
 /docs/ts/latest/cookbook/ts-to-js.html	https://v2.angular.io/docs/ts/latest/cookbook/ts-to-js.html
-/guide/cli-quickstart	/guide/quickstart
-/guide/learning-angular	/guide/quickstart
-/guide/learning-angular.html	/guide/quickstart
+/getting-started	/start
+/getting-started/routing	/start/routing
+/getting-started/data	/start/data
+/getting-started/forms	/start/forms
+/getting-started/deployment	/start/deployment
+/guide/cli-quickstart	/start
+/guide/learning-angular	/start
+/guide/learning-angular.html	/start
 /guide/metadata	/guide/aot-compiler
+/guide/quickstart	/start
 /guide/service-worker-getstart	/guide/service-worker-getting-started
 /guide/service-worker-comm	/guide/service-worker-communications
 /guide/service-worker-configref	/guide/service-worker-config
diff --git a/aio/tests/e2e/src/app.e2e-spec.ts b/aio/tests/e2e/src/app.e2e-spec.ts
index 48f68b904a..db162c5660 100644
--- a/aio/tests/e2e/src/app.e2e-spec.ts
+++ b/aio/tests/e2e/src/app.e2e-spec.ts
@@ -75,7 +75,7 @@ describe('site App', function() {
   it('should show the tutorial index page at `/tutorial` after jitterbugging through features', () => {
     // check that we can navigate directly to the tutorial page
     page.navigateTo('tutorial');
-    expect(page.getDocViewerText()).toMatch(/Tutorial: Tour of Heroes/i);
+    expect(page.getDocViewerText()).toMatch(/Tour of Heroes App and Tutorial/i);
 
     // navigate to a different page
     page.click(page.getTopMenuLink('features'));
@@ -86,8 +86,8 @@ describe('site App', function() {
 
     // Tutorial folder should still be expanded because this test runs in wide mode
     // Navigate to the tutorial introduction via a link in the sidenav
-    page.click(page.getNavItem(/introduction/i));
-    expect(page.getDocViewerText()).toMatch(/Tutorial: Tour of Heroes/i);
+    page.click(page.getNavItem(/The Hero Editor/i));
+    expect(page.getDocViewerText()).toMatch(/The Hero Editor/i);
   });
 
   it('should render `{@example}` dgeni tags as `<code-example>` elements with HTML escaped content', () => {
diff --git a/aio/tools/transforms/angular-content-package/index.js b/aio/tools/transforms/angular-content-package/index.js
index 1775220085..51cd650655 100644
--- a/aio/tools/transforms/angular-content-package/index.js
+++ b/aio/tools/transforms/angular-content-package/index.js
@@ -43,7 +43,7 @@ module.exports = new Package('angular-content', [basePackage, contentPackage])
     readFilesProcessor.sourceFiles = readFilesProcessor.sourceFiles.concat([
       {
         basePath: CONTENTS_PATH,
-        include: CONTENTS_PATH + '/{getting-started,guide,tutorial}/**/*.md',
+        include: CONTENTS_PATH + '/{start,guide,tutorial}/**/*.md',
         fileReader: 'contentFileReader'
       },
       {
diff --git a/aio/tools/transforms/authors-package/getting-started-package.js b/aio/tools/transforms/authors-package/getting-started-package.js
index d7a1277d00..350cee340e 100644
--- a/aio/tools/transforms/authors-package/getting-started-package.js
+++ b/aio/tools/transforms/authors-package/getting-started-package.js
@@ -16,7 +16,7 @@ const { CONTENTS_PATH } = require('../config');
 
 function createPackage(tutorialName) {
 
-  const tutorialFilePath = `${CONTENTS_PATH}/getting-started/${tutorialName}.md`;
+  const tutorialFilePath = `${CONTENTS_PATH}/start/${tutorialName}.md`;
   const tutorialFile = readFileSync(tutorialFilePath, 'utf8');
   const examples = [];
   tutorialFile.replace(/<code-(?:pane|example) [^>]*path="([^"]+)"/g, (_, path) => examples.push('examples/' + path));
diff --git a/aio/tools/transforms/authors-package/index.js b/aio/tools/transforms/authors-package/index.js
index b747bc8302..f8bad88e37 100644
--- a/aio/tools/transforms/authors-package/index.js
+++ b/aio/tools/transforms/authors-package/index.js
@@ -22,7 +22,7 @@ function createPackage(changedFile) {
     return require('./tutorial-package').createPackage(tutorialName);
   }
 
-  const gettingStartedMatch = /^aio\/content\/getting-started\/([^.]+)\.md/.exec(changedFile);
+  const gettingStartedMatch = /^aio\/content\/start\/([^.]+)\.md/.exec(changedFile);
   const gettingStartedExampleMatch = /^aio\/content\/examples\/getting-started\/([^\/]+)\//.exec(changedFile);
   if (gettingStartedMatch || gettingStartedExampleMatch) {
     const gettingStartedName = gettingStartedMatch && gettingStartedMatch[1] || 'index';

From d7eaae6f2267eade986ab1626aa938072a7dec35 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 17 May 2019 18:49:21 -0700
Subject: [PATCH 114/275] =?UTF-8?q?refactor(ivy):=20Move=20instructions=20?=
 =?UTF-8?q?back=20to=20=C9=B5=C9=B5=20(#30546)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is an encoding issue with using delta `Δ`, where the browser will attempt to detect the file encoding if the character set is not explicitly declared on a `<script/>` tag, and Chrome will find the `Δ` character and decide it is window-1252 encoding, which misinterprets the `Δ` character to be some other character that is not a valid JS identifier character

So back to the frog eyes we go.

```
    __
   /ɵɵ\
  ( -- ) - I am ineffable. I am forever.
 _/    \_
/  \  /  \
==  ==  ==
```

PR Close #30546
---
 aio/content/guide/deprecations.md             |    4 +-
 .../transforms/angular-api-package/index.js   |  344 +++--
 docs/PUBLIC_API.md                            |    2 +-
 integration/ngcc/test.sh                      |   14 +-
 .../src/tree/render3_function/index.ts        |   46 +-
 packages/common/src/directives/ng_class.ts    |   10 +-
 packages/common/src/directives/ng_style.ts    |   10 +-
 packages/common/src/viewport_scroller.ts      |    6 +-
 .../ngcc/test/rendering/dts_renderer_spec.ts  |    2 +-
 .../ngcc/test/rendering/renderer_spec.ts      |   10 +-
 packages/compiler-cli/src/metadata/bundler.ts |    2 +-
 .../src/ngtsc/imports/src/core.ts             |   16 +-
 .../test/compliance/mock_compile.ts           |    2 +-
 .../test/compliance/mock_compiler_spec.ts     |    2 +-
 .../compliance/r3_compiler_compliance_spec.ts |  762 +++++-----
 .../r3_view_compiler_binding_spec.ts          |  146 +-
 .../compliance/r3_view_compiler_di_spec.ts    |   14 +-
 .../r3_view_compiler_directives_spec.ts       |   56 +-
 .../compliance/r3_view_compiler_i18n_spec.ts  | 1352 ++++++++---------
 .../r3_view_compiler_input_outputs_spec.ts    |    4 +-
 .../r3_view_compiler_listener_spec.ts         |   62 +-
 .../r3_view_compiler_providers_spec.ts        |    6 +-
 .../test/compliance/r3_view_compiler_spec.ts  |   16 +-
 .../r3_view_compiler_styling_spec.ts          |  388 ++---
 .../r3_view_compiler_template_spec.ts         |  190 +--
 packages/compiler-cli/test/ngc_spec.ts        |   12 +-
 .../test/ngtsc/fake_core/index.ts             |    6 +-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     |  298 ++--
 .../compiler-cli/test/ngtsc/scope_spec.ts     |   12 +-
 .../test/ngtsc/template_mapping_spec.ts       |  164 +-
 .../test/ngtsc/template_typecheck_spec.ts     |    6 +-
 packages/compiler/design/architecture.md      |   10 +-
 .../compiler/design/separate_compilation.md   |   14 +-
 packages/compiler/src/identifiers.ts          |    6 +-
 packages/compiler/src/injectable_compiler.ts  |    2 +-
 .../compiler/src/injectable_compiler_2.ts     |    2 +-
 .../compiler/src/render3/r3_identifiers.ts    |  240 +--
 .../src/render3/r3_module_compiler.ts         |    6 +-
 .../compiler/src/render3/view/template.ts     |    2 +-
 .../differs/iterable_differs.ts               |    4 +-
 .../differs/keyvalue_differs.ts               |    4 +-
 packages/core/src/core_private_export.ts      |    4 +-
 .../core/src/core_render3_private_export.ts   |  242 +--
 packages/core/src/di/index.ts                 |    4 +-
 packages/core/src/di/injectable.ts            |    6 +-
 packages/core/src/di/injection_token.ts       |    4 +-
 packages/core/src/di/injector.ts              |    8 +-
 .../core/src/di/injector_compatibility.ts     |   23 +-
 packages/core/src/di/interface/defs.ts        |   29 +-
 packages/core/src/di/jit/environment.ts       |   12 +-
 packages/core/src/di/r3_injector.ts           |    8 +-
 packages/core/src/di/util.ts                  |    4 +-
 packages/core/src/metadata/ng_module.ts       |    8 +-
 packages/core/src/r3_symbols.ts               |    8 +-
 packages/core/src/render3/CODE_GEN_API.md     |    8 +-
 packages/core/src/render3/STATUS.md           |   32 +-
 .../src/render3/STORING_METADATA_IN_D.TS.md   |    6 +-
 packages/core/src/render3/VIEW_DATA.md        |   42 +-
 packages/core/src/render3/component_ref.ts    |    4 +-
 packages/core/src/render3/definition.ts       |   28 +-
 packages/core/src/render3/di.ts               |    6 +-
 packages/core/src/render3/di_setup.ts         |    6 +-
 .../features/inherit_definition_feature.ts    |    6 +-
 .../render3/features/ng_onchanges_feature.ts  |    2 +-
 .../src/render3/features/providers_feature.ts |    2 +-
 packages/core/src/render3/i18n.ts             |   32 +-
 packages/core/src/render3/index.ts            |  230 +--
 .../render3/instructions/alloc_host_vars.ts   |    2 +-
 .../src/render3/instructions/container.ts     |    8 +-
 packages/core/src/render3/instructions/di.ts  |   16 +-
 .../core/src/render3/instructions/element.ts  |   14 +-
 .../render3/instructions/element_container.ts |    4 +-
 .../src/render3/instructions/embedded_view.ts |    5 +-
 .../render3/instructions/get_current_view.ts  |    2 +-
 .../core/src/render3/instructions/listener.ts |    4 +-
 .../src/render3/instructions/namespace.ts     |    2 +-
 .../src/render3/instructions/next_context.ts  |    2 +-
 .../src/render3/instructions/projection.ts    |    4 +-
 .../core/src/render3/instructions/property.ts |   12 +-
 .../instructions/property_interpolation.ts    |   98 +-
 .../core/src/render3/instructions/select.ts   |    4 +-
 .../core/src/render3/instructions/shared.ts   |    4 +-
 .../core/src/render3/instructions/storage.ts  |    4 +-
 .../core/src/render3/instructions/styling.ts  |   12 +-
 .../core/src/render3/instructions/text.ts     |    4 +-
 .../core/src/render3/interfaces/definition.ts |   10 +-
 packages/core/src/render3/jit/environment.ts  |  242 +--
 packages/core/src/render3/pipe.ts             |   39 +-
 packages/core/src/render3/pure_function.ts    |   20 +-
 packages/core/src/render3/query.ts            |   22 +-
 packages/core/src/render3/state.ts            |   20 +-
 packages/core/src/render3/util/misc_utils.ts  |    6 +-
 .../view_engine_compatibility_prebound.ts     |    2 +-
 .../core/src/sanitization/sanitization.ts     |   20 +-
 packages/core/src/view/ng_module.ts           |    6 +-
 packages/core/src/view/services.ts            |    4 +-
 .../cyclic_import/bundle.golden_symbols.json  |   20 +-
 .../hello_world/bundle.golden_symbols.json    |    8 +-
 .../injection/bundle.golden_symbols.json      |    6 +-
 .../core/test/bundling/injection/usage.ts     |    8 +-
 .../bundling/todo/bundle.golden_symbols.json  |   46 +-
 .../core/test/bundling/todo_i18n/index.ts     |    2 +-
 packages/core/test/di/r3_injector_spec.ts     |   60 +-
 .../test/linker/ng_module_integration_spec.ts |    6 +-
 packages/core/test/render3/basic_perf.ts      |   22 +-
 .../test/render3/change_detection_spec.ts     |   62 +-
 packages/core/test/render3/common_with_def.ts |   18 +-
 .../core/test/render3/component_ref_spec.ts   |    8 +-
 packages/core/test/render3/component_spec.ts  |  177 +--
 packages/core/test/render3/content_spec.ts    |  734 ++++-----
 .../core/test/render3/control_flow_spec.ts    |  450 +++---
 packages/core/test/render3/debug_spec.ts      |   10 +-
 packages/core/test/render3/di_spec.ts         |  180 +--
 packages/core/test/render3/exports_spec.ts    |   24 +-
 packages/core/test/render3/i18n_spec.ts       |   40 +-
 .../core/test/render3/instructions_spec.ts    |  168 +-
 .../core/test/render3/integration_spec.ts     |  298 ++--
 packages/core/test/render3/ivy/jit_spec.ts    |   28 +-
 .../core/test/render3/jit_environment_spec.ts |   12 +-
 packages/core/test/render3/lifecycle_spec.ts  |   34 +-
 packages/core/test/render3/listeners_spec.ts  |  300 ++--
 packages/core/test/render3/outputs_spec.ts    |   42 +-
 packages/core/test/render3/pipe_spec.ts       |   16 +-
 packages/core/test/render3/providers_spec.ts  |  459 +++---
 .../core/test/render3/pure_function_spec.ts   |   28 +-
 packages/core/test/render3/query_spec.ts      |  618 ++++----
 packages/core/test/render3/render_util.ts     |   10 +-
 .../test/render3/renderer_factory_spec.ts     |   60 +-
 .../styling/class_and_style_bindings_spec.ts  |  124 +-
 .../core/test/render3/styling/players_spec.ts |   34 +-
 .../test/render3/view_container_ref_spec.ts   |   98 +-
 .../test/sanitization/sanatization_spec.ts    |   77 +-
 .../test/strict_types/inheritance_spec.ts     |    6 +-
 packages/core/test/test_bed_spec.ts           |    2 +-
 packages/core/test/view/ng_module_spec.ts     |   20 +-
 .../core/testing/src/r3_test_bed_compiler.ts  |    2 +-
 packages/core/testing/src/test_bed.ts         |    4 +-
 packages/platform-browser/src/browser/meta.ts |    4 +-
 .../platform-browser/src/browser/title.ts     |    4 +-
 tools/public_api_guard/core/core.d.ts         |  764 +++++-----
 tools/ts-api-guardian/index.bzl               |    2 +-
 141 files changed, 5361 insertions(+), 5344 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index 023455cdce..ab5bdc28ad 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -51,8 +51,8 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 | --- | ----------- | --------------------- | ----- |
 | [`CollectionChangeRecord`](api/core/CollectionChangeRecord) | [`IterableChangeRecord`](api/core/IterableChangeRecord) | v4 | none |
 | [`DefaultIterableDiffer`](api/core/DefaultIterableDiffer) | n/a | v4 | Not part of public API. |
-| [`defineInjectable`](api/core/defineInjectable) | `ΔdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
-| [`inject`](api/core/inject) | `Δinject` | v8 | Used only in generated code. No source code should depend on this API. |
+| [`defineInjectable`](api/core/defineInjectable) | `ɵɵdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
+| [`inject`](api/core/inject) | `ɵɵinject` | v8 | Used only in generated code. No source code should depend on this API. |
 | [`ReflectiveInjector`](api/core/ReflectiveInjector) | [`Injector.create`](api/core/Injector#create)  | v5 | See [`ReflectiveInjector`](#reflectiveinjector) |
 | [`ReflectiveKey`](api/core/ReflectiveKey) | none | v5 | none |
 | [`RenderComponentType`](api/core/RenderComponentType) | [`RendererType2`](api/core/RendererType2) and  [`Renderer2`](api/core/Renderer2) | v4 | none |
diff --git a/aio/tools/transforms/angular-api-package/index.js b/aio/tools/transforms/angular-api-package/index.js
index 1645490a01..55baa84af0 100644
--- a/aio/tools/transforms/angular-api-package/index.js
+++ b/aio/tools/transforms/angular-api-package/index.js
@@ -9,198 +9,210 @@ const Package = require('dgeni').Package;
 
 const basePackage = require('../angular-base-package');
 const typeScriptPackage = require('dgeni-packages/typescript');
-const { API_SOURCE_PATH, API_TEMPLATES_PATH, requireFolder } = require('../config');
+const {API_SOURCE_PATH, API_TEMPLATES_PATH, requireFolder} = require('../config');
 
-module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
+module.exports =
+    new Package('angular-api', [basePackage, typeScriptPackage])
 
-  // Register the processors
-  .processor(require('./processors/splitDescription'))
-  .processor(require('./processors/convertPrivateClassesToInterfaces'))
-  .processor(require('./processors/generateApiListDoc'))
-  .processor(require('./processors/addNotYetDocumentedProperty'))
-  .processor(require('./processors/mergeDecoratorDocs'))
-  .processor(require('./processors/extractDecoratedClasses'))
-  .processor(require('./processors/extractPipeParams'))
-  .processor(require('./processors/matchUpDirectiveDecorators'))
-  .processor(require('./processors/addMetadataAliases'))
-  .processor(require('./processors/computeApiBreadCrumbs'))
-  .processor(require('./processors/filterContainedDocs'))
-  .processor(require('./processors/processClassLikeMembers'))
-  .processor(require('./processors/markBarredODocsAsPrivate'))
-  .processor(require('./processors/filterPrivateDocs'))
-  .processor(require('./processors/computeSearchTitle'))
-  .processor(require('./processors/simplifyMemberAnchors'))
-  .processor(require('./processors/computeStability'))
-  .processor(require('./processors/removeInjectableConstructors'))
-  .processor(require('./processors/collectPackageContentDocs'))
-  .processor(require('./processors/processPackages'))
-  .processor(require('./processors/processNgModuleDocs'))
-  .processor(require('./processors/fixupRealProjectRelativePath'))
-  .processor(require('./processors/processAliasDocs'))
+        // Register the processors
+        .processor(require('./processors/splitDescription'))
+        .processor(require('./processors/convertPrivateClassesToInterfaces'))
+        .processor(require('./processors/generateApiListDoc'))
+        .processor(require('./processors/addNotYetDocumentedProperty'))
+        .processor(require('./processors/mergeDecoratorDocs'))
+        .processor(require('./processors/extractDecoratedClasses'))
+        .processor(require('./processors/extractPipeParams'))
+        .processor(require('./processors/matchUpDirectiveDecorators'))
+        .processor(require('./processors/addMetadataAliases'))
+        .processor(require('./processors/computeApiBreadCrumbs'))
+        .processor(require('./processors/filterContainedDocs'))
+        .processor(require('./processors/processClassLikeMembers'))
+        .processor(require('./processors/markBarredODocsAsPrivate'))
+        .processor(require('./processors/filterPrivateDocs'))
+        .processor(require('./processors/computeSearchTitle'))
+        .processor(require('./processors/simplifyMemberAnchors'))
+        .processor(require('./processors/computeStability'))
+        .processor(require('./processors/removeInjectableConstructors'))
+        .processor(require('./processors/collectPackageContentDocs'))
+        .processor(require('./processors/processPackages'))
+        .processor(require('./processors/processNgModuleDocs'))
+        .processor(require('./processors/fixupRealProjectRelativePath'))
+        .processor(require('./processors/processAliasDocs'))
 
 
-  /**
-   * These are the API doc types that will be rendered to actual files.
-   * This is a super set of the exported docs, since we convert some classes to
-   * more Angular specific API types, such as decorators and directives.
-   */
-  .factory(function API_DOC_TYPES_TO_RENDER(EXPORT_DOC_TYPES) {
-    return EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe', 'package']);
-  })
+        /**
+         * These are the API doc types that will be rendered to actual files.
+         * This is a super set of the exported docs, since we convert some classes to
+         * more Angular specific API types, such as decorators and directives.
+         */
+        .factory(function API_DOC_TYPES_TO_RENDER(EXPORT_DOC_TYPES) {
+          return EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe', 'package']);
+        })
 
-  /**
-   * These are the doc types that are contained within other docs
-   */
-  .factory(function API_CONTAINED_DOC_TYPES() {
-    return ['member', 'function-overload', 'get-accessor-info', 'set-accessor-info', 'parameter'];
-  })
+        /**
+         * These are the doc types that are contained within other docs
+         */
+        .factory(function API_CONTAINED_DOC_TYPES() {
+          return [
+            'member', 'function-overload', 'get-accessor-info', 'set-accessor-info', 'parameter'
+          ];
+        })
 
-  /**
-   * These are the doc types that are API docs, including ones that will be merged into container docs,
-   * such as members and overloads.
-   */
-  .factory(function API_DOC_TYPES(API_DOC_TYPES_TO_RENDER, API_CONTAINED_DOC_TYPES) {
-    return API_DOC_TYPES_TO_RENDER.concat(API_CONTAINED_DOC_TYPES);
-  })
+        /**
+         * These are the doc types that are API docs, including ones that will be merged into
+         * container docs,
+         * such as members and overloads.
+         */
+        .factory(function API_DOC_TYPES(API_DOC_TYPES_TO_RENDER, API_CONTAINED_DOC_TYPES) {
+          return API_DOC_TYPES_TO_RENDER.concat(API_CONTAINED_DOC_TYPES);
+        })
 
-  .factory(require('./readers/package-content'))
+        .factory(require('./readers/package-content'))
 
-  // Where do we get the source files?
-  .config(function(readTypeScriptModules, readFilesProcessor, collectExamples, tsParser, packageContentFileReader) {
+        // Where do we get the source files?
+        .config(function(
+            readTypeScriptModules, readFilesProcessor, collectExamples, tsParser,
+            packageContentFileReader) {
 
-    // Tell TypeScript how to load modules that start with with `@angular`
-    tsParser.options.paths = { '@angular/*': [API_SOURCE_PATH + '/*'] };
-    tsParser.options.baseUrl = '.';
+          // Tell TypeScript how to load modules that start with with `@angular`
+          tsParser.options.paths = {'@angular/*': [API_SOURCE_PATH + '/*']};
+          tsParser.options.baseUrl = '.';
 
-    // API files are typescript
-    readTypeScriptModules.basePath = API_SOURCE_PATH;
-    readTypeScriptModules.ignoreExportsMatching = [/^_|^Δ|^VERSION$/];
-    readTypeScriptModules.hidePrivateMembers = true;
+          // API files are typescript
+          readTypeScriptModules.basePath = API_SOURCE_PATH;
+          readTypeScriptModules.ignoreExportsMatching = [/^_|^ɵɵ|^VERSION$/];
+          readTypeScriptModules.hidePrivateMembers = true;
 
-    // NOTE: This list should be in sync with tools/public_api_guard/BUILD.bazel
-    readTypeScriptModules.sourceFiles = [
-      'animations/index.ts',
-      'animations/browser/index.ts',
-      'animations/browser/testing/index.ts',
-      'common/http/index.ts',
-      'common/http/testing/index.ts',
-      'common/index.ts',
-      'common/testing/index.ts',
-      'common/upgrade/index.ts',
-      'core/index.ts',
-      'core/testing/index.ts',
-      'elements/index.ts',
-      'forms/index.ts',
-      // Current plan for Angular v8 is to hide documentation for the @angular/http package
-      // 'http/index.ts',
-      // 'http/testing/index.ts',
-      'platform-browser/index.ts',
-      'platform-browser/animations/index.ts',
-      'platform-browser/testing/index.ts',
-      'platform-browser-dynamic/index.ts',
-      'platform-browser-dynamic/testing/index.ts',
-      'platform-server/index.ts',
-      'platform-server/testing/index.ts',
-      'platform-webworker/index.ts',
-      'platform-webworker-dynamic/index.ts',
-      'router/index.ts',
-      'router/testing/index.ts',
-      'router/upgrade/index.ts',
-      'service-worker/index.ts',
-      'upgrade/index.ts',
-      'upgrade/static/index.ts',
-    ];
+          // NOTE: This list should be in sync with tools/public_api_guard/BUILD.bazel
+          readTypeScriptModules.sourceFiles = [
+            'animations/index.ts',
+            'animations/browser/index.ts',
+            'animations/browser/testing/index.ts',
+            'common/http/index.ts',
+            'common/http/testing/index.ts',
+            'common/index.ts',
+            'common/testing/index.ts',
+            'common/upgrade/index.ts',
+            'core/index.ts',
+            'core/testing/index.ts',
+            'elements/index.ts',
+            'forms/index.ts',
+            // Current plan for Angular v8 is to hide documentation for the @angular/http package
+            // 'http/index.ts',
+            // 'http/testing/index.ts',
+            'platform-browser/index.ts',
+            'platform-browser/animations/index.ts',
+            'platform-browser/testing/index.ts',
+            'platform-browser-dynamic/index.ts',
+            'platform-browser-dynamic/testing/index.ts',
+            'platform-server/index.ts',
+            'platform-server/testing/index.ts',
+            'platform-webworker/index.ts',
+            'platform-webworker-dynamic/index.ts',
+            'router/index.ts',
+            'router/testing/index.ts',
+            'router/upgrade/index.ts',
+            'service-worker/index.ts',
+            'upgrade/index.ts',
+            'upgrade/static/index.ts',
+          ];
 
-    readFilesProcessor.fileReaders.push(packageContentFileReader);
+          readFilesProcessor.fileReaders.push(packageContentFileReader);
 
-    // API Examples
-    readFilesProcessor.sourceFiles = [
-      {
-        basePath: API_SOURCE_PATH,
-        include: API_SOURCE_PATH + '/examples/**/*',
-        fileReader: 'exampleFileReader'
-      },
-      {
-        basePath: API_SOURCE_PATH,
-        include: API_SOURCE_PATH + '/**/PACKAGE.md',
-        fileReader: 'packageContentFileReader'
-      }
-    ];
-    collectExamples.exampleFolders.push('examples');
-  })
+          // API Examples
+          readFilesProcessor.sourceFiles = [
+            {
+              basePath: API_SOURCE_PATH,
+              include: API_SOURCE_PATH + '/examples/**/*',
+              fileReader: 'exampleFileReader'
+            },
+            {
+              basePath: API_SOURCE_PATH,
+              include: API_SOURCE_PATH + '/**/PACKAGE.md',
+              fileReader: 'packageContentFileReader'
+            }
+          ];
+          collectExamples.exampleFolders.push('examples');
+        })
 
-  // Configure jsdoc-style tag parsing
-  .config(function(parseTagsProcessor, getInjectables, tsHost) {
-    // Load up all the tag definitions in the tag-defs folder
-    parseTagsProcessor.tagDefinitions =
-        parseTagsProcessor.tagDefinitions.concat(getInjectables(requireFolder(__dirname, './tag-defs')));
-    // We don't want license headers to be joined to the first API item's comment
-    tsHost.concatMultipleLeadingComments = false;
-  })
+        // Configure jsdoc-style tag parsing
+        .config(function(parseTagsProcessor, getInjectables, tsHost) {
+          // Load up all the tag definitions in the tag-defs folder
+          parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions.concat(
+              getInjectables(requireFolder(__dirname, './tag-defs')));
+          // We don't want license headers to be joined to the first API item's comment
+          tsHost.concatMultipleLeadingComments = false;
+        })
 
-  .config(function(computeStability, splitDescription, addNotYetDocumentedProperty, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES) {
-    computeStability.docTypes = API_DOC_TYPES_TO_RENDER;
-    // Only split the description on the API docs
-    splitDescription.docTypes = API_DOC_TYPES.concat(['package-content']);
-    addNotYetDocumentedProperty.docTypes = API_DOC_TYPES;
-  })
+        .config(function(
+            computeStability, splitDescription, addNotYetDocumentedProperty,
+            API_DOC_TYPES_TO_RENDER, API_DOC_TYPES) {
+          computeStability.docTypes = API_DOC_TYPES_TO_RENDER;
+          // Only split the description on the API docs
+          splitDescription.docTypes = API_DOC_TYPES.concat(['package-content']);
+          addNotYetDocumentedProperty.docTypes = API_DOC_TYPES;
+        })
 
-  .config(function(mergeDecoratorDocs) {
-    mergeDecoratorDocs.propertiesToMerge = [
-      'shortDescription',
-      'description',
-      'security',
-      'deprecated',
-      'see',
-      'usageNotes',
-    ];
-  })
+        .config(function(mergeDecoratorDocs) {
+          mergeDecoratorDocs.propertiesToMerge = [
+            'shortDescription',
+            'description',
+            'security',
+            'deprecated',
+            'see',
+            'usageNotes',
+          ];
+        })
 
-  .config(function(checkContentRules, API_DOC_TYPES, API_CONTAINED_DOC_TYPES) {
-    addMinLengthRules(checkContentRules);
-    addHeadingRules(checkContentRules, API_DOC_TYPES);
-    addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES);
-    checkContentRules.failOnContentErrors = true;
-  })
+        .config(function(checkContentRules, API_DOC_TYPES, API_CONTAINED_DOC_TYPES) {
+          addMinLengthRules(checkContentRules);
+          addHeadingRules(checkContentRules, API_DOC_TYPES);
+          addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES);
+          checkContentRules.failOnContentErrors = true;
+        })
 
-  .config(function(filterContainedDocs, API_CONTAINED_DOC_TYPES) {
-    filterContainedDocs.docTypes = API_CONTAINED_DOC_TYPES;
-  })
+        .config(function(filterContainedDocs, API_CONTAINED_DOC_TYPES) {
+          filterContainedDocs.docTypes = API_CONTAINED_DOC_TYPES;
+        })
 
 
-  .config(function(computePathsProcessor, EXPORT_DOC_TYPES, generateApiListDoc) {
+        .config(function(computePathsProcessor, EXPORT_DOC_TYPES, generateApiListDoc) {
 
-    const API_SEGMENT = 'api';
+          const API_SEGMENT = 'api';
 
-    generateApiListDoc.outputFolder = API_SEGMENT;
+          generateApiListDoc.outputFolder = API_SEGMENT;
 
-    computePathsProcessor.pathTemplates.push({
-      docTypes: ['package'],
-      getPath: function computeModulePath(doc) {
-        doc.moduleFolder = `${API_SEGMENT}/${doc.id.replace(/\/index$/, '')}`;
-        return doc.moduleFolder;
-      },
-      outputPathTemplate: '${moduleFolder}.json'
-    });
-    computePathsProcessor.pathTemplates.push({
-      docTypes: EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe']),
-      pathTemplate: '${moduleDoc.moduleFolder}/${name}',
-      outputPathTemplate: '${moduleDoc.moduleFolder}/${name}.json',
-    });
-  })
+          computePathsProcessor.pathTemplates.push({
+            docTypes: ['package'],
+            getPath: function computeModulePath(doc) {
+              doc.moduleFolder = `${API_SEGMENT}/${doc.id.replace(/\/index$/, '')}`;
+              return doc.moduleFolder;
+            },
+            outputPathTemplate: '${moduleFolder}.json'
+          });
+          computePathsProcessor.pathTemplates.push({
+            docTypes: EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe']),
+            pathTemplate: '${moduleDoc.moduleFolder}/${name}',
+            outputPathTemplate: '${moduleDoc.moduleFolder}/${name}.json',
+          });
+        })
 
-  .config(function(templateFinder) {
-    // Where to find the templates for the API doc rendering
-    templateFinder.templateFolders.unshift(API_TEMPLATES_PATH);
-  })
+        .config(function(templateFinder) {
+          // Where to find the templates for the API doc rendering
+          templateFinder.templateFolders.unshift(API_TEMPLATES_PATH);
+        })
 
 
-  .config(function(convertToJsonProcessor, postProcessHtml, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES, autoLinkCode) {
-    convertToJsonProcessor.docTypes = convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
-    postProcessHtml.docTypes = convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
-    autoLinkCode.docTypes = API_DOC_TYPES;
-    autoLinkCode.codeElements = ['code', 'code-example', 'code-pane'];
-  });
+        .config(function(
+            convertToJsonProcessor, postProcessHtml, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES,
+            autoLinkCode) {
+          convertToJsonProcessor.docTypes =
+              convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
+          postProcessHtml.docTypes =
+              convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
+          autoLinkCode.docTypes = API_DOC_TYPES;
+          autoLinkCode.codeElements = ['code', 'code-example', 'code-pane'];
+        });
 
 
 function addMinLengthRules(checkContentRules) {
diff --git a/docs/PUBLIC_API.md b/docs/PUBLIC_API.md
index cb1e2e94a2..40d1d08227 100644
--- a/docs/PUBLIC_API.md
+++ b/docs/PUBLIC_API.md
@@ -37,7 +37,7 @@ We explicitly don't consider the following to be our public API surface:
 
 - any file/import paths within our package except for the `/`, `/testing` and `/bundles/*` and other documented package entry-points.
 - constructors of injectable classes (services and directives) - please use DI to obtain instances of these classes
-- any class members or symbols marked as `private`, or prefixed with underscore (`_`), [barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵ`), and  [greek delta](https://en.wikipedia.org/wiki/Delta_(letter)) (`Δ`).
+- any class members or symbols marked as `private`, or prefixed with underscore (`_`), [barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵ`), and  double barred latin o (`ɵɵ`).
 - extending any of our classes unless the support for this is specifically documented in the API docs
 - the contents and API surface of the code generated by Angular's compiler (with one notable exception: the existence and name of `NgModuleFactory` instances exported from generated code is guaranteed)
 
diff --git a/integration/ngcc/test.sh b/integration/ngcc/test.sh
index 58a0c5d964..5374cc70fe 100755
--- a/integration/ngcc/test.sh
+++ b/integration/ngcc/test.sh
@@ -40,25 +40,25 @@ if [[ $? != 0 ]]; then exit 1; fi
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it compile @angular/core/ApplicationModule correctly?
-  grep "ApplicationModule.ngModuleDef = ΔdefineNgModule" node_modules/@angular/core/fesm2015/core.js
+  grep "ApplicationModule.ngModuleDef = ɵɵdefineNgModule" node_modules/@angular/core/fesm2015/core.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ΔdefineNgModule" node_modules/@angular/core/fesm5/core.js
+  grep "ApplicationModule.ngModuleDef = ɵɵdefineNgModule" node_modules/@angular/core/fesm5/core.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ΔdefineNgModule" node_modules/@angular/core/esm2015/src/application_module.js
+  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵɵdefineNgModule" node_modules/@angular/core/esm2015/src/application_module.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ΔdefineNgModule" node_modules/@angular/core/esm5/src/application_module.js
+  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵɵdefineNgModule" node_modules/@angular/core/esm5/src/application_module.js
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it transform @angular/core typing files correctly?
   grep "import [*] as ɵngcc0 from './src/r3_symbols';" node_modules/@angular/core/core.d.ts
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "static ngInjectorDef: ɵngcc0.ΔInjectorDef<ApplicationModule>;" node_modules/@angular/core/core.d.ts
+  grep "static ngInjectorDef: ɵngcc0.ɵɵInjectorDef<ApplicationModule>;" node_modules/@angular/core/core.d.ts
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it generate a base factory call for synthesized constructors correctly?
-  grep "const ɵMatTable_BaseFactory = ɵngcc0.ΔgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table.js
+  grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "const ɵMatTable_BaseFactory = ɵngcc0.ΔgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table.es5.js
+  grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table.es5.js
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Can it be safely run again (as a noop)?
diff --git a/modules/benchmarks/src/tree/render3_function/index.ts b/modules/benchmarks/src/tree/render3_function/index.ts
index 7a1fa89d79..e724141a89 100644
--- a/modules/benchmarks/src/tree/render3_function/index.ts
+++ b/modules/benchmarks/src/tree/render3_function/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵRenderFlags, ɵrenderComponent as renderComponent, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdefineComponent, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δselect, ΔstyleProp, Δstyling, Δtext, ΔtextBinding} from '@angular/core';
+import {ɵRenderFlags, ɵrenderComponent as renderComponent, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdefineComponent, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵselect, ɵɵstyleProp, ɵɵstyling, ɵɵtext, ɵɵtextBinding} from '@angular/core';
 
 import {bindAction, profile} from '../../util';
 import {createDom, destroyDom, detectChanges} from '../render3/tree';
@@ -18,7 +18,7 @@ export class TreeFunction {
   data: TreeNode = emptyTree;
 
   /** @nocollapse */
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     type: TreeFunction,
     selectors: [['tree']],
     consts: 5,
@@ -35,41 +35,41 @@ export class TreeFunction {
 const c1 = ['background-color'];
 export function TreeTpl(rf: ɵRenderFlags, ctx: TreeNode) {
   if (rf & ɵRenderFlags.Create) {
-    ΔelementStart(0, 'tree');
+    ɵɵelementStart(0, 'tree');
     {
-      ΔelementStart(1, 'span');
-      Δstyling(null, c1);
-      { Δtext(2); }
-      ΔelementEnd();
-      Δcontainer(3);
-      Δcontainer(4);
+      ɵɵelementStart(1, 'span');
+      ɵɵstyling(null, c1);
+      { ɵɵtext(2); }
+      ɵɵelementEnd();
+      ɵɵcontainer(3);
+      ɵɵcontainer(4);
     }
-    ΔelementEnd();
+    ɵɵelementEnd();
   }
   if (rf & ɵRenderFlags.Update) {
-    Δselect(1);
-    ΔstyleProp(0, ctx.depth % 2 ? '' : 'grey');
-    Δstyling();
-    Δselect(2);
-    ΔtextBinding(2, Δinterpolation1(' ', ctx.value, ' '));
-    ΔcontainerRefreshStart(3);
+    ɵɵselect(1);
+    ɵɵstyleProp(0, ctx.depth % 2 ? '' : 'grey');
+    ɵɵstyling();
+    ɵɵselect(2);
+    ɵɵtextBinding(2, ɵɵinterpolation1(' ', ctx.value, ' '));
+    ɵɵcontainerRefreshStart(3);
     {
       if (ctx.left != null) {
-        let rf0 = ΔembeddedViewStart(0, 5, 1);
+        let rf0 = ɵɵembeddedViewStart(0, 5, 1);
         { TreeTpl(rf0, ctx.left); }
-        ΔembeddedViewEnd();
+        ɵɵembeddedViewEnd();
       }
     }
-    ΔcontainerRefreshEnd();
-    ΔcontainerRefreshStart(4);
+    ɵɵcontainerRefreshEnd();
+    ɵɵcontainerRefreshStart(4);
     {
       if (ctx.right != null) {
-        let rf0 = ΔembeddedViewStart(0, 5, 1);
+        let rf0 = ɵɵembeddedViewStart(0, 5, 1);
         { TreeTpl(rf0, ctx.right); }
-        ΔembeddedViewEnd();
+        ɵɵembeddedViewEnd();
       }
     }
-    ΔcontainerRefreshEnd();
+    ɵɵcontainerRefreshEnd();
   }
 }
 
diff --git a/packages/common/src/directives/ng_class.ts b/packages/common/src/directives/ng_class.ts
index 76e3c8a8cc..43fe9d5551 100644
--- a/packages/common/src/directives/ng_class.ts
+++ b/packages/common/src/directives/ng_class.ts
@@ -5,7 +5,7 @@
  * 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 {Directive, DoCheck, Input, ɵRenderFlags, ΔclassMap, ΔdefineDirective, Δstyling, ΔstylingApply} from '@angular/core';
+import {Directive, DoCheck, Input, ɵRenderFlags, ɵɵclassMap, ɵɵdefineDirective, ɵɵstyling, ɵɵstylingApply} from '@angular/core';
 
 import {NgClassImpl, NgClassImplProvider} from './ng_class_impl';
 
@@ -29,17 +29,17 @@ export const ngClassDirectiveDef__PRE_R3__ = undefined;
 // used when the VE is not present (note the directive will
 // never be instantiated normally because it is apart of a
 // base class)
-export const ngClassDirectiveDef__POST_R3__ = ΔdefineDirective({
+export const ngClassDirectiveDef__POST_R3__ = ɵɵdefineDirective({
   type: function() {} as any,
   selectors: null as any,
   factory: () => {},
   hostBindings: function(rf: ɵRenderFlags, ctx: any, elIndex: number) {
     if (rf & ɵRenderFlags.Create) {
-      Δstyling();
+      ɵɵstyling();
     }
     if (rf & ɵRenderFlags.Update) {
-      ΔclassMap(ctx.getValue());
-      ΔstylingApply();
+      ɵɵclassMap(ctx.getValue());
+      ɵɵstylingApply();
     }
   }
 });
diff --git a/packages/common/src/directives/ng_style.ts b/packages/common/src/directives/ng_style.ts
index 67f30efccf..95f0dc7540 100644
--- a/packages/common/src/directives/ng_style.ts
+++ b/packages/common/src/directives/ng_style.ts
@@ -5,7 +5,7 @@
  * 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 {Directive, DoCheck, Input, ɵRenderFlags, ΔdefineDirective, ΔstyleMap, Δstyling, ΔstylingApply} from '@angular/core';
+import {Directive, DoCheck, Input, ɵRenderFlags, ɵɵdefineDirective, ɵɵstyleMap, ɵɵstyling, ɵɵstylingApply} from '@angular/core';
 
 import {NgStyleImpl, NgStyleImplProvider} from './ng_style_impl';
 
@@ -29,17 +29,17 @@ export const ngStyleDirectiveDef__PRE_R3__ = undefined;
 // used when the VE is not present (note the directive will
 // never be instantiated normally because it is apart of a
 // base class)
-export const ngStyleDirectiveDef__POST_R3__ = ΔdefineDirective({
+export const ngStyleDirectiveDef__POST_R3__ = ɵɵdefineDirective({
   type: function() {} as any,
   selectors: null as any,
   factory: () => {},
   hostBindings: function(rf: ɵRenderFlags, ctx: any, elIndex: number) {
     if (rf & ɵRenderFlags.Create) {
-      Δstyling();
+      ɵɵstyling();
     }
     if (rf & ɵRenderFlags.Update) {
-      ΔstyleMap(ctx.getValue());
-      ΔstylingApply();
+      ɵɵstyleMap(ctx.getValue());
+      ɵɵstylingApply();
     }
   }
 });
diff --git a/packages/common/src/viewport_scroller.ts b/packages/common/src/viewport_scroller.ts
index 2ee49bee34..fad2a4e3af 100644
--- a/packages/common/src/viewport_scroller.ts
+++ b/packages/common/src/viewport_scroller.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ErrorHandler, ΔdefineInjectable, Δinject} from '@angular/core';
+import {ErrorHandler, ɵɵdefineInjectable, ɵɵinject} from '@angular/core';
 
 import {DOCUMENT} from './dom_tokens';
 
@@ -21,9 +21,9 @@ export abstract class ViewportScroller {
   // De-sugared tree-shakable injection
   // See #23917
   /** @nocollapse */
-  static ngInjectableDef = ΔdefineInjectable({
+  static ngInjectableDef = ɵɵdefineInjectable({
     providedIn: 'root',
-    factory: () => new BrowserViewportScroller(Δinject(DOCUMENT), window, Δinject(ErrorHandler))
+    factory: () => new BrowserViewportScroller(ɵɵinject(DOCUMENT), window, ɵɵinject(ErrorHandler))
   });
 
   /**
diff --git a/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts
index 3fea099f44..5f27b1a847 100644
--- a/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts
@@ -140,7 +140,7 @@ describe('DtsRenderer', () => {
     const typingsFile = result.find(f => f.path === '/typings/file.d.ts') !;
     expect(typingsFile.contents)
         .toContain(
-            'foo(x: number): number;\n    static ngDirectiveDef: ɵngcc0.ΔDirectiveDefWithMeta');
+            'foo(x: number): number;\n    static ngDirectiveDef: ɵngcc0.ɵɵDirectiveDefWithMeta');
   });
 
   it('should render imports into typings files', () => {
diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index 83ff27c7ac..58ee02eecd 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -164,11 +164,11 @@ describe('Renderer', () => {
       const addDefinitionsSpy = testFormatter.addDefinitions as jasmine.Spy;
       expect(addDefinitionsSpy.calls.first().args[2])
           .toEqual(
-              `A.ngComponentDef = ɵngcc0.ΔdefineComponent({ type: A, selectors: [["a"]], factory: function A_Factory(t) { return new (t || A)(); }, consts: 1, vars: 1, template: function A_Template(rf, ctx) { if (rf & 1) {
-        ɵngcc0.Δtext(0);
+              `A.ngComponentDef = ɵngcc0.ɵɵdefineComponent({ type: A, selectors: [["a"]], factory: function A_Factory(t) { return new (t || A)(); }, consts: 1, vars: 1, template: function A_Template(rf, ctx) { if (rf & 1) {
+        ɵngcc0.ɵɵtext(0);
     } if (rf & 2) {
-        ɵngcc0.Δselect(0);
-        ɵngcc0.ΔtextBinding(0, ɵngcc0.Δinterpolation1("", ctx.person.name, ""));
+        ɵngcc0.ɵɵselect(0);
+        ɵngcc0.ɵɵtextBinding(0, ɵngcc0.ɵɵinterpolation1("", ctx.person.name, ""));
     } }, encapsulation: 2 });
 /*@__PURE__*/ ɵngcc0.ɵsetClassMetadata(A, [{
         type: Component,
@@ -205,7 +205,7 @@ describe('Renderer', () => {
            }));
            expect(addDefinitionsSpy.calls.first().args[2])
                .toEqual(
-                   `A.ngDirectiveDef = ɵngcc0.ΔdefineDirective({ type: A, selectors: [["", "a", ""]], factory: function A_Factory(t) { return new (t || A)(); } });
+                   `A.ngDirectiveDef = ɵngcc0.ɵɵdefineDirective({ type: A, selectors: [["", "a", ""]], factory: function A_Factory(t) { return new (t || A)(); } });
 /*@__PURE__*/ ɵngcc0.ɵsetClassMetadata(A, [{
         type: Directive,
         args: [{ selector: '[a]' }]
diff --git a/packages/compiler-cli/src/metadata/bundler.ts b/packages/compiler-cli/src/metadata/bundler.ts
index cae740edb6..50be5c11e1 100644
--- a/packages/compiler-cli/src/metadata/bundler.ts
+++ b/packages/compiler-cli/src/metadata/bundler.ts
@@ -423,7 +423,7 @@ export class MetadataBundler {
         result[key] = this.convertFunction(moduleName, value);
       } else if (isMetadataSymbolicCallExpression(value)) {
         // Class members can also contain static members that call a function with module
-        // references. e.g. "static ngInjectableDef = ΔdefineInjectable(..)". We also need to
+        // references. e.g. "static ngInjectableDef = ɵɵdefineInjectable(..)". We also need to
         // convert these module references because otherwise these resolve to non-existent files.
         result[key] = this.convertValue(moduleName, value);
       } else {
diff --git a/packages/compiler-cli/src/ngtsc/imports/src/core.ts b/packages/compiler-cli/src/ngtsc/imports/src/core.ts
index da60c29482..457a327347 100644
--- a/packages/compiler-cli/src/ngtsc/imports/src/core.ts
+++ b/packages/compiler-cli/src/ngtsc/imports/src/core.ts
@@ -48,15 +48,15 @@ export class NoopImportRewriter implements ImportRewriter {
  * which they're exported from r3_symbols.
  */
 const CORE_SUPPORTED_SYMBOLS = new Map<string, string>([
-  ['ΔdefineInjectable', 'ΔdefineInjectable'],
-  ['ΔdefineInjector', 'ΔdefineInjector'],
-  ['ΔdefineNgModule', 'ΔdefineNgModule'],
-  ['ΔsetNgModuleScope', 'ΔsetNgModuleScope'],
-  ['Δinject', 'Δinject'],
+  ['ɵɵdefineInjectable', 'ɵɵdefineInjectable'],
+  ['ɵɵdefineInjector', 'ɵɵdefineInjector'],
+  ['ɵɵdefineNgModule', 'ɵɵdefineNgModule'],
+  ['ɵɵsetNgModuleScope', 'ɵɵsetNgModuleScope'],
+  ['ɵɵinject', 'ɵɵinject'],
   ['ɵsetClassMetadata', 'setClassMetadata'],
-  ['ΔInjectableDef', 'ΔInjectableDef'],
-  ['ΔInjectorDef', 'ΔInjectorDef'],
-  ['ΔNgModuleDefWithMeta', 'ΔNgModuleDefWithMeta'],
+  ['ɵɵInjectableDef', 'ɵɵInjectableDef'],
+  ['ɵɵInjectorDef', 'ɵɵInjectorDef'],
+  ['ɵɵNgModuleDefWithMeta', 'ɵɵNgModuleDefWithMeta'],
   ['ɵNgModuleFactory', 'NgModuleFactory'],
 ]);
 
diff --git a/packages/compiler-cli/test/compliance/mock_compile.ts b/packages/compiler-cli/test/compliance/mock_compile.ts
index a980af8055..ec39a099c8 100644
--- a/packages/compiler-cli/test/compliance/mock_compile.ts
+++ b/packages/compiler-cli/test/compliance/mock_compile.ts
@@ -14,7 +14,7 @@ import * as ts from 'typescript';
 import {NgtscProgram} from '../../src/ngtsc/program';
 
 
-const IDENTIFIER = /[A-Za-z_$ɵΔ][A-Za-z0-9_$]*/;
+const IDENTIFIER = /[A-Za-z_$ɵ][A-Za-z0-9_$]*/;
 const OPERATOR =
     /!|\?|%|\*|\/|\^|&&?|\|\|?|\(|\)|\{|\}|\[|\]|:|;|<=?|>=?|={1,3}|!==?|=>|\+\+?|--?|@|,|\.|\.\.\./;
 const STRING = /'[^']*'|"[^"]*"|`[\s\S]*?`/;
diff --git a/packages/compiler-cli/test/compliance/mock_compiler_spec.ts b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
index 2d6d2cdcbb..94d69b2780 100644
--- a/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
@@ -140,7 +140,7 @@ describe('mock_compiler', () => {
     expectEmit(
         result.source, `
     // TODO: this comment should not be taken into account
-    $r3$.Δtext(0, "Hello!");
+    $r3$.ɵɵtext(0, "Hello!");
     // TODO: this comment should not be taken into account
     `,
         'todo comments should be ignored');
diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 53811b67eb..b67fa0b21c 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -53,16 +53,16 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $c1$);
-            $r3$.ΔnamespaceSVG();
-            $r3$.ΔelementStart(1, "svg");
-            $r3$.Δelement(2, "circle", $c2$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔnamespaceHTML();
-            $r3$.ΔelementStart(3, "p");
-            $r3$.Δtext(4, "test");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $c1$);
+            $r3$.ɵɵnamespaceSVG();
+            $r3$.ɵɵelementStart(1, "svg");
+            $r3$.ɵɵelement(2, "circle", $c2$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵnamespaceHTML();
+            $r3$.ɵɵelementStart(3, "p");
+            $r3$.ɵɵtext(4, "test");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -102,16 +102,16 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $c1$);
-            $r3$.ΔnamespaceMathML();
-            $r3$.ΔelementStart(1, "math");
-            $r3$.Δelement(2, "infinity");
-            $r3$.ΔelementEnd();
-            $r3$.ΔnamespaceHTML();
-            $r3$.ΔelementStart(3, "p");
-            $r3$.Δtext(4, "test");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $c1$);
+            $r3$.ɵɵnamespaceMathML();
+            $r3$.ɵɵelementStart(1, "math");
+            $r3$.ɵɵelement(2, "infinity");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵnamespaceHTML();
+            $r3$.ɵɵelementStart(3, "p");
+            $r3$.ɵɵtext(4, "test");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -150,13 +150,13 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $c1$);
-            $r3$.Δtext(1, "Hello ");
-            $r3$.ΔelementStart(2, "b");
-            $r3$.Δtext(3, "World");
-            $r3$.ΔelementEnd();
-            $r3$.Δtext(4, "!");
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $c1$);
+            $r3$.ɵɵtext(1, "Hello ");
+            $r3$.ɵɵelementStart(2, "b");
+            $r3$.ɵɵtext(3, "World");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵtext(4, "!");
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -198,13 +198,13 @@ describe('compiler compliance', () => {
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div", $e0_attrs$);
-              $r3$.Δtext(1, "Hello ");
-              $r3$.ΔelementStart(2, "b");
-              $r3$.Δtext(3, "World");
-              $r3$.ΔelementEnd();
-              $r3$.Δtext(4, "!");
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div", $e0_attrs$);
+              $r3$.ɵɵtext(1, "Hello ");
+              $r3$.ɵɵelementStart(2, "b");
+              $r3$.ɵɵtext(3, "World");
+              $r3$.ɵɵelementEnd();
+              $r3$.ɵɵtext(4, "!");
+              $r3$.ɵɵelementEnd();
             }
           }
         `;
@@ -239,12 +239,12 @@ describe('compiler compliance', () => {
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              i0.ΔelementContainerStart(0);
-              i0.ΔelementStart(1, "span");
-              i0.Δtext(2, "in a ");
-              i0.ΔelementEnd();
-              i0.Δtext(3, "container");
-              i0.ΔelementContainerEnd();
+              i0.ɵɵelementContainerStart(0);
+              i0.ɵɵelementStart(1, "span");
+              i0.ɵɵtext(2, "in a ");
+              i0.ɵɵelementEnd();
+              i0.ɵɵtext(3, "container");
+              i0.ɵɵelementContainerEnd();
             }
           }
         `;
@@ -276,8 +276,8 @@ describe('compiler compliance', () => {
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              i0.ΔelementContainerStart(0);
-              i0.ΔelementContainerEnd();
+              i0.ɵɵelementContainerStart(0);
+              i0.ɵɵelementContainerEnd();
             }
           }
         `;
@@ -313,11 +313,11 @@ describe('compiler compliance', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δelement(0, "div", $e0_attrs$);
+            $r3$.ɵɵelement(0, "div", $e0_attrs$);
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δproperty("id", ctx.id);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵproperty("id", ctx.id);
           }
         }
       `;
@@ -359,7 +359,7 @@ describe('compiler compliance', () => {
       // generating those.
       //
       // For example:
-      // `$r3$.Δproperty("ternary", (ctx.cond ? $r3$.ΔpureFunction1(8, $c0$, ctx.a): $c1$));`
+      // `$r3$.ɵɵproperty("ternary", (ctx.cond ? $r3$.ɵɵpureFunction1(8, $c0$, ctx.a): $c1$));`
       ///////////////
 
       const $e0_attrs$ = [];
@@ -368,15 +368,15 @@ describe('compiler compliance', () => {
       const template = `
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δelement(0, "div", $e0_attrs$);
-            $r3$.Δpipe(1,"pipe");
+            $r3$.ɵɵelement(0, "div", $e0_attrs$);
+            $r3$.ɵɵpipe(1,"pipe");
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δproperty("ternary", ctx.cond ? $r3$.ΔpureFunction1(8, $c0$, ctx.a): $c1$);
-            $r3$.Δproperty("pipe", $r3$.ΔpipeBind3(1, 4, ctx.value, 1, 2));
-            $r3$.Δproperty("and", ctx.cond && $r3$.ΔpureFunction1(10, $c0$, ctx.b));
-            $r3$.Δproperty("or", ctx.cond || $r3$.ΔpureFunction1(12, $c0$, ctx.c));
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵproperty("ternary", ctx.cond ? $r3$.ɵɵpureFunction1(8, $c0$, ctx.a): $c1$);
+            $r3$.ɵɵproperty("pipe", $r3$.ɵɵpipeBind3(1, 4, ctx.value, 1, 2));
+            $r3$.ɵɵproperty("and", ctx.cond && $r3$.ɵɵpureFunction1(10, $c0$, ctx.b));
+            $r3$.ɵɵproperty("or", ctx.cond || $r3$.ɵɵpureFunction1(12, $c0$, ctx.c));
           }
         }
       `;
@@ -441,20 +441,20 @@ describe('compiler compliance', () => {
         …
         hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            $r3$.ΔallocHostVars(14);
+            $r3$.ɵɵallocHostVars(14);
           }
           if (rf & 2) {
-            $r3$.ΔcomponentHostSyntheticProperty(elIndex, "@expansionHeight",
-              $r3$.Δbind(
-                $r3$.ΔpureFunction2(5, $_c1$, ctx.getExpandedState(),
-                  $r3$.ΔpureFunction2(2, $_c0$, ctx.collapsedHeight, ctx.expandedHeight)
+            $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@expansionHeight",
+              $r3$.ɵɵbind(
+                $r3$.ɵɵpureFunction2(5, $_c1$, ctx.getExpandedState(),
+                  $r3$.ɵɵpureFunction2(2, $_c0$, ctx.collapsedHeight, ctx.expandedHeight)
                 )
               ), null, true
             );
-            $r3$.ΔcomponentHostSyntheticProperty(elIndex, "@expansionWidth",
-              $r3$.Δbind(
-                $r3$.ΔpureFunction2(11, $_c1$, ctx.getExpandedState(),
-                  $r3$.ΔpureFunction2(8, $_c2$, ctx.collapsedWidth, ctx.expandedWidth)
+            $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@expansionWidth",
+              $r3$.ɵɵbind(
+                $r3$.ɵɵpureFunction2(11, $_c1$, ctx.getExpandedState(),
+                  $r3$.ɵɵpureFunction2(8, $_c2$, ctx.collapsedWidth, ctx.expandedWidth)
                 )
               ), null, true
             );
@@ -493,7 +493,7 @@ describe('compiler compliance', () => {
         const $e0_classBindings$ = ["error"];
         const $e0_styleBindings$ = ["background-color"];
         …
-        MyComponent.ngComponentDef = i0.ΔdefineComponent({type:MyComponent,selectors:[["my-component"]],
+        MyComponent.ngComponentDef = i0.ɵɵdefineComponent({type:MyComponent,selectors:[["my-component"]],
             factory: function MyComponent_Factory(t){
               return new (t || MyComponent)();
             },
@@ -501,15 +501,15 @@ describe('compiler compliance', () => {
             vars: 0,
             template: function MyComponent_Template(rf,ctx){
               if (rf & 1) {
-                $r3$.ΔelementStart(0, "div");
-                $r3$.Δstyling($e0_classBindings$, $e0_styleBindings$);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵelementStart(0, "div");
+                $r3$.ɵɵstyling($e0_classBindings$, $e0_styleBindings$);
+                $r3$.ɵɵelementEnd();
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.ΔstyleProp(0, ctx.color);
-                $r3$.ΔclassProp(0, ctx.error);
-                $r3$.ΔstylingApply();
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵstyleProp(0, ctx.color);
+                $r3$.ɵɵclassProp(0, ctx.error);
+                $r3$.ɵɵstylingApply();
               }
             },
             encapsulation: 2
@@ -549,7 +549,7 @@ describe('compiler compliance', () => {
 
       // ChildComponent definition should be:
       const ChildComponentDefinition = `
-        ChildComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        ChildComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: ChildComponent,
           selectors: [["child"]],
           factory: function ChildComponent_Factory(t) { return new (t || ChildComponent)(); },
@@ -557,7 +557,7 @@ describe('compiler compliance', () => {
           vars: 0,
           template:  function ChildComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δtext(0, "child-view");
+              $r3$.ɵɵtext(0, "child-view");
             }
           },
           encapsulation: 2
@@ -565,7 +565,7 @@ describe('compiler compliance', () => {
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        SomeDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: SomeDirective,
           selectors: [["", "some-directive", ""]],
           factory: function SomeDirective_Factory(t) {return new (t || SomeDirective)(); }
@@ -576,7 +576,7 @@ describe('compiler compliance', () => {
       const MyComponentDefinition = `
         const $c1$ = ["some-directive", ""];
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -584,8 +584,8 @@ describe('compiler compliance', () => {
           vars: 0,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δelement(0, "child", $c1$);
-              $r3$.Δtext(1, "!");
+              $r3$.ɵɵelement(0, "child", $c1$);
+              $r3$.ɵɵtext(1, "!");
             }
           },
           directives: [ChildComponent, SomeDirective],
@@ -622,7 +622,7 @@ describe('compiler compliance', () => {
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        SomeDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: SomeDirective,
           selectors: [["div", "some-directive", "", 8, "foo", 3, "title", "", 9, "baz"]],
           factory: function SomeDirective_Factory(t) {return new (t || SomeDirective)(); }
@@ -631,7 +631,7 @@ describe('compiler compliance', () => {
 
       // OtherDirective definition should be:
       const OtherDirectiveDefinition = `
-        OtherDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
+        OtherDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: OtherDirective,
           selectors: [["", 5, "span", "title", "", 9, "baz"]],
           factory: function OtherDirective_Factory(t) {return new (t || OtherDirective)(); }
@@ -663,7 +663,7 @@ describe('compiler compliance', () => {
       // EmptyOutletComponent definition should be:
       const EmptyOutletComponentDefinition = `
         …
-        EmptyOutletComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        EmptyOutletComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: EmptyOutletComponent,
           selectors: [["ng-component"]],
           factory: function EmptyOutletComponent_Factory(t) { return new (t || EmptyOutletComponent)(); },
@@ -671,7 +671,7 @@ describe('compiler compliance', () => {
           vars: 0,
           template: function EmptyOutletComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δelement(0, "router-outlet");
+              $r3$.ɵɵelement(0, "router-outlet");
             }
           },
           encapsulation: 2
@@ -746,13 +746,13 @@ describe('compiler compliance', () => {
 
          const MyComponentDefinition = `
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) {
              return new (t || MyComponent)(
-                $r3$.ΔdirectiveInject($i$.ElementRef), $r3$.ΔdirectiveInject($i$.ViewContainerRef),
-                $r3$.ΔdirectiveInject($i$.ChangeDetectorRef));
+                $r3$.ɵɵdirectiveInject($i$.ElementRef), $r3$.ɵɵdirectiveInject($i$.ViewContainerRef),
+                $r3$.ɵɵdirectiveInject($i$.ChangeDetectorRef));
           },
           consts: 0,
           vars: 0,
@@ -792,29 +792,29 @@ describe('compiler compliance', () => {
       };
 
       const IfDirectiveDefinition = `
-        IfDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
+        IfDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: IfDirective,
           selectors: [["", "if", ""]],
-          factory: function IfDirective_Factory(t) { return new (t || IfDirective)($r3$.ΔdirectiveInject($i$.TemplateRef)); }
+          factory: function IfDirective_Factory(t) { return new (t || IfDirective)($r3$.ɵɵdirectiveInject($i$.TemplateRef)); }
         });`;
       const MyComponentDefinition = `
         const $c1$ = ["foo", ""];
         const $c2$ = [${AttributeMarker.Template}, "if"];
         function MyComponent_li_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "li");
-            $r3$.Δtext(1);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "li");
+            $r3$.ɵɵtext(1);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            const $myComp$ = $r3$.ΔnextContext();
-            const $foo$ = $r3$.Δreference(1);
-            $r3$.Δselect(1);
-            $r3$.ΔtextBinding(1, $r3$.Δinterpolation2("", $myComp$.salutation, " ", $foo$, ""));
+            const $myComp$ = $r3$.ɵɵnextContext();
+            const $foo$ = $r3$.ɵɵreference(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2("", $myComp$.salutation, " ", $foo$, ""));
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -822,9 +822,9 @@ describe('compiler compliance', () => {
           vars: 0,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "ul", null, $c1$);
-              $r3$.Δtemplate(2, MyComponent_li_2_Template, 2, 2, "li", $c2$);
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "ul", null, $c1$);
+              $r3$.ɵɵtemplate(2, MyComponent_li_2_Template, 2, 2, "li", $c2$);
+              $r3$.ɵɵelementEnd();
             }
           },
           directives:[IfDirective],
@@ -877,7 +877,7 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = [${AttributeMarker.Bindings}, "names"];
           const $e0_ff$ = function ($v$) { return ["Nancy", $v$]; };
           …
-          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -885,11 +885,11 @@ describe('compiler compliance', () => {
             vars: 3,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δelement(0, "my-comp", $e0_attrs$);
+                $r3$.ɵɵelement(0, "my-comp", $e0_attrs$);
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.Δproperty("names", $r3$.ΔpureFunction1(1, $e0_ff$, ctx.customName));
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵproperty("names", $r3$.ɵɵpureFunction1(1, $e0_ff$, ctx.customName));
               }
             },
            directives: [MyComp],
@@ -960,7 +960,7 @@ describe('compiler compliance', () => {
             return ["start-", $v0$, $v1$, $v2$, $v3$, $v4$, "-middle-", $v5$, $v6$, $v7$, $v8$, "-end"];
           }
           …
-          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -968,12 +968,12 @@ describe('compiler compliance', () => {
             vars: 11,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δelement(0, "my-comp", $e0_attr$);
+                $r3$.ɵɵelement(0, "my-comp", $e0_attr$);
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.Δproperty("names",
-                    $r3$.ΔpureFunctionV(1, $e0_ff$, [ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8]));
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵproperty("names",
+                    $r3$.ɵɵpureFunctionV(1, $e0_ff$, [ctx.n0, ctx.n1, ctx.n2, ctx.n3, ctx.n4, ctx.n5, ctx.n6, ctx.n7, ctx.n8]));
               }
             },
             directives: [MyComp],
@@ -1024,7 +1024,7 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = [${AttributeMarker.Bindings}, "config"];
           const $e0_ff$ = function ($v$) { return {"duration": 500, animation: $v$}; };
           …
-          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -1032,11 +1032,11 @@ describe('compiler compliance', () => {
             vars: 3,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δelement(0, "object-comp", $e0_attrs$);
+                $r3$.ɵɵelement(0, "object-comp", $e0_attrs$);
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.Δproperty("config", $r3$.ΔpureFunction1(1, $e0_ff$, ctx.name));
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵproperty("config", $r3$.ɵɵpureFunction1(1, $e0_ff$, ctx.name));
               }
             },
             directives: [ObjectComp],
@@ -1093,7 +1093,7 @@ describe('compiler compliance', () => {
           const $e0_ff_1$ = function ($v$) { return [$c0$, $v$]; };
           const $e0_ff_2$ = function ($v1$, $v2$) { return {animation: $v1$, actions: $v2$}; };
           …
-          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -1101,13 +1101,13 @@ describe('compiler compliance', () => {
             vars: 8,
             template:  function MyApp_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δelement(0, "nested-comp", $e0_attrs$);
+                $r3$.ɵɵelement(0, "nested-comp", $e0_attrs$);
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.Δproperty(
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵproperty(
                     "config",
-                    $r3$.ΔpureFunction2(5, $e0_ff_2$, ctx.name, $r3$.ΔpureFunction1(3, $e0_ff_1$, $r3$.ΔpureFunction1(1, $e0_ff$, ctx.duration))));
+                    $r3$.ɵɵpureFunction2(5, $e0_ff_2$, ctx.name, $r3$.ɵɵpureFunction1(3, $e0_ff_1$, $r3$.ɵɵpureFunction1(1, $e0_ff$, ctx.duration))));
               }
             },
             directives: [NestedComp],
@@ -1155,7 +1155,7 @@ describe('compiler compliance', () => {
         };
 
         const SimpleComponentDefinition = `
-          SimpleComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          SimpleComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: SimpleComponent,
             selectors: [["simple"]],
             factory: function SimpleComponent_Factory(t) { return new (t || SimpleComponent)(); },
@@ -1164,10 +1164,10 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function SimpleComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔprojectionDef();
-                $r3$.ΔelementStart(0, "div");
-                $r3$.Δprojection(1);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵprojectionDef();
+                $r3$.ɵɵelementStart(0, "div");
+                $r3$.ɵɵprojection(1);
+                $r3$.ɵɵelementEnd();
               }
             },
             encapsulation: 2
@@ -1178,7 +1178,7 @@ describe('compiler compliance', () => {
           const $c4$ = ["id","second"];
           const $c1$ = [[["span", "title", "tofirst"]], [["span", "title", "tosecond"]]];
           …
-          ComplexComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ComplexComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: ComplexComponent,
             selectors: [["complex"]],
             factory: function ComplexComponent_Factory(t) { return new (t || ComplexComponent)(); },
@@ -1187,13 +1187,13 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function ComplexComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔprojectionDef($c1$);
-                $r3$.ΔelementStart(0, "div", $c3$);
-                $r3$.Δprojection(1, 1);
-                $r3$.ΔelementEnd();
-                $r3$.ΔelementStart(2, "div", $c4$);
-                $r3$.Δprojection(3, 2);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵprojectionDef($c1$);
+                $r3$.ɵɵelementStart(0, "div", $c3$);
+                $r3$.ɵɵprojection(1, 1);
+                $r3$.ɵɵelementEnd();
+                $r3$.ɵɵelementStart(2, "div", $c4$);
+                $r3$.ɵɵprojection(3, 2);
+                $r3$.ɵɵelementEnd();
               }
             },
             encapsulation: 2
@@ -1240,38 +1240,38 @@ describe('compiler compliance', () => {
           const $_c1$ = ["id", "third", ${AttributeMarker.Template}, "ngIf"];
           const $_c2$ = ["id", "second"];
           function Cmp_div_0_Template(rf, ctx) { if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c2$);
-            $r3$.Δprojection(1, 1);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c2$);
+            $r3$.ɵɵprojection(1, 1);
+            $r3$.ɵɵelementEnd();
           } }
           const $_c3$ = ["id", "third"];
           function Cmp_div_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div", $_c3$);
-              $r3$.Δtext(1, " No ng-content, no instructions generated. ");
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div", $_c3$);
+              $r3$.ɵɵtext(1, " No ng-content, no instructions generated. ");
+              $r3$.ɵɵelementEnd();
             }
           }
           function Cmp_ng_template_2_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δtext(0, " '*' selector: ");
-              $r3$.Δprojection(1);
+              $r3$.ɵɵtext(0, " '*' selector: ");
+              $r3$.ɵɵprojection(1);
             }
           }
           const $_c4$ = [[["span", "title", "tofirst"]]];
           …
           template: function Cmp_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔprojectionDef($_c4$);
-              $r3$.Δtemplate(0, Cmp_div_0_Template, 2, 0, "div", $_c0$);
-              $r3$.Δtemplate(1, Cmp_div_1_Template, 2, 0, "div", $_c1$);
-              $r3$.Δtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
+              $r3$.ɵɵprojectionDef($_c4$);
+              $r3$.ɵɵtemplate(0, Cmp_div_0_Template, 2, 0, "div", $_c0$);
+              $r3$.ɵɵtemplate(1, Cmp_div_1_Template, 2, 0, "div", $_c1$);
+              $r3$.ɵɵtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.Δproperty("ngIf", ctx.visible);
-              $r3$.Δselect(1);
-              $r3$.Δproperty("ngIf", ctx.visible);
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵproperty("ngIf", ctx.visible);
+              $r3$.ɵɵselect(1);
+              $r3$.ɵɵproperty("ngIf", ctx.visible);
             }
           }
         `;
@@ -1312,19 +1312,19 @@ describe('compiler compliance', () => {
         const output = `
           function Cmp_ng_template_1_ng_template_1_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δprojection(0, 4);
+                $r3$.ɵɵprojection(0, 4);
             }
           }
           function Cmp_ng_template_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δprojection(0, 3);
-              $r3$.Δtemplate(1, Cmp_ng_template_1_ng_template_1_Template, 1, 0, "ng-template");
+              $r3$.ɵɵprojection(0, 3);
+              $r3$.ɵɵtemplate(1, Cmp_ng_template_1_ng_template_1_Template, 1, 0, "ng-template");
             }
           }
           function Cmp_ng_template_2_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δtext(0, " '*' selector in a template: ");
-              $r3$.Δprojection(1);
+              $r3$.ɵɵtext(0, " '*' selector in a template: ");
+              $r3$.ɵɵprojection(1);
             }
           }
           const $_c0$ = [[["", "id", "tomainbefore"]], [["", "id", "tomainafter"]], [["", "id", "totemplate"]], [["", "id", "tonestedtemplate"]]];
@@ -1332,11 +1332,11 @@ describe('compiler compliance', () => {
           …
           template: function Cmp_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔprojectionDef($_c2$);
-              $r3$.Δprojection(0, 1);
-              $r3$.Δtemplate(1, Cmp_ng_template_1_Template, 2, 0, "ng-template");
-              $r3$.Δtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
-              $r3$.Δprojection(3, 2);
+              $r3$.ɵɵprojectionDef($_c2$);
+              $r3$.ɵɵprojection(0, 1);
+              $r3$.ɵɵtemplate(1, Cmp_ng_template_1_Template, 2, 0, "ng-template");
+              $r3$.ɵɵtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
+              $r3$.ɵɵprojection(3, 2);
             }
           }
         `;
@@ -1376,7 +1376,7 @@ describe('compiler compliance', () => {
           const $_c1$ = ["[title]"];
           const $_c2$ = [5, ["", "title", ""]];
           …
-          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) {
@@ -1386,9 +1386,9 @@ describe('compiler compliance', () => {
             vars: 0,
             template: function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                    $r3$.ΔelementStart(0, "simple");
-                    $r3$.Δelement(1, "h1", $_c2$);
-                    $r3$.ΔelementEnd();
+                    $r3$.ɵɵelementStart(0, "simple");
+                    $r3$.ɵɵelement(1, "h1", $_c2$);
+                    $r3$.ɵɵelementEnd();
                 }
             },
             encapsulation: 2
@@ -1431,7 +1431,7 @@ describe('compiler compliance', () => {
           const $_c1$ = ["[title]"];
           const $_c2$ = [5, ["", "title", ""]];
           …
-          MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+          MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyApp,
             selectors: [["my-app"]],
             factory: function MyApp_Factory(t) {
@@ -1441,9 +1441,9 @@ describe('compiler compliance', () => {
             vars: 0,
             template: function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                    $r3$.ΔelementStart(0, "simple");
-                    $r3$.Δelement(1, "h1", $_c2$);
-                    $r3$.ΔelementEnd();
+                    $r3$.ɵɵelementStart(0, "simple");
+                    $r3$.ɵɵelement(1, "h1", $_c2$);
+                    $r3$.ɵɵelementEnd();
                 }
             },
             encapsulation: 2
@@ -1497,26 +1497,26 @@ describe('compiler compliance', () => {
         const ViewQueryComponentDefinition = `
           const $e0_attrs$ = ["someDir",""];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: ViewQueryComponent,
             selectors: [["view-query-component"]],
             factory: function ViewQueryComponent_Factory(t) { return new (t || ViewQueryComponent)(); },
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔviewQuery(SomeDirective, true, null);
-                $r3$.ΔviewQuery(SomeDirective, true, null);
+                $r3$.ɵɵviewQuery(SomeDirective, true, null);
+                $r3$.ɵɵviewQuery(SomeDirective, true, null);
               }
               if (rf & 2) {
                 var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDirs = $tmp$);
               }
             },
             consts: 1,
             vars: 0,
             template:  function ViewQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δelement(0, "div", $e0_attrs$);
+                $r3$.ɵɵelement(0, "div", $e0_attrs$);
               }
             },
             directives: function () { return [SomeDirective]; },
@@ -1557,17 +1557,17 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             …
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔviewQuery($e0_attrs$, true, null);
-                $r3$.ΔviewQuery($e1_attrs$, true, null);
+                $r3$.ɵɵviewQuery($e0_attrs$, true, null);
+                $r3$.ɵɵviewQuery($e1_attrs$, true, null);
               }
               if (rf & 2) {
                 var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRefs = $tmp$);
               }
             },
             …
@@ -1608,26 +1608,26 @@ describe('compiler compliance', () => {
           const $refs$ = ["foo"];
           const $e0_attrs$ = ["someDir",""];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: ViewQueryComponent,
             selectors: [["view-query-component"]],
             factory: function ViewQueryComponent_Factory(t) { return new (t || ViewQueryComponent)(); },
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔstaticViewQuery(SomeDirective, true, null);
-                $r3$.ΔviewQuery($refs$, true, null);
+                $r3$.ɵɵstaticViewQuery(SomeDirective, true, null);
+                $r3$.ɵɵviewQuery($refs$, true, null);
               }
               if (rf & 2) {
                 var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.foo = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.foo = $tmp$.first);
               }
             },
             consts: 1,
             vars: 0,
             template:  function ViewQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δelement(0, "div", $e0_attrs$);
+                $r3$.ɵɵelement(0, "div", $e0_attrs$);
               }
             },
             directives: function () { return [SomeDirective]; },
@@ -1673,21 +1673,21 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ViewQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ViewQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             …
             viewQuery: function ViewQueryComponent_Query(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔviewQuery($e0_attrs$, true, TemplateRef);
-                $r3$.ΔviewQuery(SomeDirective, true, ElementRef);
-                $r3$.ΔviewQuery($e1_attrs$, true, ElementRef);
-                $r3$.ΔviewQuery(SomeDirective, true, TemplateRef);
+                $r3$.ɵɵviewQuery($e0_attrs$, true, TemplateRef);
+                $r3$.ɵɵviewQuery(SomeDirective, true, ElementRef);
+                $r3$.ɵɵviewQuery($e1_attrs$, true, ElementRef);
+                $r3$.ɵɵviewQuery(SomeDirective, true, TemplateRef);
               }
               if (rf & 2) {
                 var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRef = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDir = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.myRefs = $tmp$);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.someDirs = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRefs = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDirs = $tmp$);
               }
             },
             …
@@ -1735,7 +1735,7 @@ describe('compiler compliance', () => {
         };
 
         const ContentQueryComponentDefinition = `
-          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: ContentQueryComponent,
             selectors: [["content-query-component"]],
             factory: function ContentQueryComponent_Factory(t) {
@@ -1743,13 +1743,13 @@ describe('compiler compliance', () => {
             },
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-              $r3$.ΔcontentQuery(dirIndex, SomeDirective, true, null);
-              $r3$.ΔcontentQuery(dirIndex, SomeDirective, false, null);
+              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, true, null);
+              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false, null);
               }
               if (rf & 2) {
               var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirList = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDirList = $tmp$);
               }
             },
             ngContentSelectors: _c0,
@@ -1757,10 +1757,10 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function ContentQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔprojectionDef();
-                $r3$.ΔelementStart(0, "div");
-                $r3$.Δprojection(1);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵprojectionDef();
+                $r3$.ɵɵelementStart(0, "div");
+                $r3$.ɵɵprojection(1);
+                $r3$.ɵɵelementEnd();
               }
             },
             encapsulation: 2
@@ -1799,17 +1799,17 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             …
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-              $r3$.ΔcontentQuery(dirIndex, $e0_attrs$, true, null);
-              $r3$.ΔcontentQuery(dirIndex, $e1_attrs$, false, null);
+              $r3$.ɵɵcontentQuery(dirIndex, $e0_attrs$, true, null);
+              $r3$.ɵɵcontentQuery(dirIndex, $e1_attrs$, false, null);
               }
               if (rf & 2) {
               var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRefs = $tmp$);
               }
             },
             …
@@ -1857,7 +1857,7 @@ describe('compiler compliance', () => {
         };
 
         const ContentQueryComponentDefinition = `
-          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: ContentQueryComponent,
             selectors: [["content-query-component"]],
             factory: function ContentQueryComponent_Factory(t) {
@@ -1865,13 +1865,13 @@ describe('compiler compliance', () => {
             },
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-              $r3$.ΔstaticContentQuery(dirIndex, SomeDirective, true, null);
-              $r3$.ΔcontentQuery(dirIndex, $ref0$, true, null);
+              $r3$.ɵɵstaticContentQuery(dirIndex, SomeDirective, true, null);
+              $r3$.ɵɵcontentQuery(dirIndex, $ref0$, true, null);
               }
               if (rf & 2) {
               var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.foo = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.foo = $tmp$.first);
               }
             },
             ngContentSelectors: $_c1$,
@@ -1879,10 +1879,10 @@ describe('compiler compliance', () => {
             vars: 0,
             template:  function ContentQueryComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔprojectionDef();
-                $r3$.ΔelementStart(0, "div");
-                $r3$.Δprojection(1);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵprojectionDef();
+                $r3$.ɵɵelementStart(0, "div");
+                $r3$.ɵɵprojection(1);
+                $r3$.ɵɵelementEnd();
               }
             },
             encapsulation: 2
@@ -1926,21 +1926,21 @@ describe('compiler compliance', () => {
           const $e0_attrs$ = ["myRef"];
           const $e1_attrs$ = ["myRef1", "myRef2", "myRef3"];
           …
-          ContentQueryComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          ContentQueryComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             …
             contentQueries: function ContentQueryComponent_ContentQueries(rf, ctx, dirIndex) {
               if (rf & 1) {
-                $r3$.ΔcontentQuery(dirIndex, $e0_attrs$, true, TemplateRef);
-              $r3$.ΔcontentQuery(dirIndex, SomeDirective, true, ElementRef);
-              $r3$.ΔcontentQuery(dirIndex, $e1_attrs$, false, ElementRef);
-              $r3$.ΔcontentQuery(dirIndex, SomeDirective, false, TemplateRef);
+                $r3$.ɵɵcontentQuery(dirIndex, $e0_attrs$, true, TemplateRef);
+              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, true, ElementRef);
+              $r3$.ɵɵcontentQuery(dirIndex, $e1_attrs$, false, ElementRef);
+              $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false, TemplateRef);
               }
               if (rf & 2) {
               var $tmp$;
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRef = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDir = $tmp$.first);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.myRefs = $tmp$);
-                $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.someDirs = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRef = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRefs = $tmp$);
+                $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDirs = $tmp$);
               }
             },
             …
@@ -2034,7 +2034,7 @@ describe('compiler compliance', () => {
         };
 
         const MyPipeDefinition = `
-            MyPipe.ngPipeDef = $r3$.ΔdefinePipe({
+            MyPipe.ngPipeDef = $r3$.ɵɵdefinePipe({
               name: "myPipe",
               type: MyPipe,
               factory: function MyPipe_Factory(t) { return new (t || MyPipe)(); },
@@ -2043,7 +2043,7 @@ describe('compiler compliance', () => {
         `;
 
         const MyPurePipeDefinition = `
-            MyPurePipe.ngPipeDef = $r3$.ΔdefinePipe({
+            MyPurePipe.ngPipeDef = $r3$.ɵɵdefinePipe({
               name: "myPurePipe",
               type: MyPurePipe,
               factory: function MyPurePipe_Factory(t) { return new (t || MyPurePipe)(); },
@@ -2055,7 +2055,7 @@ describe('compiler compliance', () => {
               return [$a0$, 1, 2, 3, 4, 5];
             };
             // ...
-            MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+            MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
               type: MyApp,
               selectors: [["my-app"]],
               factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -2063,20 +2063,20 @@ describe('compiler compliance', () => {
               vars: 20,
               template:  function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                  $r3$.Δtext(0);
-                  $r3$.Δpipe(1, "myPurePipe");
-                  $r3$.Δpipe(2, "myPipe");
-                  $r3$.ΔelementStart(3, "p");
-                  $r3$.Δtext(4);
-                  $r3$.Δpipe(5, "myPipe");
-                  $r3$.Δpipe(6, "myPipe");
-                  $r3$.ΔelementEnd();
+                  $r3$.ɵɵtext(0);
+                  $r3$.ɵɵpipe(1, "myPurePipe");
+                  $r3$.ɵɵpipe(2, "myPipe");
+                  $r3$.ɵɵelementStart(3, "p");
+                  $r3$.ɵɵtext(4);
+                  $r3$.ɵɵpipe(5, "myPipe");
+                  $r3$.ɵɵpipe(6, "myPipe");
+                  $r3$.ɵɵelementEnd();
                 }
                 if (rf & 2) {
-                  $r3$.Δselect(0);
-                  $r3$.ΔtextBinding(0, $r3$.Δinterpolation1("", $r3$.ΔpipeBind2(1, 3, $r3$.ΔpipeBind2(2, 6, ctx.name, ctx.size), ctx.size), ""));
-                  $r3$.Δselect(4);
-                  $r3$.ΔtextBinding(4, $r3$.Δinterpolation2("", $r3$.ΔpipeBindV(5, 9, $r3$.ΔpureFunction1(18, $c0$, ctx.name)), " ", ctx.name ? 1 : $r3$.ΔpipeBind1(6, 16, 2), ""));
+                  $r3$.ɵɵselect(0);
+                  $r3$.ɵɵtextBinding(0, $r3$.ɵɵinterpolation1("", $r3$.ɵɵpipeBind2(1, 3, $r3$.ɵɵpipeBind2(2, 6, ctx.name, ctx.size), ctx.size), ""));
+                  $r3$.ɵɵselect(4);
+                  $r3$.ɵɵtextBinding(4, $r3$.ɵɵinterpolation2("", $r3$.ɵɵpipeBindV(5, 9, $r3$.ɵɵpureFunction1(18, $c0$, ctx.name)), " ", ctx.name ? 1 : $r3$.ɵɵpipeBind1(6, 16, 2), ""));
                 }
               },
               pipes: [MyPurePipe, MyPipe],
@@ -2122,7 +2122,7 @@ describe('compiler compliance', () => {
 
         const MyAppDefinition = `
             // ...
-            MyApp.ngComponentDef = $r3$.ΔdefineComponent({
+            MyApp.ngComponentDef = $r3$.ɵɵdefineComponent({
               type: MyApp,
               selectors: [["my-app"]],
               factory: function MyApp_Factory(t) { return new (t || MyApp)(); },
@@ -2130,21 +2130,21 @@ describe('compiler compliance', () => {
               vars: 27,
               template:  function MyApp_Template(rf, ctx) {
                 if (rf & 1) {
-                  $r3$.Δtext(0);
-                  $r3$.Δpipe(1, "myPipe");
-                  $r3$.Δpipe(2, "myPipe");
-                  $r3$.Δpipe(3, "myPipe");
-                  $r3$.Δpipe(4, "myPipe");
-                  $r3$.Δpipe(5, "myPipe");
+                  $r3$.ɵɵtext(0);
+                  $r3$.ɵɵpipe(1, "myPipe");
+                  $r3$.ɵɵpipe(2, "myPipe");
+                  $r3$.ɵɵpipe(3, "myPipe");
+                  $r3$.ɵɵpipe(4, "myPipe");
+                  $r3$.ɵɵpipe(5, "myPipe");
                 }
                 if (rf & 2) {
-                  $r3$.Δselect(0);
-                  $r3$.ΔtextBinding(0, $r3$.Δinterpolation5(
-                    "0:", i0.ΔpipeBind1(1, 5, ctx.name),
-                    "1:", i0.ΔpipeBind2(2, 7, ctx.name, 1),
-                    "2:", i0.ΔpipeBind3(3, 10, ctx.name, 1, 2),
-                    "3:", i0.ΔpipeBind4(4, 14, ctx.name, 1, 2, 3),
-                    "4:", i0.ΔpipeBindV(5, 19, $r3$.ΔpureFunction1(25, $c0$, ctx.name)),
+                  $r3$.ɵɵselect(0);
+                  $r3$.ɵɵtextBinding(0, $r3$.ɵɵinterpolation5(
+                    "0:", i0.ɵɵpipeBind1(1, 5, ctx.name),
+                    "1:", i0.ɵɵpipeBind2(2, 7, ctx.name, 1),
+                    "2:", i0.ɵɵpipeBind3(3, 10, ctx.name, 1, 2),
+                    "3:", i0.ɵɵpipeBind4(4, 14, ctx.name, 1, 2, 3),
+                    "4:", i0.ɵɵpipeBindV(5, 19, $r3$.ɵɵpureFunction1(25, $c0$, ctx.name)),
                     ""
                   ));
                 }
@@ -2178,7 +2178,7 @@ describe('compiler compliance', () => {
       const MyComponentDefinition = `
         const $c1$ = ["user", ""];
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2186,13 +2186,13 @@ describe('compiler compliance', () => {
           vars: 1,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δelement(0, "input", null, $c1$);
-              $r3$.Δtext(2);
+              $r3$.ɵɵelement(0, "input", null, $c1$);
+              $r3$.ɵɵtext(2);
             }
             if (rf & 2) {
-              const $user$ = $r3$.Δreference(1);
-              $r3$.Δselect(2);
-              $r3$.ΔtextBinding(2, $r3$.Δinterpolation1("Hello ", $user$.value, "!"));
+              const $user$ = $r3$.ɵɵreference(1);
+              $r3$.ɵɵselect(2);
+              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1("Hello ", $user$.value, "!"));
             }
           },
           encapsulation: 2
@@ -2244,38 +2244,38 @@ describe('compiler compliance', () => {
         const $c4$ = ["bar", ""];
         function MyComponent_div_3_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "span");
-            $r3$.Δtext(1);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "span");
+            $r3$.ɵɵtext(1);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.ΔnextContext();
-            const $bar$ = $r3$.Δreference(4);
-            $r3$.ΔnextContext();
-            const $foo$ = $r3$.Δreference(1);
-            const $baz$ = $r3$.Δreference(5);
-            $r3$.Δselect(1);
-            $r3$.ΔtextBinding(1, $r3$.Δinterpolation3("", $foo$, "-", $bar$, "-", $baz$, ""));
+            $r3$.ɵɵnextContext();
+            const $bar$ = $r3$.ɵɵreference(4);
+            $r3$.ɵɵnextContext();
+            const $foo$ = $r3$.ɵɵreference(1);
+            const $baz$ = $r3$.ɵɵreference(5);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation3("", $foo$, "-", $bar$, "-", $baz$, ""));
           }
         }
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δtext(1);
-            $r3$.Δtemplate(2, MyComponent_div_3_span_2_Template, 2, 3, "span", $c2$);
-            $r3$.Δelement(3, "span", null, $c4$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵtext(1);
+            $r3$.ɵɵtemplate(2, MyComponent_div_3_span_2_Template, 2, 3, "span", $c2$);
+            $r3$.ɵɵelement(3, "span", null, $c4$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            const $bar$ = $r3$.Δreference(4);
-            $r3$.ΔnextContext();
-            const $foo$ = $r3$.Δreference(1);
-            $r3$.Δselect(1);
-            $r3$.ΔtextBinding(1, $r3$.Δinterpolation2(" ", $foo$, "-", $bar$, " "));
+            const $bar$ = $r3$.ɵɵreference(4);
+            $r3$.ɵɵnextContext();
+            const $foo$ = $r3$.ɵɵreference(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2(" ", $foo$, "-", $bar$, " "));
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2283,15 +2283,15 @@ describe('compiler compliance', () => {
           vars: 1,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δelement(0, "div", null, $c1$);
-              $r3$.Δtext(2);
-              $r3$.Δtemplate(3, MyComponent_div_3_Template, 5, 2, "div", $c2$);
-              $r3$.Δelement(4, "div", null, $c3$);
+              $r3$.ɵɵelement(0, "div", null, $c1$);
+              $r3$.ɵɵtext(2);
+              $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 5, 2, "div", $c2$);
+              $r3$.ɵɵelement(4, "div", null, $c3$);
             }
             if (rf & 2) {
-              const $foo$ = $r3$.Δreference(1);
-              $r3$.Δselect(2);
-              $r3$.ΔtextBinding(2, $r3$.Δinterpolation1(" ", $foo$, " "));
+              const $foo$ = $r3$.ɵɵreference(1);
+              $r3$.ɵɵselect(2);
+              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1(" ", $foo$, " "));
             }
           },
           directives:[IfDirective],
@@ -2336,40 +2336,40 @@ describe('compiler compliance', () => {
 
       function MyComponent_div_0_span_3_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "span");
-          $i0$.Δtext(1);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "span");
+          $i0$.ɵɵtext(1);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
-          const $item$ = $i0$.ΔnextContext().$implicit;
-          const $foo$ = $i0$.Δreference(2);
-          $r3$.Δselect(1);
-          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $foo$, " - ", $item$, " "));
+          const $item$ = $i0$.ɵɵnextContext().$implicit;
+          const $foo$ = $i0$.ɵɵreference(2);
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $foo$, " - ", $item$, " "));
         }
       }
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "div");
-          $i0$.Δelement(1, "div", null, $c1$);
-          $i0$.Δtemplate(3, MyComponent_div_0_span_3_Template, 2, 2, "span", $c2$);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "div");
+          $i0$.ɵɵelement(1, "div", null, $c1$);
+          $i0$.ɵɵtemplate(3, MyComponent_div_0_span_3_Template, 2, 2, "span", $c2$);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
-          const $app$ = $i0$.ΔnextContext();
-          $r3$.Δselect(3);
-          $i0$.Δproperty("ngIf", $app$.showing);
+          const $app$ = $i0$.ɵɵnextContext();
+          $r3$.ɵɵselect(3);
+          $i0$.ɵɵproperty("ngIf", $app$.showing);
         }
       }
 
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_div_0_Template, 4, 1, "div", $c0$);
+          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 1, "div", $c0$);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("ngForOf", ctx.items);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -2424,12 +2424,12 @@ describe('compiler compliance', () => {
 
       it('should gen hooks with a few simple components', () => {
         const LifecycleCompDefinition = `
-          LifecycleComp.ngComponentDef = $r3$.ΔdefineComponent({
+          LifecycleComp.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: LifecycleComp,
             selectors: [["lifecycle-comp"]],
             factory: function LifecycleComp_Factory(t) { return new (t || LifecycleComp)(); },
             inputs: {nameMin: ["name", "nameMin"]},
-            features: [$r3$.ΔNgOnChangesFeature()],
+            features: [$r3$.ɵɵNgOnChangesFeature()],
             consts: 0,
             vars: 0,
             template:  function LifecycleComp_Template(rf, ctx) {},
@@ -2437,7 +2437,7 @@ describe('compiler compliance', () => {
           });`;
 
         const SimpleLayoutDefinition = `
-          SimpleLayout.ngComponentDef = $r3$.ΔdefineComponent({
+          SimpleLayout.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: SimpleLayout,
             selectors: [["simple-layout"]],
             factory: function SimpleLayout_Factory(t) { return new (t || SimpleLayout)(); },
@@ -2445,14 +2445,14 @@ describe('compiler compliance', () => {
             vars: 2,
             template:  function SimpleLayout_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.Δelement(0, "lifecycle-comp", $e0_attrs$);
-                $r3$.Δelement(1, "lifecycle-comp", $e1_attrs$);
+                $r3$.ɵɵelement(0, "lifecycle-comp", $e0_attrs$);
+                $r3$.ɵɵelement(1, "lifecycle-comp", $e1_attrs$);
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.Δproperty("name", ctx.name1);
-                $r3$.Δselect(1);
-                $r3$.Δproperty("name", ctx.name2);
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵproperty("name", ctx.name1);
+                $r3$.ɵɵselect(1);
+                $r3$.ɵɵproperty("name", ctx.name2);
               }
             },
             directives: [LifecycleComp],
@@ -2547,13 +2547,13 @@ describe('compiler compliance', () => {
 
         // TODO(benlesh): Enforce this when the directives are specified
         const ForDirectiveDefinition = `
-              ForOfDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
+              ForOfDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
                 type: ForOfDirective,
                 selectors: [["", "forOf", ""]],
                 factory: function ForOfDirective_Factory(t) {
-                  return new (t || ForOfDirective)($r3$.ΔdirectiveInject(ViewContainerRef), $r3$.ΔdirectiveInject(TemplateRef));
+                  return new (t || ForOfDirective)($r3$.ɵɵdirectiveInject(ViewContainerRef), $r3$.ɵɵdirectiveInject(TemplateRef));
                 },
-                features: [$r3$.ΔNgOnChangesFeature()],
+                features: [$r3$.ɵɵNgOnChangesFeature()],
                 inputs: {forOf: "forOf"}
               });
             `;
@@ -2562,14 +2562,14 @@ describe('compiler compliance', () => {
               const $t1_attrs$ = [${AttributeMarker.Template}, "for", "forOf"];
               function MyComponent__svg_g_1_Template(rf, ctx) {
                 if (rf & 1) {
-                  $r3$.ΔnamespaceSVG();
-                  $r3$.ΔelementStart(0,"g");
-                  $r3$.Δelement(1,"circle");
-                  $r3$.ΔelementEnd();
+                  $r3$.ɵɵnamespaceSVG();
+                  $r3$.ɵɵelementStart(0,"g");
+                  $r3$.ɵɵelement(1,"circle");
+                  $r3$.ɵɵelementEnd();
                 }
               }
               …
-              MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+              MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
                 type: MyComponent,
                 selectors: [["my-component"]],
                 factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2577,14 +2577,14 @@ describe('compiler compliance', () => {
                 vars: 1,
                 template:  function MyComponent_Template(rf, ctx){
                   if (rf & 1) {
-                    $r3$.ΔnamespaceSVG();
-                    $r3$.ΔelementStart(0,"svg");
-                    $r3$.Δtemplate(1, MyComponent__svg_g_1_Template, 2, 0, "g", $t1_attrs$);
-                    $r3$.ΔelementEnd();
+                    $r3$.ɵɵnamespaceSVG();
+                    $r3$.ɵɵelementStart(0,"svg");
+                    $r3$.ɵɵtemplate(1, MyComponent__svg_g_1_Template, 2, 0, "g", $t1_attrs$);
+                    $r3$.ɵɵelementEnd();
                   }
                   if (rf & 2) {
-                    $r3$.Δselect(1);
-                    $r3$.Δproperty("forOf", ctx.items);
+                    $r3$.ɵɵselect(1);
+                    $r3$.ɵɵproperty("forOf", ctx.items);
                   }
                 },
                 directives: function() { return [ForOfDirective]; },
@@ -2626,13 +2626,13 @@ describe('compiler compliance', () => {
 
         // TODO(chuckj): Enforce this when the directives are specified
         const ForDirectiveDefinition = `
-          ForOfDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
+          ForOfDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
             type: ForOfDirective,
             selectors: [["", "forOf", ""]],
             factory: function ForOfDirective_Factory(t) {
-              return new (t || ForOfDirective)($r3$.ΔdirectiveInject(ViewContainerRef), $r3$.ΔdirectiveInject(TemplateRef));
+              return new (t || ForOfDirective)($r3$.ɵɵdirectiveInject(ViewContainerRef), $r3$.ɵɵdirectiveInject(TemplateRef));
             },
-            features: [$r3$.ΔNgOnChangesFeature()],
+            features: [$r3$.ɵɵNgOnChangesFeature()],
             inputs: {forOf: "forOf"}
           });
         `;
@@ -2641,18 +2641,18 @@ describe('compiler compliance', () => {
           const $t1_attrs$ = [${AttributeMarker.Template}, "for", "forOf"];
           function MyComponent_li_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "li");
-              $r3$.Δtext(1);
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "li");
+              $r3$.ɵɵtext(1);
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
               const $item$ = ctx.$implicit;
-              $r3$.Δselect(1);
-              $r3$.ΔtextBinding(1, $r3$.Δinterpolation1("", $item$.name, ""));
+              $r3$.ɵɵselect(1);
+              $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation1("", $item$.name, ""));
             }
           }
           …
-          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyComponent,
             selectors: [["my-component"]],
             factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2660,13 +2660,13 @@ describe('compiler compliance', () => {
             vars: 1,
             template:  function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔelementStart(0, "ul");
-                $r3$.Δtemplate(1, MyComponent_li_1_Template, 2, 1, "li", $t1_attrs$);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵelementStart(0, "ul");
+                $r3$.ɵɵtemplate(1, MyComponent_li_1_Template, 2, 1, "li", $t1_attrs$);
+                $r3$.ɵɵelementEnd();
               }
               if (rf & 2) {
-                $r3$.Δselect(1);
-                $r3$.Δproperty("forOf", ctx.items);
+                $r3$.ɵɵselect(1);
+                $r3$.ɵɵproperty("forOf", ctx.items);
               }
             },
             directives: function() { return [ForOfDirective]; },
@@ -2723,40 +2723,40 @@ describe('compiler compliance', () => {
           const $t4_attrs$ = [${AttributeMarker.Template}, "for", "forOf"];
           function MyComponent_li_1_li_4_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "li");
-              $r3$.Δtext(1);
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "li");
+              $r3$.ɵɵtext(1);
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
               const $info$ = ctx.$implicit;
-              const $item$ = $r3$.ΔnextContext().$implicit;
-              $r3$.Δselect(1);
-              $r3$.ΔtextBinding(1, $r3$.Δinterpolation2(" ", $item$.name, ": ", $info$.description, " "));
+              const $item$ = $r3$.ɵɵnextContext().$implicit;
+              $r3$.ɵɵselect(1);
+              $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2(" ", $item$.name, ": ", $info$.description, " "));
             }
           }
 
           function MyComponent_li_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "li");
-              $r3$.ΔelementStart(1, "div");
-              $r3$.Δtext(2);
-              $r3$.ΔelementEnd();
-              $r3$.ΔelementStart(3, "ul");
-              $r3$.Δtemplate(4, MyComponent_li_1_li_4_Template, 2, 2, "li", $t4_attrs$);
-              $r3$.ΔelementEnd();
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "li");
+              $r3$.ɵɵelementStart(1, "div");
+              $r3$.ɵɵtext(2);
+              $r3$.ɵɵelementEnd();
+              $r3$.ɵɵelementStart(3, "ul");
+              $r3$.ɵɵtemplate(4, MyComponent_li_1_li_4_Template, 2, 2, "li", $t4_attrs$);
+              $r3$.ɵɵelementEnd();
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
               const $item$ = ctx.$implicit;
-              $r3$.Δselect(2);
-              $r3$.ΔtextBinding(2, $r3$.Δinterpolation1("", IDENT.name, ""));
-              $r3$.Δselect(4);
-              $r3$.Δproperty("forOf", IDENT.infos);
+              $r3$.ɵɵselect(2);
+              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1("", IDENT.name, ""));
+              $r3$.ɵɵselect(4);
+              $r3$.ɵɵproperty("forOf", IDENT.infos);
             }
           }
 
           …
-          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyComponent,
             selectors: [["my-component"]],
             factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -2764,13 +2764,13 @@ describe('compiler compliance', () => {
             vars: 1,
             template:  function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔelementStart(0, "ul");
-                $r3$.Δtemplate(1, MyComponent_li_1_Template, 5, 2, "li", $c1$);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵelementStart(0, "ul");
+                $r3$.ɵɵtemplate(1, MyComponent_li_1_Template, 5, 2, "li", $c1$);
+                $r3$.ɵɵelementEnd();
               }
               if (rf & 2) {
-                $r3$.Δselect(1);
-                $r3$.Δproperty("forOf", ctx.items);
+                $r3$.ɵɵselect(1);
+                $r3$.ɵɵproperty("forOf", ctx.items);
               }
             },
             directives: function () { return [ForOfDirective]; },
@@ -2874,7 +2874,7 @@ describe('compiler compliance', () => {
 
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
-        SomeDirective.ngDirectiveDef = $r3$.ΔdefineDirective({
+        SomeDirective.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: SomeDirective,
           selectors: [["", "some-directive", ""]],
           factory: function SomeDirective_Factory(t) {return new (t || SomeDirective)(); },
@@ -2931,7 +2931,7 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ΔdefineBase({
+      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
         inputs: {
           input1: "input1",
           input2: ["alias2", "input2"]
@@ -2977,7 +2977,7 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ΔdefineBase({
+      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
         outputs: {
           output1: "output1",
           output2: "output2"
@@ -3029,7 +3029,7 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ΔdefineBase({
+      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
         inputs: {
           input1: "input1",
           input2: ["whatever", "input2"]
@@ -3071,14 +3071,14 @@ describe('compiler compliance', () => {
       const expectedOutput = `
       const $e0_attrs$ = ["something"];
       // ...
-      BaseClass.ngBaseDef = i0.ΔdefineBase({
+      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
         viewQuery: function (rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔviewQuery($e0_attrs$, true, null);
+            $r3$.ɵɵviewQuery($e0_attrs$, true, null);
           }
           if (rf & 2) {
             var $tmp$;
-            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$.first);
+            $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.something = $tmp$.first);
           }
         }
       });
@@ -3116,14 +3116,14 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ΔdefineBase({
+      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
         viewQuery: function (rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔviewQuery(SomeDirective, true, null);
+            $r3$.ɵɵviewQuery(SomeDirective, true, null);
           }
           if (rf & 2) {
             var $tmp$;
-            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadViewQuery())) && (ctx.something = $tmp$);
+            $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.something = $tmp$);
           }
         }
       });
@@ -3159,14 +3159,14 @@ describe('compiler compliance', () => {
       const expectedOutput = `
       const $e0_attrs$ = ["something"];
       // ...
-      BaseClass.ngBaseDef = i0.ΔdefineBase({
+      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
         contentQueries: function (rf, ctx, dirIndex) {
           if (rf & 1) {
-            $r3$.ΔcontentQuery(dirIndex, $e0_attrs$, true, null);
+            $r3$.ɵɵcontentQuery(dirIndex, $e0_attrs$, true, null);
           }
           if (rf & 2) {
             var $tmp$;
-            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$.first);
+            $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.something = $tmp$.first);
           }
         }
       });
@@ -3204,14 +3204,14 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = i0.ΔdefineBase({
+      BaseClass.ngBaseDef = i0.ɵɵdefineBase({
         contentQueries: function (rf, ctx, dirIndex) {
           if (rf & 1) {
-            $r3$.ΔcontentQuery(dirIndex, SomeDirective, false, null);
+            $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false, null);
           }
           if (rf & 2) {
             var $tmp$;
-            $r3$.ΔqueryRefresh(($tmp$ = $r3$.ΔloadContentQuery())) && (ctx.something = $tmp$);
+            $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.something = $tmp$);
           }
         }
       });
@@ -3247,13 +3247,13 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = $r3$.ΔdefineBase({
+      BaseClass.ngBaseDef = $r3$.ɵɵdefineBase({
         hostBindings: function (rf, ctx, elIndex) {
           if (rf & 1) {
-            $r3$.ΔallocHostVars(1);
+            $r3$.ɵɵallocHostVars(1);
           }
           if (rf & 2) {
-            $r3$.ΔelementAttribute(elIndex, "tabindex", $r3$.Δbind(ctx.tabindex));
+            $r3$.ɵɵelementAttribute(elIndex, "tabindex", $r3$.ɵɵbind(ctx.tabindex));
           }
         }
       });
@@ -3289,10 +3289,10 @@ describe('compiler compliance', () => {
       };
       const expectedOutput = `
       // ...
-      BaseClass.ngBaseDef = $r3$.ΔdefineBase({
+      BaseClass.ngBaseDef = $r3$.ɵɵdefineBase({
         hostBindings: function (rf, ctx, elIndex) {
           if (rf & 1) {
-            $r3$.Δlistener("mousedown", function ($event) {
+            $r3$.ɵɵlistener("mousedown", function ($event) {
               return ctx.handleMousedown($event);
             });
           }
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index 701c1b8e5b..7fa4977f60 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -39,13 +39,13 @@ describe('compiler compliance: bindings', () => {
       const template = `
       template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "div");
-          $i0$.Δtext(1);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "div");
+          $i0$.ɵɵtext(1);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
-          $r3$.Δselect(1);
-          $i0$.ΔtextBinding(1, $i0$.Δinterpolation1("Hello ", $ctx$.name, ""));
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation1("Hello ", $ctx$.name, ""));
         }
       }`;
       const result = compile(files, angularFiles);
@@ -78,11 +78,11 @@ describe('compiler compliance: bindings', () => {
       …
       template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.Δelement(0, "a", $e0_attrs$);
+          $i0$.ɵɵelement(0, "a", $e0_attrs$);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("title", $ctx$.title);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("title", $ctx$.title);
         }
       }`;
       const result = compile(files, angularFiles);
@@ -113,11 +113,11 @@ describe('compiler compliance: bindings', () => {
       …
       template:function MyComponent_Template(rf, $ctx$){
         if (rf & 1) {
-          $i0$.Δelement(0, "a", $e0_attrs$);
+          $i0$.ɵɵelement(0, "a", $e0_attrs$);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.ΔpropertyInterpolate1("title", "Hello ", $ctx$.name, "");
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵpropertyInterpolate1("title", "Hello ", $ctx$.name, "");
         }
       }`;
       const result = compile(files, angularFiles);
@@ -138,7 +138,7 @@ describe('compiler compliance: bindings', () => {
         }
       };
       const result = compile(files, angularFiles);
-      expect(result.source).not.toContain('i0.ΔelementProperty');
+      expect(result.source).not.toContain('i0.ɵɵelementProperty');
     });
 
     it('should not remap property names whose names do not correspond to their attribute names',
@@ -170,11 +170,11 @@ describe('compiler compliance: bindings', () => {
 
       function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-            $i0$.Δelement(0, "label", _c0);
+            $i0$.ɵɵelement(0, "label", _c0);
         }
         if (rf & 2) {
-            $i0$.Δselect(0);
-            $i0$.Δproperty("for", ctx.forValue);
+            $i0$.ɵɵselect(0);
+            $i0$.ɵɵproperty("for", ctx.forValue);
         }
       }`;
 
@@ -204,16 +204,16 @@ describe('compiler compliance: bindings', () => {
       };
 
       const HostBindingDirDeclaration = `
-        HostBindingDir.ngDirectiveDef = $r3$.ΔdefineDirective({
+        HostBindingDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: HostBindingDir,
           selectors: [["", "hostBindingDir", ""]],
           factory: function HostBindingDir_Factory(t) { return new (t || HostBindingDir)(); },
           hostBindings: function HostBindingDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔallocHostVars(1);
+              $r3$.ɵɵallocHostVars(1);
             }
             if (rf & 2) {
-              $r3$.Δproperty("id", ctx.dirId, null, true);
+              $r3$.ɵɵproperty("id", ctx.dirId, null, true);
             }
           }
         });
@@ -251,16 +251,16 @@ describe('compiler compliance: bindings', () => {
       const HostBindingCompDeclaration = `
         const $ff$ = function ($v$) { return ["red", $v$]; };
         …
-        HostBindingComp.ngComponentDef = $r3$.ΔdefineComponent({
+        HostBindingComp.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: HostBindingComp,
           selectors: [["host-binding-comp"]],
           factory: function HostBindingComp_Factory(t) { return new (t || HostBindingComp)(); },
           hostBindings: function HostBindingComp_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔallocHostVars(3);
+              $r3$.ɵɵallocHostVars(3);
             }
             if (rf & 2) {
-              $r3$.Δproperty("id", $r3$.ΔpureFunction1(1, $ff$, ctx.id), null, true);
+              $r3$.ɵɵproperty("id", $r3$.ɵɵpureFunction1(1, $ff$, ctx.id), null, true);
             }
           },
           consts: 0,
@@ -299,16 +299,16 @@ describe('compiler compliance: bindings', () => {
       };
 
       const HostAttributeDirDeclaration = `
-        HostAttributeDir.ngDirectiveDef = $r3$.ΔdefineDirective({
+        HostAttributeDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: HostAttributeDir,
           selectors: [["", "hostAttributeDir", ""]],
           factory: function HostAttributeDir_Factory(t) { return new (t || HostAttributeDir)(); },
           hostBindings: function HostAttributeDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔallocHostVars(1);
+              $r3$.ɵɵallocHostVars(1);
             }
             if (rf & 2) {
-              $r3$.ΔelementAttribute(elIndex, "required", $r3$.Δbind(ctx.required));
+              $r3$.ɵɵelementAttribute(elIndex, "required", $r3$.ɵɵbind(ctx.required));
             }
           }
         });
@@ -344,13 +344,13 @@ describe('compiler compliance: bindings', () => {
       const HostAttributeDirDeclaration = `
         const $c0$ = ["aria-label", "label"];
         …
-        HostAttributeDir.ngDirectiveDef = $r3$.ΔdefineDirective({
+        HostAttributeDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: HostAttributeDir,
           selectors: [["", "hostAttributeDir", ""]],
           factory: function HostAttributeDir_Factory(t) { return new (t || HostAttributeDir)(); },
           hostBindings: function HostAttributeDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔelementHostAttrs($c0$);
+              $r3$.ɵɵelementHostAttrs($c0$);
             }
           }
         });
@@ -402,25 +402,25 @@ describe('compiler compliance: bindings', () => {
         const $c0$ = ["title", "hello there from component", ${AttributeMarker.Styles}, "opacity", "1"];
         const $c1$ = ["title", "hello there from directive", ${AttributeMarker.Classes}, "one", "two", ${AttributeMarker.Styles}, "width", "200px", "height", "500px"];
         …
-        HostAttributeComp.ngComponentDef = $r3$.ΔdefineComponent({
+        HostAttributeComp.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: HostAttributeComp,
           selectors: [["my-host-attribute-component"]],
           factory: function HostAttributeComp_Factory(t) { return new (t || HostAttributeComp)(); },
           hostBindings: function HostAttributeComp_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔelementHostAttrs($c0$);
+              $r3$.ɵɵelementHostAttrs($c0$);
               …
             }
             …
           }
         …
-        HostAttributeDir.ngDirectiveDef = $r3$.ΔdefineDirective({
+        HostAttributeDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           type: HostAttributeDir,
           selectors: [["", "hostAttributeDir", ""]],
           factory: function HostAttributeDir_Factory(t) { return new (t || HostAttributeDir)(); },
           hostBindings: function HostAttributeDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔelementHostAttrs($c1$);
+              $r3$.ɵɵelementHostAttrs($c1$);
               …
             }
             …
@@ -469,26 +469,26 @@ describe('compiler compliance: bindings', () => {
       const template = `
       …
         if (rf & 2) {
-          i0.Δselect(0);
-          i0.ΔpropertyInterpolateV("title", ["a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i", ctx.nine, "j"]);
-          i0.Δselect(1);
-          i0.ΔpropertyInterpolate8("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i");
-          i0.Δselect(2);
-          i0.ΔpropertyInterpolate7("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h");
-          i0.Δselect(3);
-          i0.ΔpropertyInterpolate6("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g");
-          i0.Δselect(4);
-          i0.ΔpropertyInterpolate5("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f");
-          i0.Δselect(5);
-          i0.ΔpropertyInterpolate4("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e");
-          i0.Δselect(6);
-          i0.ΔpropertyInterpolate3("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d");
-          i0.Δselect(7);
-          i0.ΔpropertyInterpolate2("title", "a", ctx.one, "b", ctx.two, "c");
-          i0.Δselect(8);
-          i0.ΔpropertyInterpolate1("title", "a", ctx.one, "b");
-          i0.Δselect(9);
-          i0.ΔpropertyInterpolate("title", ctx.one);
+          i0.ɵɵselect(0);
+          i0.ɵɵpropertyInterpolateV("title", ["a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i", ctx.nine, "j"]);
+          i0.ɵɵselect(1);
+          i0.ɵɵpropertyInterpolate8("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i");
+          i0.ɵɵselect(2);
+          i0.ɵɵpropertyInterpolate7("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h");
+          i0.ɵɵselect(3);
+          i0.ɵɵpropertyInterpolate6("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g");
+          i0.ɵɵselect(4);
+          i0.ɵɵpropertyInterpolate5("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f");
+          i0.ɵɵselect(5);
+          i0.ɵɵpropertyInterpolate4("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e");
+          i0.ɵɵselect(6);
+          i0.ɵɵpropertyInterpolate3("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d");
+          i0.ɵɵselect(7);
+          i0.ɵɵpropertyInterpolate2("title", "a", ctx.one, "b", ctx.two, "c");
+          i0.ɵɵselect(8);
+          i0.ɵɵpropertyInterpolate1("title", "a", ctx.one, "b");
+          i0.ɵɵselect(9);
+          i0.ɵɵpropertyInterpolate("title", ctx.one);
       }
       …
       `;
@@ -510,19 +510,19 @@ describe('compiler compliance: bindings', () => {
         …
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.ΔelementStart(0, "b", $_c0$, $_c1$);
-            $i0$.ΔdisableBindings();
-            $i0$.ΔelementStart(2, "i");
-            $i0$.Δtext(3, "Hello {{ name }}!");
-            $i0$.ΔelementEnd();
-            $i0$.ΔenableBindings();
-            $i0$.ΔelementEnd();
-            $i0$.Δtext(4);
+            $i0$.ɵɵelementStart(0, "b", $_c0$, $_c1$);
+            $i0$.ɵɵdisableBindings();
+            $i0$.ɵɵelementStart(2, "i");
+            $i0$.ɵɵtext(3, "Hello {{ name }}!");
+            $i0$.ɵɵelementEnd();
+            $i0$.ɵɵenableBindings();
+            $i0$.ɵɵelementEnd();
+            $i0$.ɵɵtext(4);
           }
           if (rf & 2) {
-            const $_r0$ = $i0$.Δreference(1);
-            $r3$.Δselect(4);
-            $i0$.ΔtextBinding(4, $i0$.Δinterpolation1(" ", $_r0$.id, " "));
+            const $_r0$ = $i0$.ɵɵreference(1);
+            $r3$.ɵɵselect(4);
+            $i0$.ɵɵtextBinding(4, $i0$.ɵɵinterpolation1(" ", $_r0$.id, " "));
           }
         }
       `;
@@ -542,12 +542,12 @@ describe('compiler compliance: bindings', () => {
         …
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.ΔelementStart(0, "div");
-            $i0$.ΔdisableBindings();
-            $i0$.Δelement(1, "input", $_c0$);
-            $i0$.Δtext(2, " {{ myInput.value }} ");
-            $i0$.ΔenableBindings();
-            $i0$.ΔelementEnd();
+            $i0$.ɵɵelementStart(0, "div");
+            $i0$.ɵɵdisableBindings();
+            $i0$.ɵɵelement(1, "input", $_c0$);
+            $i0$.ɵɵtext(2, " {{ myInput.value }} ");
+            $i0$.ɵɵenableBindings();
+            $i0$.ɵɵelementEnd();
         }
       `;
       const result = compile(files, angularFiles);
@@ -566,11 +566,11 @@ describe('compiler compliance: bindings', () => {
         …
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.ΔelementStart(0, "div");
-            $i0$.ΔdisableBindings();
-            $i0$.Δelement(1, "div", $_c0$);
-            $i0$.ΔenableBindings();
-            $i0$.ΔelementEnd();
+            $i0$.ɵɵelementStart(0, "div");
+            $i0$.ɵɵdisableBindings();
+            $i0$.ɵɵelement(1, "div", $_c0$);
+            $i0$.ɵɵenableBindings();
+            $i0$.ɵɵelementEnd();
         }
       `;
       const result = compile(files, angularFiles);
@@ -585,7 +585,7 @@ describe('compiler compliance: bindings', () => {
       const template = `
         template:function MyComponent_Template(rf, $ctx$){
           if (rf & 1) {
-            $i0$.Δelement(0, "div");
+            $i0$.ɵɵelement(0, "div");
           }
         }
       `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
index 6e3fd1d315..f68c5a037e 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
@@ -50,13 +50,13 @@ describe('compiler compliance: dependency injection', () => {
     const factory = `
       factory: function MyComponent_Factory(t) {
         return new (t || MyComponent)(
-          $r3$.ΔinjectAttribute('name'),
-          $r3$.ΔdirectiveInject(MyService),
-          $r3$.ΔdirectiveInject(MyService, 1),
-          $r3$.ΔdirectiveInject(MyService, 2),
-          $r3$.ΔdirectiveInject(MyService, 4),
-          $r3$.ΔdirectiveInject(MyService, 8),
-          $r3$.ΔdirectiveInject(MyService, 10)
+          $r3$.ɵɵinjectAttribute('name'),
+          $r3$.ɵɵdirectiveInject(MyService),
+          $r3$.ɵɵdirectiveInject(MyService, 1),
+          $r3$.ɵɵdirectiveInject(MyService, 2),
+          $r3$.ɵɵdirectiveInject(MyService, 4),
+          $r3$.ɵɵdirectiveInject(MyService, 8),
+          $r3$.ɵɵdirectiveInject(MyService, 10)
         );
       }`;
 
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts
index 71085868ea..6ef22fdcf0 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_directives_spec.ts
@@ -38,7 +38,7 @@ describe('compiler compliance: directives', () => {
 
       // MyComponent definition should be:
       const MyComponentDefinition = `
-            MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+            MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
                 type: MyComponent,
                 selectors: [["my-component"]],
                 factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -46,7 +46,7 @@ describe('compiler compliance: directives', () => {
                 vars: 0,
                 template: function MyComponent_Template(rf, ctx) {
                     if (rf & 1) {
-                        $r3$.Δelement(0, "div");
+                        $r3$.ɵɵelement(0, "div");
                     }
                 },
                 encapsulation: 2
@@ -84,7 +84,7 @@ describe('compiler compliance: directives', () => {
 
       // MyComponent definition should be:
       const MyComponentDefinition = `
-            MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+            MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
                 type: MyComponent,
                 selectors: [["my-component"]],
                 factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -92,7 +92,7 @@ describe('compiler compliance: directives', () => {
                 vars: 0,
                 template: function MyComponent_Template(rf, ctx) {
                     if (rf & 1) {
-                        $r3$.Δelement(0, "div");
+                        $r3$.ɵɵelement(0, "div");
                     }
                 },
                 encapsulation: 2
@@ -132,15 +132,15 @@ describe('compiler compliance: directives', () => {
                 …
                 const _c0 = [${AttributeMarker.Bindings}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.Δelement(0, "div", _c0);
+                            $r3$.ɵɵelement(0, "div", _c0);
                         }
                         if (rf & 2) {
-                            $r3$.Δselect(0);
-                            $r3$.Δproperty("someDirective", true);
+                            $r3$.ɵɵselect(0);
+                            $r3$.ɵɵproperty("someDirective", true);
                         }
                     },
                     …
@@ -187,15 +187,15 @@ describe('compiler compliance: directives', () => {
         const $_c0$ = ["directiveA", ""];
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtext(0, "Some content");
+            $r3$.ɵɵtext(0, "Some content");
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $_c0$);
+              $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $_c0$);
             }
           },
           …
@@ -241,21 +241,21 @@ describe('compiler compliance: directives', () => {
         const $_c1$ = ["directiveA", ""];
         function MyComponent_ng_container_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementContainerStart(0, $_c1$);
-            $r3$.Δtext(1, "Some content");
-            $r3$.ΔelementContainerEnd();
+            $r3$.ɵɵelementContainerStart(0, $_c1$);
+            $r3$.ɵɵtext(1, "Some content");
+            $r3$.ɵɵelementContainerEnd();
           }
         }
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           …
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.Δtemplate(0, MyComponent_ng_container_0_Template, 2, 0, "ng-container", $_c0$);
+              $r3$.ɵɵtemplate(0, MyComponent_ng_container_0_Template, 2, 0, "ng-container", $_c0$);
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.Δproperty("ngIf", ctx.showing);
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵproperty("ngIf", ctx.showing);
             }
           },
           …
@@ -295,15 +295,15 @@ describe('compiler compliance: directives', () => {
                 …
                 const $c0_a0$ = [${AttributeMarker.Bindings}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $c0_a0$);
+                            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $c0_a0$);
                         }
                         if (rf & 2) {
-                            $r3$.Δselect(0);
-                            $r3$.Δproperty("someDirective", true);
+                            $r3$.ɵɵselect(0);
+                            $r3$.ɵɵproperty("someDirective", true);
                         }
                     },
                     …
@@ -344,11 +344,11 @@ describe('compiler compliance: directives', () => {
                 …
                 const $c0_a0$ = [${AttributeMarker.Template}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.Δtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0_a0$);
+                            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0_a0$);
                         }
                     },
                     …
@@ -393,13 +393,13 @@ describe('compiler compliance: directives', () => {
                 …
                 const $c0_a0$ = [${AttributeMarker.Bindings}, "someDirective"];
                 …
-                MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+                MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
                     …
                     template: function MyComponent_Template(rf, ctx) {
                         if (rf & 1) {
-                            $r3$.ΔelementStart(0, "div", $c0_a0$);
-                            $r3$.Δlistener("someDirective", function MyComponent_Template_div_someDirective_0_listener($event) { return ctx.noop(); });
-                            $r3$.ΔelementEnd();
+                            $r3$.ɵɵelementStart(0, "div", $c0_a0$);
+                            $r3$.ɵɵlistener("someDirective", function MyComponent_Template_div_someDirective_0_listener($event) { return ctx.noop(); });
+                            $r3$.ɵɵelementEnd();
                         }
                     },
                     …
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index 697aafcfbe..bc5e396424 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -195,7 +195,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_idA$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("Content A");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("Content A");
         }
         const $_c2$ = ["title", "Title B"];
         var $I18N_3$;
@@ -208,7 +208,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_idB$$APP_SPEC_TS_4$;
         }
         else {
-            $I18N_3$ = $r3$.Δi18nLocalize("Title B");
+            $I18N_3$ = $r3$.ɵɵi18nLocalize("Title B");
         }
         const $_c5$ = ["title", $I18N_3$];
         const $_c6$ = ["title", "Title C"];
@@ -221,7 +221,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_4978592519614169666$$APP_SPEC_TS_8$;
         }
         else {
-            $I18N_7$ = $r3$.Δi18nLocalize("Title C");
+            $I18N_7$ = $r3$.ɵɵi18nLocalize("Title C");
         }
         const $_c9$ = ["title", $I18N_7$];
         const $_c10$ = ["title", "Title D"];
@@ -235,7 +235,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_11$ = $MSG_EXTERNAL_5200291527729162531$$APP_SPEC_TS_12$;
         }
         else {
-            $I18N_11$ = $r3$.Δi18nLocalize("Title D");
+            $I18N_11$ = $r3$.ɵɵi18nLocalize("Title D");
         }
         const $_c13$ = ["title", $I18N_11$];
         const $_c14$ = ["title", "Title E"];
@@ -248,7 +248,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_15$ = $MSG_EXTERNAL_idE$$APP_SPEC_TS_16$;
         }
         else {
-            $I18N_15$ = $r3$.Δi18nLocalize("Title E");
+            $I18N_15$ = $r3$.ɵɵi18nLocalize("Title E");
         }
         const $_c17$ = ["title", $I18N_15$];
         const $_c18$ = ["title", "Title F"];
@@ -258,7 +258,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_19$ = $MSG_EXTERNAL_idF$$APP_SPEC_TS_20$;
         }
         else {
-            $I18N_19$ = $r3$.Δi18nLocalize("Title F");
+            $I18N_19$ = $r3$.ɵɵi18nLocalize("Title F");
         }
         const $_c21$ = ["title", $I18N_19$];
         const $_c22$ = ["title", "Title G"];
@@ -271,39 +271,39 @@ describe('i18n support in the view compiler', () => {
             $I18N_23$ = $MSG_EXTERNAL_idG$$APP_SPEC_TS_24$;
         }
         else {
-            $I18N_23$ = $r3$.Δi18nLocalize("Title G");
+            $I18N_23$ = $r3$.ɵɵi18nLocalize("Title G");
         }
         const $_c25$ = ["title", $I18N_23$];
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(2, "div", $_c2$);
-            $r3$.Δi18nAttributes(3, $_c5$);
-            $r3$.Δtext(4, "Content B");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(5, "div", $_c6$);
-            $r3$.Δi18nAttributes(6, $_c9$);
-            $r3$.Δtext(7, "Content C");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(8, "div", $_c10$);
-            $r3$.Δi18nAttributes(9, $_c13$);
-            $r3$.Δtext(10, "Content D");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(11, "div", $_c14$);
-            $r3$.Δi18nAttributes(12, $_c17$);
-            $r3$.Δtext(13, "Content E");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(14, "div", $_c18$);
-            $r3$.Δi18nAttributes(15, $_c21$);
-            $r3$.Δtext(16, "Content F");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(17, "div", $_c22$);
-            $r3$.Δi18nAttributes(18, $_c25$);
-            $r3$.Δtext(19, "Content G");
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(2, "div", $_c2$);
+            $r3$.ɵɵi18nAttributes(3, $_c5$);
+            $r3$.ɵɵtext(4, "Content B");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(5, "div", $_c6$);
+            $r3$.ɵɵi18nAttributes(6, $_c9$);
+            $r3$.ɵɵtext(7, "Content C");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(8, "div", $_c10$);
+            $r3$.ɵɵi18nAttributes(9, $_c13$);
+            $r3$.ɵɵtext(10, "Content D");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(11, "div", $_c14$);
+            $r3$.ɵɵi18nAttributes(12, $_c17$);
+            $r3$.ɵɵtext(13, "Content E");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(14, "div", $_c18$);
+            $r3$.ɵɵi18nAttributes(15, $_c21$);
+            $r3$.ɵɵtext(16, "Content F");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(17, "div", $_c22$);
+            $r3$.ɵɵi18nAttributes(18, $_c25$);
+            $r3$.ɵɵtext(19, "Content G");
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -321,7 +321,7 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δelement(0, "div", $_c0$);
+            $r3$.ɵɵelement(0, "div", $_c0$);
           }
         }
       `;
@@ -346,15 +346,15 @@ describe('i18n support in the view compiler', () => {
           $I18N_1$ = $MSG_EXTERNAL_8809028065680254561$$APP_SPEC_TS_1$;
         }
         else {
-          $I18N_1$ = $r3$.Δi18nLocalize("introduction");
+          $I18N_1$ = $r3$.ɵɵi18nLocalize("introduction");
         }
         const $_c1$ = ["title", $I18N_1$];
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c0$);
-            $r3$.Δi18nAttributes(1, $_c1$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c0$);
+            $r3$.ɵɵi18nAttributes(1, $_c1$);
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -383,7 +383,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_1$ = $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$;
         }
         else {
-          $I18N_1$ = $r3$.Δi18nLocalize("static text");
+          $I18N_1$ = $r3$.ɵɵi18nLocalize("static text");
         }
         var $I18N_2$;
         if (ngI18nClosureMode) {
@@ -397,7 +397,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_2$ = $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$;
         }
         else {
-          $I18N_2$ = $r3$.Δi18nLocalize("intro {$interpolation}", {
+          $I18N_2$ = $r3$.ɵɵi18nLocalize("intro {$interpolation}", {
             "interpolation": "\uFFFD0\uFFFD"
           });
         }
@@ -413,7 +413,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_3$ = $r3$.Δi18nLocalize("{$interpolation}", {
+            $I18N_3$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -435,7 +435,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_6$ = $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$;
         }
         else {
-            $I18N_6$ = $r3$.Δi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
+            $I18N_6$ = $r3$.ɵɵi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
               "interpolation": "\uFFFD0\uFFFD", "interpolation_1": "\uFFFD1\uFFFD", "interpolation_2": "\uFFFD2\uFFFD"
             });
         }
@@ -447,7 +447,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$;
         }
         else {
-            $I18N_7$ = $r3$.Δi18nLocalize("{$interpolation}", {
+            $I18N_7$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -460,25 +460,25 @@ describe('i18n support in the view compiler', () => {
         vars: 8,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c0$);
-            $r3$.Δpipe(1, "uppercase");
-            $r3$.Δi18nAttributes(2, $_c1$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(3, "div", $_c2$);
-            $r3$.Δi18nAttributes(4, $_c3$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c0$);
+            $r3$.ɵɵpipe(1, "uppercase");
+            $r3$.ɵɵi18nAttributes(2, $_c1$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(3, "div", $_c2$);
+            $r3$.ɵɵi18nAttributes(4, $_c3$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 0, ctx.valueA)));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
-            $r3$.Δi18nApply(2);
-            $r3$.Δselect(3);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA + ctx.valueB));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
-            $r3$.Δi18nApply(4);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
+            $r3$.ɵɵi18nApply(2);
+            $r3$.ɵɵselect(3);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA + ctx.valueB));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueC));
+            $r3$.ɵɵi18nApply(4);
           }
         }
       `;
@@ -505,7 +505,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_8977039798304050198$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("intro {$interpolation}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("intro {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -513,15 +513,15 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c0$);
-            $r3$.Δpipe(1, "uppercase");
-            $r3$.Δi18nAttributes(2, $_c3$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c0$);
+            $r3$.ɵɵpipe(1, "uppercase");
+            $r3$.ɵɵi18nAttributes(2, $_c3$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 0, ctx.valueA)));
-            $r3$.Δi18nApply(2);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
+            $r3$.ɵɵi18nApply(2);
           }
         }
       `;
@@ -550,25 +550,25 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("different scope {$interpolation}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("different scope {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         const $_c2$ = ["title", $I18N_1$];
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.ΔelementStart(1, "div", $_c1$);
-            $r3$.Δpipe(2, "uppercase");
-            $r3$.Δi18nAttributes(3, $_c2$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵelementStart(1, "div", $_c1$);
+            $r3$.ɵɵpipe(2, "uppercase");
+            $r3$.ɵɵi18nAttributes(3, $_c2$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
             const $outer_r1$ = ctx.$implicit;
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 0, $outer_r1$)));
-            $r3$.Δi18nApply(3);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 0, $outer_r1$)));
+            $r3$.ɵɵi18nApply(3);
           }
         }
         …
@@ -576,11 +576,11 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
+            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δproperty("ngForOf", ctx.items);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵproperty("ngForOf", ctx.items);
           }
         }
       `;
@@ -612,7 +612,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("static text");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("static text");
         }
         var $I18N_2$;
         if (ngI18nClosureMode) {
@@ -626,7 +626,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("intro {$interpolation}", {
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("intro {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -642,7 +642,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_3$ = $r3$.Δi18nLocalize("{$interpolation}", {
+            $I18N_3$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -664,7 +664,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_6$ = $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$;
         }
         else {
-            $I18N_6$ = $r3$.Δi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
+            $I18N_6$ = $r3$.ɵɵi18nLocalize("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
               "interpolation": "\uFFFD0\uFFFD", "interpolation_1": "\uFFFD1\uFFFD", "interpolation_2": "\uFFFD2\uFFFD"
             });
         }
@@ -676,7 +676,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$;
         }
         else {
-            $I18N_7$ = $r3$.Δi18nLocalize("{$interpolation}", {
+            $I18N_7$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -689,25 +689,25 @@ describe('i18n support in the view compiler', () => {
         vars: 8,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c0$);
-            $r3$.Δpipe(1, "uppercase");
-            $r3$.Δi18nAttributes(2, $_c1$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(3, "div", $_c2$);
-            $r3$.Δi18nAttributes(4, $_c3$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c0$);
+            $r3$.ɵɵpipe(1, "uppercase");
+            $r3$.ɵɵi18nAttributes(2, $_c1$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(3, "div", $_c2$);
+            $r3$.ɵɵi18nAttributes(4, $_c3$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 0, ctx.valueA)));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
-            $r3$.Δi18nApply(2);
-            $r3$.Δselect(3);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA + ctx.valueB));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
-            $r3$.Δi18nApply(4);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
+            $r3$.ɵɵi18nApply(2);
+            $r3$.ɵɵselect(3);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA + ctx.valueB));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueC));
+            $r3$.ɵɵi18nApply(4);
           }
         }
       `;
@@ -737,25 +737,25 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("different scope {$interpolation}", {
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("different scope {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         const $_c4$ = ["title", $I18N_2$];
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.ΔelementStart(1, "div", $_c1$);
-            $r3$.Δpipe(2, "uppercase");
-            $r3$.Δi18nAttributes(3, $_c4$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵelementStart(1, "div", $_c1$);
+            $r3$.ɵɵpipe(2, "uppercase");
+            $r3$.ɵɵi18nAttributes(3, $_c4$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
             const $outer_r1$ = ctx.$implicit;
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 0, $outer_r1$)));
-            $r3$.Δi18nApply(3);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 0, $outer_r1$)));
+            $r3$.ɵɵi18nApply(3);
           }
         }
         …
@@ -763,11 +763,11 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
+            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 3, "div", $_c0$);
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δproperty("ngForOf", ctx.items);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵproperty("ngForOf", ctx.items);
           }
         }
       `;
@@ -792,7 +792,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7727043314656808423$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("Element title");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("Element title");
         }
         const $_c1$ = ["title", $I18N_0$];
         var $I18N_2$;
@@ -801,15 +801,15 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_4969674997806975147$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("Some content");
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("Some content");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c0$);
-            $r3$.Δi18nAttributes(1, $_c1$);
-            $r3$.Δi18n(2, $I18N_2$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c0$);
+            $r3$.ɵɵi18nAttributes(1, $_c1$);
+            $r3$.ɵɵi18n(2, $I18N_2$);
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -831,7 +831,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_ID_WITH_INVALID_CHARS$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("Element title");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("Element title");
         }
         const $_c1$ = ["title", $I18N_0$];
         var $I18N_2$;
@@ -840,7 +840,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_ID_WITH_INVALID_CHARS_2$$APP_SPEC_TS_4$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize(" Some content ");
+            $I18N_2$ = $r3$.ɵɵi18nLocalize(" Some content ");
         }
         …
       `;
@@ -866,9 +866,9 @@ describe('i18n support in the view compiler', () => {
       const output = String.raw `
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δelement(0, "div");
-            $r3$.Δelement(1, "div");
-            $r3$.Δelement(2, "div");
+            $r3$.ɵɵelement(0, "div");
+            $r3$.ɵɵelement(1, "div");
+            $r3$.ɵɵelement(2, "div");
           }
         }
       `;
@@ -892,7 +892,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4924931801512133405$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("Some text 'with single quotes', \"with double quotes\" and without quotes.");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("Some text 'with single quotes', \"with double quotes\" and without quotes.");
         }
       `;
 
@@ -915,7 +915,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #1");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #1");
         }
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -923,7 +923,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("My i18n block #2");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("My i18n block #2");
         }
         var $I18N_2$;
         if (ngI18nClosureMode) {
@@ -931,26 +931,26 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_5023003143537152794$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("My i18n block #3");
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("My i18n block #3");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(2, "div");
-            $r3$.Δtext(3, "My non-i18n block #1");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(4, "div");
-            $r3$.Δi18n(5, $I18N_1$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(6, "div");
-            $r3$.Δtext(7, "My non-i18n block #2");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(8, "div");
-            $r3$.Δi18n(9, $I18N_2$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(2, "div");
+            $r3$.ɵɵtext(3, "My non-i18n block #1");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(4, "div");
+            $r3$.ɵɵi18n(5, $I18N_1$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(6, "div");
+            $r3$.ɵɵtext(7, "My non-i18n block #2");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(8, "div");
+            $r3$.ɵɵi18n(9, $I18N_2$);
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -972,7 +972,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2817319788724342848$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("Some value: {$phA}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("Some value: {$phA}", {
               "phA": "\uFFFD0\uFFFD"
             });
         }
@@ -981,14 +981,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -1010,21 +1010,21 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_6749967533321674787$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$interpolation}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -1049,7 +1049,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_1482713963707913023$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize(" {$interpolation} {$interpolation_1} ", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize(" {$interpolation} {$interpolation_1} ", {
               "interpolation": "\uFFFD0\uFFFD",
               "interpolation_1": "\uFFFD1\uFFFD"
             });
@@ -1057,16 +1057,16 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.Δpipe(2, "async");
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵpipe(2, "async");
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 2, ctx.valueA)));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA == null ? null : ctx.valueA.a == null ? null : ctx.valueA.a.b));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 2, ctx.valueA)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA == null ? null : ctx.valueA.a == null ? null : ctx.valueA.a.b));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -1089,7 +1089,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_572579892698764378$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #{$interpolation}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1101,7 +1101,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_609623417156596326$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("My i18n block #{$interpolation}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("My i18n block #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1113,7 +1113,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_3998119318957372120$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("My i18n block #{$interpolation}", {
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("My i18n block #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1122,27 +1122,27 @@ describe('i18n support in the view compiler', () => {
         vars: 5,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(2, "div");
-            $r3$.Δi18n(3, $I18N_1$);
-            $r3$.Δpipe(4, "uppercase");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(5, "div");
-            $r3$.Δi18n(6, $I18N_2$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(2, "div");
+            $r3$.ɵɵi18n(3, $I18N_1$);
+            $r3$.ɵɵpipe(4, "uppercase");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(5, "div");
+            $r3$.ɵɵi18n(6, $I18N_2$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.one));
-            $r3$.Δi18nApply(1);
-            $r3$.Δselect(3);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(4, 3, ctx.two)));
-            $r3$.Δi18nApply(3);
-            $r3$.Δselect(6);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.three + ctx.four + ctx.five));
-            $r3$.Δi18nApply(6);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.one));
+            $r3$.ɵɵi18nApply(1);
+            $r3$.ɵɵselect(3);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(4, 3, ctx.two)));
+            $r3$.ɵɵi18nApply(3);
+            $r3$.ɵɵselect(6);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.three + ctx.four + ctx.five));
+            $r3$.ɵɵi18nApply(6);
           }
         }
       `;
@@ -1179,7 +1179,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7905233330103651696$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize(" My i18n block #{$interpolation} {$startTagSpan}Plain text in nested element{$closeTagSpan}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize(" My i18n block #{$interpolation} {$startTagSpan}Plain text in nested element{$closeTagSpan}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagSpan": "\uFFFD#2\uFFFD",
               "closeTagSpan": "\uFFFD/#2\uFFFD"
@@ -1198,7 +1198,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_5788821996131681377$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize(" My i18n block #{$interpolation} {$startTagDiv}{$startTagDiv}{$startTagSpan} More bindings in more nested element: {$interpolation_1} {$closeTagSpan}{$closeTagDiv}{$closeTagDiv}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize(" My i18n block #{$interpolation} {$startTagDiv}{$startTagDiv}{$startTagSpan} More bindings in more nested element: {$interpolation_1} {$closeTagSpan}{$closeTagDiv}{$closeTagDiv}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagDiv": "[\uFFFD#6\uFFFD|\uFFFD#7\uFFFD]",
               "startTagSpan": "\uFFFD#8\uFFFD",
@@ -1207,36 +1207,36 @@ describe('i18n support in the view compiler', () => {
               "closeTagDiv": "[\uFFFD/#7\uFFFD|\uFFFD/#6\uFFFD]"
             });
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$);
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$);
         …
         consts: 9,
         vars: 5,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δelement(2, "span");
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(3, "div");
-            $r3$.Δi18nStart(4, $I18N_1$);
-            $r3$.Δpipe(5, "uppercase");
-            $r3$.ΔelementStart(6, "div");
-            $r3$.ΔelementStart(7, "div");
-            $r3$.Δelement(8, "span");
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵelement(2, "span");
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(3, "div");
+            $r3$.ɵɵi18nStart(4, $I18N_1$);
+            $r3$.ɵɵpipe(5, "uppercase");
+            $r3$.ɵɵelementStart(6, "div");
+            $r3$.ɵɵelementStart(7, "div");
+            $r3$.ɵɵelement(8, "span");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.one));
-            $r3$.Δi18nApply(1);
-            $r3$.Δselect(4);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(5, 3, ctx.two)));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.nestedInBlockTwo));
-            $r3$.Δi18nApply(4);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.one));
+            $r3$.ɵɵi18nApply(1);
+            $r3$.ɵɵselect(4);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(5, 3, ctx.two)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.nestedInBlockTwo));
+            $r3$.ɵɵi18nApply(4);
           }
         }
       `;
@@ -1271,7 +1271,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_4782264005467235841$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("Span title {$interpolation} and {$interpolation_1}", {
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("Span title {$interpolation} and {$interpolation_1}", {
               "interpolation": "\uFFFD0\uFFFD",
               "interpolation_1": "\uFFFD1\uFFFD"
             });
@@ -1287,7 +1287,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4446430594603971069$$APP_SPEC_TS_5$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize(" My i18n block #1 with value: {$interpolation} {$startTagSpan} Plain text in nested element (block #1) {$closeTagSpan}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize(" My i18n block #1 with value: {$interpolation} {$startTagSpan} Plain text in nested element (block #1) {$closeTagSpan}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagSpan": "\uFFFD#2\uFFFD",
               "closeTagSpan": "\uFFFD/#2\uFFFD"
@@ -1301,7 +1301,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $MSG_EXTERNAL_2719594642740200058$$APP_SPEC_TS_8$;
         }
         else {
-            $I18N_7$ = $r3$.Δi18nLocalize("Span title {$interpolation}", {
+            $I18N_7$ = $r3$.ɵɵi18nLocalize("Span title {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1316,7 +1316,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_6$ = $MSG_EXTERNAL_2778714953278357902$$APP_SPEC_TS_10$;
         }
         else {
-            $I18N_6$ = $r3$.Δi18nLocalize(" My i18n block #2 with value {$interpolation} {$startTagSpan} Plain text in nested element (block #2) {$closeTagSpan}", {
+            $I18N_6$ = $r3$.ɵɵi18nLocalize(" My i18n block #2 with value {$interpolation} {$startTagSpan} Plain text in nested element (block #2) {$closeTagSpan}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagSpan": "\uFFFD#7\uFFFD",
               "closeTagSpan": "\uFFFD/#7\uFFFD"
@@ -1327,34 +1327,34 @@ describe('i18n support in the view compiler', () => {
         vars: 7,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.ΔelementStart(2, "span", $_c1$);
-            $r3$.Δi18nAttributes(3, $_c4$);
-            $r3$.ΔelementEnd();
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(4, "div");
-            $r3$.Δi18nStart(5, $I18N_6$);
-            $r3$.Δpipe(6, "uppercase");
-            $r3$.ΔelementStart(7, "span", $_c1$);
-            $r3$.Δi18nAttributes(8, $_c9$);
-            $r3$.ΔelementEnd();
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵelementStart(2, "span", $_c1$);
+            $r3$.ɵɵi18nAttributes(3, $_c4$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(4, "div");
+            $r3$.ɵɵi18nStart(5, $I18N_6$);
+            $r3$.ɵɵpipe(6, "uppercase");
+            $r3$.ɵɵelementStart(7, "span", $_c1$);
+            $r3$.ɵɵi18nAttributes(8, $_c9$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(2);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueB));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueC));
-            $r3$.Δi18nApply(3);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueA));
-            $r3$.Δi18nApply(1);
-            $r3$.Δselect(7);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.valueE));
-            $r3$.Δi18nApply(8);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(6, 5, ctx.valueD)));
-            $r3$.Δi18nApply(5);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueC));
+            $r3$.ɵɵi18nApply(3);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueA));
+            $r3$.ɵɵi18nApply(1);
+            $r3$.ɵɵselect(7);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueE));
+            $r3$.ɵɵi18nApply(8);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(6, 5, ctx.valueD)));
+            $r3$.ɵɵi18nApply(5);
           }
         }
       `;
@@ -1390,7 +1390,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7679414751795588050$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize(" Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$closeTagDiv}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize(" Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$closeTagDiv}", {
               "interpolation": "\uFFFD0\uFFFD",
               "startTagDiv": "\uFFFD#3\uFFFD",
               "interpolation_1": "\uFFFD1\uFFFD",
@@ -1400,21 +1400,21 @@ describe('i18n support in the view compiler', () => {
         …
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.ΔelementStart(1, "div");
-            $r3$.Δi18nStart(2, $I18N_1$);
-            $r3$.Δelement(3, "div");
-            $r3$.Δpipe(4, "uppercase");
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵelementStart(1, "div");
+            $r3$.ɵɵi18nStart(2, $I18N_1$);
+            $r3$.ɵɵelement(3, "div");
+            $r3$.ɵɵpipe(4, "uppercase");
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(2);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.valueA));
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(4, 2, $ctx_r0$.valueB)));
-            $r3$.Δi18nApply(2);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.valueA));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(4, 2, $ctx_r0$.valueB)));
+            $r3$.ɵɵi18nApply(2);
           }
         }
         …
@@ -1422,14 +1422,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δtext(1, " Some content ");
-            $r3$.Δtemplate(2, MyComponent_div_2_Template, 5, 4, "div", $_c0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵtext(1, " Some content ");
+            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 5, 4, "div", $_c0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(2);
-            $r3$.Δproperty("ngIf", ctx.visible);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵproperty("ngIf", ctx.visible);
           }
         }
       `;
@@ -1450,7 +1450,7 @@ describe('i18n support in the view compiler', () => {
         const $_c2$ = ["src", "logo.png", ${AttributeMarker.Bindings}, "title", ${AttributeMarker.Template}, "ngIf"];
         function MyComponent_img_1_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δelement(0, "img", $_c0$);
+            $r3$.ɵɵelement(0, "img", $_c0$);
           }
         }
         const $_c3$ = ["src", "logo.png", ${AttributeMarker.Bindings}, "title"];
@@ -1462,22 +1462,22 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_2367729185105559721$$APP_SPEC_TS__2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("App logo #{$interpolation}", {
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("App logo #{$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         const $_c4$ = ["title", $I18N_2$];
         function MyComponent_img_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "img", $_c3$);
-            $r3$.Δi18nAttributes(1, $_c4$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "img", $_c3$);
+            $r3$.ɵɵi18nAttributes(1, $_c4$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.id));
-            $r3$.Δi18nApply(1);
+            const $ctx_r1$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.id));
+            $r3$.ɵɵi18nApply(1);
           }
         }
         …
@@ -1485,15 +1485,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δelement(0, "img", $_c0$);
-            $r3$.Δtemplate(1, MyComponent_img_1_Template, 1, 0, "img", $_c1$);
-            $r3$.Δtemplate(2, MyComponent_img_2_Template, 2, 1, "img", $_c2$);
+            $r3$.ɵɵelement(0, "img", $_c0$);
+            $r3$.ɵɵtemplate(1, MyComponent_img_1_Template, 1, 0, "img", $_c1$);
+            $r3$.ɵɵtemplate(2, MyComponent_img_2_Template, 2, 1, "img", $_c2$);
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δproperty("ngIf", ctx.visible);
-            $r3$.Δselect(2);
-            $r3$.Δproperty("ngIf", ctx.visible);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵproperty("ngIf", ctx.visible);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵproperty("ngIf", ctx.visible);
           }
         }
       `;
@@ -1530,38 +1530,38 @@ describe('i18n support in the view compiler', () => {
         const $_c0$ = [${AttributeMarker.Template}, "ngIf"];
         function MyComponent_div_2_div_4_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_0$, 2);
-            $r3$.ΔelementStart(1, "div");
-            $r3$.Δelement(2, "div");
-            $r3$.ΔelementEnd();
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_0$, 2);
+            $r3$.ɵɵelementStart(1, "div");
+            $r3$.ɵɵelement(2, "div");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r2$ = $r3$.ΔnextContext(2);
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r2$.valueC));
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r2$.valueD));
-            $r3$.Δi18nApply(0);
+            const $ctx_r2$ = $r3$.ɵɵnextContext(2);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r2$.valueC));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r2$.valueD));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_0$, 1);
-            $r3$.ΔelementStart(1, "div");
-            $r3$.ΔelementStart(2, "div");
-            $r3$.Δpipe(3, "uppercase");
-            $r3$.Δtemplate(4, MyComponent_div_2_div_4_Template, 3, 2, "div", $_c1$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵelementStart(1, "div");
+            $r3$.ɵɵelementStart(2, "div");
+            $r3$.ɵɵpipe(3, "uppercase");
+            $r3$.ɵɵtemplate(4, MyComponent_div_2_div_4_Template, 3, 2, "div", $_c1$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(4);
-            $r3$.Δproperty("ngIf", $ctx_r0$.exists);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.valueA));
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(3, 3, $ctx_r0$.valueB)));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(4);
+            $r3$.ɵɵproperty("ngIf", $ctx_r0$.exists);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.valueA));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(3, 3, $ctx_r0$.valueB)));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         var $I18N_0$;
@@ -1582,7 +1582,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_1221890473527419724$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize(" Some content {$startTagDiv_2} Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$startTagDiv_1} Content inside sub-template {$interpolation_2} {$startTagDiv} Bottom level element {$interpolation_3} {$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$startTagDiv_3} Some other content {$interpolation_4} {$startTagDiv} More nested levels with bindings {$interpolation_5} {$closeTagDiv}{$closeTagDiv}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize(" Some content {$startTagDiv_2} Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$startTagDiv_1} Content inside sub-template {$interpolation_2} {$startTagDiv} Bottom level element {$interpolation_3} {$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$startTagDiv_3} Some other content {$interpolation_4} {$startTagDiv} More nested levels with bindings {$interpolation_5} {$closeTagDiv}{$closeTagDiv}", {
               "startTagDiv_2": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagDiv": "[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]",
               "startTagDiv_3": "\uFFFD*3:3\uFFFD\uFFFD#1:3\uFFFD",
@@ -1596,22 +1596,22 @@ describe('i18n support in the view compiler', () => {
               "interpolation_5": "\uFFFD1:3\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$);
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$);
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_0$, 3);
-            $r3$.ΔelementStart(1, "div");
-            $r3$.Δelement(2, "div");
-            $r3$.Δpipe(3, "uppercase");
-            $r3$.ΔelementEnd();
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_0$, 3);
+            $r3$.ɵɵelementStart(1, "div");
+            $r3$.ɵɵelement(2, "div");
+            $r3$.ɵɵpipe(3, "uppercase");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.valueE + $ctx_r1$.valueF));
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(3, 2, $ctx_r1$.valueG)));
-            $r3$.Δi18nApply(0);
+            const $ctx_r1$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.valueE + $ctx_r1$.valueF));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(3, 2, $ctx_r1$.valueG)));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -1619,18 +1619,18 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δtemplate(2, MyComponent_div_2_Template, 5, 5, "div", $_c1$);
-            $r3$.Δtemplate(3, MyComponent_div_3_Template, 4, 4, "div", $_c1$);
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 5, 5, "div", $_c1$);
+            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 4, "div", $_c1$);
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(2);
-            $r3$.Δproperty("ngIf", ctx.visible);
-            $r3$.Δselect(3);
-            $r3$.Δproperty("ngIf", !ctx.visible);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵproperty("ngIf", ctx.visible);
+            $r3$.ɵɵselect(3);
+            $r3$.ɵɵproperty("ngIf", !ctx.visible);
           }
         }
       `;
@@ -1655,7 +1655,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_119975189388320493$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("Some other content {$startTagSpan}{$interpolation}{$closeTagSpan}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("Some other content {$startTagSpan}{$interpolation}{$closeTagSpan}", {
               "startTagSpan": "\uFFFD#2\uFFFD",
               "interpolation": "\uFFFD0\uFFFD",
               "closeTagSpan": "\uFFFD/#2\uFFFD"
@@ -1664,17 +1664,17 @@ describe('i18n support in the view compiler', () => {
         …
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δi18nStart(1, $I18N_1$);
-              $r3$.Δelement(2, "span");
-              $r3$.Δi18nEnd();
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵi18nStart(1, $I18N_1$);
+              $r3$.ɵɵelement(2, "span");
+              $r3$.ɵɵi18nEnd();
+              $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-              const $ctx_r0$ = $r3$.ΔnextContext();
-              $r3$.Δselect(1);
-              $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.valueA));
-              $r3$.Δi18nApply(1);
+              const $ctx_r0$ = $r3$.ɵɵnextContext();
+              $r3$.ɵɵselect(1);
+              $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.valueA));
+              $r3$.ɵɵi18nApply(1);
           }
         }
         …
@@ -1682,11 +1682,11 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_div_0_Template, 3, 1, "div", $_c0$);
+            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 3, 1, "div", $_c0$);
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δproperty("ngIf", ctx.visible);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵproperty("ngIf", ctx.visible);
           }
         }
       `;
@@ -1707,15 +1707,15 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_APP_SPEC_TS_2$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("Hello");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("Hello");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c0$);
-            $r3$.Δlistener("click", function MyComponent_Template_div_click_0_listener($event) { return ctx.onClick(); });
-            $r3$.Δi18n(1, $I18N_1$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c0$);
+            $r3$.ɵɵlistener("click", function MyComponent_Template_div_click_0_listener($event) { return ctx.onClick(); });
+            $r3$.ɵɵi18n(1, $I18N_1$);
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -1737,14 +1737,14 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #1");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #1");
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -1764,9 +1764,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -1774,14 +1774,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -1802,7 +1802,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("My i18n block #2");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("My i18n block #2");
         }
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -1810,20 +1810,20 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("My i18n block #1");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("My i18n block #1");
         }
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18n(0, $I18N_1$);
+            $r3$.ɵɵi18n(0, $I18N_1$);
           }
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template");
-            $r3$.ΔelementContainerStart(1);
-            $r3$.Δi18n(2, $I18N_0$);
-            $r3$.ΔelementContainerEnd();
+            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template");
+            $r3$.ɵɵelementContainerStart(1);
+            $r3$.ɵɵi18n(2, $I18N_0$);
+            $r3$.ɵɵelementContainerEnd();
           }
         }
       `;
@@ -1845,7 +1845,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_5295701706185791735$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("Text #1");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("Text #1");
         }
         const $_c2$ = [${AttributeMarker.Styles}, "padding", "10px"];
         var $I18N_3$;
@@ -1854,19 +1854,19 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_4722270221386399294$$APP_SPEC_TS_3$;
         }
         else {
-            $I18N_3$ = $r3$.Δi18nLocalize("Text #2");
+            $I18N_3$ = $r3$.ɵɵi18nLocalize("Text #2");
         }
         …
         consts: 4,
         vars: 0,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "span", $_c0$);
-            $r3$.Δi18n(1, $I18N_1$);
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(2, "span", $_c1$);
-            $r3$.Δi18n(3, $I18N_3$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "span", $_c0$);
+            $r3$.ɵɵi18n(1, $I18N_1$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(2, "span", $_c1$);
+            $r3$.ɵɵi18n(3, $I18N_3$);
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -1890,7 +1890,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_0$ = $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS_0$;
         }
         else {
-          $I18N_0$ = $r3$.Δi18nLocalize("Some content: {$interpolation}", {
+          $I18N_0$ = $r3$.ɵɵi18nLocalize("Some content: {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
@@ -1899,15 +1899,15 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementContainerStart(0);
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.Δpipe(2, "uppercase");
-            $r3$.ΔelementContainerEnd();
+            $r3$.ɵɵelementContainerStart(0);
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵpipe(2, "uppercase");
+            $r3$.ɵɵelementContainerEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(2, 1, ctx.valueA)));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 1, ctx.valueA)));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -1929,19 +1929,19 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS__0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("Some content: {$interpolation}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("Some content: {$interpolation}", {
               "interpolation": "\uFFFD0\uFFFD"
             });
         }
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18n(0, $I18N_0$);
-            $r3$.Δpipe(1, "uppercase");
+            $r3$.ɵɵi18n(0, $I18N_0$);
+            $r3$.ɵɵpipe(1, "uppercase");
           } if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 1, $ctx_r0$.valueA)));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 1, $ctx_r0$.valueA)));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -1949,7 +1949,7 @@ describe('i18n support in the view compiler', () => {
         vars: 0,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 2, 3, "ng-template");
+            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 2, 3, "ng-template");
           }
         }
       `;
@@ -1979,7 +1979,7 @@ describe('i18n support in the view compiler', () => {
           $I18N_0$ = $MSG_EXTERNAL_702706566400598764$$APP_SPEC_TS_0$;
         }
         else {
-          $I18N_0$ = $r3$.Δi18nLocalize("{$startTagNgTemplate}Template content: {$interpolation}{$closeTagNgTemplate}{$startTagNgContainer}Container content: {$interpolation_1}{$closeTagNgContainer}", {
+          $I18N_0$ = $r3$.ɵɵi18nLocalize("{$startTagNgTemplate}Template content: {$interpolation}{$closeTagNgTemplate}{$startTagNgContainer}Container content: {$interpolation_1}{$closeTagNgContainer}", {
             "startTagNgTemplate": "\uFFFD*2:1\uFFFD",
             "closeTagNgTemplate": "\uFFFD/*2:1\uFFFD",
             "startTagNgContainer": "\uFFFD#3\uFFFD",
@@ -1990,14 +1990,14 @@ describe('i18n support in the view compiler', () => {
         }
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18n(0, $I18N_0$, 1);
-            $r3$.Δpipe(1, "uppercase");
+            $r3$.ɵɵi18n(0, $I18N_0$, 1);
+            $r3$.ɵɵpipe(1, "uppercase");
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 1, $ctx_r0$.valueA)));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 1, $ctx_r0$.valueA)));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -2005,19 +2005,19 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δtemplate(2, MyComponent_ng_template_2_Template, 2, 3, "ng-template");
-            $r3$.ΔelementContainerStart(3);
-            $r3$.Δpipe(4, "uppercase");
-            $r3$.ΔelementContainerEnd();
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 2, 3, "ng-template");
+            $r3$.ɵɵelementContainerStart(3);
+            $r3$.ɵɵpipe(4, "uppercase");
+            $r3$.ɵɵelementContainerEnd();
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(4, 1, ctx.valueB)));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(4, 1, ctx.valueB)));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2038,9 +2038,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_1$;
@@ -2049,20 +2049,20 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18n(0, $I18N_1$);
+            $r3$.ɵɵi18n(0, $I18N_1$);
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.gender));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.gender));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -2070,15 +2070,15 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 1, "ng-template");
-            $r3$.ΔelementContainerStart(1);
-            $r3$.Δi18n(2, $I18N_0$);
-            $r3$.ΔelementContainerEnd();
+            $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 1, "ng-template");
+            $r3$.ɵɵelementContainerStart(1);
+            $r3$.ɵɵi18n(2, $I18N_0$);
+            $r3$.ɵɵelementContainerEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(2);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
-            $r3$.Δi18nApply(2);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
+            $r3$.ɵɵi18nApply(2);
           }
         }
       `;
@@ -2104,26 +2104,26 @@ describe('i18n support in the view compiler', () => {
       const output = String.raw `
         function MyComponent_ng_template_2_ng_template_2_ng_template_1_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18n(0, $I18N_0$, 3);
+            $r3$.ɵɵi18n(0, $I18N_0$, 3);
           }
           if (rf & 2) {
-            const $ctx_r2$ = $r3$.ΔnextContext(3);
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r2$.valueC));
-            $r3$.Δi18nApply(0);
+            const $ctx_r2$ = $r3$.ɵɵnextContext(3);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r2$.valueC));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         function MyComponent_ng_template_2_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_0$, 2);
-            $r3$.Δtemplate(1, MyComponent_ng_template_2_ng_template_2_ng_template_1_Template, 1, 1, "ng-template");
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_0$, 2);
+            $r3$.ɵɵtemplate(1, MyComponent_ng_template_2_ng_template_2_ng_template_1_Template, 1, 1, "ng-template");
+            $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ΔnextContext(2);
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.valueB));
-            $r3$.Δi18nApply(0);
+            const $ctx_r1$ = $r3$.ɵɵnextContext(2);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.valueB));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         var $I18N_0$;
@@ -2138,7 +2138,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2051477021417799640$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$startTagNgTemplate} Template A: {$interpolation} {$startTagNgTemplate} Template B: {$interpolation_1} {$startTagNgTemplate} Template C: {$interpolation_2} {$closeTagNgTemplate}{$closeTagNgTemplate}{$closeTagNgTemplate}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$startTagNgTemplate} Template A: {$interpolation} {$startTagNgTemplate} Template B: {$interpolation_1} {$startTagNgTemplate} Template C: {$interpolation_2} {$closeTagNgTemplate}{$closeTagNgTemplate}{$closeTagNgTemplate}", {
               "startTagNgTemplate": "[\uFFFD*2:1\uFFFD|\uFFFD*2:2\uFFFD|\uFFFD*1:3\uFFFD]",
               "closeTagNgTemplate": "[\uFFFD/*1:3\uFFFD|\uFFFD/*2:2\uFFFD|\uFFFD/*2:1\uFFFD]",
               "interpolation": "\uFFFD0:1\uFFFD",
@@ -2146,19 +2146,19 @@ describe('i18n support in the view compiler', () => {
               "interpolation_2": "\uFFFD0:3\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$);
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$);
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_0$, 1);
-            $r3$.Δpipe(1, "uppercase");
-            $r3$.Δtemplate(2, MyComponent_ng_template_2_ng_template_2_Template, 2, 1, "ng-template");
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵpipe(1, "uppercase");
+            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_ng_template_2_Template, 2, 1, "ng-template");
+            $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($r3$.ΔpipeBind1(1, 1, $ctx_r0$.valueA)));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 1, $ctx_r0$.valueA)));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -2166,11 +2166,11 @@ describe('i18n support in the view compiler', () => {
         vars: 0,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δtemplate(2, MyComponent_ng_template_2_Template, 3, 3, "ng-template");
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 3, 3, "ng-template");
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
         }
       `;
@@ -2191,9 +2191,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_1$;
@@ -2202,20 +2202,20 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18n(0, $I18N_1$);
+            $r3$.ɵɵi18n(0, $I18N_1$);
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -2223,15 +2223,15 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementContainerStart(0);
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementContainerEnd();
-            $r3$.Δtemplate(2, MyComponent_ng_template_2_Template, 1, 1, "ng-template");
+            $r3$.ɵɵelementContainerStart(0);
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementContainerEnd();
+            $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 1, 1, "ng-template");
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2259,7 +2259,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4891196282781544695$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$tagImg} is my logo #1 ", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$tagImg} is my logo #1 ", {
               "tagImg": "\uFFFD#2\uFFFD\uFFFD/#2\uFFFD"
             });
         }
@@ -2271,26 +2271,26 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_461986953980355147$$APP_SPEC_TS__2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("{$tagImg} is my logo #2 ", {
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("{$tagImg} is my logo #2 ", {
               "tagImg": "\uFFFD#1\uFFFD\uFFFD/#1\uFFFD"
             });
         }
         function MyComponent_ng_template_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_2$);
-            $r3$.Δelement(1, "img", $_c0$);
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_2$);
+            $r3$.ɵɵelement(1, "img", $_c0$);
+            $r3$.ɵɵi18nEnd();
           }
         }
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementContainerStart(0);
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δelement(2, "img", $_c0$);
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementContainerEnd();
-            $r3$.Δtemplate(3, MyComponent_ng_template_3_Template, 2, 0, "ng-template");
+            $r3$.ɵɵelementContainerStart(0);
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵelement(2, "img", $_c0$);
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementContainerEnd();
+            $r3$.ɵɵtemplate(3, MyComponent_ng_template_3_Template, 2, 0, "ng-template");
           }
         }
       `;
@@ -2318,7 +2318,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8537814667662432133$$APP_SPEC_TS__0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize(" Root content {$startTagNgContainer} Nested content {$closeTagNgContainer}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize(" Root content {$startTagNgContainer} Nested content {$closeTagNgContainer}", {
               "startTagNgContainer": "\uFFFD*1:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagNgContainer": "\uFFFD/#1:1\uFFFD\uFFFD/*1:1\uFFFD"
             });
@@ -2345,7 +2345,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("Test");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("Test");
         }
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -2353,7 +2353,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("Test");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("Test");
         }
         …
       `;
@@ -2381,7 +2381,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_963542717423364282$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("\n          Some text\n          {$startTagSpan}Text inside span{$closeTagSpan}\n        ", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("\n          Some text\n          {$startTagSpan}Text inside span{$closeTagSpan}\n        ", {
               "startTagSpan": "\uFFFD#3\uFFFD",
               "closeTagSpan": "\uFFFD/#3\uFFFD"
             });
@@ -2389,13 +2389,13 @@ describe('i18n support in the view compiler', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtext(0, "\n        ");
-            $r3$.ΔelementStart(1, "div");
-            $r3$.Δi18nStart(2, $I18N_0$);
-            $r3$.Δelement(3, "span");
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
-            $r3$.Δtext(4, "\n      ");
+            $r3$.ɵɵtext(0, "\n        ");
+            $r3$.ɵɵelementStart(1, "div");
+            $r3$.ɵɵi18nStart(2, $I18N_0$);
+            $r3$.ɵɵelement(3, "span");
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵtext(4, "\n      ");
           }
         }
       `;
@@ -2417,9 +2417,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -2427,14 +2427,14 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2454,9 +2454,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4166854826696768832$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, single {'single quotes'} double {\"double quotes\"} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, single {'single quotes'} double {\"double quotes\"} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
       `;
@@ -2476,9 +2476,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -2486,12 +2486,12 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18n(0, $I18N_0$);
+            $r3$.ɵɵi18n(0, $I18N_0$);
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
-            $r3$.Δi18nApply(0);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
+            $r3$.ɵɵi18nApply(0);
           }
         }
       `;
@@ -2517,9 +2517,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c0$ = ["title", "icu only", ${AttributeMarker.Template}, "ngIf"];
@@ -2531,22 +2531,22 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_3$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
+            $I18N_3$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
         }
-        $I18N_3$ = $r3$.Δi18nPostprocess($I18N_3$, {
+        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c2$);
-            $r3$.Δi18n(1, $I18N_3$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c2$);
+            $r3$.ɵɵi18n(1, $I18N_3$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
-            $r3$.Δi18nApply(1);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
+            $r3$.ɵɵi18nApply(1);
           }
         }
         const $_c3$ = ["title", "icu and text"];
@@ -2558,27 +2558,27 @@ describe('i18n support in the view compiler', () => {
             $I18N_5$ = $MSG_EXTERNAL_1922743304863699161$$APP_SPEC_TS__5$;
         }
         else {
-            $I18N_5$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 0 {no emails} 1 {one email} other {{$interpolation} emails}}", {
+            $I18N_5$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 0 {no emails} 1 {one email} other {{$interpolation} emails}}", {
               "interpolation": "\uFFFD1\uFFFD"
             });
         }
-        $I18N_5$ = $r3$.Δi18nPostprocess($I18N_5$, {
+        $I18N_5$ = $r3$.ɵɵi18nPostprocess($I18N_5$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $_c3$);
-            $r3$.Δtext(1, " You have ");
-            $r3$.Δi18n(2, $I18N_5$);
-            $r3$.Δtext(3, ". ");
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div", $_c3$);
+            $r3$.ɵɵtext(1, " You have ");
+            $r3$.ɵɵi18n(2, $I18N_5$);
+            $r3$.ɵɵtext(3, ". ");
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            const $ctx_r1$ = $r3$.ΔnextContext();
-            $r3$.Δselect(2);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.count));
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r1$.count));
-            $r3$.Δi18nApply(2);
+            const $ctx_r1$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.count));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r1$.count));
+            $r3$.ɵɵi18nApply(2);
           }
         }
         …
@@ -2586,20 +2586,20 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
-            $r3$.Δtemplate(2, MyComponent_div_2_Template, 2, 1, "div", $_c0$);
-            $r3$.Δtemplate(3, MyComponent_div_3_Template, 4, 2, "div", $_c1$);
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 2, 1, "div", $_c0$);
+            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 2, "div", $_c1$);
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nApply(1);
-            $r3$.Δselect(2);
-            $r3$.Δproperty("ngIf", ctx.visible);
-            $r3$.Δselect(3);
-            $r3$.Δproperty("ngIf", ctx.available);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nApply(1);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵproperty("ngIf", ctx.visible);
+            $r3$.ɵɵselect(3);
+            $r3$.ɵɵproperty("ngIf", ctx.available);
           }
         }
       `;
@@ -2621,25 +2621,25 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2949673783721159566$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {{$interpolation}}}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {{$interpolation}}}", {
               "interpolation": "\uFFFD1\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.other));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.other));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2670,7 +2670,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_2417296354340576868$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male - {$startBoldText}male{$closeBoldText}} female {female {$startBoldText}female{$closeBoldText}} other {{$startTagDiv}{$startItalicText}other{$closeItalicText}{$closeTagDiv}}}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male - {$startBoldText}male{$closeBoldText}} female {female {$startBoldText}female{$closeBoldText}} other {{$startTagDiv}{$startItalicText}other{$closeItalicText}{$closeTagDiv}}}", {
               "startBoldText": "<b>",
               "closeBoldText": "</b>",
               "startItalicText": "<i>",
@@ -2679,7 +2679,7 @@ describe('i18n support in the view compiler', () => {
               "closeTagDiv": "</div>"
             });
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c2$ = [1, "other"];
@@ -2697,7 +2697,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_5791551881115084301$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startBoldText}Other content{$closeBoldText}{$startTagDiv}{$startItalicText}Another content{$closeItalicText}{$closeTagDiv}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startBoldText}Other content{$closeBoldText}{$startTagDiv}{$startItalicText}Another content{$closeItalicText}{$closeTagDiv}", {
               "startBoldText": "\uFFFD#2\uFFFD",
               "closeBoldText": "\uFFFD/#2\uFFFD",
               "startTagDiv": "\uFFFD#3\uFFFD",
@@ -2712,19 +2712,19 @@ describe('i18n support in the view compiler', () => {
         vars: 1,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δelement(2, "b");
-            $r3$.ΔelementStart(3, "div");
-            $r3$.Δstyling($_c2$);
-            $r3$.Δelement(4, "i");
-            $r3$.ΔelementEnd();
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵelement(2, "b");
+            $r3$.ɵɵelementStart(3, "div");
+            $r3$.ɵɵstyling($_c2$);
+            $r3$.ɵɵelement(4, "i");
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2746,11 +2746,11 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_6879461626778511059$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male of age: {$interpolation}} female {female} other {other}}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male of age: {$interpolation}} female {female} other {other}}", {
               "interpolation": "\uFFFD1\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -2758,15 +2758,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.ageA + ctx.ageB + ctx.ageC));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.ageA + ctx.ageB + ctx.ageC));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2789,9 +2789,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_2$;
@@ -2800,9 +2800,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
         }
-        $I18N_2$ = $r3$.Δi18nPostprocess($I18N_2$, {
+        $I18N_2$ = $r3$.ɵɵi18nPostprocess($I18N_2$, {
           "VAR_SELECT": "\uFFFD1\uFFFD"
         });
         var $I18N_0$;
@@ -2814,7 +2814,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_2967249209167308918$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$icu_1}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$icu_1}", {
               "icu": $I18N_1$,
               "icu_1": $I18N_2$
             });
@@ -2824,15 +2824,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2860,9 +2860,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         var $I18N_2$;
@@ -2871,9 +2871,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_2$ = $MSG_APP_SPEC_TS_2$;
         }
         else {
-            $I18N_2$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_2$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_2$ = $r3$.Δi18nPostprocess($I18N_2$, {
+        $I18N_2$ = $r3$.ɵɵi18nPostprocess($I18N_2$, {
           "VAR_SELECT": "\uFFFD1\uFFFD"
         });
         const $_c3$ = [${AttributeMarker.Template}, "ngIf"];
@@ -2883,9 +2883,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_4$ = $MSG_APP_SPEC_TS__4$;
         }
         else {
-            $I18N_4$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_4$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_4$ = $r3$.Δi18nPostprocess($I18N_4$, {
+        $I18N_4$ = $r3$.ɵɵi18nPostprocess($I18N_4$, {
           "VAR_SELECT": "\uFFFD0:1\uFFFD"
         });
         var $I18N_0$;
@@ -2899,27 +2899,27 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startTagDiv}{$icu}{$closeTagDiv}{$startTagDiv_1}{$icu}{$closeTagDiv}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startTagDiv}{$icu}{$closeTagDiv}{$startTagDiv_1}{$icu}{$closeTagDiv}", {
               "startTagDiv": "\uFFFD#2\uFFFD",
               "closeTagDiv": "[\uFFFD/#2\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*3:1\uFFFD]",
               "startTagDiv_1": "\uFFFD*3:1\uFFFD\uFFFD#1:1\uFFFD",
               "icu": "\uFFFDI18N_EXP_ICU\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "ICU": [$I18N_1$, $I18N_2$, $I18N_4$]
         });
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-              $r3$.Δi18nStart(0, $I18N_0$, 1);
-              $r3$.Δelement(1, "div");
-              $r3$.Δi18nEnd();
+              $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+              $r3$.ɵɵelement(1, "div");
+              $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.gender));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.gender));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -2927,19 +2927,19 @@ describe('i18n support in the view compiler', () => {
         vars: 3,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δelement(2, "div");
-            $r3$.Δtemplate(3, MyComponent_div_3_Template, 2, 1, "div", $_c3$);
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵelement(2, "div");
+            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 2, 1, "div", $_c3$);
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(3);
-            $r3$.Δproperty("ngIf", ctx.visible);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(3);
+            $r3$.ɵɵproperty("ngIf", ctx.visible);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -2968,9 +2968,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_343563413083115114$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT_1, select, male {male of age: {VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}} female {female} other {other}}");
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT_1, select, male {male of age: {VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}} female {female} other {other}}");
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD",
           "VAR_SELECT_1": "\uFFFD1\uFFFD"
         });
@@ -2979,15 +2979,15 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -3015,9 +3015,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male} female {female} other {other}}");
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c2$ = [${AttributeMarker.Template}, "ngIf"];
@@ -3027,9 +3027,9 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_3$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
+            $I18N_3$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
         }
-        $I18N_3$ = $r3$.Δi18nPostprocess($I18N_3$, {
+        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
           "VAR_SELECT": "\uFFFD0:1\uFFFD"
         });
         var $I18N_0$;
@@ -3043,7 +3043,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_1194472282609532229$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
               "startTagSpan": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagSpan": "\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD",
               "icu": $I18N_1$,
@@ -3052,15 +3052,15 @@ describe('i18n support in the view compiler', () => {
         }
         function MyComponent_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_0$, 1);
-            $r3$.Δelement(1, "span");
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵelement(1, "span");
+            $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -3068,17 +3068,17 @@ describe('i18n support in the view compiler', () => {
         vars: 2,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δtemplate(2, MyComponent_span_2_Template, 2, 1, "span", $_c2$);
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 1, "span", $_c2$);
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(2);
-            $r3$.Δproperty("ngIf", ctx.ageVisible);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵproperty("ngIf", ctx.ageVisible);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -3106,12 +3106,12 @@ describe('i18n support in the view compiler', () => {
             $I18N_1$ = $MSG_EXTERNAL_7825031864601787094$$APP_SPEC_TS_1$;
         }
         else {
-            $I18N_1$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male {$interpolation}} female {female {$interpolation_1}} other {other}}", {
+            $I18N_1$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male {$interpolation}} female {female {$interpolation_1}} other {other}}", {
               "interpolation": "\uFFFD1\uFFFD",
               "interpolation_1": "\uFFFD2\uFFFD"
             });
         }
-        $I18N_1$ = $r3$.Δi18nPostprocess($I18N_1$, {
+        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         const $_c0$ = [${AttributeMarker.Template}, "ngIf"];
@@ -3123,11 +3123,11 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $MSG_EXTERNAL_2310343208266678305$$APP_SPEC_TS__3$;
         }
         else {
-            $I18N_3$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other: {$interpolation}}}", {
+            $I18N_3$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other: {$interpolation}}}", {
               "interpolation": "\uFFFD1:1\uFFFD"
             });
         }
-        $I18N_3$ = $r3$.Δi18nPostprocess($I18N_3$, {
+        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
           "VAR_SELECT": "\uFFFD0:1\uFFFD"
         });
         var $I18N_0$;
@@ -3141,7 +3141,7 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_7186042105600518133$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{$icu}{$startTagSpan}{$icu_1}{$closeTagSpan}", {
               "startTagSpan": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
               "closeTagSpan": "\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD",
               "icu": $I18N_1$,
@@ -3150,16 +3150,16 @@ describe('i18n support in the view compiler', () => {
         }
         function MyComponent_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δi18nStart(0, $I18N_0$, 1);
-            $r3$.Δelement(1, "span");
-            $r3$.Δi18nEnd();
+            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵelement(1, "span");
+            $r3$.ɵɵi18nEnd();
           }
           if (rf & 2) {
-            const $ctx_r0$ = $r3$.ΔnextContext();
-            $r3$.Δselect(0);
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.age));
-            $r3$.Δi18nExp($r3$.Δbind($ctx_r0$.otherAge));
-            $r3$.Δi18nApply(0);
+            const $ctx_r0$ = $r3$.ɵɵnextContext();
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.age));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($ctx_r0$.otherAge));
+            $r3$.ɵɵi18nApply(0);
           }
         }
         …
@@ -3167,19 +3167,19 @@ describe('i18n support in the view compiler', () => {
         vars: 4,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18nStart(1, $I18N_0$);
-            $r3$.Δtemplate(2, MyComponent_span_2_Template, 2, 2, "span", $_c2$);
-            $r3$.Δi18nEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 2, "span", $_c2$);
+            $r3$.ɵɵi18nEnd();
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(2);
-            $r3$.Δproperty("ngIf", ctx.ageVisible);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.weight));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.height));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(2);
+            $r3$.ɵɵproperty("ngIf", ctx.ageVisible);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.weight));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.height));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
@@ -3209,13 +3209,13 @@ describe('i18n support in the view compiler', () => {
             $I18N_0$ = $MSG_EXTERNAL_4853189513362404940$$APP_SPEC_TS_0$;
         }
         else {
-            $I18N_0$ = $r3$.Δi18nLocalize("{VAR_SELECT, select, male {male {$phA}} female {female {$phB}} other {other {$phC}}}", {
+            $I18N_0$ = $r3$.ɵɵi18nLocalize("{VAR_SELECT, select, male {male {$phA}} female {female {$phB}} other {other {$phC}}}", {
               "phA": "\uFFFD1\uFFFD",
               "phB": "\uFFFD2\uFFFD",
               "phC": "\uFFFD3\uFFFD"
             });
         }
-        $I18N_0$ = $r3$.Δi18nPostprocess($I18N_0$, {
+        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
         …
@@ -3223,17 +3223,17 @@ describe('i18n support in the view compiler', () => {
         vars: 4,
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div");
-            $r3$.Δi18n(1, $I18N_0$);
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            $r3$.Δselect(1);
-            $r3$.Δi18nExp($r3$.Δbind(ctx.gender));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.weight));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.height));
-            $r3$.Δi18nExp($r3$.Δbind(ctx.age));
-            $r3$.Δi18nApply(1);
+            $r3$.ɵɵselect(1);
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.weight));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.height));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.age));
+            $r3$.ɵɵi18nApply(1);
           }
         }
       `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
index 1baa56d05c..97dadc1562 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_input_outputs_spec.ts
@@ -52,7 +52,7 @@ describe('compiler compliance: listen()', () => {
     };
 
     const componentDef = `
-      MyComponent.ngComponentDef = IDENT.ΔdefineComponent({
+      MyComponent.ngComponentDef = IDENT.ɵɵdefineComponent({
           …
           inputs:{
             componentInput: "componentInput",
@@ -66,7 +66,7 @@ describe('compiler compliance: listen()', () => {
         });`;
 
     const directiveDef = `
-      MyDirective.ngDirectiveDef = IDENT.ΔdefineDirective({
+      MyDirective.ngDirectiveDef = IDENT.ɵɵdefineDirective({
         …
         inputs:{
           directiveInput: "directiveInput",
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
index ce9d81f7c9..e40d62ad52 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_listener_spec.ts
@@ -45,12 +45,12 @@ describe('compiler compliance: listen()', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "div", $e0_attrs$);
-            $r3$.Δlistener("click", function MyComponent_Template_div_click_0_listener($event) {
+            $r3$.ɵɵelementStart(0, "div", $e0_attrs$);
+            $r3$.ɵɵlistener("click", function MyComponent_Template_div_click_0_listener($event) {
               ctx.onClick($event);
               return 1 == 2;
             });
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementEnd();
           }
         }
         `;
@@ -91,11 +91,11 @@ describe('compiler compliance: listen()', () => {
         …
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ΔelementStart(0, "my-app", $e0_attrs$);
-            $r3$.Δlistener("click", function MyComponent_Template_my_app_click_0_listener($event) {
+            $r3$.ɵɵelementStart(0, "my-app", $e0_attrs$);
+            $r3$.ɵɵlistener("click", function MyComponent_Template_my_app_click_0_listener($event) {
               return ctx.onClick($event);
             });
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementEnd();
           }
         }
         `;
@@ -138,33 +138,33 @@ describe('compiler compliance: listen()', () => {
 
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            const $s$ = $r3$.ΔgetCurrentView();
-            $r3$.ΔelementStart(0, "div");
-            $r3$.ΔelementStart(1, "div", $e_attrs$);
-            $r3$.Δlistener("click", function MyComponent_div_0_Template_div_click_1_listener($event) {
-              $r3$.ΔrestoreView($s$);
-              const $comp$ = $r3$.ΔnextContext();
+            const $s$ = $r3$.ɵɵgetCurrentView();
+            $r3$.ɵɵelementStart(0, "div");
+            $r3$.ɵɵelementStart(1, "div", $e_attrs$);
+            $r3$.ɵɵlistener("click", function MyComponent_div_0_Template_div_click_1_listener($event) {
+              $r3$.ɵɵrestoreView($s$);
+              const $comp$ = $r3$.ɵɵnextContext();
               return $comp$.onClick($comp$.foo);
             });
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementStart(2, "button", $e_attrs$);
-            $r3$.Δlistener("click", function MyComponent_div_0_Template_button_click_2_listener($event) {
-              $r3$.ΔrestoreView($s$);
-              const $comp2$ = $r3$.ΔnextContext();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementStart(2, "button", $e_attrs$);
+            $r3$.ɵɵlistener("click", function MyComponent_div_0_Template_button_click_2_listener($event) {
+              $r3$.ɵɵrestoreView($s$);
+              const $comp2$ = $r3$.ɵɵnextContext();
               return $comp2$.onClick2($comp2$.bar);
             });
-            $r3$.ΔelementEnd();
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementEnd();
+            $r3$.ɵɵelementEnd();
           }
         }
         // ...
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_div_0_Template, 3, 0, "div", $c0$);
+            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 3, 0, "div", $c0$);
           }
           if (rf & 2) {
-            $i0$.Δselect(0);
-            $i0$.Δproperty("ngIf", ctx.showing);
+            $i0$.ɵɵselect(0);
+            $i0$.ɵɵproperty("ngIf", ctx.showing);
           }
         }
         `;
@@ -199,7 +199,7 @@ describe('compiler compliance: listen()', () => {
         const $e0_attrs$ = [${AttributeMarker.Bindings}, "click"];
         const $e2_refs$ = ["user", ""];
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors: [["my-component"]],
           factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
@@ -207,16 +207,16 @@ describe('compiler compliance: listen()', () => {
           vars: 0,
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              const $s$ = $r3$.ΔgetCurrentView();
-              $r3$.ΔelementStart(0, "button", $e0_attrs$);
-                $r3$.Δlistener("click", function MyComponent_Template_button_click_0_listener($event) {
-                   $r3$.ΔrestoreView($s$);
-                   const $user$ = $r3$.Δreference(3);
+              const $s$ = $r3$.ɵɵgetCurrentView();
+              $r3$.ɵɵelementStart(0, "button", $e0_attrs$);
+                $r3$.ɵɵlistener("click", function MyComponent_Template_button_click_0_listener($event) {
+                   $r3$.ɵɵrestoreView($s$);
+                   const $user$ = $r3$.ɵɵreference(3);
                    return ctx.onClick($user$.value);
                 });
-                $r3$.Δtext(1, "Save");
-              $r3$.ΔelementEnd();
-              $r3$.Δelement(2, "input", null, $e2_refs$);
+                $r3$.ɵɵtext(1, "Save");
+              $r3$.ɵɵelementEnd();
+              $r3$.ɵɵelement(2, "input", null, $e2_refs$);
             }
           },
           encapsulation: 2
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
index 6198a03d02..0a0eaed14e 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
@@ -46,7 +46,7 @@ describe('compiler compliance: providers', () => {
     const result = compile(files, angularFiles);
     expectEmit(
         result.source,
-        'features: [i0.ΔProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}], [GreeterEN])],',
+        'features: [i0.ɵɵProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}], [GreeterEN])],',
         'Incorrect features');
   });
 
@@ -79,7 +79,7 @@ describe('compiler compliance: providers', () => {
     const result = compile(files, angularFiles);
     expectEmit(
         result.source,
-        'features: [i0.ΔProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}])],',
+        'features: [i0.ɵɵProvidersFeature([GreeterEN, {provide: Greeter, useClass: GreeterEN}])],',
         'Incorrect features');
   });
 
@@ -111,7 +111,7 @@ describe('compiler compliance: providers', () => {
 
     const result = compile(files, angularFiles);
     expectEmit(
-        result.source, 'features: [i0.ΔProvidersFeature([], [GreeterEN])],', 'Incorrect features');
+        result.source, 'features: [i0.ɵɵProvidersFeature([], [GreeterEN])],', 'Incorrect features');
   });
 
   it('should not emit the ProvidersFeature feature when no providers', () => {
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
index 5e271f339a..10dbc48055 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
@@ -113,7 +113,7 @@ describe('r3_view_compiler', () => {
       };
 
       const bV_call =
-          `$r3$.ΔinterpolationV([" ",ctx.list[0]," ",ctx.list[1]," ",ctx.list[2]," ",ctx.list[3],
+          `$r3$.ɵɵinterpolationV([" ",ctx.list[0]," ",ctx.list[1]," ",ctx.list[2]," ",ctx.list[3],
         " ",ctx.list[4]," ",ctx.list[5]," ",ctx.list[6]," ",ctx.list[7]," ",ctx.list[8],
         " "])`;
       const result = compile(files, angularFiles);
@@ -143,12 +143,12 @@ describe('r3_view_compiler', () => {
       const template = `
       template: function MyApp_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δelement(0, "div");
+          $i0$.ɵɵelement(0, "div");
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("@attr", …);
-          $i0$.Δproperty("@binding", …);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("@attr", …);
+          $i0$.ɵɵproperty("@binding", …);
         }
       }`;
       const result = compile(files, angularFiles);
@@ -176,10 +176,10 @@ describe('r3_view_compiler', () => {
       const template = `
       template: function MyApp_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "div");
+          $i0$.ɵɵelementStart(0, "div");
           …
-          $i0$.Δselect(0);
-          $i0$.Δproperty("@mySelector", …);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("@mySelector", …);
         }
       }`;
       const result = compile(files, angularFiles);
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index 43256c46d1..250cb6bf56 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -95,7 +95,7 @@ describe('compiler compliance: styling', () => {
          };
 
          const template = `
-         MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+         MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
            …
            styles: ["div.cool { color: blue; }", ":host.nice p { color: gold; }"],
            encapsulation: 1
@@ -128,7 +128,7 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors:[["my-component"]],
           factory:function MyComponent_Factory(t){
@@ -170,7 +170,7 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           type: MyComponent,
           selectors:[["my-component"]],
           factory:function MyComponent_Factory(t){
@@ -215,23 +215,23 @@ describe('compiler compliance: styling', () => {
 
       const template = `
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           …
           consts: 3,
           vars: 3,
           template:  function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.Δelement(0, "div");
-              $r3$.Δelement(1, "div");
-              $r3$.Δelement(2, "div");
+              $r3$.ɵɵelement(0, "div");
+              $r3$.ɵɵelement(1, "div");
+              $r3$.ɵɵelement(2, "div");
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.Δproperty("@foo", ctx.exp);
-              $r3$.Δselect(1);
-              $r3$.Δproperty("@bar", undefined);
-              $r3$.Δselect(2);
-              $r3$.Δproperty("@baz", undefined);
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵproperty("@foo", ctx.exp);
+              $r3$.ɵɵselect(1);
+              $r3$.ɵɵproperty("@bar", undefined);
+              $r3$.ɵɵselect(2);
+              $r3$.ɵɵproperty("@baz", undefined);
             }
           },
           encapsulation: 2
@@ -277,19 +277,19 @@ describe('compiler compliance: styling', () => {
 
       const template = `
         …
-        MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+        MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
           …
           consts: 1,
           vars: 1,
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δlistener("@myAnimation.start", function MyComponent_Template_div_animation_myAnimation_start_0_listener($event) { return ctx.onStart($event); });
-              $r3$.Δlistener("@myAnimation.done", function MyComponent_Template_div_animation_myAnimation_done_0_listener($event) { return ctx.onDone($event); });
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵlistener("@myAnimation.start", function MyComponent_Template_div_animation_myAnimation_start_0_listener($event) { return ctx.onStart($event); });
+              $r3$.ɵɵlistener("@myAnimation.done", function MyComponent_Template_div_animation_myAnimation_done_0_listener($event) { return ctx.onDone($event); });
+              $r3$.ɵɵelementEnd();
             } if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.Δproperty("@myAnimation", ctx.exp);
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵproperty("@myAnimation", ctx.exp);
             }
           },
           encapsulation: 2,
@@ -340,15 +340,15 @@ describe('compiler compliance: styling', () => {
       };
 
       const template = `
-        MyAnimDir.ngDirectiveDef = $r3$.ΔdefineDirective({
+        MyAnimDir.ngDirectiveDef = $r3$.ɵɵdefineDirective({
           …
           hostBindings: function MyAnimDir_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔallocHostVars(1);
-              $r3$.ΔcomponentHostSyntheticListener("@myAnim.start", function MyAnimDir_animation_myAnim_start_HostBindingHandler($event) { return ctx.onStart(); });
-              $r3$.ΔcomponentHostSyntheticListener("@myAnim.done", function MyAnimDir_animation_myAnim_done_HostBindingHandler($event) { return ctx.onDone(); });
+              $r3$.ɵɵallocHostVars(1);
+              $r3$.ɵɵcomponentHostSyntheticListener("@myAnim.start", function MyAnimDir_animation_myAnim_start_HostBindingHandler($event) { return ctx.onStart(); });
+              $r3$.ɵɵcomponentHostSyntheticListener("@myAnim.done", function MyAnimDir_animation_myAnim_done_HostBindingHandler($event) { return ctx.onDone(); });
             } if (rf & 2) {
-              $r3$.ΔcomponentHostSyntheticProperty(elIndex, "@myAnim", $r3$.Δbind(ctx.myAnimState), null, true);
+              $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@myAnim", $r3$.ɵɵbind(ctx.myAnimState), null, true);
             }
           }
           …
@@ -384,14 +384,14 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔstyleMap($ctx$.myStyleExp);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵstyleMap($ctx$.myStyleExp);
+              $r3$.ɵɵstylingApply();
             }
           }
           `;
@@ -450,14 +450,14 @@ describe('compiler compliance: styling', () => {
           vars: 1,
           template: function MyComponentWithInterpolation_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling();
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling();
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔclassMap($r3$.Δinterpolation1("foo foo-", $ctx$.fooId, ""));
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵclassMap($r3$.ɵɵinterpolation1("foo foo-", $ctx$.fooId, ""));
+              $r3$.ɵɵstylingApply();
             }
           }
         …
@@ -465,14 +465,14 @@ describe('compiler compliance: styling', () => {
           vars: 2,
           template: function MyComponentWithMuchosInterpolation_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling();
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling();
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔclassMap($r3$.Δinterpolation2("foo foo-", $ctx$.fooId, "-", $ctx$.fooUsername, ""));
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵclassMap($r3$.ɵɵinterpolation2("foo foo-", $ctx$.fooId, "-", $ctx$.fooUsername, ""));
+              $r3$.ɵɵstylingApply();
             }
           }
         …
@@ -480,14 +480,14 @@ describe('compiler compliance: styling', () => {
           vars: 0,
           template: function MyComponentWithoutInterpolation_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling();
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling();
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔclassMap($ctx$.exp);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵclassMap($ctx$.exp);
+              $r3$.ɵɵstylingApply();
             }
           }
           `;
@@ -527,7 +527,7 @@ describe('compiler compliance: styling', () => {
           const $_c0$ = [${AttributeMarker.Styles}, "opacity", "1", ${AttributeMarker.Bindings}, "style"];
           const $_c1$ = ["width", "height"];
           …
-          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
               type: MyComponent,
               selectors:[["my-component"]],
               factory:function MyComponent_Factory(t){
@@ -537,17 +537,17 @@ describe('compiler compliance: styling', () => {
               vars: 1,
               template:  function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ΔelementStart(0, "div", $_c0$);
-                  $r3$.Δstyling(null, $_c1$, $r3$.ΔdefaultStyleSanitizer);
-                  $r3$.ΔelementEnd();
+                  $r3$.ɵɵelementStart(0, "div", $_c0$);
+                  $r3$.ɵɵstyling(null, $_c1$, $r3$.ɵɵdefaultStyleSanitizer);
+                  $r3$.ɵɵelementEnd();
                 }
                 if (rf & 2) {
-                  $r3$.Δselect(0);
-                  $r3$.ΔstyleMap($ctx$.myStyleExp);
-                  $r3$.ΔstyleProp(0, $ctx$.myWidth);
-                  $r3$.ΔstyleProp(1, $ctx$.myHeight);
-                  $r3$.ΔstylingApply();
-                  $r3$.ΔelementAttribute(0, "style", $r3$.Δbind("border-width: 10px"), $r3$.ΔsanitizeStyle);
+                  $r3$.ɵɵselect(0);
+                  $r3$.ɵɵstyleMap($ctx$.myStyleExp);
+                  $r3$.ɵɵstyleProp(0, $ctx$.myWidth);
+                  $r3$.ɵɵstyleProp(1, $ctx$.myHeight);
+                  $r3$.ɵɵstylingApply();
+                  $r3$.ɵɵelementAttribute(0, "style", $r3$.ɵɵbind("border-width: 10px"), $r3$.ɵɵsanitizeStyle);
                 }
               },
               encapsulation: 2
@@ -587,7 +587,7 @@ describe('compiler compliance: styling', () => {
               }
           }
 
-          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
             type: MyComponent,
             selectors: [["my-component"]],
             factory: function MyComponent_Factory(t) {
@@ -597,14 +597,14 @@ describe('compiler compliance: styling', () => {
             vars: 0,
             template:  function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔelementStart(0, "div");
-                $r3$.Δstyling(null, _c0, $r3$.ΔdefaultStyleSanitizer);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵelementStart(0, "div");
+                $r3$.ɵɵstyling(null, _c0, $r3$.ɵɵdefaultStyleSanitizer);
+                $r3$.ɵɵelementEnd();
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.ΔstyleProp(0, ctx.myImage);
-                $r3$.ΔstylingApply();
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵstyleProp(0, ctx.myImage);
+                $r3$.ɵɵstylingApply();
               }
             },
             encapsulation: 2
@@ -639,14 +639,14 @@ describe('compiler compliance: styling', () => {
           …
           template:  function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling(null, _c0);
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling(null, _c0);
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔstyleProp(0, 12, "px");
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵstyleProp(0, 12, "px");
+              $r3$.ɵɵstylingApply();
             }
           }
      `;
@@ -705,14 +705,14 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling();
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling();
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔclassMap($ctx$.myClassExp);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵclassMap($ctx$.myClassExp);
+              $r3$.ɵɵstylingApply();
             }
           }
           `;
@@ -752,7 +752,7 @@ describe('compiler compliance: styling', () => {
           const $e0_attrs$ = [${AttributeMarker.Classes}, "grape", ${AttributeMarker.Bindings}, "class"];
           const $e0_bindings$ = ["apple", "orange"];
           …
-          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
               type: MyComponent,
               selectors:[["my-component"]],
               factory:function MyComponent_Factory(t){
@@ -762,17 +762,17 @@ describe('compiler compliance: styling', () => {
               vars: 1,
               template:  function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.ΔelementStart(0, "div", $e0_attrs$);
-                  $r3$.Δstyling($e0_bindings$);
-                  $r3$.ΔelementEnd();
+                  $r3$.ɵɵelementStart(0, "div", $e0_attrs$);
+                  $r3$.ɵɵstyling($e0_bindings$);
+                  $r3$.ɵɵelementEnd();
                 }
                 if (rf & 2) {
-                  $r3$.Δselect(0);
-                  $r3$.ΔclassMap($ctx$.myClassExp);
-                  $r3$.ΔclassProp(0, $ctx$.yesToApple);
-                  $r3$.ΔclassProp(1, $ctx$.yesToOrange);
-                  $r3$.ΔstylingApply();
-                  $r3$.ΔelementAttribute(0, "class", $r3$.Δbind("banana"));
+                  $r3$.ɵɵselect(0);
+                  $r3$.ɵɵclassMap($ctx$.myClassExp);
+                  $r3$.ɵɵclassProp(0, $ctx$.yesToApple);
+                  $r3$.ɵɵclassProp(1, $ctx$.yesToOrange);
+                  $r3$.ɵɵstylingApply();
+                  $r3$.ɵɵelementAttribute(0, "class", $r3$.ɵɵbind("banana"));
                 }
               },
               encapsulation: 2
@@ -808,7 +808,7 @@ describe('compiler compliance: styling', () => {
          const template = `
           const $e0_attrs$ = [${AttributeMarker.Classes}, "foo", ${AttributeMarker.Styles}, "width", "100px", ${AttributeMarker.Bindings}, "class", "style"];
           …
-          MyComponent.ngComponentDef = $r3$.ΔdefineComponent({
+          MyComponent.ngComponentDef = $r3$.ɵɵdefineComponent({
               type: MyComponent,
               selectors:[["my-component"]],
               factory:function MyComponent_Factory(t){
@@ -818,12 +818,12 @@ describe('compiler compliance: styling', () => {
               vars: 2,
               template:  function MyComponent_Template(rf, $ctx$) {
                 if (rf & 1) {
-                  $r3$.Δelement(0, "div", $e0_attrs$);
+                  $r3$.ɵɵelement(0, "div", $e0_attrs$);
                 }
                 if (rf & 2) {
-                  $r3$.Δselect(0);
-                  $r3$.ΔelementAttribute(0, "class", $r3$.Δbind("round"));
-                  $r3$.ΔelementAttribute(0, "style", $r3$.Δbind("height:100px"), $r3$.ΔsanitizeStyle);
+                  $r3$.ɵɵselect(0);
+                  $r3$.ɵɵelementAttribute(0, "class", $r3$.ɵɵbind("round"));
+                  $r3$.ɵɵelementAttribute(0, "style", $r3$.ɵɵbind("height:100px"), $r3$.ɵɵsanitizeStyle);
                 }
               },
               encapsulation: 2
@@ -884,15 +884,15 @@ describe('compiler compliance: styling', () => {
       const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔstyleMap($ctx$.myStyleExp);
-              $r3$.ΔclassMap($ctx$.myClassExp);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵstyleMap($ctx$.myStyleExp);
+              $r3$.ɵɵclassMap($ctx$.myClassExp);
+              $r3$.ɵɵstylingApply();
             }
           }
           `;
@@ -926,17 +926,17 @@ describe('compiler compliance: styling', () => {
          const template = `
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
-              $r3$.Δpipe(1, "stylePipe");
-              $r3$.Δpipe(2, "classPipe");
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
+              $r3$.ɵɵpipe(1, "stylePipe");
+              $r3$.ɵɵpipe(2, "classPipe");
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔstyleMap($r3$.ΔpipeBind1(1, 0, $ctx$.myStyleExp));
-              $r3$.ΔclassMap($r3$.ΔpipeBind1(2, 2, $ctx$.myClassExp));
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵstyleMap($r3$.ɵɵpipeBind1(1, 0, $ctx$.myStyleExp));
+              $r3$.ɵɵclassMap($r3$.ɵɵpipeBind1(2, 2, $ctx$.myClassExp));
+              $r3$.ɵɵstylingApply();
             }
           }
           `;
@@ -981,25 +981,25 @@ describe('compiler compliance: styling', () => {
           …
           template: function MyComponent_Template(rf, $ctx$) {
             if (rf & 1) {
-              $r3$.ΔelementStart(0, "div");
-              $r3$.Δstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ΔdefaultStyleSanitizer);
-              $r3$.Δpipe(1, "pipe");
-              $r3$.Δpipe(2, "pipe");
-              $r3$.Δpipe(3, "pipe");
-              $r3$.Δpipe(4, "pipe");
-              $r3$.Δtext(5);
-              $r3$.ΔelementEnd();
+              $r3$.ɵɵelementStart(0, "div");
+              $r3$.ɵɵstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ɵɵdefaultStyleSanitizer);
+              $r3$.ɵɵpipe(1, "pipe");
+              $r3$.ɵɵpipe(2, "pipe");
+              $r3$.ɵɵpipe(3, "pipe");
+              $r3$.ɵɵpipe(4, "pipe");
+              $r3$.ɵɵtext(5);
+              $r3$.ɵɵelementEnd();
             }
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔstyleMap($r3$.ΔpipeBind2(1, 1, $ctx$.myStyleExp, 1000));
-              $r3$.ΔclassMap($e2_styling$);
-              $r3$.ΔstyleProp(0, $r3$.ΔpipeBind2(2, 4, $ctx$.barExp, 3000));
-              $r3$.ΔstyleProp(1, $r3$.ΔpipeBind2(3, 7, $ctx$.bazExp, 4000));
-              $r3$.ΔclassProp(0, $r3$.ΔpipeBind2(4, 10, $ctx$.fooExp, 2000));
-              $r3$.ΔstylingApply();
-              $r3$.Δselect(5);
-              $r3$.ΔtextBinding(5, $r3$.Δinterpolation1(" ", $ctx$.item, ""));
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵstyleMap($r3$.ɵɵpipeBind2(1, 1, $ctx$.myStyleExp, 1000));
+              $r3$.ɵɵclassMap($e2_styling$);
+              $r3$.ɵɵstyleProp(0, $r3$.ɵɵpipeBind2(2, 4, $ctx$.barExp, 3000));
+              $r3$.ɵɵstyleProp(1, $r3$.ɵɵpipeBind2(3, 7, $ctx$.bazExp, 4000));
+              $r3$.ɵɵclassProp(0, $r3$.ɵɵpipeBind2(4, 10, $ctx$.fooExp, 2000));
+              $r3$.ɵɵstylingApply();
+              $r3$.ɵɵselect(5);
+              $r3$.ɵɵtextBinding(5, $r3$.ɵɵinterpolation1(" ", $ctx$.item, ""));
             }
           }
           `;
@@ -1041,18 +1041,18 @@ describe('compiler compliance: styling', () => {
           template: function MyComponent_Template(rf, $ctx$) {
             …
             if (rf & 2) {
-              $r3$.Δselect(0);
-              $r3$.ΔstyleProp(0, $ctx$.w1);
-              $r3$.ΔstylingApply();
-              $r3$.Δselect(1);
-              $r3$.ΔstyleProp(0, $ctx$.h1);
-              $r3$.ΔstylingApply();
-              $r3$.Δselect(2);
-              $r3$.ΔclassProp(0, $ctx$.a1);
-              $r3$.ΔstylingApply();
-              $r3$.Δselect(3);
-              $r3$.ΔclassProp(0, $ctx$.r1);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵselect(0);
+              $r3$.ɵɵstyleProp(0, $ctx$.w1);
+              $r3$.ɵɵstylingApply();
+              $r3$.ɵɵselect(1);
+              $r3$.ɵɵstyleProp(0, $ctx$.h1);
+              $r3$.ɵɵstylingApply();
+              $r3$.ɵɵselect(2);
+              $r3$.ɵɵclassProp(0, $ctx$.a1);
+              $r3$.ɵɵstylingApply();
+              $r3$.ɵɵselect(3);
+              $r3$.ɵɵclassProp(0, $ctx$.r1);
+              $r3$.ɵɵstylingApply();
             }
           }
           `;
@@ -1104,15 +1104,15 @@ describe('compiler compliance: styling', () => {
           …
           hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.ΔelementHostAttrs($e0_attrs$);
-              $r3$.Δstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ΔdefaultStyleSanitizer);
+              $r3$.ɵɵelementHostAttrs($e0_attrs$);
+              $r3$.ɵɵstyling($e0_classBindings$, $e0_styleBindings$, $r3$.ɵɵdefaultStyleSanitizer);
             }
             if (rf & 2) {
-              $r3$.ΔstyleMap(ctx.myStyle);
-              $r3$.ΔclassMap(ctx.myClass);
-              $r3$.ΔstyleProp(0, ctx.myColorProp);
-              $r3$.ΔclassProp(0, ctx.myFooClass);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵstyleMap(ctx.myStyle);
+              $r3$.ɵɵclassMap(ctx.myClass);
+              $r3$.ɵɵstyleProp(0, ctx.myColorProp);
+              $r3$.ɵɵclassProp(0, ctx.myFooClass);
+              $r3$.ɵɵstylingApply();
             }
           },
           consts: 0,
@@ -1166,16 +1166,16 @@ describe('compiler compliance: styling', () => {
           …
           hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.Δstyling(_c0, _c1, $r3$.ΔdefaultStyleSanitizer);
+              $r3$.ɵɵstyling(_c0, _c1, $r3$.ɵɵdefaultStyleSanitizer);
             }
             if (rf & 2) {
-              $r3$.ΔstyleMap(ctx.myStyle);
-              $r3$.ΔclassMap(ctx.myClasses);
-              $r3$.ΔstyleProp(0, ctx.myHeightProp, "pt");
-              $r3$.ΔstyleProp(1, ctx.myWidthProp);
-              $r3$.ΔclassProp(0, ctx.myBarClass);
-              $r3$.ΔclassProp(1, ctx.myFooClass);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵstyleMap(ctx.myStyle);
+              $r3$.ɵɵclassMap(ctx.myClasses);
+              $r3$.ɵɵstyleProp(0, ctx.myHeightProp, "pt");
+              $r3$.ɵɵstyleProp(1, ctx.myWidthProp);
+              $r3$.ɵɵclassProp(0, ctx.myBarClass);
+              $r3$.ɵɵclassProp(1, ctx.myFooClass);
+              $r3$.ɵɵstylingApply();
             }
           },
           consts: 0,
@@ -1229,17 +1229,17 @@ describe('compiler compliance: styling', () => {
             …
             function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ΔelementStart(0, "div");
-                $r3$.Δstyling(_c2, _c3, $r3$.ΔdefaultStyleSanitizer);
-                $r3$.ΔelementEnd();
+                $r3$.ɵɵelementStart(0, "div");
+                $r3$.ɵɵstyling(_c2, _c3, $r3$.ɵɵdefaultStyleSanitizer);
+                $r3$.ɵɵelementEnd();
               }
               if (rf & 2) {
-                $r3$.Δselect(0);
-                $r3$.ΔstyleMap(ctx.myStyleExp);
-                $r3$.ΔclassMap(ctx.myClassExp);
-                $r3$.ΔstyleProp(0, ctx.myHeightExp, null, true);
-                $r3$.ΔclassProp(0, ctx.myBarClassExp, true);
-                $r3$.ΔstylingApply();
+                $r3$.ɵɵselect(0);
+                $r3$.ɵɵstyleMap(ctx.myStyleExp);
+                $r3$.ɵɵclassMap(ctx.myClassExp);
+                $r3$.ɵɵstyleProp(0, ctx.myHeightExp, null, true);
+                $r3$.ɵɵclassProp(0, ctx.myBarClassExp, true);
+                $r3$.ɵɵstylingApply();
               }
             },
           `;
@@ -1250,14 +1250,14 @@ describe('compiler compliance: styling', () => {
             …
             hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
               if (rf & 1) {
-                $r3$.Δstyling(_c0, _c1, $r3$.ΔdefaultStyleSanitizer);
+                $r3$.ɵɵstyling(_c0, _c1, $r3$.ɵɵdefaultStyleSanitizer);
               }
               if (rf & 2) {
-                $r3$.ΔstyleMap(ctx.myStyleExp);
-                $r3$.ΔclassMap(ctx.myClassExp);
-                $r3$.ΔstyleProp(0, ctx.myWidthExp, null, true);
-                $r3$.ΔclassProp(0, ctx.myFooClassExp, true);
-                $r3$.ΔstylingApply();
+                $r3$.ɵɵstyleMap(ctx.myStyleExp);
+                $r3$.ɵɵclassMap(ctx.myClassExp);
+                $r3$.ɵɵstyleProp(0, ctx.myWidthExp, null, true);
+                $r3$.ɵɵclassProp(0, ctx.myFooClassExp, true);
+                $r3$.ɵɵstylingApply();
               }
             },
           `;
@@ -1319,33 +1319,33 @@ describe('compiler compliance: styling', () => {
           …
           function ClassDirective_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.Δstyling();
+              $r3$.ɵɵstyling();
             }
             if (rf & 2) {
-              $r3$.ΔclassMap(ctx.myClassMap);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵclassMap(ctx.myClassMap);
+              $r3$.ɵɵstylingApply();
             }
           }
           …
           function WidthDirective_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.Δstyling($widthDir_classes$, $widthDir_styles$);
+              $r3$.ɵɵstyling($widthDir_classes$, $widthDir_styles$);
             }
             if (rf & 2) {
-              $r3$.ΔstyleProp(0, ctx.myWidth);
-              $r3$.ΔclassProp(0, ctx.myFooClass);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵstyleProp(0, ctx.myWidth);
+              $r3$.ɵɵclassProp(0, ctx.myFooClass);
+              $r3$.ɵɵstylingApply();
             }
           }
           …
           function HeightDirective_HostBindings(rf, ctx, elIndex) {
             if (rf & 1) {
-              $r3$.Δstyling($heightDir_classes$, $heightDir_styles$);
+              $r3$.ɵɵstyling($heightDir_classes$, $heightDir_styles$);
             }
             if (rf & 2) {
-              $r3$.ΔstyleProp(0, ctx.myHeight);
-              $r3$.ΔclassProp(0, ctx.myBarClass);
-              $r3$.ΔstylingApply();
+              $r3$.ɵɵstyleProp(0, ctx.myHeight);
+              $r3$.ɵɵclassProp(0, ctx.myBarClass);
+              $r3$.ɵɵstylingApply();
             }
           }
           …
@@ -1399,16 +1399,16 @@ describe('compiler compliance: styling', () => {
       …
       hostBindings: function MyComponent_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          $r3$.ΔallocHostVars(2);
-          $r3$.ΔelementHostAttrs($_c0$);
-          $r3$.Δstyling(null, null, $r3$.ΔdefaultStyleSanitizer);
+          $r3$.ɵɵallocHostVars(2);
+          $r3$.ɵɵelementHostAttrs($_c0$);
+          $r3$.ɵɵstyling(null, null, $r3$.ɵɵdefaultStyleSanitizer);
         }
         if (rf & 2) {
-          $r3$.Δproperty("id", ctx.id, null, true);
-          $r3$.Δproperty("title", ctx.title, null, true);
-          $r3$.ΔstyleMap(ctx.myStyle);
-          $r3$.ΔclassMap(ctx.myClass);
-          $r3$.ΔstylingApply();
+          $r3$.ɵɵproperty("id", ctx.id, null, true);
+          $r3$.ɵɵproperty("title", ctx.title, null, true);
+          $r3$.ɵɵstyleMap(ctx.myStyle);
+          $r3$.ɵɵclassMap(ctx.myClass);
+          $r3$.ɵɵstylingApply();
         }
       }
     `;
@@ -1447,15 +1447,15 @@ describe('compiler compliance: styling', () => {
       …
       hostBindings: function WidthDirective_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          $r3$.ΔallocHostVars(2);
-          $r3$.Δstyling($_c0$, $_c1$);
+          $r3$.ɵɵallocHostVars(2);
+          $r3$.ɵɵstyling($_c0$, $_c1$);
         }
         if (rf & 2) {
-          $r3$.Δproperty("id", ctx.id, null, true);
-          $r3$.Δproperty("title", ctx.title, null, true);
-          $r3$.ΔstyleProp(0, ctx.myWidth);
-          $r3$.ΔclassProp(0, ctx.myFooClass);
-          $r3$.ΔstylingApply();
+          $r3$.ɵɵproperty("id", ctx.id, null, true);
+          $r3$.ɵɵproperty("title", ctx.title, null, true);
+          $r3$.ɵɵstyleProp(0, ctx.myWidth);
+          $r3$.ɵɵclassProp(0, ctx.myFooClass);
+          $r3$.ɵɵstylingApply();
         }
       }
     `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
index 4adf227d14..0ab46c841b 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
@@ -56,65 +56,65 @@ describe('compiler compliance: template', () => {
       function MyComponent_ul_0_li_1_div_1_Template(rf, ctx) {
 
         if (rf & 1) {
-          const $s$ = $i0$.ΔgetCurrentView();
-          $i0$.ΔelementStart(0, "div", $c2$);
-          $i0$.Δlistener("click", function MyComponent_ul_0_li_1_div_1_Template_div_click_0_listener($event){
-            $i0$.ΔrestoreView($s$);
+          const $s$ = $i0$.ɵɵgetCurrentView();
+          $i0$.ɵɵelementStart(0, "div", $c2$);
+          $i0$.ɵɵlistener("click", function MyComponent_ul_0_li_1_div_1_Template_div_click_0_listener($event){
+            $i0$.ɵɵrestoreView($s$);
             const $inner$ = ctx.$implicit;
-            const $middle$ = $i0$.ΔnextContext().$implicit;
-            const $outer$ = $i0$.ΔnextContext().$implicit;
-            const $myComp$ = $i0$.ΔnextContext();
+            const $middle$ = $i0$.ɵɵnextContext().$implicit;
+            const $outer$ = $i0$.ɵɵnextContext().$implicit;
+            const $myComp$ = $i0$.ɵɵnextContext();
             return $myComp$.onClick($outer$, $middle$, $inner$);
           });
-          $i0$.Δtext(1);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵtext(1);
+          $i0$.ɵɵelementEnd();
         }
 
         if (rf & 2) {
           const $inner1$ = ctx.$implicit;
-          const $middle1$ = $i0$.ΔnextContext().$implicit;
-          const $outer1$ = $i0$.ΔnextContext().$implicit;
-          const $myComp1$ = $i0$.ΔnextContext();
-          $i0$.Δselect(0);
-          $i0$.Δproperty("title", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component));
-          $r3$.Δselect(1);
-          $i0$.ΔtextBinding(1, $i0$.Δinterpolation1(" ", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component), " "));
+          const $middle1$ = $i0$.ɵɵnextContext().$implicit;
+          const $outer1$ = $i0$.ɵɵnextContext().$implicit;
+          const $myComp1$ = $i0$.ɵɵnextContext();
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("title", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component));
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation1(" ", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component), " "));
         }
       }
 
       function MyComponent_ul_0_li_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "li");
-          $i0$.Δtemplate(1, MyComponent_ul_0_li_1_div_1_Template, 2, 2, "div", $c1$);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "li");
+          $i0$.ɵɵtemplate(1, MyComponent_ul_0_li_1_div_1_Template, 2, 2, "div", $c1$);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
-          const $myComp2$ = $i0$.ΔnextContext(2);
-          $r3$.Δselect(1);
-          $i0$.Δproperty("ngForOf", $myComp2$.items);
+          const $myComp2$ = $i0$.ɵɵnextContext(2);
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵproperty("ngForOf", $myComp2$.items);
         }
       }
 
       function MyComponent_ul_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "ul");
-          $i0$.Δtemplate(1, MyComponent_ul_0_li_1_Template, 2, 1, "li", $c0$);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "ul");
+          $i0$.ɵɵtemplate(1, MyComponent_ul_0_li_1_Template, 2, 1, "li", $c0$);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
           const $outer2$ = ctx.$implicit;
-          $r3$.Δselect(1);
-          $i0$.Δproperty("ngForOf", $outer2$.items);
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵproperty("ngForOf", $outer2$.items);
         }
       }
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_ul_0_Template, 2, 1, "ul", $c0$);
+          $i0$.ɵɵtemplate(0, MyComponent_ul_0_Template, 2, 1, "ul", $c0$);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("ngForOf", ctx.items);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -152,26 +152,26 @@ describe('compiler compliance: template', () => {
 
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
-            const $s$ = $r3$.ΔgetCurrentView();
-            $r3$.ΔelementStart(0, "div", $e_attrs$);
-            $r3$.Δlistener("click", function MyComponent_div_0_Template_div_click_0_listener($event) {
-              $r3$.ΔrestoreView($s$);
+            const $s$ = $r3$.ɵɵgetCurrentView();
+            $r3$.ɵɵelementStart(0, "div", $e_attrs$);
+            $r3$.ɵɵlistener("click", function MyComponent_div_0_Template_div_click_0_listener($event) {
+              $r3$.ɵɵrestoreView($s$);
               const $d$ = ctx.$implicit;
               const $i$ = ctx.index;
-              const $comp$ = $r3$.ΔnextContext();
+              const $comp$ = $r3$.ɵɵnextContext();
               return $comp$._handleClick($d$, $i$);
             });
-            $r3$.ΔelementEnd();
+            $r3$.ɵɵelementEnd();
           }
         }
         // ...
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.Δtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $t0_attrs$);
+            $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $t0_attrs$);
           }
           if (rf & 2) {
-            $r3$.Δselect(0);
-            $r3$.Δproperty("ngForOf", ctx._data);
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵproperty("ngForOf", ctx._data);
           }
         }
         `;
@@ -207,25 +207,25 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_span_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "span");
-          $i0$.Δtext(1);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "span");
+          $i0$.ɵɵtext(1);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
           const $item$ = ctx.$implicit;
           const $i$ = ctx.index;
-          $r3$.Δselect(1);
-          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $i$, " - ", $item$, " "));
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $i$, " - ", $item$, " "));
         }
       }
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_span_0_Template, 2, 2, "span", _c0);
+          $i0$.ɵɵtemplate(0, MyComponent_span_0_Template, 2, 2, "span", _c0);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("ngForOf", ctx.items);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -263,40 +263,40 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_div_0_span_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "span");
-          $i0$.Δtext(1);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "span");
+          $i0$.ɵɵtext(1);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
-          const $div$ = $i0$.ΔnextContext();
+          const $div$ = $i0$.ɵɵnextContext();
           const $i$ = $div$.index;
           const $item$ = $div$.$implicit;
-          $r3$.Δselect(1);
-          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $i$, " - ", $item$, " "));
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $i$, " - ", $item$, " "));
         }
       }
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "div");
-          $i0$.Δtemplate(1, MyComponent_div_0_span_1_Template, 2, 2, "span", $c1$);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "div");
+          $i0$.ɵɵtemplate(1, MyComponent_div_0_span_1_Template, 2, 2, "span", $c1$);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
-          const $app$ = $i0$.ΔnextContext();
-          $r3$.Δselect(1);
-          $i0$.Δproperty("ngIf", $app$.showing);
+          const $app$ = $i0$.ɵɵnextContext();
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵproperty("ngIf", $app$.showing);
         }
       }
 
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
+          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("ngForOf", ctx.items);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -335,51 +335,51 @@ describe('compiler compliance: template', () => {
       const $c0$ = [${AttributeMarker.Template}, "ngFor", "ngForOf"];
       function MyComponent_div_0_div_1_div_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "div");
-          $i0$.Δtext(1);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "div");
+          $i0$.ɵɵtext(1);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
-          const $middle$ = $i0$.ΔnextContext().$implicit;
-          const $myComp$ = $i0$.ΔnextContext(2);
-          $r3$.Δselect(1);
-          $i0$.ΔtextBinding(1, $i0$.Δinterpolation2(" ", $middle$.value, " - ", $myComp$.name, " "));
+          const $middle$ = $i0$.ɵɵnextContext().$implicit;
+          const $myComp$ = $i0$.ɵɵnextContext(2);
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $middle$.value, " - ", $myComp$.name, " "));
         }
       }
 
       function MyComponent_div_0_div_1_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "div");
-          $i0$.Δtemplate(1, MyComponent_div_0_div_1_div_1_Template, 2, 2, "div", $c0$);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "div");
+          $i0$.ɵɵtemplate(1, MyComponent_div_0_div_1_div_1_Template, 2, 2, "div", $c0$);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
           const $middle$ = ctx.$implicit;
-          $r3$.Δselect(1);
-          $i0$.Δproperty("ngForOf", $middle$.items);
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵproperty("ngForOf", $middle$.items);
         }
       }
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.ΔelementStart(0, "div");
-          $i0$.Δtemplate(1, MyComponent_div_0_div_1_Template, 2, 1, "div", $c0$);
-          $i0$.ΔelementEnd();
+          $i0$.ɵɵelementStart(0, "div");
+          $i0$.ɵɵtemplate(1, MyComponent_div_0_div_1_Template, 2, 1, "div", $c0$);
+          $i0$.ɵɵelementEnd();
         }
         if (rf & 2) {
           const $outer$ = ctx.$implicit;
-          $r3$.Δselect(1);
-          $i0$.Δproperty("ngForOf", $outer$.items);
+          $r3$.ɵɵselect(1);
+          $i0$.ɵɵproperty("ngForOf", $outer$.items);
         }
       }
       // ...
       template:function MyComponent_Template(rf, ctx){
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
+          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 2, 1, "div", $c0$);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("ngForOf", ctx.items);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("ngForOf", ctx.items);
         }
       }`;
 
@@ -414,7 +414,7 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_ng_template_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δtext(0, " some-content ");
+          $i0$.ɵɵtext(0, " some-content ");
         }
       }
 
@@ -422,11 +422,11 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $c0$);
+          $i0$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", $c0$);
         }
         if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("boundAttr", ctx.b);
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("boundAttr", ctx.b);
         }
       }`;
 
@@ -459,7 +459,7 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_ng_template_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δtext(0, "some-content");
+          $i0$.ɵɵtext(0, "some-content");
         }
       }
 
@@ -467,7 +467,7 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", null, $t0_refs$, $i0$.ΔtemplateRefExtractor);
+          $i0$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template", null, $t0_refs$, $i0$.ɵɵtemplateRefExtractor);
         }
       }`;
 
@@ -504,8 +504,8 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $t0_attrs$);
-          $i0$.Δlistener("outDirective", function MyComponent_Template_ng_template_outDirective_0_listener($event) { return $event.doSth(); });
+          $i0$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", $t0_attrs$);
+          $i0$.ɵɵlistener("outDirective", function MyComponent_Template_ng_template_outDirective_0_listener($event) { return $event.doSth(); });
         }
       }`;
 
@@ -705,7 +705,7 @@ describe('compiler compliance: template', () => {
 
       function MyComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δelement(0, "div");
+          $i0$.ɵɵelement(0, "div");
         }
       }
 
@@ -713,11 +713,11 @@ describe('compiler compliance: template', () => {
 
       template: function MyComponent_Template(rf, ctx) {
         if (rf & 1) {
-          $i0$.Δtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0$);
-          $i0$.Δpipe(1, "pipe");
+          $i0$.ɵɵtemplate(0, MyComponent_div_0_Template, 1, 0, "div", $c0$);
+          $i0$.ɵɵpipe(1, "pipe");
         } if (rf & 2) {
-          $i0$.Δselect(0);
-          $i0$.Δproperty("ngIf", $i0$.ΔpipeBind1(1, 1, ctx.val));
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵproperty("ngIf", $i0$.ɵɵpipeBind1(1, 1, ctx.val));
         }
       }`;
 
diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts
index cee9296932..665bd37c98 100644
--- a/packages/compiler-cli/test/ngc_spec.ts
+++ b/packages/compiler-cli/test/ngc_spec.ts
@@ -2113,7 +2113,7 @@ describe('ngc transformer command-line', () => {
         })
         export class Service {}
       `);
-      expect(source).toMatch(/ngInjectableDef = .+\.ΔdefineInjectable\(/);
+      expect(source).toMatch(/ngInjectableDef = .+\.ɵɵdefineInjectable\(/);
       expect(source).toMatch(/ngInjectableDef.*token: Service/);
       expect(source).toMatch(/ngInjectableDef.*providedIn: .+\.Module/);
     });
@@ -2169,7 +2169,7 @@ describe('ngc transformer command-line', () => {
         })
         export class Service {}
       `);
-      expect(source).toMatch(/ngInjectableDef.*return ..\.Δinject\(Existing\)/);
+      expect(source).toMatch(/ngInjectableDef.*return ..\.ɵɵinject\(Existing\)/);
     });
 
     it('compiles a useFactory InjectableDef with optional dep', () => {
@@ -2189,7 +2189,7 @@ describe('ngc transformer command-line', () => {
           constructor(e: Existing|null) {}
         }
       `);
-      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.Δinject\(Existing, 8\)/);
+      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.ɵɵinject\(Existing, 8\)/);
     });
 
     it('compiles a useFactory InjectableDef with skip-self dep', () => {
@@ -2209,7 +2209,7 @@ describe('ngc transformer command-line', () => {
           constructor(e: Existing) {}
         }
       `);
-      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.Δinject\(Existing, 4\)/);
+      expect(source).toMatch(/ngInjectableDef.*return ..\(..\.ɵɵinject\(Existing, 4\)/);
     });
 
     it('compiles a service that depends on a token', () => {
@@ -2226,7 +2226,7 @@ describe('ngc transformer command-line', () => {
           constructor(@Inject(TOKEN) value: boolean) {}
         }
       `);
-      expect(source).toMatch(/ngInjectableDef = .+\.ΔdefineInjectable\(/);
+      expect(source).toMatch(/ngInjectableDef = .+\.ɵɵdefineInjectable\(/);
       expect(source).toMatch(/ngInjectableDef.*token: Service/);
       expect(source).toMatch(/ngInjectableDef.*providedIn: .+\.Module/);
     });
@@ -2253,7 +2253,7 @@ describe('ngc transformer command-line', () => {
           constructor(@Inject(TOKEN) token: any) {}
         }
       `);
-      expect(source).toMatch(/new Service\(i0\.Δinject\(exports\.TOKEN\)\);/);
+      expect(source).toMatch(/new Service\(i0\.ɵɵinject\(exports\.TOKEN\)\);/);
     });
   });
 
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index e4f66a272c..3e5fc4eba6 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -62,9 +62,9 @@ export function forwardRef<T>(fn: () => T): T {
 
 export interface SimpleChanges { [propName: string]: any; }
 
-export type ΔNgModuleDefWithMeta<ModuleT, DeclarationsT, ImportsT, ExportsT> = any;
-export type ΔDirectiveDefWithMeta<DirT, SelectorT, ExportAsT, InputsT, OutputsT, QueriesT> = any;
-export type ΔPipeDefWithMeta<PipeT, NameT> = any;
+export type ɵɵNgModuleDefWithMeta<ModuleT, DeclarationsT, ImportsT, ExportsT> = any;
+export type ɵɵDirectiveDefWithMeta<DirT, SelectorT, ExportAsT, InputsT, OutputsT, QueriesT> = any;
+export type ɵɵPipeDefWithMeta<PipeT, NameT> = any;
 
 export enum ViewEncapsulation {
   Emulated = 0,
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index b1d1452f1b..4150691c0e 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -18,12 +18,12 @@ const varRegExp = (name: string): RegExp => new RegExp(`var \\w+ = \\[\"${name}\
 
 const viewQueryRegExp = (descend: boolean, ref?: string): RegExp => {
   const maybeRef = ref ? `${ref}` : `null`;
-  return new RegExp(`i0\\.ΔviewQuery\\(\\w+, ${descend}, ${maybeRef}\\)`);
+  return new RegExp(`i0\\.ɵɵviewQuery\\(\\w+, ${descend}, ${maybeRef}\\)`);
 };
 
 const contentQueryRegExp = (predicate: string, descend: boolean, ref?: string): RegExp => {
   const maybeRef = ref ? `${ref}` : `null`;
-  return new RegExp(`i0\\.ΔcontentQuery\\(dirIndex, ${predicate}, ${descend}, ${maybeRef}\\)`);
+  return new RegExp(`i0\\.ɵɵcontentQuery\\(dirIndex, ${predicate}, ${descend}, ${maybeRef}\\)`);
 };
 
 const setClassMetadataRegExp = (expectedType: string): RegExp =>
@@ -56,8 +56,8 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('Service.ngInjectableDef =');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Dep>;');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵɵInjectableDef<Dep>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵɵInjectableDef<Service>;');
   });
 
   it('should compile Injectables with a generic service', () => {
@@ -75,7 +75,7 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents).toContain('Store.ngInjectableDef =');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Store<any>>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵɵInjectableDef<Store<any>>;');
   });
 
   it('should compile Injectables with providedIn without errors', () => {
@@ -99,11 +99,11 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('Dep.ngInjectableDef =');
     expect(jsContents).toContain('Service.ngInjectableDef =');
     expect(jsContents)
-        .toContain('return new (t || Service)(i0.Δinject(Dep)); }, providedIn: \'root\' });');
+        .toContain('return new (t || Service)(i0.ɵɵinject(Dep)); }, providedIn: \'root\' });');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Dep>;');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵɵInjectableDef<Dep>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵɵInjectableDef<Service>;');
   });
 
   it('should compile Injectables with providedIn and factory without errors', () => {
@@ -128,7 +128,7 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('return r; }, providedIn: \'root\' });');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵɵInjectableDef<Service>;');
   });
 
   it('should compile Injectables with providedIn and factory with deps without errors', () => {
@@ -151,13 +151,13 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents).toContain('Service.ngInjectableDef =');
     expect(jsContents).toContain('factory: function Service_Factory(t) { var r = null; if (t) {');
-    expect(jsContents).toContain('(r = new t(i0.Δinject(Dep)));');
+    expect(jsContents).toContain('(r = new t(i0.ɵɵinject(Dep)));');
     expect(jsContents)
-        .toContain('(r = (function (dep) { return new Service(dep); })(i0.Δinject(Dep)));');
+        .toContain('(r = (function (dep) { return new Service(dep); })(i0.ɵɵinject(Dep)));');
     expect(jsContents).toContain('return r; }, providedIn: \'root\' });');
     expect(jsContents).not.toContain('__decorate');
     const dtsContents = env.getContents('test.d.ts');
-    expect(dtsContents).toContain('static ngInjectableDef: i0.ΔInjectableDef<Service>;');
+    expect(dtsContents).toContain('static ngInjectableDef: i0.ɵɵInjectableDef<Service>;');
   });
 
   it('should compile @Injectable with an @Optional dependency', () => {
@@ -193,13 +193,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ΔdefineComponent');
+    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ɵɵdefineComponent');
     expect(jsContents).not.toContain('__decorate');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ɵɵComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
   });
 
   it('should compile Components (dynamic inline template) without errors', () => {
@@ -217,13 +217,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ΔdefineComponent');
+    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ɵɵdefineComponent');
     expect(jsContents).not.toContain('__decorate');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ɵɵComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
   });
 
   it('should compile Components (function call inline template) without errors', () => {
@@ -244,13 +244,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ΔdefineComponent');
+    expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ɵɵdefineComponent');
     expect(jsContents).not.toContain('__decorate');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ɵɵComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
   });
 
   it('should compile Components (external template) without errors', () => {
@@ -351,13 +351,13 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('TestBase.ngBaseDef = i0.ΔdefineBase');
-    expect(jsContents).toContain('TestComponent.ngComponentDef = i0.ΔdefineComponent');
-    expect(jsContents).toContain('TestDirective.ngDirectiveDef = i0.ΔdefineDirective');
-    expect(jsContents).toContain('TestPipe.ngPipeDef = i0.ΔdefinePipe');
-    expect(jsContents).toContain('TestInjectable.ngInjectableDef = i0.ΔdefineInjectable');
-    expect(jsContents).toContain('MyModule.ngModuleDef = i0.ΔdefineNgModule');
-    expect(jsContents).toContain('MyModule.ngInjectorDef = i0.ΔdefineInjector');
+    expect(jsContents).toContain('TestBase.ngBaseDef = i0.ɵɵdefineBase');
+    expect(jsContents).toContain('TestComponent.ngComponentDef = i0.ɵɵdefineComponent');
+    expect(jsContents).toContain('TestDirective.ngDirectiveDef = i0.ɵɵdefineDirective');
+    expect(jsContents).toContain('TestPipe.ngPipeDef = i0.ɵɵdefinePipe');
+    expect(jsContents).toContain('TestInjectable.ngInjectableDef = i0.ɵɵdefineInjectable');
+    expect(jsContents).toContain('MyModule.ngModuleDef = i0.ɵɵdefineNgModule');
+    expect(jsContents).toContain('MyModule.ngInjectorDef = i0.ɵɵdefineInjector');
     expect(jsContents).toContain('inputs: { input: "input" }');
     expect(jsContents).toContain('outputs: { output: "output" }');
   });
@@ -442,25 +442,26 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule, bootstrap: [TestCmp] });');
     expect(jsContents)
-        .toContain('/*@__PURE__*/ i0.ΔsetNgModuleScope(TestModule, { declarations: [TestCmp] });');
+        .toContain('i0.ɵɵdefineNgModule({ type: TestModule, bootstrap: [TestCmp] });');
+    expect(jsContents)
+        .toContain('/*@__PURE__*/ i0.ɵɵsetNgModuleScope(TestModule, { declarations: [TestCmp] });');
     expect(jsContents)
         .toContain(
-            'i0.ΔdefineInjector({ factory: ' +
+            'i0.ɵɵdefineInjector({ factory: ' +
             'function TestModule_Factory(t) { return new (t || TestModule)(); } });');
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngComponentDef: i0.ΔComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
+            'static ngComponentDef: i0.ɵɵComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], never, never>');
+            'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, [typeof TestCmp], never, never>');
     expect(dtsContents).not.toContain('__decorate');
   });
 
-  it('should not emit a ΔsetNgModuleScope call when no scope metadata is present', () => {
+  it('should not emit a ɵɵsetNgModuleScope call when no scope metadata is present', () => {
     env.tsconfig();
     env.write('test.ts', `
         import {NgModule} from '@angular/core';
@@ -472,8 +473,8 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
-    expect(jsContents).not.toContain('ΔsetNgModuleScope(TestModule,');
+    expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
+    expect(jsContents).not.toContain('ɵɵsetNgModuleScope(TestModule,');
   });
 
   it('should emit the id when the module\'s id is a string', () => {
@@ -488,7 +489,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain(`i0.ΔdefineNgModule({ type: TestModule, id: 'test' })`);
+    expect(jsContents).toContain(`i0.ɵɵdefineNgModule({ type: TestModule, id: 'test' })`);
   });
 
   it('should emit the id when the module\'s id is defined as `module.id`', () => {
@@ -506,7 +507,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule, id: module.id })');
+    expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule, id: module.id })');
   });
 
   it('should filter out directives and pipes from module exports in the injector def', () => {
@@ -547,15 +548,15 @@ describe('ngtsc behavioral tests', () => {
       export class Comp {}
     `);
     env.write('node_modules/@angular/router/index.d.ts', `
-      import {ΔComponentDefWithMeta, ModuleWithProviders, ΔNgModuleDefWithMeta} from '@angular/core';
+      import {ɵɵComponentDefWithMeta, ModuleWithProviders, ɵɵNgModuleDefWithMeta} from '@angular/core';
 
       export declare class RouterComp {
-        static ngComponentDef: ΔComponentDefWithMeta<RouterComp, "lib-cmp", never, {}, {}, never>
+        static ngComponentDef: ɵɵComponentDefWithMeta<RouterComp, "lib-cmp", never, {}, {}, never>
       }
 
       declare class RouterModule {
         static forRoot(): ModuleWithProviders<RouterModule>;
-        static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, [typeof RouterComp], never, [typeof RouterComp]>;
+        static ngModuleDef: ɵɵNgModuleDefWithMeta<RouterModule, [typeof RouterComp], never, [typeof RouterComp]>;
       }
     `);
 
@@ -564,7 +565,7 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents)
         .toContain(
-            'i0.ΔdefineInjector({ factory: function TestModule_Factory(t) ' +
+            'i0.ɵɵdefineInjector({ factory: function TestModule_Factory(t) ' +
             '{ return new (t || TestModule)(); }, imports: [[OtherModule, RouterModule.forRoot()],' +
             '\n            OtherModule,\n            RouterModule] });');
   });
@@ -596,18 +597,18 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
+    expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
     expect(jsContents)
         .toContain(
-            `TestModule.ngInjectorDef = i0.ΔdefineInjector({ factory: ` +
+            `TestModule.ngInjectorDef = i0.ɵɵdefineInjector({ factory: ` +
             `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
             `Token, useValue: 'test' }], imports: [[OtherModule]] });`);
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
-    expect(dtsContents).toContain('static ngInjectorDef: i0.ΔInjectorDef');
+            'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.ɵɵInjectorDef');
   });
 
   it('should compile NgModules with factory providers without errors', () => {
@@ -637,18 +638,18 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
+    expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
     expect(jsContents)
         .toContain(
-            `TestModule.ngInjectorDef = i0.ΔdefineInjector({ factory: ` +
+            `TestModule.ngInjectorDef = i0.ɵɵdefineInjector({ factory: ` +
             `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
             `Token, useFactory: function () { return new Token(); } }], imports: [[OtherModule]] });`);
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
-    expect(dtsContents).toContain('static ngInjectorDef: i0.ΔInjectorDef');
+            'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.ɵɵInjectorDef');
   });
 
   it('should compile NgModules with factory providers and deps without errors', () => {
@@ -682,18 +683,18 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
+    expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
     expect(jsContents)
         .toContain(
-            `TestModule.ngInjectorDef = i0.ΔdefineInjector({ factory: ` +
+            `TestModule.ngInjectorDef = i0.ɵɵdefineInjector({ factory: ` +
             `function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
             `Token, useFactory: function (dep) { return new Token(dep); }, deps: [Dep] }], imports: [[OtherModule]] });`);
 
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
-    expect(dtsContents).toContain('static ngInjectorDef: i0.ΔInjectorDef');
+            'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
+    expect(dtsContents).toContain('static ngInjectorDef: i0.ɵɵInjectorDef');
   });
 
   it('should compile NgModules with references to local components', () => {
@@ -854,9 +855,9 @@ describe('ngtsc behavioral tests', () => {
 
     expect(jsContents)
         .toContain(
-            'TestPipe.ngPipeDef = i0.ΔdefinePipe({ name: "test-pipe", type: TestPipe, ' +
+            'TestPipe.ngPipeDef = i0.ɵɵdefinePipe({ name: "test-pipe", type: TestPipe, ' +
             'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: false })');
-    expect(dtsContents).toContain('static ngPipeDef: i0.ΔPipeDefWithMeta<TestPipe, "test-pipe">;');
+    expect(dtsContents).toContain('static ngPipeDef: i0.ɵɵPipeDefWithMeta<TestPipe, "test-pipe">;');
   });
 
   it('should compile pure Pipes without errors', () => {
@@ -877,9 +878,9 @@ describe('ngtsc behavioral tests', () => {
 
     expect(jsContents)
         .toContain(
-            'TestPipe.ngPipeDef = i0.ΔdefinePipe({ name: "test-pipe", type: TestPipe, ' +
+            'TestPipe.ngPipeDef = i0.ɵɵdefinePipe({ name: "test-pipe", type: TestPipe, ' +
             'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: true })');
-    expect(dtsContents).toContain('static ngPipeDef: i0.ΔPipeDefWithMeta<TestPipe, "test-pipe">;');
+    expect(dtsContents).toContain('static ngPipeDef: i0.ɵɵPipeDefWithMeta<TestPipe, "test-pipe">;');
   });
 
   it('should compile Pipes with dependencies', () => {
@@ -901,7 +902,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
 
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('return new (t || TestPipe)(i0.ΔdirectiveInject(Dep));');
+    expect(jsContents).toContain('return new (t || TestPipe)(i0.ɵɵdirectiveInject(Dep));');
   });
 
   it('should compile Pipes with generic types', () => {
@@ -921,7 +922,7 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toContain('TestPipe.ngPipeDef =');
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
-        .toContain('static ngPipeDef: i0.ΔPipeDefWithMeta<TestPipe<any>, "test-pipe">;');
+        .toContain('static ngPipeDef: i0.ɵɵPipeDefWithMeta<TestPipe<any>, "test-pipe">;');
   });
 
   it('should include @Pipes in @NgModule scopes', () => {
@@ -947,7 +948,7 @@ describe('ngtsc behavioral tests', () => {
     const dtsContents = env.getContents('test.d.ts');
     expect(dtsContents)
         .toContain(
-            'i0.ΔNgModuleDefWithMeta<TestModule, [typeof TestPipe, typeof TestCmp], never, never>');
+            'i0.ɵɵNgModuleDefWithMeta<TestModule, [typeof TestPipe, typeof TestCmp], never, never>');
   });
 
   describe('empty and missing selectors', () => {
@@ -1062,7 +1063,7 @@ describe('ngtsc behavioral tests', () => {
       expect(dtsContents).toContain('ComponentDefWithMeta<TestCmp');
       expect(dtsContents).toContain('DirectiveDefWithMeta<TestDir');
       expect(dtsContents).toContain('PipeDefWithMeta<TestPipe');
-      expect(dtsContents).toContain('ΔNgModuleDefWithMeta<TestNgModule');
+      expect(dtsContents).toContain('ɵɵNgModuleDefWithMeta<TestNgModule');
 
       // Validate that each class's .d.ts declaration also has an injectable definition.
       expect(dtsContents).toContain('InjectableDef<TestCmp');
@@ -1287,7 +1288,7 @@ describe('ngtsc behavioral tests', () => {
       `);
 
       env.driveMain();
-      expect(env.getContents('test.js')).toContain('i0.ΔpureFunction1');
+      expect(env.getContents('test.js')).toContain('i0.ɵɵpureFunction1');
     });
 
     it('should compile array literals inside function arguments', () => {
@@ -1309,7 +1310,7 @@ describe('ngtsc behavioral tests', () => {
       `);
 
       env.driveMain();
-      expect(env.getContents('test.js')).toContain('i0.ΔpureFunction1');
+      expect(env.getContents('test.js')).toContain('i0.ɵɵpureFunction1');
     });
   });
 
@@ -1325,11 +1326,11 @@ describe('ngtsc behavioral tests', () => {
     `);
 
       env.write('node_modules/router/index.d.ts', `
-        import {ModuleWithProviders, ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ModuleWithProviders, ɵɵNgModuleDefWithMeta} from '@angular/core';
 
         declare class RouterModule {
           static forRoot(): ModuleWithProviders<RouterModule>;
-          static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<RouterModule, never, never, never>;
         }
     `);
 
@@ -1341,7 +1342,8 @@ describe('ngtsc behavioral tests', () => {
       const dtsContents = env.getContents('test.d.ts');
       expect(dtsContents).toContain(`import * as i1 from "router";`);
       expect(dtsContents)
-          .toContain('i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
+          .toContain(
+              'i0.ɵɵNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
     });
 
     it('should extract the generic type if it is provided as qualified type name', () => {
@@ -1366,9 +1368,9 @@ describe('ngtsc behavioral tests', () => {
     `);
 
       env.write('node_modules/router/internal.d.ts', `
-        import {ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵNgModuleDefWithMeta} from '@angular/core';
         export declare class InternalRouterModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<InternalRouterModule, never, never, never>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<InternalRouterModule, never, never, never>;
         }
     `);
 
@@ -1381,18 +1383,18 @@ describe('ngtsc behavioral tests', () => {
       expect(dtsContents).toContain(`import * as i1 from "router";`);
       expect(dtsContents)
           .toContain(
-              'i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.InternalRouterModule], never>');
+              'i0.ɵɵNgModuleDefWithMeta<TestModule, never, [typeof i1.InternalRouterModule], never>');
     });
 
     it('should not reference a constant with a ModuleWithProviders value in ngModuleDef imports',
        () => {
          env.tsconfig();
          env.write('dep.d.ts', `
-          import {ModuleWithProviders, ΔNgModuleDefWithMeta as ΔNgModuleDefWithMeta} from '@angular/core';
+          import {ModuleWithProviders, ɵɵNgModuleDefWithMeta as ɵɵNgModuleDefWithMeta} from '@angular/core';
 
           export declare class DepModule {
             static forRoot(arg1: any, arg2: any): ModuleWithProviders<DepModule>;
-            static ngModuleDef: ΔNgModuleDefWithMeta<DepModule, never, never, never>;
+            static ngModuleDef: ɵɵNgModuleDefWithMeta<DepModule, never, never, never>;
           }
         `);
          env.write('test.ts', `
@@ -1427,13 +1429,13 @@ describe('ngtsc behavioral tests', () => {
   `);
 
        env.write('node_modules/router/index.d.ts', `
-      import {ModuleWithProviders, ΔNgModuleDefWithMeta} from '@angular/core';
+      import {ModuleWithProviders, ɵɵNgModuleDefWithMeta} from '@angular/core';
 
       export interface MyType extends ModuleWithProviders {}
 
       declare class RouterModule {
         static forRoot(): (MyType)&{ngModule:RouterModule};
-        static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
+        static ngModuleDef: ɵɵNgModuleDefWithMeta<RouterModule, never, never, never>;
       }
   `);
 
@@ -1446,7 +1448,7 @@ describe('ngtsc behavioral tests', () => {
        expect(dtsContents).toContain(`import * as i1 from "router";`);
        expect(dtsContents)
            .toContain(
-               'i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
+               'i0.ɵɵNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
      });
 
   it('should unwrap a namespace imported ModuleWithProviders function if a generic type is provided for it',
@@ -1466,7 +1468,7 @@ describe('ngtsc behavioral tests', () => {
 
         declare class RouterModule {
           static forRoot(): core.ModuleWithProviders<RouterModule>;
-          static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<RouterModule, never, never, never>;
         }
     `);
 
@@ -1479,7 +1481,7 @@ describe('ngtsc behavioral tests', () => {
        expect(dtsContents).toContain(`import * as i1 from "router";`);
        expect(dtsContents)
            .toContain(
-               'i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
+               'i0.ɵɵNgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
      });
 
   it('should inject special types according to the metadata', () => {
@@ -1517,7 +1519,7 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
     expect(jsContents)
         .toContain(
-            `factory: function FooCmp_Factory(t) { return new (t || FooCmp)(i0.ΔinjectAttribute("test"), i0.ΔdirectiveInject(i0.ChangeDetectorRef), i0.ΔdirectiveInject(i0.ElementRef), i0.ΔdirectiveInject(i0.Injector), i0.ΔdirectiveInject(i0.Renderer2), i0.ΔdirectiveInject(i0.TemplateRef), i0.ΔdirectiveInject(i0.ViewContainerRef)); }`);
+            `factory: function FooCmp_Factory(t) { return new (t || FooCmp)(i0.ɵɵinjectAttribute("test"), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(i0.ElementRef), i0.ɵɵdirectiveInject(i0.Injector), i0.ɵɵdirectiveInject(i0.Renderer2), i0.ɵɵdirectiveInject(i0.TemplateRef), i0.ɵɵdirectiveInject(i0.ViewContainerRef)); }`);
   });
 
   it('should generate queries for components', () => {
@@ -1547,9 +1549,9 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toMatch(varRegExp('test1'));
     expect(jsContents).toMatch(varRegExp('test2'));
     expect(jsContents).toMatch(varRegExp('accessor'));
-    // match `i0.ΔcontentQuery(dirIndex, _c1, true, TemplateRef)`
+    // match `i0.ɵɵcontentQuery(dirIndex, _c1, true, TemplateRef)`
     expect(jsContents).toMatch(contentQueryRegExp('\\w+', true, 'TemplateRef'));
-    // match `i0.ΔviewQuery(_c2, true, null)`
+    // match `i0.ɵɵviewQuery(_c2, true, null)`
     expect(jsContents).toMatch(viewQueryRegExp(true));
   });
 
@@ -1579,10 +1581,10 @@ describe('ngtsc behavioral tests', () => {
     expect(jsContents).toMatch(varRegExp('test1'));
     expect(jsContents).toMatch(varRegExp('test2'));
     expect(jsContents).toMatch(varRegExp('accessor'));
-    // match `i0.ΔcontentQuery(dirIndex, _c1, true, TemplateRef)`
+    // match `i0.ɵɵcontentQuery(dirIndex, _c1, true, TemplateRef)`
     expect(jsContents).toMatch(contentQueryRegExp('\\w+', true, 'TemplateRef'));
 
-    // match `i0.ΔviewQuery(_c2, true, null)`
+    // match `i0.ɵɵviewQuery(_c2, true, null)`
     // Note that while ViewQuery doesn't necessarily make sense on a directive, because it doesn't
     // have a view, we still need to handle it because a component could extend the directive.
     expect(jsContents).toMatch(viewQueryRegExp(true));
@@ -1608,11 +1610,11 @@ describe('ngtsc behavioral tests', () => {
 
     env.driveMain();
     const jsContents = env.getContents('test.js');
-    // match `i0.ΔcontentQuery(dirIndex, TemplateRef, true, null)`
+    // match `i0.ɵɵcontentQuery(dirIndex, TemplateRef, true, null)`
     expect(jsContents).toMatch(contentQueryRegExp('TemplateRef', true));
-    // match `i0.ΔcontentQuery(dirIndex, ViewContainerRef, true, null)`
+    // match `i0.ɵɵcontentQuery(dirIndex, ViewContainerRef, true, null)`
     expect(jsContents).toMatch(contentQueryRegExp('ViewContainerRef', true));
-    // match `i0.ΔcontentQuery(dirIndex, _c0, true, null)`
+    // match `i0.ɵɵcontentQuery(dirIndex, _c0, true, null)`
     expect(jsContents).toContain('_c0 = ["parens"];');
     expect(jsContents).toMatch(contentQueryRegExp('_c0', true));
   });
@@ -1662,9 +1664,9 @@ describe('ngtsc behavioral tests', () => {
     const hostBindingsFn = `
       hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick(); });
-          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onDocumentClick($event.target); }, false, i0.ΔresolveDocument);
-          i0.Δlistener("scroll", function FooCmp_scroll_HostBindingHandler($event) { return ctx.onWindowScroll(); }, false, i0.ΔresolveWindow);
+          i0.ɵɵlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick(); });
+          i0.ɵɵlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onDocumentClick($event.target); }, false, i0.ɵɵresolveDocument);
+          i0.ɵɵlistener("scroll", function FooCmp_scroll_HostBindingHandler($event) { return ctx.onWindowScroll(); }, false, i0.ɵɵresolveWindow);
         }
       }
     `;
@@ -1760,17 +1762,17 @@ describe('ngtsc behavioral tests', () => {
     const hostBindingsFn = `
       hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          i0.ΔallocHostVars(2);
-          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick($event); });
-          i0.Δlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onBodyClick($event); }, false, i0.ΔresolveBody);
-          i0.Δlistener("change", function FooCmp_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg1, ctx.arg2, ctx.arg3); });
-          i0.Δstyling(_c0);
+          i0.ɵɵallocHostVars(2);
+          i0.ɵɵlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick($event); });
+          i0.ɵɵlistener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onBodyClick($event); }, false, i0.ɵɵresolveBody);
+          i0.ɵɵlistener("change", function FooCmp_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg1, ctx.arg2, ctx.arg3); });
+          i0.ɵɵstyling(_c0);
         }
         if (rf & 2) {
-          i0.ΔelementAttribute(elIndex, "hello", i0.Δbind(ctx.foo));
-          i0.Δproperty("prop", ctx.bar, null, true);
-          i0.ΔclassProp(0, ctx.someClass);
-          i0.ΔstylingApply();
+          i0.ɵɵelementAttribute(elIndex, "hello", i0.ɵɵbind(ctx.foo));
+          i0.ɵɵproperty("prop", ctx.bar, null, true);
+          i0.ɵɵclassProp(0, ctx.someClass);
+          i0.ɵɵstylingApply();
         }
       }
     `;
@@ -1799,7 +1801,7 @@ describe('ngtsc behavioral tests', () => {
     `);
     env.driveMain();
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('i0.ΔelementHostAttrs(["test", test])');
+    expect(jsContents).toContain('i0.ɵɵelementHostAttrs(["test", test])');
   });
 
   it('should accept enum values as host bindings', () => {
@@ -1824,7 +1826,7 @@ describe('ngtsc behavioral tests', () => {
     `);
 
     env.driveMain();
-    expect(env.getContents('test.js')).toContain('"hello", i0.Δbind(ctx.foo)');
+    expect(env.getContents('test.js')).toContain('"hello", i0.ɵɵbind(ctx.foo)');
   });
 
   it('should generate host listeners for directives within hostBindings section', () => {
@@ -1846,7 +1848,7 @@ describe('ngtsc behavioral tests', () => {
     const hostBindingsFn = `
       hostBindings: function Dir_HostBindings(rf, ctx, elIndex) {
         if (rf & 1) {
-          i0.Δlistener("change", function Dir_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg); });
+          i0.ɵɵlistener("change", function Dir_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg); });
         }
       }
     `;
@@ -2041,7 +2043,7 @@ describe('ngtsc behavioral tests', () => {
     `);
     env.driveMain();
     const jsContents = env.getContents('test.js');
-    expect(jsContents).not.toContain('i0.ΔelementProperty');
+    expect(jsContents).not.toContain('i0.ɵɵelementProperty');
   });
 
   it('should correctly recognize local symbols', () => {
@@ -2296,8 +2298,8 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = env.getContents('test.js');
 
     expect(jsContents)
-        .toContain('function Base_Factory(t) { return new (t || Base)(i0.Δinject(Dep)); }');
-    expect(jsContents).toContain('var \u0275Child_BaseFactory = i0.ΔgetInheritedFactory(Child)');
+        .toContain('function Base_Factory(t) { return new (t || Base)(i0.ɵɵinject(Dep)); }');
+    expect(jsContents).toContain('var \u0275Child_BaseFactory = i0.ɵɵgetInheritedFactory(Child)');
     expect(jsContents)
         .toContain('function Child_Factory(t) { return \u0275Child_BaseFactory(t || Child); }');
     expect(jsContents)
@@ -2322,7 +2324,7 @@ describe('ngtsc behavioral tests', () => {
     env.driveMain();
     const jsContents = env.getContents('test.js');
 
-    expect(jsContents).toContain('var \u0275Dir_BaseFactory = i0.ΔgetInheritedFactory(Dir)');
+    expect(jsContents).toContain('var \u0275Dir_BaseFactory = i0.ɵɵgetInheritedFactory(Dir)');
   });
 
   it('should wrap "directives" in component metadata in a closure when forward references are present',
@@ -2463,8 +2465,8 @@ describe('ngtsc behavioral tests', () => {
     const jsContents = trim(env.getContents('test.js'));
     expect(jsContents).toContain(`import Default from './types';`);
     expect(jsContents).toContain(`import * as i1 from "./types";`);
-    expect(jsContents).toContain('i0.ΔdirectiveInject(Default)');
-    expect(jsContents).toContain('i0.ΔdirectiveInject(i1.Other)');
+    expect(jsContents).toContain('i0.ɵɵdirectiveInject(Default)');
+    expect(jsContents).toContain('i0.ɵɵdirectiveInject(i1.Other)');
     expect(jsContents).toMatch(setClassMetadataRegExp('type: Default'));
     expect(jsContents).toMatch(setClassMetadataRegExp('type: i1.Other'));
   });
@@ -2575,8 +2577,8 @@ describe('ngtsc behavioral tests', () => {
       const jsContents = env.getContents('test.js');
       expect(jsContents)
           .toMatch(
-              /i\d\.ΔsetComponentScope\(NormalComponent,\s+\[NormalComponent,\s+CyclicComponent\],\s+\[\]\)/);
-      expect(jsContents).not.toContain('/*__PURE__*/ i0.ΔsetComponentScope');
+              /i\d\.ɵɵsetComponentScope\(NormalComponent,\s+\[NormalComponent,\s+CyclicComponent\],\s+\[\]\)/);
+      expect(jsContents).not.toContain('/*__PURE__*/ i0.ɵɵsetComponentScope');
     });
 
     it('should detect a cycle added entirely during compilation', () => {
@@ -2767,14 +2769,14 @@ describe('ngtsc behavioral tests', () => {
     it('should not emit multiple references to the same directive', () => {
       env.tsconfig();
       env.write('node_modules/external/index.d.ts', `
-        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵDirectiveDefWithMeta, ɵɵNgModuleDefWithMeta} from '@angular/core';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ɵɵDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class ExternalModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
         }
       `);
       env.write('test.ts', `
@@ -2803,19 +2805,19 @@ describe('ngtsc behavioral tests', () => {
     it('should import directives by their external name', () => {
       env.tsconfig();
       env.write('node_modules/external/index.d.ts', `
-        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵDirectiveDefWithMeta, ɵɵNgModuleDefWithMeta} from '@angular/core';
         import {InternalDir} from './internal';
 
         export {InternalDir as ExternalDir} from './internal';
 
         export declare class ExternalModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof InternalDir], never, [typeof InternalDir]>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<ExternalModule, [typeof InternalDir], never, [typeof InternalDir]>;
         }
       `);
       env.write('node_modules/external/internal.d.ts', `
 
         export declare class InternalDir {
-          static ngDirectiveDef: ΔDirectiveDefWithMeta<InternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ɵɵDirectiveDefWithMeta<InternalDir, '[test]', never, never, never, never>;
         }
       `);
       env.write('test.ts', `
@@ -3024,14 +3026,14 @@ describe('ngtsc behavioral tests', () => {
         export class Module {}
       `);
       env.write('node_modules/external/index.d.ts', `
-        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵDirectiveDefWithMeta, ɵɵNgModuleDefWithMeta} from '@angular/core';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ɵɵDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class ExternalModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
         }
       `);
 
@@ -3211,15 +3213,15 @@ describe('ngtsc behavioral tests', () => {
       const hostBindingsFn = `
         hostBindings: function UnsafeAttrsDirective_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            i0.ΔallocHostVars(6);
+            i0.ɵɵallocHostVars(6);
           }
           if (rf & 2) {
-            i0.ΔelementAttribute(elIndex, "href", i0.Δbind(ctx.attrHref), i0.ΔsanitizeUrlOrResourceUrl);
-            i0.ΔelementAttribute(elIndex, "src", i0.Δbind(ctx.attrSrc), i0.ΔsanitizeUrlOrResourceUrl);
-            i0.ΔelementAttribute(elIndex, "action", i0.Δbind(ctx.attrAction), i0.ΔsanitizeUrl);
-            i0.ΔelementAttribute(elIndex, "profile", i0.Δbind(ctx.attrProfile), i0.ΔsanitizeResourceUrl);
-            i0.ΔelementAttribute(elIndex, "innerHTML", i0.Δbind(ctx.attrInnerHTML), i0.ΔsanitizeHtml);
-            i0.ΔelementAttribute(elIndex, "title", i0.Δbind(ctx.attrSafeTitle));
+            i0.ɵɵelementAttribute(elIndex, "href", i0.ɵɵbind(ctx.attrHref), i0.ɵɵsanitizeUrlOrResourceUrl);
+            i0.ɵɵelementAttribute(elIndex, "src", i0.ɵɵbind(ctx.attrSrc), i0.ɵɵsanitizeUrlOrResourceUrl);
+            i0.ɵɵelementAttribute(elIndex, "action", i0.ɵɵbind(ctx.attrAction), i0.ɵɵsanitizeUrl);
+            i0.ɵɵelementAttribute(elIndex, "profile", i0.ɵɵbind(ctx.attrProfile), i0.ɵɵsanitizeResourceUrl);
+            i0.ɵɵelementAttribute(elIndex, "innerHTML", i0.ɵɵbind(ctx.attrInnerHTML), i0.ɵɵsanitizeHtml);
+            i0.ɵɵelementAttribute(elIndex, "title", i0.ɵɵbind(ctx.attrSafeTitle));
           }
         }
       `;
@@ -3266,15 +3268,15 @@ describe('ngtsc behavioral tests', () => {
       const hostBindingsFn = `
         hostBindings: function UnsafePropsDirective_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            i0.ΔallocHostVars(6);
+            i0.ɵɵallocHostVars(6);
           }
           if (rf & 2) {
-            i0.Δproperty("href", ctx.propHref, i0.ΔsanitizeUrlOrResourceUrl, true);
-            i0.Δproperty("src", ctx.propSrc, i0.ΔsanitizeUrlOrResourceUrl, true);
-            i0.Δproperty("action", ctx.propAction, i0.ΔsanitizeUrl, true);
-            i0.Δproperty("profile", ctx.propProfile, i0.ΔsanitizeResourceUrl, true);
-            i0.Δproperty("innerHTML", ctx.propInnerHTML, i0.ΔsanitizeHtml, true);
-            i0.Δproperty("title", ctx.propSafeTitle, null, true);
+            i0.ɵɵproperty("href", ctx.propHref, i0.ɵɵsanitizeUrlOrResourceUrl, true);
+            i0.ɵɵproperty("src", ctx.propSrc, i0.ɵɵsanitizeUrlOrResourceUrl, true);
+            i0.ɵɵproperty("action", ctx.propAction, i0.ɵɵsanitizeUrl, true);
+            i0.ɵɵproperty("profile", ctx.propProfile, i0.ɵɵsanitizeResourceUrl, true);
+            i0.ɵɵproperty("innerHTML", ctx.propInnerHTML, i0.ɵɵsanitizeHtml, true);
+            i0.ɵɵproperty("title", ctx.propSafeTitle, null, true);
           }
         }
       `;
@@ -3306,15 +3308,15 @@ describe('ngtsc behavioral tests', () => {
       const hostBindingsFn = `
         hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
           if (rf & 1) {
-            i0.ΔallocHostVars(6);
+            i0.ɵɵallocHostVars(6);
           }
           if (rf & 2) {
-            i0.Δproperty("src", ctx.srcProp, null, true);
-            i0.Δproperty("href", ctx.hrefProp, null, true);
-            i0.Δproperty("title", ctx.titleProp, null, true);
-            i0.ΔelementAttribute(elIndex, "src", i0.Δbind(ctx.srcAttr));
-            i0.ΔelementAttribute(elIndex, "href", i0.Δbind(ctx.hrefAttr));
-            i0.ΔelementAttribute(elIndex, "title", i0.Δbind(ctx.titleAttr));
+            i0.ɵɵproperty("src", ctx.srcProp, null, true);
+            i0.ɵɵproperty("href", ctx.hrefProp, null, true);
+            i0.ɵɵproperty("title", ctx.titleProp, null, true);
+            i0.ɵɵelementAttribute(elIndex, "src", i0.ɵɵbind(ctx.srcAttr));
+            i0.ɵɵelementAttribute(elIndex, "href", i0.ɵɵbind(ctx.hrefAttr));
+            i0.ɵɵelementAttribute(elIndex, "title", i0.ɵɵbind(ctx.titleAttr));
           }
         }
       `;
@@ -3344,13 +3346,13 @@ describe('ngtsc behavioral tests', () => {
     beforeEach(() => {
       env.tsconfig();
       env.write('node_modules/@angular/router/index.d.ts', `
-        import {ModuleWithProviders, ΔNgModuleDefWithMeta as ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ModuleWithProviders, ɵɵNgModuleDefWithMeta as ɵɵNgModuleDefWithMeta} from '@angular/core';
 
         export declare var ROUTES;
         export declare class RouterModule {
           static forRoot(arg1: any, arg2: any): ModuleWithProviders<RouterModule>;
           static forChild(arg1: any): ModuleWithProviders<RouterModule>;
-          static ngModuleDef: ΔNgModuleDefWithMeta<RouterModule, never, never, never>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<RouterModule, never, never, never>;
         }
       `);
     });
@@ -3980,24 +3982,24 @@ export const Foo = Foo__PRE_R3__;
 
       // 'alpha' declares the directive which will ultimately be imported.
       env.write('alpha.d.ts', `
-        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵDirectiveDefWithMeta, ɵɵNgModuleDefWithMeta} from '@angular/core';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ɵɵDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class AlphaModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<AlphaModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<AlphaModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
         }
       `);
 
       // 'beta' re-exports AlphaModule from alpha.
       env.write('beta.d.ts', `
-        import {ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵNgModuleDefWithMeta} from '@angular/core';
         import {AlphaModule} from './alpha';
 
         export declare class BetaModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<AlphaModule, never, never, [typeof AlphaModule]>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<AlphaModule, never, never, [typeof AlphaModule]>;
         }
       `);
 
@@ -4029,26 +4031,26 @@ export const Foo = Foo__PRE_R3__;
     it('should write alias ES2015 exports for NgModule exported directives', () => {
       env.tsconfig({'_useHostForImportGeneration': true});
       env.write('external.d.ts', `
-        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵDirectiveDefWithMeta, ɵɵNgModuleDefWithMeta} from '@angular/core';
         import {LibModule} from './lib';
 
         export declare class ExternalDir {
-          static ngDirectiveDef: ΔDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
+          static ngDirectiveDef: ɵɵDirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
         }
 
         export declare class ExternalModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir, typeof LibModule]>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir, typeof LibModule]>;
         }
       `);
       env.write('lib.d.ts', `
-        import {ΔDirectiveDefWithMeta, ΔNgModuleDefWithMeta} from '@angular/core';
+        import {ɵɵDirectiveDefWithMeta, ɵɵNgModuleDefWithMeta} from '@angular/core';
 
         export declare class LibDir {
-          static ngDirectiveDef: ΔDirectiveDefWithMeta<LibDir, '[lib]', never, never, never, never>;
+          static ngDirectiveDef: ɵɵDirectiveDefWithMeta<LibDir, '[lib]', never, never, never, never>;
         }
 
         export declare class LibModule {
-          static ngModuleDef: ΔNgModuleDefWithMeta<LibModule, [typeof LibDir], never, [typeof LibDir]>;
+          static ngModuleDef: ɵɵNgModuleDefWithMeta<LibModule, [typeof LibDir], never, [typeof LibDir]>;
         }
       `);
       env.write('foo.ts', `
diff --git a/packages/compiler-cli/test/ngtsc/scope_spec.ts b/packages/compiler-cli/test/ngtsc/scope_spec.ts
index 5ea177671f..10127f9947 100644
--- a/packages/compiler-cli/test/ngtsc/scope_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/scope_spec.ts
@@ -36,15 +36,15 @@ describe('ngtsc module scopes', () => {
         env.driveMain();
 
         const jsContents = env.getContents('test.js');
-        expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
+        expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
         expect(jsContents)
             .toContain(
-                '/*@__PURE__*/ i0.ΔsetNgModuleScope(TestModule, { imports: [OtherModule] });');
+                '/*@__PURE__*/ i0.ɵɵsetNgModuleScope(TestModule, { imports: [OtherModule] });');
 
         const dtsContents = env.getContents('test.d.ts');
         expect(dtsContents)
             .toContain(
-                'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, never, [typeof OtherModule], never>');
+                'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, never, [typeof OtherModule], never>');
       });
 
       it('should produce an error when an invalid class is imported', () => {
@@ -98,15 +98,15 @@ describe('ngtsc module scopes', () => {
         env.driveMain();
 
         const jsContents = env.getContents('test.js');
-        expect(jsContents).toContain('i0.ΔdefineNgModule({ type: TestModule });');
+        expect(jsContents).toContain('i0.ɵɵdefineNgModule({ type: TestModule });');
         expect(jsContents)
             .toContain(
-                '/*@__PURE__*/ i0.ΔsetNgModuleScope(TestModule, { exports: [OtherModule] });');
+                '/*@__PURE__*/ i0.ɵɵsetNgModuleScope(TestModule, { exports: [OtherModule] });');
 
         const dtsContents = env.getContents('test.d.ts');
         expect(dtsContents)
             .toContain(
-                'static ngModuleDef: i0.ΔNgModuleDefWithMeta<TestModule, never, never, [typeof OtherModule]>');
+                'static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<TestModule, never, never, [typeof OtherModule]>');
       });
 
       it('should produce an error when a non-NgModule class is exported', () => {
diff --git a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
index 3c0d117bb2..135311857d 100644
--- a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
@@ -23,17 +23,17 @@ describe('template source-mapping', () => {
       it('should map simple element with content', () => {
         const mappings = compileAndMap('<h1>Heading 1</h1>');
         expect(mappings).toContain(
-            {source: '<h1>', generated: 'i0.ΔelementStart(0, "h1")', sourceUrl: '../test.ts'});
+            {source: '<h1>', generated: 'i0.ɵɵelementStart(0, "h1")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: 'Heading 1', generated: 'i0.Δtext(1, "Heading 1")', sourceUrl: '../test.ts'});
+            {source: 'Heading 1', generated: 'i0.ɵɵtext(1, "Heading 1")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</h1>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h1>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map void element', () => {
         const mappings = compileAndMap('<hr>');
         expect(mappings).toContain(
-            {source: '<hr>', generated: 'i0.Δelement(0, "hr")', sourceUrl: '../test.ts'});
+            {source: '<hr>', generated: 'i0.ɵɵelement(0, "hr")', sourceUrl: '../test.ts'});
       });
     });
 
@@ -41,40 +41,40 @@ describe('template source-mapping', () => {
       it('should map a mix of interpolated and static content', () => {
         const mappings = compileAndMap('<h3>Hello {{ name }}</h3>');
         expect(mappings).toContain(
-            {source: '<h3>', generated: 'i0.ΔelementStart(0, "h3")', sourceUrl: '../test.ts'});
+            {source: '<h3>', generated: 'i0.ɵɵelementStart(0, "h3")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: 'Hello {{ name }}',
-          generated: 'i0.ΔtextBinding(1, i0.Δinterpolation1("Hello ", ctx.name, ""))',
+          generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("Hello ", ctx.name, ""))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</h3>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h3>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a complex interpolated expression', () => {
         const mappings = compileAndMap('<h2>{{ greeting + " " + name }}</h2>');
         expect(mappings).toContain(
-            {source: '<h2>', generated: 'i0.ΔelementStart(0, "h2")', sourceUrl: '../test.ts'});
+            {source: '<h2>', generated: 'i0.ɵɵelementStart(0, "h2")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '{{ greeting + " " + name }}',
           generated:
-              'i0.ΔtextBinding(1, i0.Δinterpolation1("", ctx.greeting + " " + ctx.name, ""))',
+              'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx.greeting + " " + ctx.name, ""))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</h2>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h2>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map interpolated properties', () => {
         const mappings = compileAndMap('<div id="{{name}}"></div>');
         expect(mappings).toContain({
           source: '<div id="{{name}}"></div>',
-          generated: 'i0.Δelement(0, "div", _c0)',
+          generated: 'i0.ɵɵelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: 'id="{{name}}"',
-          generated: 'i0.ΔpropertyInterpolate("id", ctx.name)',
+          generated: 'i0.ɵɵpropertyInterpolate("id", ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -82,15 +82,15 @@ describe('template source-mapping', () => {
       it('should map interpolation with pipe', () => {
         const mappings = compileAndMap('<div>{{200.3 | percent : 2 }}</div>');
         expect(mappings).toContain(
-            {source: '<div>', generated: 'i0.ΔelementStart(0, "div")', sourceUrl: '../test.ts'});
+            {source: '<div>', generated: 'i0.ɵɵelementStart(0, "div")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '{{200.3 | percent : 2 }}',
           generated:
-              'i0.ΔtextBinding(1, i0.Δinterpolation1("", i0.ΔpipeBind2(2, 1, 200.3, 2), ""))',
+              'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", i0.ɵɵpipeBind2(2, 1, 200.3, 2), ""))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
     });
 
@@ -99,12 +99,12 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<div [attr]="name"></div>');
         expect(mappings).toContain({
           source: '<div [attr]="name"></div>',
-          generated: 'i0.Δelement(0, "div", _c0)',
+          generated: 'i0.ɵɵelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '[attr]="name"',
-          generated: 'i0.Δproperty("attr", ctx.name)',
+          generated: 'i0.ɵɵproperty("attr", ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -114,12 +114,12 @@ describe('template source-mapping', () => {
 
         expect(mappings).toContain({
           source: '<div [attr]="greeting + name"></div>',
-          generated: 'i0.Δelement(0, "div", _c0)',
+          generated: 'i0.ɵɵelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '[attr]="greeting + name"',
-          generated: 'i0.Δproperty("attr", ctx.greeting + ctx.name)',
+          generated: 'i0.ɵɵproperty("attr", ctx.greeting + ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -128,12 +128,12 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<div bind-attr="name"></div>');
         expect(mappings).toContain({
           source: '<div bind-attr="name"></div>',
-          generated: 'i0.Δelement(0, "div", _c0)',
+          generated: 'i0.ɵɵelement(0, "div", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: 'bind-attr="name"',
-          generated: 'i0.Δproperty("attr", ctx.name)',
+          generated: 'i0.ɵɵproperty("attr", ctx.name)',
           sourceUrl: '../test.ts'
         });
       });
@@ -142,15 +142,15 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<button (click)="doSomething()">Do it</button>');
         expect(mappings).toContain({
           source: '<button (click)="doSomething()">',
-          generated: 'i0.ΔelementStart(0, "button", _c0)',
+          generated: 'i0.ɵɵelementStart(0, "button", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: 'Do it', generated: 'i0.Δtext(1, "Do it")', sourceUrl: '../test.ts'});
+            {source: 'Do it', generated: 'i0.ɵɵtext(1, "Do it")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: 'doSomething()', generated: 'ctx.doSomething()', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</button>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</button>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a complex output binding expression', () => {
@@ -158,11 +158,11 @@ describe('template source-mapping', () => {
             compileAndMap(`<button (click)="items.push('item' + items.length)">Add Item</button>`);
         expect(mappings).toContain({
           source: `<button (click)="items.push('item' + items.length)">`,
-          generated: 'i0.ΔelementStart(0, "button", _c0)',
+          generated: 'i0.ɵɵelementStart(0, "button", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: 'Add Item', generated: 'i0.Δtext(1, "Add Item")', sourceUrl: '../test.ts'});
+            {source: 'Add Item', generated: 'i0.ɵɵtext(1, "Add Item")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: 'items.push(', generated: 'ctx.items.push(', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
@@ -173,41 +173,41 @@ describe('template source-mapping', () => {
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</button>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</button>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a longhand output binding expression', () => {
         const mappings = compileAndMap('<button on-click="doSomething()">Do it</button>');
         expect(mappings).toContain({
           source: '<button on-click="doSomething()">',
-          generated: 'i0.ΔelementStart(0, "button", _c0)',
+          generated: 'i0.ɵɵelementStart(0, "button", _c0)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: 'Do it', generated: 'i0.Δtext(1, "Do it")', sourceUrl: '../test.ts'});
+            {source: 'Do it', generated: 'i0.ɵɵtext(1, "Do it")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: 'doSomething()', generated: 'ctx.doSomething()', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</button>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</button>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
 
       it('should map a two-way binding expression', () => {
         const mappings = compileAndMap('Name: <input [(ngModel)]="name">');
         expect(mappings).toContain({
           source: '<input [(ngModel)]="name">',
-          generated: 'i0.ΔelementStart(1, "input", _c0)',
+          generated: 'i0.ɵɵelementStart(1, "input", _c0)',
           sourceUrl: '../test.ts'
         });
         // TODO: improve mappings here
         expect(mappings).toContain({
           source: '[(ngModel)]="name"',
           generated:
-              'i0.Δlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
+              'i0.ɵɵlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '<input [(ngModel)]="name">',
-          generated: 'i0.ΔelementEnd()',
+          generated: 'i0.ɵɵelementEnd()',
           sourceUrl: '../test.ts'
         });
       });
@@ -216,19 +216,19 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('Name: <input bindon-ngModel="name">');
         expect(mappings).toContain({
           source: '<input bindon-ngModel="name">',
-          generated: 'i0.ΔelementStart(1, "input", _c0)',
+          generated: 'i0.ɵɵelementStart(1, "input", _c0)',
           sourceUrl: '../test.ts'
         });
         // TODO: improve mappings here
         expect(mappings).toContain({
           source: 'bindon-ngModel="name"',
           generated:
-              'i0.Δlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
+              'i0.ɵɵlistener("ngModelChange", function TestCmp_Template_input_ngModelChange_1_listener($event) { return ctx.name = $event; })',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain({
           source: '<input bindon-ngModel="name">',
-          generated: 'i0.ΔelementEnd()',
+          generated: 'i0.ɵɵelementEnd()',
           sourceUrl: '../test.ts'
         });
       });
@@ -237,17 +237,17 @@ describe('template source-mapping', () => {
         const mappings = compileAndMap('<div [class.initial]="isInitial">Message</div>');
         expect(mappings).toContain({
           source: '<div [class.initial]="isInitial">',
-          generated: 'i0.ΔelementStart(0, "div")',
+          generated: 'i0.ɵɵelementStart(0, "div")',
           sourceUrl: '../test.ts'
         });
 
         // TODO: Add better mappings for binding
 
         expect(mappings).toContain(
-            {source: 'Message', generated: 'i0.Δtext(1, "Message")', sourceUrl: '../test.ts'});
+            {source: 'Message', generated: 'i0.ɵɵtext(1, "Message")', sourceUrl: '../test.ts'});
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
     });
 
@@ -257,20 +257,20 @@ describe('template source-mapping', () => {
 
         expect(mappings).toContain({
           source: '<div *ngIf="showMessage()">',
-          generated: 'i0.ΔelementStart(0, "div")',
+          generated: 'i0.ɵɵelementStart(0, "div")',
           sourceUrl: '../test.ts'
         });
 
         // TODO - map the bindings better
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
 
         // TODO: the `ctx_r...` appears to be dependent upon previous tests!!!
 
         // expect(mappings).toContain({
         //   source: '{{ name }}',
-        //   generated: 'i0.ΔtextBinding(1, i0.Δinterpolation1("", ctx_r0.name, ""))',
+        //   generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx_r0.name, ""))',
         //   sourceUrl: '../test.ts'
         // });
       });
@@ -283,18 +283,18 @@ describe('template source-mapping', () => {
             `</ng-template>`);
 
         expect(mappings).toContain(
-            {source: '<div>', generated: 'i0.ΔelementStart(0, "div")', sourceUrl: '../test.ts'});
+            {source: '<div>', generated: 'i0.ɵɵelementStart(0, "div")', sourceUrl: '../test.ts'});
 
         // TODO - map the bindings better
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
 
         // TODO: the `ctx_r...` appears to be dependent upon previous tests!!!
 
         // expect(mappings).toContain({
         //   source: '{{ name }}',
-        //   generated: 'i0.ΔtextBinding(1, i0.Δinterpolation1("", ctx_r0.name, ""))',
+        //   generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx_r0.name, ""))',
         //   sourceUrl: '../test.ts'
         // });
       });
@@ -305,14 +305,14 @@ describe('template source-mapping', () => {
 
         expect(mappings).toContain({
           source: '<div *ngFor="let item of items; index as i; trackBy: trackByFn">',
-          generated: 'i0.ΔelementStart(0, "div")',
+          generated: 'i0.ɵɵelementStart(0, "div")',
           sourceUrl: '../test.ts'
         });
 
         // TODO - map the bindings better
 
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
 
       });
 
@@ -331,20 +331,20 @@ describe('template source-mapping', () => {
             `<div><ng-content></ng-content></div>`);
 
         expect(mappings).toContain(
-            {source: '<h3>', generated: 'i0.ΔelementStart(0, "h3")', sourceUrl: '../test.ts'});
+            {source: '<h3>', generated: 'i0.ɵɵelementStart(0, "h3")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '<ng-content select="title">',
-          generated: 'i0.Δprojection(1, 1)',
+          generated: 'i0.ɵɵprojection(1, 1)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
-            {source: '</h3>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</h3>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '<div>', generated: 'i0.ΔelementStart(2, "div")', sourceUrl: '../test.ts'});
+            {source: '<div>', generated: 'i0.ɵɵelementStart(2, "div")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '<ng-content>', generated: 'i0.Δprojection(3)', sourceUrl: '../test.ts'});
+            {source: '<ng-content>', generated: 'i0.ɵɵprojection(3)', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '</div>', generated: 'i0.ΔelementEnd()', sourceUrl: '../test.ts'});
+            {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
     });
 
@@ -353,24 +353,24 @@ describe('template source-mapping', () => {
 
       // Creation mode
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain({
-        generated: 'i0.Δtext(1, "this is a test")',
+        generated: 'i0.ɵɵtext(1, "this is a test")',
         source: 'this is a test',
         sourceUrl: '../test.ts'
       });
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.Δtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
 
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
+        generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -381,24 +381,24 @@ describe('template source-mapping', () => {
 
       // Creation mode
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementStart(0, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain({
-        generated: 'i0.Δtext(1, "this is a test")',
+        generated: 'i0.ɵɵtext(1, "this is a test")',
         source: 'this is a test',
         sourceUrl: '../test.ts'
       });
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementStart(2, "div")', source: '<div>', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.Δtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../test.ts'});
       expect(mappings).toContain(
-          {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
+          {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
 
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
+        generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -410,7 +410,7 @@ describe('template source-mapping', () => {
          const mappings = compileAndMap('<div class=\\"some-class\\">this is a test</div>');
 
          expect(mappings).toContain({
-           generated: 'i0.ΔelementStart(0, "div", _c0)',
+           generated: 'i0.ɵɵelementStart(0, "div", _c0)',
            source: '<div class=\\"some-class\\">',
            sourceUrl: '../test.ts'
          });
@@ -429,30 +429,30 @@ describe('template source-mapping', () => {
 
         // Creation mode
         expect(mappings).toContain({
-          generated: 'i0.ΔelementStart(0, "div")',
+          generated: 'i0.ɵɵelementStart(0, "div")',
           source: '<div>',
           sourceUrl: '../dir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.Δtext(1, "this is a test")',
+          generated: 'i0.ɵɵtext(1, "this is a test")',
           source: 'this is a test',
           sourceUrl: '../dir/test.html'
         });
         expect(mappings).toContain(
-            {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
+            {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
         expect(mappings).toContain({
-          generated: 'i0.ΔelementStart(2, "div")',
+          generated: 'i0.ɵɵelementStart(2, "div")',
           source: '<div>',
           sourceUrl: '../dir/test.html'
         });
         expect(mappings).toContain(
-            {generated: 'i0.Δtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../dir/test.html'});
+            {generated: 'i0.ɵɵtext(3)', source: '{{ 1 + 2 }}', sourceUrl: '../dir/test.html'});
         expect(mappings).toContain(
-            {generated: 'i0.ΔelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
+            {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../dir/test.html'});
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
+          generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../dir/test.html'
         });
@@ -464,39 +464,39 @@ describe('template source-mapping', () => {
 
         // Creation mode
         expect(mappings).toContain({
-          generated: 'i0.ΔelementStart(0, "div")',
+          generated: 'i0.ɵɵelementStart(0, "div")',
           source: '<div>',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.Δtext(1, "this is a test")',
+          generated: 'i0.ɵɵtext(1, "this is a test")',
           source: 'this is a test',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ΔelementEnd()',
+          generated: 'i0.ɵɵelementEnd()',
           source: '</div>',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ΔelementStart(2, "div")',
+          generated: 'i0.ɵɵelementStart(2, "div")',
           source: '<div>',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.Δtext(3)',
+          generated: 'i0.ɵɵtext(3)',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../extraRootDir/test.html'
         });
         expect(mappings).toContain({
-          generated: 'i0.ΔelementEnd()',
+          generated: 'i0.ɵɵelementEnd()',
           source: '</div>',
           sourceUrl: '../extraRootDir/test.html'
         });
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ΔtextBinding(3, i0.Δinterpolation1("", 1 + 2, ""))',
+          generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../extraRootDir/test.html'
         });
diff --git a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
index 7a8dd63f32..09116d003a 100644
--- a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
@@ -34,17 +34,17 @@ export declare class IndexPipe {
 export declare class NgForOf<T> {
   ngForOf: T[];
   static ngTemplateContextGuard<T>(dir: NgForOf<T>, ctx: any): ctx is NgForOfContext<T>;
-  static ngDirectiveDef: i0.ΔDirectiveDefWithMeta<NgForOf<any>, '[ngFor][ngForOf]', never, {'ngForOf': 'ngForOf'}, {}, never>;
+  static ngDirectiveDef: i0.ɵɵDirectiveDefWithMeta<NgForOf<any>, '[ngFor][ngForOf]', never, {'ngForOf': 'ngForOf'}, {}, never>;
 }
 
 export declare class NgIf {
   ngIf: any;
   static ngTemplateGuard_ngIf: 'binding';
-  static ngDirectiveDef: i0.ΔDirectiveDefWithMeta<NgForOf<any>, '[ngIf]', never, {'ngIf': 'ngIf'}, {}, never>;
+  static ngDirectiveDef: i0.ɵɵDirectiveDefWithMeta<NgForOf<any>, '[ngIf]', never, {'ngIf': 'ngIf'}, {}, never>;
 }
 
 export declare class CommonModule {
-  static ngModuleDef: i0.ΔNgModuleDefWithMeta<CommonModule, [typeof NgIf, typeof NgForOf, typeof IndexPipe], never, [typeof NgIf, typeof NgForOf, typeof IndexPipe]>;
+  static ngModuleDef: i0.ɵɵNgModuleDefWithMeta<CommonModule, [typeof NgIf, typeof NgForOf, typeof IndexPipe], never, [typeof NgIf, typeof NgForOf, typeof IndexPipe]>;
 }
 `);
 }
diff --git a/packages/compiler/design/architecture.md b/packages/compiler/design/architecture.md
index 6076110fde..81591efb9b 100644
--- a/packages/compiler/design/architecture.md
+++ b/packages/compiler/design/architecture.md
@@ -81,18 +81,18 @@ In `ngtsc` this is instead emitted as,
 ```js
 const i0 = require("@angular/core");
 class GreetComponent {}
-GreetComponent.ngComponentDef = i0.ΔdefineComponent({
+GreetComponent.ngComponentDef = i0.ɵɵdefineComponent({
     type: GreetComponent,
     tag: 'greet',
     factory: () => new GreetComponent(),
     template: function (rf, ctx) {
         if (rf & RenderFlags.Create) {
-            i0.ΔelementStart(0, 'div');
-            i0.Δtext(1);
-            i0.ΔelementEnd();
+            i0.ɵɵelementStart(0, 'div');
+            i0.ɵɵtext(1);
+            i0.ɵɵelementEnd();
         }
         if (rf & RenderFlags.Update) {
-            i0.ΔtextBinding(1, i0.Δinterpolation1('Hello ', ctx.name, '!'));
+            i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1('Hello ', ctx.name, '!'));
         }
     }
 });
diff --git a/packages/compiler/design/separate_compilation.md b/packages/compiler/design/separate_compilation.md
index 899d7a0ecc..49fe89efcc 100644
--- a/packages/compiler/design/separate_compilation.md
+++ b/packages/compiler/design/separate_compilation.md
@@ -161,7 +161,7 @@ export class MyComponent {
 ```js
 export class MyComponent {
   name: string;
-  static ngComponentDef = ΔdefineComponent({...});
+  static ngComponentDef = ɵɵdefineComponent({...});
 }
 ```
 
@@ -213,7 +213,7 @@ export class MyDirective {
   constructor() {
     this.dirId = 'some id';
   }
-  static ngDirectiveDef = ΔdefineDirective({...});
+  static ngDirectiveDef = ɵɵdefineDirective({...});
 }
 ```
 
@@ -256,7 +256,7 @@ export class MyPipe implements PipeTransform {
 ```js
 export class MyPipe {
   transform(...) ...
-  static ngPipeDef = ΔdefinePipe({...});
+  static ngPipeDef = ɵɵdefinePipe({...});
 }
 ```
 
@@ -329,7 +329,7 @@ export class MyModule {}
 *my.module.js*
 ```js
 export class MyModule {
-  static ngInjectorDef = ΔdefineInjector(...);
+  static ngInjectorDef = ɵɵdefineInjector(...);
 }
 ```
 
@@ -389,7 +389,7 @@ manually written as:
 
 ```ts
 export class MyModule {
-  static ngInjectorDef = ΔdefineInjector({
+  static ngInjectorDef = ɵɵdefineInjector({
     providers: [{
       provide: Service, useClass: ServiceImpl
     }],
@@ -411,7 +411,7 @@ export class MyModule {
 }
 ```
 
-except for the call to `ΔdefineInjector` would generate a `{ __symbolic: 'error' }`
+except for the call to `ɵɵdefineInjector` would generate a `{ __symbolic: 'error' }`
 value which is ignored by the ivy compiler. This allows the system to ignore
 the difference between manually and mechanically created module definitions.
 
@@ -440,7 +440,7 @@ properties by including a `// @__BUILD_OPTIMIZER_REMOVE_` comment:
 
 ```ts
 export class MyModule {
-  static ngInjectorDef = ΔdefineInjector({
+  static ngInjectorDef = ɵɵdefineInjector({
     providers: [{
       provide: Service, useClass: ServiceImpl
     }],
diff --git a/packages/compiler/src/identifiers.ts b/packages/compiler/src/identifiers.ts
index 4978a6996e..dd2b88f603 100644
--- a/packages/compiler/src/identifiers.ts
+++ b/packages/compiler/src/identifiers.ts
@@ -62,11 +62,11 @@ export class Identifiers {
     moduleName: CORE,
 
   };
-  static inject: o.ExternalReference = {name: 'Δinject', moduleName: CORE};
+  static inject: o.ExternalReference = {name: 'ɵɵinject', moduleName: CORE};
   static INJECTOR: o.ExternalReference = {name: 'INJECTOR', moduleName: CORE};
   static Injector: o.ExternalReference = {name: 'Injector', moduleName: CORE};
-  static ΔdefineInjectable: o.ExternalReference = {name: 'ΔdefineInjectable', moduleName: CORE};
-  static InjectableDef: o.ExternalReference = {name: 'ΔInjectableDef', moduleName: CORE};
+  static ɵɵdefineInjectable: o.ExternalReference = {name: 'ɵɵdefineInjectable', moduleName: CORE};
+  static InjectableDef: o.ExternalReference = {name: 'ɵɵInjectableDef', moduleName: CORE};
   static ViewEncapsulation: o.ExternalReference = {
     name: 'ViewEncapsulation',
     moduleName: CORE,
diff --git a/packages/compiler/src/injectable_compiler.ts b/packages/compiler/src/injectable_compiler.ts
index 4e1291369e..d915800852 100644
--- a/packages/compiler/src/injectable_compiler.ts
+++ b/packages/compiler/src/injectable_compiler.ts
@@ -116,7 +116,7 @@ export class InjectableCompiler {
       mapEntry('token', ctx.importExpr(injectable.type.reference)),
       mapEntry('providedIn', providedIn),
     ];
-    return o.importExpr(Identifiers.ΔdefineInjectable).callFn([o.literalMap(def)]);
+    return o.importExpr(Identifiers.ɵɵdefineInjectable).callFn([o.literalMap(def)]);
   }
 
   compile(injectable: CompileInjectableMetadata, ctx: OutputContext): void {
diff --git a/packages/compiler/src/injectable_compiler_2.ts b/packages/compiler/src/injectable_compiler_2.ts
index 6158b92a91..068697f00a 100644
--- a/packages/compiler/src/injectable_compiler_2.ts
+++ b/packages/compiler/src/injectable_compiler_2.ts
@@ -100,7 +100,7 @@ export function compileInjectable(meta: R3InjectableMetadata): InjectableDef {
   const token = meta.type;
   const providedIn = meta.providedIn;
 
-  const expression = o.importExpr(Identifiers.ΔdefineInjectable).callFn([mapToMapExpression(
+  const expression = o.importExpr(Identifiers.ɵɵdefineInjectable).callFn([mapToMapExpression(
       {token, factory: result.factory, providedIn})]);
   const type = new o.ExpressionType(o.importExpr(
       Identifiers.InjectableDef, [typeWithParameters(meta.type, meta.typeArgumentCount)]));
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index fb9944cf36..af400aa98c 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -17,237 +17,237 @@ export class Identifiers {
   static PATCH_DEPS = 'patchedDeps';
 
   /* Instructions */
-  static namespaceHTML: o.ExternalReference = {name: 'ΔnamespaceHTML', moduleName: CORE};
+  static namespaceHTML: o.ExternalReference = {name: 'ɵɵnamespaceHTML', moduleName: CORE};
 
-  static namespaceMathML: o.ExternalReference = {name: 'ΔnamespaceMathML', moduleName: CORE};
+  static namespaceMathML: o.ExternalReference = {name: 'ɵɵnamespaceMathML', moduleName: CORE};
 
-  static namespaceSVG: o.ExternalReference = {name: 'ΔnamespaceSVG', moduleName: CORE};
+  static namespaceSVG: o.ExternalReference = {name: 'ɵɵnamespaceSVG', moduleName: CORE};
 
-  static element: o.ExternalReference = {name: 'Δelement', moduleName: CORE};
+  static element: o.ExternalReference = {name: 'ɵɵelement', moduleName: CORE};
 
-  static elementStart: o.ExternalReference = {name: 'ΔelementStart', moduleName: CORE};
+  static elementStart: o.ExternalReference = {name: 'ɵɵelementStart', moduleName: CORE};
 
-  static elementEnd: o.ExternalReference = {name: 'ΔelementEnd', moduleName: CORE};
+  static elementEnd: o.ExternalReference = {name: 'ɵɵelementEnd', moduleName: CORE};
 
-  static elementProperty: o.ExternalReference = {name: 'ΔelementProperty', moduleName: CORE};
+  static elementProperty: o.ExternalReference = {name: 'ɵɵelementProperty', moduleName: CORE};
 
-  static select: o.ExternalReference = {name: 'Δselect', moduleName: CORE};
+  static select: o.ExternalReference = {name: 'ɵɵselect', moduleName: CORE};
 
   static componentHostSyntheticProperty:
-      o.ExternalReference = {name: 'ΔcomponentHostSyntheticProperty', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵcomponentHostSyntheticProperty', moduleName: CORE};
 
   static componentHostSyntheticListener:
-      o.ExternalReference = {name: 'ΔcomponentHostSyntheticListener', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵcomponentHostSyntheticListener', moduleName: CORE};
 
-  static elementAttribute: o.ExternalReference = {name: 'ΔelementAttribute', moduleName: CORE};
+  static elementAttribute: o.ExternalReference = {name: 'ɵɵelementAttribute', moduleName: CORE};
 
-  static classProp: o.ExternalReference = {name: 'ΔclassProp', moduleName: CORE};
+  static classProp: o.ExternalReference = {name: 'ɵɵclassProp', moduleName: CORE};
 
   static elementContainerStart:
-      o.ExternalReference = {name: 'ΔelementContainerStart', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵelementContainerStart', moduleName: CORE};
 
   static elementContainerEnd:
-      o.ExternalReference = {name: 'ΔelementContainerEnd', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵelementContainerEnd', moduleName: CORE};
 
-  static styling: o.ExternalReference = {name: 'Δstyling', moduleName: CORE};
+  static styling: o.ExternalReference = {name: 'ɵɵstyling', moduleName: CORE};
 
-  static styleMap: o.ExternalReference = {name: 'ΔstyleMap', moduleName: CORE};
+  static styleMap: o.ExternalReference = {name: 'ɵɵstyleMap', moduleName: CORE};
 
-  static classMap: o.ExternalReference = {name: 'ΔclassMap', moduleName: CORE};
+  static classMap: o.ExternalReference = {name: 'ɵɵclassMap', moduleName: CORE};
 
-  static styleProp: o.ExternalReference = {name: 'ΔstyleProp', moduleName: CORE};
+  static styleProp: o.ExternalReference = {name: 'ɵɵstyleProp', moduleName: CORE};
 
-  static stylingApply: o.ExternalReference = {name: 'ΔstylingApply', moduleName: CORE};
+  static stylingApply: o.ExternalReference = {name: 'ɵɵstylingApply', moduleName: CORE};
 
-  static elementHostAttrs: o.ExternalReference = {name: 'ΔelementHostAttrs', moduleName: CORE};
+  static elementHostAttrs: o.ExternalReference = {name: 'ɵɵelementHostAttrs', moduleName: CORE};
 
-  static containerCreate: o.ExternalReference = {name: 'Δcontainer', moduleName: CORE};
+  static containerCreate: o.ExternalReference = {name: 'ɵɵcontainer', moduleName: CORE};
 
-  static nextContext: o.ExternalReference = {name: 'ΔnextContext', moduleName: CORE};
+  static nextContext: o.ExternalReference = {name: 'ɵɵnextContext', moduleName: CORE};
 
-  static templateCreate: o.ExternalReference = {name: 'Δtemplate', moduleName: CORE};
+  static templateCreate: o.ExternalReference = {name: 'ɵɵtemplate', moduleName: CORE};
 
-  static text: o.ExternalReference = {name: 'Δtext', moduleName: CORE};
+  static text: o.ExternalReference = {name: 'ɵɵtext', moduleName: CORE};
 
-  static textBinding: o.ExternalReference = {name: 'ΔtextBinding', moduleName: CORE};
+  static textBinding: o.ExternalReference = {name: 'ɵɵtextBinding', moduleName: CORE};
 
-  static bind: o.ExternalReference = {name: 'Δbind', moduleName: CORE};
+  static bind: o.ExternalReference = {name: 'ɵɵbind', moduleName: CORE};
 
-  static enableBindings: o.ExternalReference = {name: 'ΔenableBindings', moduleName: CORE};
+  static enableBindings: o.ExternalReference = {name: 'ɵɵenableBindings', moduleName: CORE};
 
-  static disableBindings: o.ExternalReference = {name: 'ΔdisableBindings', moduleName: CORE};
+  static disableBindings: o.ExternalReference = {name: 'ɵɵdisableBindings', moduleName: CORE};
 
-  static allocHostVars: o.ExternalReference = {name: 'ΔallocHostVars', moduleName: CORE};
+  static allocHostVars: o.ExternalReference = {name: 'ɵɵallocHostVars', moduleName: CORE};
 
-  static getCurrentView: o.ExternalReference = {name: 'ΔgetCurrentView', moduleName: CORE};
+  static getCurrentView: o.ExternalReference = {name: 'ɵɵgetCurrentView', moduleName: CORE};
 
-  static restoreView: o.ExternalReference = {name: 'ΔrestoreView', moduleName: CORE};
+  static restoreView: o.ExternalReference = {name: 'ɵɵrestoreView', moduleName: CORE};
 
-  static interpolation1: o.ExternalReference = {name: 'Δinterpolation1', moduleName: CORE};
-  static interpolation2: o.ExternalReference = {name: 'Δinterpolation2', moduleName: CORE};
-  static interpolation3: o.ExternalReference = {name: 'Δinterpolation3', moduleName: CORE};
-  static interpolation4: o.ExternalReference = {name: 'Δinterpolation4', moduleName: CORE};
-  static interpolation5: o.ExternalReference = {name: 'Δinterpolation5', moduleName: CORE};
-  static interpolation6: o.ExternalReference = {name: 'Δinterpolation6', moduleName: CORE};
-  static interpolation7: o.ExternalReference = {name: 'Δinterpolation7', moduleName: CORE};
-  static interpolation8: o.ExternalReference = {name: 'Δinterpolation8', moduleName: CORE};
-  static interpolationV: o.ExternalReference = {name: 'ΔinterpolationV', moduleName: CORE};
+  static interpolation1: o.ExternalReference = {name: 'ɵɵinterpolation1', moduleName: CORE};
+  static interpolation2: o.ExternalReference = {name: 'ɵɵinterpolation2', moduleName: CORE};
+  static interpolation3: o.ExternalReference = {name: 'ɵɵinterpolation3', moduleName: CORE};
+  static interpolation4: o.ExternalReference = {name: 'ɵɵinterpolation4', moduleName: CORE};
+  static interpolation5: o.ExternalReference = {name: 'ɵɵinterpolation5', moduleName: CORE};
+  static interpolation6: o.ExternalReference = {name: 'ɵɵinterpolation6', moduleName: CORE};
+  static interpolation7: o.ExternalReference = {name: 'ɵɵinterpolation7', moduleName: CORE};
+  static interpolation8: o.ExternalReference = {name: 'ɵɵinterpolation8', moduleName: CORE};
+  static interpolationV: o.ExternalReference = {name: 'ɵɵinterpolationV', moduleName: CORE};
 
-  static pureFunction0: o.ExternalReference = {name: 'ΔpureFunction0', moduleName: CORE};
-  static pureFunction1: o.ExternalReference = {name: 'ΔpureFunction1', moduleName: CORE};
-  static pureFunction2: o.ExternalReference = {name: 'ΔpureFunction2', moduleName: CORE};
-  static pureFunction3: o.ExternalReference = {name: 'ΔpureFunction3', moduleName: CORE};
-  static pureFunction4: o.ExternalReference = {name: 'ΔpureFunction4', moduleName: CORE};
-  static pureFunction5: o.ExternalReference = {name: 'ΔpureFunction5', moduleName: CORE};
-  static pureFunction6: o.ExternalReference = {name: 'ΔpureFunction6', moduleName: CORE};
-  static pureFunction7: o.ExternalReference = {name: 'ΔpureFunction7', moduleName: CORE};
-  static pureFunction8: o.ExternalReference = {name: 'ΔpureFunction8', moduleName: CORE};
-  static pureFunctionV: o.ExternalReference = {name: 'ΔpureFunctionV', moduleName: CORE};
+  static pureFunction0: o.ExternalReference = {name: 'ɵɵpureFunction0', moduleName: CORE};
+  static pureFunction1: o.ExternalReference = {name: 'ɵɵpureFunction1', moduleName: CORE};
+  static pureFunction2: o.ExternalReference = {name: 'ɵɵpureFunction2', moduleName: CORE};
+  static pureFunction3: o.ExternalReference = {name: 'ɵɵpureFunction3', moduleName: CORE};
+  static pureFunction4: o.ExternalReference = {name: 'ɵɵpureFunction4', moduleName: CORE};
+  static pureFunction5: o.ExternalReference = {name: 'ɵɵpureFunction5', moduleName: CORE};
+  static pureFunction6: o.ExternalReference = {name: 'ɵɵpureFunction6', moduleName: CORE};
+  static pureFunction7: o.ExternalReference = {name: 'ɵɵpureFunction7', moduleName: CORE};
+  static pureFunction8: o.ExternalReference = {name: 'ɵɵpureFunction8', moduleName: CORE};
+  static pureFunctionV: o.ExternalReference = {name: 'ɵɵpureFunctionV', moduleName: CORE};
 
-  static pipeBind1: o.ExternalReference = {name: 'ΔpipeBind1', moduleName: CORE};
-  static pipeBind2: o.ExternalReference = {name: 'ΔpipeBind2', moduleName: CORE};
-  static pipeBind3: o.ExternalReference = {name: 'ΔpipeBind3', moduleName: CORE};
-  static pipeBind4: o.ExternalReference = {name: 'ΔpipeBind4', moduleName: CORE};
-  static pipeBindV: o.ExternalReference = {name: 'ΔpipeBindV', moduleName: CORE};
+  static pipeBind1: o.ExternalReference = {name: 'ɵɵpipeBind1', moduleName: CORE};
+  static pipeBind2: o.ExternalReference = {name: 'ɵɵpipeBind2', moduleName: CORE};
+  static pipeBind3: o.ExternalReference = {name: 'ɵɵpipeBind3', moduleName: CORE};
+  static pipeBind4: o.ExternalReference = {name: 'ɵɵpipeBind4', moduleName: CORE};
+  static pipeBindV: o.ExternalReference = {name: 'ɵɵpipeBindV', moduleName: CORE};
 
-  static property: o.ExternalReference = {name: 'Δproperty', moduleName: CORE};
+  static property: o.ExternalReference = {name: 'ɵɵproperty', moduleName: CORE};
 
   static propertyInterpolate:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate', moduleName: CORE};
   static propertyInterpolate1:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate1', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate1', moduleName: CORE};
   static propertyInterpolate2:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate2', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate2', moduleName: CORE};
   static propertyInterpolate3:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate3', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate3', moduleName: CORE};
   static propertyInterpolate4:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate4', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate4', moduleName: CORE};
   static propertyInterpolate5:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate5', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate5', moduleName: CORE};
   static propertyInterpolate6:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate6', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate6', moduleName: CORE};
   static propertyInterpolate7:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate7', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate7', moduleName: CORE};
   static propertyInterpolate8:
-      o.ExternalReference = {name: 'ΔpropertyInterpolate8', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolate8', moduleName: CORE};
   static propertyInterpolateV:
-      o.ExternalReference = {name: 'ΔpropertyInterpolateV', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵpropertyInterpolateV', moduleName: CORE};
 
-  static i18n: o.ExternalReference = {name: 'Δi18n', moduleName: CORE};
-  static i18nAttributes: o.ExternalReference = {name: 'Δi18nAttributes', moduleName: CORE};
-  static i18nExp: o.ExternalReference = {name: 'Δi18nExp', moduleName: CORE};
-  static i18nStart: o.ExternalReference = {name: 'Δi18nStart', moduleName: CORE};
-  static i18nEnd: o.ExternalReference = {name: 'Δi18nEnd', moduleName: CORE};
-  static i18nApply: o.ExternalReference = {name: 'Δi18nApply', moduleName: CORE};
-  static i18nPostprocess: o.ExternalReference = {name: 'Δi18nPostprocess', moduleName: CORE};
-  static i18nLocalize: o.ExternalReference = {name: 'Δi18nLocalize', moduleName: CORE};
+  static i18n: o.ExternalReference = {name: 'ɵɵi18n', moduleName: CORE};
+  static i18nAttributes: o.ExternalReference = {name: 'ɵɵi18nAttributes', moduleName: CORE};
+  static i18nExp: o.ExternalReference = {name: 'ɵɵi18nExp', moduleName: CORE};
+  static i18nStart: o.ExternalReference = {name: 'ɵɵi18nStart', moduleName: CORE};
+  static i18nEnd: o.ExternalReference = {name: 'ɵɵi18nEnd', moduleName: CORE};
+  static i18nApply: o.ExternalReference = {name: 'ɵɵi18nApply', moduleName: CORE};
+  static i18nPostprocess: o.ExternalReference = {name: 'ɵɵi18nPostprocess', moduleName: CORE};
+  static i18nLocalize: o.ExternalReference = {name: 'ɵɵi18nLocalize', moduleName: CORE};
 
-  static load: o.ExternalReference = {name: 'Δload', moduleName: CORE};
+  static load: o.ExternalReference = {name: 'ɵɵload', moduleName: CORE};
 
-  static pipe: o.ExternalReference = {name: 'Δpipe', moduleName: CORE};
+  static pipe: o.ExternalReference = {name: 'ɵɵpipe', moduleName: CORE};
 
-  static projection: o.ExternalReference = {name: 'Δprojection', moduleName: CORE};
-  static projectionDef: o.ExternalReference = {name: 'ΔprojectionDef', moduleName: CORE};
+  static projection: o.ExternalReference = {name: 'ɵɵprojection', moduleName: CORE};
+  static projectionDef: o.ExternalReference = {name: 'ɵɵprojectionDef', moduleName: CORE};
 
-  static reference: o.ExternalReference = {name: 'Δreference', moduleName: CORE};
+  static reference: o.ExternalReference = {name: 'ɵɵreference', moduleName: CORE};
 
-  static inject: o.ExternalReference = {name: 'Δinject', moduleName: CORE};
+  static inject: o.ExternalReference = {name: 'ɵɵinject', moduleName: CORE};
 
-  static injectAttribute: o.ExternalReference = {name: 'ΔinjectAttribute', moduleName: CORE};
+  static injectAttribute: o.ExternalReference = {name: 'ɵɵinjectAttribute', moduleName: CORE};
 
-  static directiveInject: o.ExternalReference = {name: 'ΔdirectiveInject', moduleName: CORE};
+  static directiveInject: o.ExternalReference = {name: 'ɵɵdirectiveInject', moduleName: CORE};
 
   static templateRefExtractor:
-      o.ExternalReference = {name: 'ΔtemplateRefExtractor', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵtemplateRefExtractor', moduleName: CORE};
 
-  static resolveWindow: o.ExternalReference = {name: 'ΔresolveWindow', moduleName: CORE};
-  static resolveDocument: o.ExternalReference = {name: 'ΔresolveDocument', moduleName: CORE};
-  static resolveBody: o.ExternalReference = {name: 'ΔresolveBody', moduleName: CORE};
+  static resolveWindow: o.ExternalReference = {name: 'ɵɵresolveWindow', moduleName: CORE};
+  static resolveDocument: o.ExternalReference = {name: 'ɵɵresolveDocument', moduleName: CORE};
+  static resolveBody: o.ExternalReference = {name: 'ɵɵresolveBody', moduleName: CORE};
 
-  static defineBase: o.ExternalReference = {name: 'ΔdefineBase', moduleName: CORE};
+  static defineBase: o.ExternalReference = {name: 'ɵɵdefineBase', moduleName: CORE};
 
   static BaseDef: o.ExternalReference = {
-    name: 'ΔBaseDef',
+    name: 'ɵɵBaseDef',
     moduleName: CORE,
   };
 
-  static defineComponent: o.ExternalReference = {name: 'ΔdefineComponent', moduleName: CORE};
+  static defineComponent: o.ExternalReference = {name: 'ɵɵdefineComponent', moduleName: CORE};
 
-  static setComponentScope: o.ExternalReference = {name: 'ΔsetComponentScope', moduleName: CORE};
+  static setComponentScope: o.ExternalReference = {name: 'ɵɵsetComponentScope', moduleName: CORE};
 
   static ComponentDefWithMeta: o.ExternalReference = {
-    name: 'ΔComponentDefWithMeta',
+    name: 'ɵɵComponentDefWithMeta',
     moduleName: CORE,
   };
 
   static defineDirective: o.ExternalReference = {
-    name: 'ΔdefineDirective',
+    name: 'ɵɵdefineDirective',
     moduleName: CORE,
   };
 
   static DirectiveDefWithMeta: o.ExternalReference = {
-    name: 'ΔDirectiveDefWithMeta',
+    name: 'ɵɵDirectiveDefWithMeta',
     moduleName: CORE,
   };
 
   static InjectorDef: o.ExternalReference = {
-    name: 'ΔInjectorDef',
+    name: 'ɵɵInjectorDef',
     moduleName: CORE,
   };
 
   static defineInjector: o.ExternalReference = {
-    name: 'ΔdefineInjector',
+    name: 'ɵɵdefineInjector',
     moduleName: CORE,
   };
 
   static NgModuleDefWithMeta: o.ExternalReference = {
-    name: 'ΔNgModuleDefWithMeta',
+    name: 'ɵɵNgModuleDefWithMeta',
     moduleName: CORE,
   };
 
-  static defineNgModule: o.ExternalReference = {name: 'ΔdefineNgModule', moduleName: CORE};
-  static setNgModuleScope: o.ExternalReference = {name: 'ΔsetNgModuleScope', moduleName: CORE};
+  static defineNgModule: o.ExternalReference = {name: 'ɵɵdefineNgModule', moduleName: CORE};
+  static setNgModuleScope: o.ExternalReference = {name: 'ɵɵsetNgModuleScope', moduleName: CORE};
 
-  static PipeDefWithMeta: o.ExternalReference = {name: 'ΔPipeDefWithMeta', moduleName: CORE};
+  static PipeDefWithMeta: o.ExternalReference = {name: 'ɵɵPipeDefWithMeta', moduleName: CORE};
 
-  static definePipe: o.ExternalReference = {name: 'ΔdefinePipe', moduleName: CORE};
+  static definePipe: o.ExternalReference = {name: 'ɵɵdefinePipe', moduleName: CORE};
 
-  static queryRefresh: o.ExternalReference = {name: 'ΔqueryRefresh', moduleName: CORE};
-  static viewQuery: o.ExternalReference = {name: 'ΔviewQuery', moduleName: CORE};
-  static staticViewQuery: o.ExternalReference = {name: 'ΔstaticViewQuery', moduleName: CORE};
-  static staticContentQuery: o.ExternalReference = {name: 'ΔstaticContentQuery', moduleName: CORE};
-  static loadViewQuery: o.ExternalReference = {name: 'ΔloadViewQuery', moduleName: CORE};
-  static contentQuery: o.ExternalReference = {name: 'ΔcontentQuery', moduleName: CORE};
-  static loadContentQuery: o.ExternalReference = {name: 'ΔloadContentQuery', moduleName: CORE};
+  static queryRefresh: o.ExternalReference = {name: 'ɵɵqueryRefresh', moduleName: CORE};
+  static viewQuery: o.ExternalReference = {name: 'ɵɵviewQuery', moduleName: CORE};
+  static staticViewQuery: o.ExternalReference = {name: 'ɵɵstaticViewQuery', moduleName: CORE};
+  static staticContentQuery: o.ExternalReference = {name: 'ɵɵstaticContentQuery', moduleName: CORE};
+  static loadViewQuery: o.ExternalReference = {name: 'ɵɵloadViewQuery', moduleName: CORE};
+  static contentQuery: o.ExternalReference = {name: 'ɵɵcontentQuery', moduleName: CORE};
+  static loadContentQuery: o.ExternalReference = {name: 'ɵɵloadContentQuery', moduleName: CORE};
 
-  static NgOnChangesFeature: o.ExternalReference = {name: 'ΔNgOnChangesFeature', moduleName: CORE};
+  static NgOnChangesFeature: o.ExternalReference = {name: 'ɵɵNgOnChangesFeature', moduleName: CORE};
 
   static InheritDefinitionFeature:
-      o.ExternalReference = {name: 'ΔInheritDefinitionFeature', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵInheritDefinitionFeature', moduleName: CORE};
 
-  static ProvidersFeature: o.ExternalReference = {name: 'ΔProvidersFeature', moduleName: CORE};
+  static ProvidersFeature: o.ExternalReference = {name: 'ɵɵProvidersFeature', moduleName: CORE};
 
-  static listener: o.ExternalReference = {name: 'Δlistener', moduleName: CORE};
+  static listener: o.ExternalReference = {name: 'ɵɵlistener', moduleName: CORE};
 
   static getFactoryOf: o.ExternalReference = {
-    name: 'ΔgetFactoryOf',
+    name: 'ɵɵgetFactoryOf',
     moduleName: CORE,
   };
 
   static getInheritedFactory: o.ExternalReference = {
-    name: 'ΔgetInheritedFactory',
+    name: 'ɵɵgetInheritedFactory',
     moduleName: CORE,
   };
 
   // sanitization-related functions
-  static sanitizeHtml: o.ExternalReference = {name: 'ΔsanitizeHtml', moduleName: CORE};
-  static sanitizeStyle: o.ExternalReference = {name: 'ΔsanitizeStyle', moduleName: CORE};
+  static sanitizeHtml: o.ExternalReference = {name: 'ɵɵsanitizeHtml', moduleName: CORE};
+  static sanitizeStyle: o.ExternalReference = {name: 'ɵɵsanitizeStyle', moduleName: CORE};
   static defaultStyleSanitizer:
-      o.ExternalReference = {name: 'ΔdefaultStyleSanitizer', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵdefaultStyleSanitizer', moduleName: CORE};
   static sanitizeResourceUrl:
-      o.ExternalReference = {name: 'ΔsanitizeResourceUrl', moduleName: CORE};
-  static sanitizeScript: o.ExternalReference = {name: 'ΔsanitizeScript', moduleName: CORE};
-  static sanitizeUrl: o.ExternalReference = {name: 'ΔsanitizeUrl', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵsanitizeResourceUrl', moduleName: CORE};
+  static sanitizeScript: o.ExternalReference = {name: 'ɵɵsanitizeScript', moduleName: CORE};
+  static sanitizeUrl: o.ExternalReference = {name: 'ɵɵsanitizeUrl', moduleName: CORE};
   static sanitizeUrlOrResourceUrl:
-      o.ExternalReference = {name: 'ΔsanitizeUrlOrResourceUrl', moduleName: CORE};
+      o.ExternalReference = {name: 'ɵɵsanitizeUrlOrResourceUrl', moduleName: CORE};
 }
diff --git a/packages/compiler/src/render3/r3_module_compiler.ts b/packages/compiler/src/render3/r3_module_compiler.ts
index e45f8f0acb..df83a468d6 100644
--- a/packages/compiler/src/render3/r3_module_compiler.ts
+++ b/packages/compiler/src/render3/r3_module_compiler.ts
@@ -107,7 +107,7 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
   }
 
   // If requested to emit scope information inline, pass the declarations, imports and exports to
-  // the `ΔdefineNgModule` call. The JIT compilation uses this.
+  // the `ɵɵdefineNgModule` call. The JIT compilation uses this.
   if (emitInline) {
     if (declarations.length) {
       definitionMap.declarations = refsToArray(declarations, containsForwardDecls);
@@ -122,7 +122,7 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
     }
   }
 
-  // If not emitting inline, the scope information is not passed into `ΔdefineNgModule` as it would
+  // If not emitting inline, the scope information is not passed into `ɵɵdefineNgModule` as it would
   // prevent tree-shaking of the declarations, imports and exports references.
   else {
     const setNgModuleScopeCall = generateSetNgModuleScopeCall(meta);
@@ -150,7 +150,7 @@ export function compileNgModule(meta: R3NgModuleMetadata): R3NgModuleDef {
 }
 
 /**
- * Generates a function call to `ΔsetNgModuleScope` with all necessary information so that the
+ * Generates a function call to `ɵɵsetNgModuleScope` with all necessary information so that the
  * transitive module scope can be computed during runtime in JIT mode. This call is marked pure
  * such that the references to declarations, imports and exports may be elided causing these
  * symbols to become tree-shakeable.
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 17c1fbf41d..758ceb66ea 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -874,7 +874,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       return trimTrailingNulls(parameters);
     });
 
-    // handle property bindings e.g. Δproperty('ngForOf', ctx.items), et al;
+    // handle property bindings e.g. ɵɵproperty('ngForOf', ctx.items), et al;
     const context = o.variable(CONTEXT_NAME);
     this.templatePropertyBindings(template, templateIndex, context, template.templateAttrs);
 
diff --git a/packages/core/src/change_detection/differs/iterable_differs.ts b/packages/core/src/change_detection/differs/iterable_differs.ts
index f8727adb5e..2d08ea8b5a 100644
--- a/packages/core/src/change_detection/differs/iterable_differs.ts
+++ b/packages/core/src/change_detection/differs/iterable_differs.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ΔdefineInjectable} from '../../di/interface/defs';
+import {ɵɵdefineInjectable} from '../../di/interface/defs';
 import {StaticProvider} from '../../di/interface/provider';
 import {Optional, SkipSelf} from '../../di/metadata';
 import {DefaultIterableDifferFactory} from '../differs/default_iterable_differ';
@@ -143,7 +143,7 @@ export interface IterableDifferFactory {
  */
 export class IterableDiffers {
   /** @nocollapse */
-  static ngInjectableDef = ΔdefineInjectable({
+  static ngInjectableDef = ɵɵdefineInjectable({
     providedIn: 'root',
     factory: () => new IterableDiffers([new DefaultIterableDifferFactory()])
   });
diff --git a/packages/core/src/change_detection/differs/keyvalue_differs.ts b/packages/core/src/change_detection/differs/keyvalue_differs.ts
index d511134b72..5c9571ef05 100644
--- a/packages/core/src/change_detection/differs/keyvalue_differs.ts
+++ b/packages/core/src/change_detection/differs/keyvalue_differs.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Optional, SkipSelf, StaticProvider, ΔdefineInjectable} from '../../di';
+import {Optional, SkipSelf, StaticProvider, ɵɵdefineInjectable} from '../../di';
 import {DefaultKeyValueDifferFactory} from './default_keyvalue_differ';
 
 
@@ -118,7 +118,7 @@ export interface KeyValueDifferFactory {
  */
 export class KeyValueDiffers {
   /** @nocollapse */
-  static ngInjectableDef = ΔdefineInjectable({
+  static ngInjectableDef = ɵɵdefineInjectable({
     providedIn: 'root',
     factory: () => new KeyValueDiffers([new DefaultKeyValueDifferFactory()])
   });
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index 41a2a4d67c..d4f139a16e 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -13,8 +13,8 @@ export {devModeEqual as ɵdevModeEqual} from './change_detection/change_detectio
 export {isListLikeIterable as ɵisListLikeIterable} from './change_detection/change_detection_util';
 export {ChangeDetectorStatus as ɵChangeDetectorStatus, isDefaultChangeDetectionStrategy as ɵisDefaultChangeDetectionStrategy} from './change_detection/constants';
 export {Console as ɵConsole} from './console';
-export {inject, setCurrentInjector as ɵsetCurrentInjector, ɵɵinject, Δinject} from './di/injector_compatibility';
-export {getInjectableDef as ɵgetInjectableDef, ΔInjectableDef as ΔInjectableDef, ΔInjectorDef} from './di/interface/defs';
+export {inject, setCurrentInjector as ɵsetCurrentInjector, ɵɵinject} from './di/injector_compatibility';
+export {getInjectableDef as ɵgetInjectableDef, ɵɵInjectableDef, ɵɵInjectorDef} from './di/interface/defs';
 export {APP_ROOT as ɵAPP_ROOT} from './di/scope';
 export {ivyEnabled as ɵivyEnabled} from './ivy_switch';
 export {ComponentFactory as ɵComponentFactory} from './linker/component_factory';
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 0bd5a86bab..f2b48983e4 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -8,11 +8,11 @@
 
 // clang-format off
 export {
-  ΔdefineBase,
-  ΔdefineComponent,
-  ΔdefineDirective,
-  ΔdefinePipe,
-  ΔdefineNgModule,
+  ɵɵdefineBase,
+  ɵɵdefineComponent,
+  ɵɵdefineDirective,
+  ɵɵdefinePipe,
+  ɵɵdefineNgModule,
   detectChanges as ɵdetectChanges,
   renderComponent as ɵrenderComponent,
   AttributeMarker as ɵAttributeMarker,
@@ -21,16 +21,16 @@ export {
   ComponentRef as ɵRender3ComponentRef,
   DirectiveType as ɵDirectiveType,
   RenderFlags as ɵRenderFlags,
-  ΔdirectiveInject,
-  ΔinjectAttribute,
-  ΔgetFactoryOf,
-  ΔgetInheritedFactory,
-  ΔsetComponentScope,
-  ΔsetNgModuleScope,
-  ΔtemplateRefExtractor,
-  ΔProvidersFeature,
-  ΔInheritDefinitionFeature,
-  ΔNgOnChangesFeature,
+  ɵɵdirectiveInject,
+  ɵɵinjectAttribute,
+  ɵɵgetFactoryOf,
+  ɵɵgetInheritedFactory,
+  ɵɵsetComponentScope,
+  ɵɵsetNgModuleScope,
+  ɵɵtemplateRefExtractor,
+  ɵɵProvidersFeature,
+  ɵɵInheritDefinitionFeature,
+  ɵɵNgOnChangesFeature,
   LifecycleHooksFeature as ɵLifecycleHooksFeature,
   NgModuleType as ɵNgModuleType,
   NgModuleRef as ɵRender3NgModuleRef,
@@ -38,114 +38,114 @@ export {
   markDirty as ɵmarkDirty,
   NgModuleFactory as ɵNgModuleFactory,
   NO_CHANGE as ɵNO_CHANGE,
-  Δcontainer,
-  ΔnextContext,
-  ΔelementStart,
-  ΔnamespaceHTML,
-  ΔnamespaceMathML,
-  ΔnamespaceSVG,
-  Δelement,
-  Δlistener,
-  Δtext,
-  ΔembeddedViewStart,
-  Δprojection,
-  Δbind,
-  Δinterpolation1,
-  Δinterpolation2,
-  Δinterpolation3,
-  Δinterpolation4,
-  Δinterpolation5,
-  Δinterpolation6,
-  Δinterpolation7,
-  Δinterpolation8,
-  ΔinterpolationV,
-  ΔpipeBind1,
-  ΔpipeBind2,
-  ΔpipeBind3,
-  ΔpipeBind4,
-  ΔpipeBindV,
-  ΔpureFunction0,
-  ΔpureFunction1,
-  ΔpureFunction2,
-  ΔpureFunction3,
-  ΔpureFunction4,
-  ΔpureFunction5,
-  ΔpureFunction6,
-  ΔpureFunction7,
-  ΔpureFunction8,
-  ΔpureFunctionV,
-  ΔgetCurrentView,
+  ɵɵcontainer,
+  ɵɵnextContext,
+  ɵɵelementStart,
+  ɵɵnamespaceHTML,
+  ɵɵnamespaceMathML,
+  ɵɵnamespaceSVG,
+  ɵɵelement,
+  ɵɵlistener,
+  ɵɵtext,
+  ɵɵembeddedViewStart,
+  ɵɵprojection,
+  ɵɵbind,
+  ɵɵinterpolation1,
+  ɵɵinterpolation2,
+  ɵɵinterpolation3,
+  ɵɵinterpolation4,
+  ɵɵinterpolation5,
+  ɵɵinterpolation6,
+  ɵɵinterpolation7,
+  ɵɵinterpolation8,
+  ɵɵinterpolationV,
+  ɵɵpipeBind1,
+  ɵɵpipeBind2,
+  ɵɵpipeBind3,
+  ɵɵpipeBind4,
+  ɵɵpipeBindV,
+  ɵɵpureFunction0,
+  ɵɵpureFunction1,
+  ɵɵpureFunction2,
+  ɵɵpureFunction3,
+  ɵɵpureFunction4,
+  ɵɵpureFunction5,
+  ɵɵpureFunction6,
+  ɵɵpureFunction7,
+  ɵɵpureFunction8,
+  ɵɵpureFunctionV,
+  ɵɵgetCurrentView,
   getDirectives as ɵgetDirectives,
   getHostElement as ɵgetHostElement,
-  ΔrestoreView,
-  ΔcontainerRefreshStart,
-  ΔcontainerRefreshEnd,
-  ΔqueryRefresh,
-  ΔviewQuery,
-  ΔstaticViewQuery,
-  ΔstaticContentQuery,
-  ΔloadViewQuery,
-  ΔcontentQuery,
-  ΔloadContentQuery,
-  ΔelementEnd,
-  ΔelementProperty,
-  Δproperty,
-  ΔpropertyInterpolate,
-  ΔpropertyInterpolate1,
-  ΔpropertyInterpolate2,
-  ΔpropertyInterpolate3,
-  ΔpropertyInterpolate4,
-  ΔpropertyInterpolate5,
-  ΔpropertyInterpolate6,
-  ΔpropertyInterpolate7,
-  ΔpropertyInterpolate8,
-  ΔpropertyInterpolateV,
-  ΔcomponentHostSyntheticProperty,
-  ΔcomponentHostSyntheticListener,
-  ΔprojectionDef,
-  Δreference,
-  ΔenableBindings,
-  ΔdisableBindings,
-  ΔallocHostVars,
-  ΔelementAttribute,
-  ΔelementContainerStart,
-  ΔelementContainerEnd,
-  Δstyling,
-  ΔstyleMap,
-  ΔclassMap,
-  ΔstyleProp,
-  ΔstylingApply,
-  ΔclassProp,
-  ΔelementHostAttrs,
+  ɵɵrestoreView,
+  ɵɵcontainerRefreshStart,
+  ɵɵcontainerRefreshEnd,
+  ɵɵqueryRefresh,
+  ɵɵviewQuery,
+  ɵɵstaticViewQuery,
+  ɵɵstaticContentQuery,
+  ɵɵloadViewQuery,
+  ɵɵcontentQuery,
+  ɵɵloadContentQuery,
+  ɵɵelementEnd,
+  ɵɵelementProperty,
+  ɵɵproperty,
+  ɵɵpropertyInterpolate,
+  ɵɵpropertyInterpolate1,
+  ɵɵpropertyInterpolate2,
+  ɵɵpropertyInterpolate3,
+  ɵɵpropertyInterpolate4,
+  ɵɵpropertyInterpolate5,
+  ɵɵpropertyInterpolate6,
+  ɵɵpropertyInterpolate7,
+  ɵɵpropertyInterpolate8,
+  ɵɵpropertyInterpolateV,
+  ɵɵcomponentHostSyntheticProperty,
+  ɵɵcomponentHostSyntheticListener,
+  ɵɵprojectionDef,
+  ɵɵreference,
+  ɵɵenableBindings,
+  ɵɵdisableBindings,
+  ɵɵallocHostVars,
+  ɵɵelementAttribute,
+  ɵɵelementContainerStart,
+  ɵɵelementContainerEnd,
+  ɵɵstyling,
+  ɵɵstyleMap,
+  ɵɵclassMap,
+  ɵɵstyleProp,
+  ɵɵstylingApply,
+  ɵɵclassProp,
+  ɵɵelementHostAttrs,
 
-  Δselect,
-  ΔtextBinding,
-  Δtemplate,
-  ΔembeddedViewEnd,
+  ɵɵselect,
+  ɵɵtextBinding,
+  ɵɵtemplate,
+  ɵɵembeddedViewEnd,
   store as ɵstore,
-  Δload,
-  Δpipe,
-  ΔBaseDef,
+  ɵɵload,
+  ɵɵpipe,
+  ɵɵBaseDef,
   ComponentDef as ɵComponentDef,
-  ΔComponentDefWithMeta,
+  ɵɵComponentDefWithMeta,
   DirectiveDef as ɵDirectiveDef,
-  ΔDirectiveDefWithMeta,
+  ɵɵDirectiveDefWithMeta,
   PipeDef as ɵPipeDef,
-  ΔPipeDefWithMeta,
+  ɵɵPipeDefWithMeta,
   whenRendered as ɵwhenRendered,
-  Δi18n,
-  Δi18nAttributes,
-  Δi18nExp,
-  Δi18nStart,
-  Δi18nEnd,
-  Δi18nApply,
-  Δi18nPostprocess,
+  ɵɵi18n,
+  ɵɵi18nAttributes,
+  ɵɵi18nExp,
+  ɵɵi18nStart,
+  ɵɵi18nEnd,
+  ɵɵi18nApply,
+  ɵɵi18nPostprocess,
   i18nConfigureLocalize as ɵi18nConfigureLocalize,
-  Δi18nLocalize,
+  ɵɵi18nLocalize,
   setClassMetadata as ɵsetClassMetadata,
-  ΔresolveWindow,
-  ΔresolveDocument,
-  ΔresolveBody,
+  ɵɵresolveWindow,
+  ɵɵresolveDocument,
+  ɵɵresolveBody,
 } from './render3/index';
 
 
@@ -167,18 +167,18 @@ export {
 
 export {
   NgModuleDef as ɵNgModuleDef,
-  ΔNgModuleDefWithMeta,
+  ɵɵNgModuleDefWithMeta,
   NgModuleTransitiveScopes as ɵNgModuleTransitiveScopes,
 } from './metadata/ng_module';
 
 export {
-  ΔsanitizeHtml,
-  ΔsanitizeStyle,
-  ΔdefaultStyleSanitizer,
-  ΔsanitizeScript,
-  ΔsanitizeUrl,
-  ΔsanitizeResourceUrl,
-  ΔsanitizeUrlOrResourceUrl,
+  ɵɵsanitizeHtml,
+  ɵɵsanitizeStyle,
+  ɵɵdefaultStyleSanitizer,
+  ɵɵsanitizeScript,
+  ɵɵsanitizeUrl,
+  ɵɵsanitizeResourceUrl,
+  ɵɵsanitizeUrlOrResourceUrl,
 } from './sanitization/sanitization';
 
 export {
diff --git a/packages/core/src/di/index.ts b/packages/core/src/di/index.ts
index 1733f522a0..6435213cad 100644
--- a/packages/core/src/di/index.ts
+++ b/packages/core/src/di/index.ts
@@ -14,11 +14,11 @@
 
 export * from './metadata';
 export {InjectFlags} from './interface/injector';
-export {ΔdefineInjectable, defineInjectable, ɵɵdefineInjectable, ΔdefineInjector, InjectableType, InjectorType} from './interface/defs';
+export {ɵɵdefineInjectable, defineInjectable, ɵɵdefineInjector, InjectableType, InjectorType} from './interface/defs';
 export {forwardRef, resolveForwardRef, ForwardRefFn} from './forward_ref';
 export {Injectable, InjectableDecorator, InjectableProvider} from './injectable';
 export {Injector} from './injector';
-export {Δinject, inject, ɵɵinject, INJECTOR} from './injector_compatibility';
+export {ɵɵinject, inject, INJECTOR} from './injector_compatibility';
 export {ReflectiveInjector} from './reflective_injector';
 export {StaticProvider, ValueProvider, ConstructorSansProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider} from './interface/provider';
 export {ResolvedReflectiveFactory, ResolvedReflectiveProvider} from './reflective_provider';
diff --git a/packages/core/src/di/injectable.ts b/packages/core/src/di/injectable.ts
index 784c9b72a8..19767f6f4b 100644
--- a/packages/core/src/di/injectable.ts
+++ b/packages/core/src/di/injectable.ts
@@ -9,7 +9,7 @@
 import {Type} from '../interface/type';
 import {TypeDecorator, makeDecorator} from '../util/decorators';
 
-import {InjectableType, getInjectableDef, ΔInjectableDef, ΔdefineInjectable} from './interface/defs';
+import {InjectableType, getInjectableDef, ɵɵInjectableDef, ɵɵdefineInjectable} from './interface/defs';
 import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueSansProvider} from './interface/provider';
 import {compileInjectable as render3CompileInjectable} from './jit/injectable';
 import {convertInjectableProviderToFactory} from './util';
@@ -80,7 +80,7 @@ export const Injectable: InjectableDecorator = makeDecorator(
  *
  * @publicApi
  */
-export interface InjectableType<T> extends Type<T> { ngInjectableDef: ΔInjectableDef<T>; }
+export interface InjectableType<T> extends Type<T> { ngInjectableDef: ɵɵInjectableDef<T>; }
 
 /**
  * Supports @Injectable() in JIT mode for Render2.
@@ -89,7 +89,7 @@ function render2CompileInjectable(
     injectableType: InjectableType<any>,
     options: {providedIn?: Type<any>| 'root' | null} & InjectableProvider): void {
   if (options && options.providedIn !== undefined && !getInjectableDef(injectableType)) {
-    injectableType.ngInjectableDef = ΔdefineInjectable({
+    injectableType.ngInjectableDef = ɵɵdefineInjectable({
       providedIn: options.providedIn,
       factory: convertInjectableProviderToFactory(injectableType, options),
     });
diff --git a/packages/core/src/di/injection_token.ts b/packages/core/src/di/injection_token.ts
index 496d6bb765..ac16ca838a 100644
--- a/packages/core/src/di/injection_token.ts
+++ b/packages/core/src/di/injection_token.ts
@@ -8,7 +8,7 @@
 
 import {Type} from '../interface/type';
 
-import {ΔdefineInjectable} from './interface/defs';
+import {ɵɵdefineInjectable} from './interface/defs';
 
 /**
  * Creates a token that can be used in a DI Provider.
@@ -67,7 +67,7 @@ export class InjectionToken<T> {
       // We are using it to assign `-1` which is used to identify `Injector`.
       (this as any).__NG_ELEMENT_ID__ = options;
     } else if (options !== undefined) {
-      this.ngInjectableDef = ΔdefineInjectable({
+      this.ngInjectableDef = ɵɵdefineInjectable({
         providedIn: options.providedIn || 'root',
         factory: options.factory,
       });
diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts
index 3216018e5a..cd6556c18e 100644
--- a/packages/core/src/di/injector.ts
+++ b/packages/core/src/di/injector.ts
@@ -11,8 +11,8 @@ import {stringify} from '../util/stringify';
 
 import {resolveForwardRef} from './forward_ref';
 import {InjectionToken} from './injection_token';
-import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, formatError, Δinject} from './injector_compatibility';
-import {ΔdefineInjectable} from './interface/defs';
+import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, formatError, ɵɵinject} from './injector_compatibility';
+import {ɵɵdefineInjectable} from './interface/defs';
 import {InjectFlags} from './interface/injector';
 import {ConstructorProvider, ExistingProvider, FactoryProvider, StaticClassProvider, StaticProvider, ValueProvider} from './interface/provider';
 import {Inject, Optional, Self, SkipSelf} from './metadata';
@@ -88,9 +88,9 @@ export abstract class Injector {
   }
 
   /** @nocollapse */
-  static ngInjectableDef = ΔdefineInjectable({
+  static ngInjectableDef = ɵɵdefineInjectable({
     providedIn: 'any' as any,
-    factory: () => Δinject(INJECTOR),
+    factory: () => ɵɵinject(INJECTOR),
   });
 
   /**
diff --git a/packages/core/src/di/injector_compatibility.ts b/packages/core/src/di/injector_compatibility.ts
index 10eb13f290..83cc2638ab 100644
--- a/packages/core/src/di/injector_compatibility.ts
+++ b/packages/core/src/di/injector_compatibility.ts
@@ -13,7 +13,7 @@ import {stringify} from '../util/stringify';
 import {resolveForwardRef} from './forward_ref';
 import {InjectionToken} from './injection_token';
 import {Injector} from './injector';
-import {getInjectableDef, ΔInjectableDef} from './interface/defs';
+import {getInjectableDef, ɵɵInjectableDef} from './interface/defs';
 import {InjectFlags} from './interface/injector';
 import {ValueProvider} from './interface/provider';
 import {Inject, Optional, Self, SkipSelf} from './metadata';
@@ -107,9 +107,10 @@ export function injectInjectorOnly<T>(
  * @see inject
  * @codeGenApi
  */
-export function Δinject<T>(token: Type<T>| InjectionToken<T>): T;
-export function Δinject<T>(token: Type<T>| InjectionToken<T>, flags?: InjectFlags): T|null;
-export function Δinject<T>(token: Type<T>| InjectionToken<T>, flags = InjectFlags.Default): T|null {
+export function ɵɵinject<T>(token: Type<T>| InjectionToken<T>): T;
+export function ɵɵinject<T>(token: Type<T>| InjectionToken<T>, flags?: InjectFlags): T|null;
+export function ɵɵinject<T>(token: Type<T>| InjectionToken<T>, flags = InjectFlags.Default): T|
+    null {
   return (_injectImplementation || injectInjectorOnly)(token, flags);
 }
 
@@ -137,13 +138,7 @@ export function Δinject<T>(token: Type<T>| InjectionToken<T>, flags = InjectFla
  *
  * @publicApi
  */
-export const inject = Δinject;
-
-/**
- * @deprecated delete by v8, use `inject`.
- * @codeGenApi
- */
-export const ɵɵinject = Δinject;
+export const inject = ɵɵinject;
 
 /**
  * Injects `root` tokens in limp mode.
@@ -154,7 +149,7 @@ export const ɵɵinject = Δinject;
  */
 export function injectRootLimpMode<T>(
     token: Type<T>| InjectionToken<T>, notFoundValue: T | undefined, flags: InjectFlags): T|null {
-  const injectableDef: ΔInjectableDef<T>|null = getInjectableDef(token);
+  const injectableDef: ɵɵInjectableDef<T>|null = getInjectableDef(token);
   if (injectableDef && injectableDef.providedIn == 'root') {
     return injectableDef.value === undefined ? injectableDef.value = injectableDef.factory() :
                                                injectableDef.value;
@@ -191,9 +186,9 @@ export function injectArgs(types: (Type<any>| InjectionToken<any>| any[])[]): an
         }
       }
 
-      args.push(Δinject(type !, flags));
+      args.push(ɵɵinject(type !, flags));
     } else {
-      args.push(Δinject(arg));
+      args.push(ɵɵinject(arg));
     }
   }
   return args;
diff --git a/packages/core/src/di/interface/defs.ts b/packages/core/src/di/interface/defs.ts
index f98c09cf6a..e92f931825 100644
--- a/packages/core/src/di/interface/defs.ts
+++ b/packages/core/src/di/interface/defs.ts
@@ -26,7 +26,7 @@ import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, S
  *
  * @publicApi
  */
-export interface ΔInjectableDef<T> {
+export interface ɵɵInjectableDef<T> {
   /**
    * Specifies that the given type belongs to a particular injector:
    * - `InjectorType` such as `NgModule`,
@@ -60,7 +60,7 @@ export interface ΔInjectableDef<T> {
  *
  * @publicApi
  */
-export interface ΔInjectorDef<T> {
+export interface ɵɵInjectorDef<T> {
   factory: () => T;
 
   // TODO(alxhub): Narrow down the type here once decorators properly change the return type of the
@@ -131,28 +131,21 @@ export interface InjectorTypeWithProviders<T> {
  *
  * @codeGenApi
  */
-export function ΔdefineInjectable<T>(opts: {
+export function ɵɵdefineInjectable<T>(opts: {
   providedIn?: Type<any>| 'root' | 'any' | null,
   factory: () => T,
 }): never {
   return ({
     providedIn: opts.providedIn as any || null, factory: opts.factory, value: undefined,
-  } as ΔInjectableDef<T>) as never;
+  } as ɵɵInjectableDef<T>) as never;
 }
 
 /**
  * @deprecated in v8, delete after v10. This API should be used only be generated code, and that
- * code should now use ΔdefineInjectable instead.
+ * code should now use ɵɵdefineInjectable instead.
  * @publicApi
  */
-export const defineInjectable = ΔdefineInjectable;
-
-/**
- * @deprecated delete before v8. Use `defineInjectable`, which is also deprecated, but will be
- * around until v10.
- * @publicApi
- */
-export const ɵɵdefineInjectable = ΔdefineInjectable;
+export const defineInjectable = ɵɵdefineInjectable;
 
 /**
  * Construct an `InjectorDef` which configures an injector.
@@ -174,11 +167,11 @@ export const ɵɵdefineInjectable = ΔdefineInjectable;
  *
  * @publicApi
  */
-export function ΔdefineInjector(options: {factory: () => any, providers?: any[], imports?: any[]}):
+export function ɵɵdefineInjector(options: {factory: () => any, providers?: any[], imports?: any[]}):
     never {
   return ({
     factory: options.factory, providers: options.providers || [], imports: options.imports || [],
-  } as ΔInjectorDef<any>) as never;
+  } as ɵɵInjectorDef<any>) as never;
 }
 
 /**
@@ -187,7 +180,7 @@ export function ΔdefineInjector(options: {factory: () => any, providers?: any[]
  *
  * @param type A type which may have its own (non-inherited) `ngInjectableDef`.
  */
-export function getInjectableDef<T>(type: any): ΔInjectableDef<T>|null {
+export function getInjectableDef<T>(type: any): ɵɵInjectableDef<T>|null {
   return type && type.hasOwnProperty(NG_INJECTABLE_DEF) ? type[NG_INJECTABLE_DEF] : null;
 }
 
@@ -199,7 +192,7 @@ export function getInjectableDef<T>(type: any): ΔInjectableDef<T>|null {
  * @deprecated Will be removed in v10, where an error will occur in the scenario if we find the
  * `ngInjectableDef` on an ancestor only.
  */
-export function getInheritedInjectableDef<T>(type: any): ΔInjectableDef<T>|null {
+export function getInheritedInjectableDef<T>(type: any): ɵɵInjectableDef<T>|null {
   if (type && type[NG_INJECTABLE_DEF]) {
     // TODO(FW-1307): Re-add ngDevMode when closure can handle it
     // ngDevMode &&
@@ -217,7 +210,7 @@ export function getInheritedInjectableDef<T>(type: any): ΔInjectableDef<T>|null
  *
  * @param type type which may have `ngInjectorDef`
  */
-export function getInjectorDef<T>(type: any): ΔInjectorDef<T>|null {
+export function getInjectorDef<T>(type: any): ɵɵInjectorDef<T>|null {
   return type && type.hasOwnProperty(NG_INJECTOR_DEF) ? (type as any)[NG_INJECTOR_DEF] : null;
 }
 
diff --git a/packages/core/src/di/jit/environment.ts b/packages/core/src/di/jit/environment.ts
index a702bb6943..9bd8141b10 100644
--- a/packages/core/src/di/jit/environment.ts
+++ b/packages/core/src/di/jit/environment.ts
@@ -7,8 +7,8 @@
  */
 
 import {Type} from '../../interface/type';
-import {Δinject} from '../injector_compatibility';
-import {getInjectableDef, getInjectorDef, ΔdefineInjectable, ΔdefineInjector} from '../interface/defs';
+import {ɵɵinject} from '../injector_compatibility';
+import {getInjectableDef, getInjectorDef, ɵɵdefineInjectable, ɵɵdefineInjector} from '../interface/defs';
 
 
 
@@ -18,10 +18,10 @@ import {getInjectableDef, getInjectorDef, ΔdefineInjectable, ΔdefineInjector}
  * This should be kept up to date with the public exports of @angular/core.
  */
 export const angularCoreDiEnv: {[name: string]: Function} = {
-  'ΔdefineInjectable': ΔdefineInjectable,
-  'ΔdefineInjector': ΔdefineInjector,
-  'Δinject': Δinject,
-  'ΔgetFactoryOf': getFactoryOf,
+  'ɵɵdefineInjectable': ɵɵdefineInjectable,
+  'ɵɵdefineInjector': ɵɵdefineInjector,
+  'ɵɵinject': ɵɵinject,
+  'ɵɵgetFactoryOf': getFactoryOf,
 };
 
 function getFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T)|null {
diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index d7c2daca54..be8b0cb07c 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -14,8 +14,8 @@ import {stringify} from '../util/stringify';
 import {resolveForwardRef} from './forward_ref';
 import {InjectionToken} from './injection_token';
 import {Injector} from './injector';
-import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, injectArgs, setCurrentInjector, Δinject} from './injector_compatibility';
-import {InjectorType, InjectorTypeWithProviders, getInheritedInjectableDef, getInjectableDef, getInjectorDef, ΔInjectableDef} from './interface/defs';
+import {INJECTOR, NG_TEMP_TOKEN_PATH, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE, catchInjectorError, injectArgs, setCurrentInjector, ɵɵinject} from './injector_compatibility';
+import {InjectorType, InjectorTypeWithProviders, getInheritedInjectableDef, getInjectableDef, getInjectorDef, ɵɵInjectableDef} from './interface/defs';
 import {InjectFlags} from './interface/injector';
 import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider} from './interface/provider';
 import {APP_ROOT} from './scope';
@@ -366,7 +366,7 @@ export class R3Injector {
     return record.value as T;
   }
 
-  private injectableDefInScope(def: ΔInjectableDef<any>): boolean {
+  private injectableDefInScope(def: ɵɵInjectableDef<any>): boolean {
     if (!def.providedIn) {
       return false;
     } else if (typeof def.providedIn === 'string') {
@@ -450,7 +450,7 @@ export function providerToFactory(
     if (isValueProvider(provider)) {
       factory = () => resolveForwardRef(provider.useValue);
     } else if (isExistingProvider(provider)) {
-      factory = () => Δinject(resolveForwardRef(provider.useExisting));
+      factory = () => ɵɵinject(resolveForwardRef(provider.useExisting));
     } else if (isFactoryProvider(provider)) {
       factory = () => provider.useFactory(...injectArgs(provider.deps || []));
     } else {
diff --git a/packages/core/src/di/util.ts b/packages/core/src/di/util.ts
index d5e5830ad2..ccc78def56 100644
--- a/packages/core/src/di/util.ts
+++ b/packages/core/src/di/util.ts
@@ -10,7 +10,7 @@ import {Type} from '../interface/type';
 import {ReflectionCapabilities} from '../reflection/reflection_capabilities';
 import {getClosureSafeProperty} from '../util/property';
 
-import {injectArgs, Δinject} from './injector_compatibility';
+import {injectArgs, ɵɵinject} from './injector_compatibility';
 import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from './interface/provider';
 
 const USE_VALUE =
@@ -32,7 +32,7 @@ export function convertInjectableProviderToFactory(
     return () => valueProvider.useValue;
   } else if ((provider as ExistingSansProvider).useExisting) {
     const existingProvider = (provider as ExistingSansProvider);
-    return () => Δinject(existingProvider.useExisting);
+    return () => ɵɵinject(existingProvider.useExisting);
   } else if ((provider as FactorySansProvider).useFactory) {
     const factoryProvider = (provider as FactorySansProvider);
     return () => factoryProvider.useFactory(...injectArgs(factoryProvider.deps || EMPTY_ARRAY));
diff --git a/packages/core/src/metadata/ng_module.ts b/packages/core/src/metadata/ng_module.ts
index b4fcb65be5..0b7638f0ad 100644
--- a/packages/core/src/metadata/ng_module.ts
+++ b/packages/core/src/metadata/ng_module.ts
@@ -7,7 +7,7 @@
  */
 
 import {ApplicationRef} from '../application_ref';
-import {InjectorType, ΔdefineInjector} from '../di/interface/defs';
+import {InjectorType, ɵɵdefineInjector} from '../di/interface/defs';
 import {Provider} from '../di/interface/provider';
 import {convertInjectableProviderToFactory} from '../di/util';
 import {Type} from '../interface/type';
@@ -35,7 +35,7 @@ export interface NgModuleTransitiveScopes {
 /**
  * @publicApi
  */
-export type ΔNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
+export type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
 
 /**
  * Runtime link information for NgModules.
@@ -43,7 +43,7 @@ export type ΔNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleD
  * This is the internal data structure used by the runtime to assemble components, directives,
  * pipes, and injectors.
  *
- * NOTE: Always use `ΔdefineNgModule` function to create this object,
+ * NOTE: Always use `ɵɵdefineNgModule` function to create this object,
  * never create the object directly since the shape of this object
  * can change between versions.
  */
@@ -350,7 +350,7 @@ function preR3NgModuleCompile(moduleType: InjectorType<any>, metadata: NgModule)
     imports = [...imports, metadata.exports];
   }
 
-  moduleType.ngInjectorDef = ΔdefineInjector({
+  moduleType.ngInjectorDef = ɵɵdefineInjector({
     factory: convertInjectableProviderToFactory(moduleType, {useClass: moduleType}),
     providers: metadata && metadata.providers,
     imports: imports,
diff --git a/packages/core/src/r3_symbols.ts b/packages/core/src/r3_symbols.ts
index 073cf4f9a5..6f8a80bbdb 100644
--- a/packages/core/src/r3_symbols.ts
+++ b/packages/core/src/r3_symbols.ts
@@ -21,10 +21,10 @@
  * The below symbols are used for @Injectable and @NgModule compilation.
  */
 
-export {Δinject} from './di/injector_compatibility';
-export {ΔInjectableDef, ΔInjectorDef, ΔdefineInjectable, ΔdefineInjector} from './di/interface/defs';
-export {NgModuleDef, ΔNgModuleDefWithMeta} from './metadata/ng_module';
-export {ΔdefineNgModule} from './render3/definition';
+export {ɵɵinject} from './di/injector_compatibility';
+export {ɵɵInjectableDef, ɵɵInjectorDef, ɵɵdefineInjectable, ɵɵdefineInjector} from './di/interface/defs';
+export {NgModuleDef, ɵɵNgModuleDefWithMeta} from './metadata/ng_module';
+export {ɵɵdefineNgModule} from './render3/definition';
 export {setClassMetadata} from './render3/metadata';
 export {NgModuleFactory} from './render3/ng_module_ref';
 
diff --git a/packages/core/src/render3/CODE_GEN_API.md b/packages/core/src/render3/CODE_GEN_API.md
index dc7fcba617..359ae0937f 100644
--- a/packages/core/src/render3/CODE_GEN_API.md
+++ b/packages/core/src/render3/CODE_GEN_API.md
@@ -1,11 +1,11 @@
 # Code Gen API
 
-### Prefix Δ
+### Prefix ɵɵ
 
-Ivy exports a number of functions prefixed with `Δ`, for example `ΔelementStart`, or `Δinject`, et al. These functions are part of API required for code generation by the Angular compiler. These functions are called by generated code, and they must be publicly exposed in order to be consumed by this generated code. **They are not meant for developer consumption**. The reason they are prefixed with `Δ` is not only to identify them as different from other functions, but also to make them not show up at the top of IDE code completion in environments such as Visual Studio code.
+Ivy exports a number of functions prefixed with `ɵɵ`, for example `ɵɵelementStart`, or `ɵɵinject`, et al. These functions are part of API required for code generation by the Angular compiler. These functions are called by generated code, and they must be publicly exposed in order to be consumed by this generated code. **They are not meant for developer consumption**. The reason they are prefixed with `ɵɵ` is not only to identify them as different from other functions, but also to make them not show up at the top of IDE code completion in environments such as Visual Studio code.
 
 
 ### Guidance
 
-- Do not use `Δ` functions directly. They are meant to be used in generated code.
-- Do not create new `Δ` functions, it's not a convention that Angular consumes, and it is liable to confuse other developers into thinking consuming Angular's `Δ` functions is a good pattern to follow.
+- Do not use `ɵɵ` functions directly. They are meant to be used in generated code.
+- Do not create new `ɵɵ` functions, it's not a convention that Angular consumes, and it is liable to confuse other developers into thinking consuming Angular's `ɵɵ` functions is a good pattern to follow.
diff --git a/packages/core/src/render3/STATUS.md b/packages/core/src/render3/STATUS.md
index c26cece2d1..c2648c11c5 100644
--- a/packages/core/src/render3/STATUS.md
+++ b/packages/core/src/render3/STATUS.md
@@ -10,8 +10,8 @@ We currently expect Ivy to remain behind the flag until it's feature complete an
 
 The work can be divided into three categories:
 - `@angular/compiler-cli`: TypeScript transformer pipeline which includes two command line tools:
-  - `ngtsc`: (Angular TypeScript Compiler) Angular compiler which strips out `@Component` (and friends) and replaces it with `ΔdefineComponent` (and friends).
-  - `ngcc`: (Angular Compatibility Compiler) NPM upgrade compiler which reads the `STORING_METADATA_IN_D.TS.json` files and `.js` files and adds `ΔdefineComponent` (and friends) into the `node_module`. This in effect converts a pre-ivy module into ivy module.
+  - `ngtsc`: (Angular TypeScript Compiler) Angular compiler which strips out `@Component` (and friends) and replaces it with `ɵɵdefineComponent` (and friends).
+  - `ngcc`: (Angular Compatibility Compiler) NPM upgrade compiler which reads the `STORING_METADATA_IN_D.TS.json` files and `.js` files and adds `ɵɵdefineComponent` (and friends) into the `node_module`. This in effect converts a pre-ivy module into ivy module.
 - `@angular/compiler`: Ivy Compiler which converts decorator into ivy
 - `@angular/core`: Decorators which can be patched with `@angular/compiler`.
 
@@ -20,7 +20,7 @@ The work can be divided into three categories:
 ### `ngtsc` TSC compiler transformer
 
 TSC transformer which removes and converts `@Pipe`, `@Component`, `@Directive` and `@NgModule`
-to the corresponding `ΔdefinePipe`, `ΔdefineComponent`, `ΔdefineDirective` and `ΔdefineInjector`.
+to the corresponding `ɵɵdefinePipe`, `ɵɵdefineComponent`, `ɵɵdefineDirective` and `ɵɵdefineInjector`.
 
 - ✅ Basic setup of the transformer into `tsc`
 - ✅ Can read STORING_METADATA_IN_D.TS from `.d.ts` (see: [STORING_METADATA_IN_D.TS.md](./STORING_METADATA_IN_D.TS.md))
@@ -40,19 +40,19 @@ A tool which "upgrades" `node_module` compiled with non-ivy `ngc` into ivy compl
 
 ## `@angular/compiler` changes
 
-- ✅ Component compilation: Translates `@Component` => `ΔdefineComponent`
+- ✅ Component compilation: Translates `@Component` => `ɵɵdefineComponent`
   - ✅ `TemplateCompiler` (current known as `ViewCompiler`)
   - ✅ `StyleCompiler`
-- ✅ `PipeCompiler`: Translates `@Pipe` => `ΔdefinePipe`
-- ✅ `DirectiveCompiler`: Translates `@Directive` => `ΔdefineDirective`
-- ✅ `InjectableCompiler`: Translates `@Injectable` => `ΔdefineInjectable`
-- ✅ `NgModuleCompiler`: Translates `@NgModule` => `ΔdefineInjector` (and `ΔdefineNgModule` only in jit)
+- ✅ `PipeCompiler`: Translates `@Pipe` => `ɵɵdefinePipe`
+- ✅ `DirectiveCompiler`: Translates `@Directive` => `ɵɵdefineDirective`
+- ✅ `InjectableCompiler`: Translates `@Injectable` => `ɵɵdefineInjectable`
+- ✅ `NgModuleCompiler`: Translates `@NgModule` => `ɵɵdefineInjector` (and `ɵɵdefineNgModule` only in jit)
 - ❌ Documentation
 
 
 ## `@angular/core` changes
 
-The goal is for the `@Component` (and friends) to be the compiler of template. Since decorators are functions which execute during parsing of the `.js` file, the decorator can compile the template into Ivy. The AoT compiler's job is to remove the `@Component` and replace it with call to `ΔdefineComponent`.
+The goal is for the `@Component` (and friends) to be the compiler of template. Since decorators are functions which execute during parsing of the `.js` file, the decorator can compile the template into Ivy. The AoT compiler's job is to remove the `@Component` and replace it with call to `ɵɵdefineComponent`.
 
 - ✅ `@angular/compiler` can patch itself onto:
   - ✅ `@Injectable`
@@ -70,13 +70,13 @@ The goal is for the `@Component` (and friends) to be the compiler of template. S
 ## Decorators
 | Annotation          | `defineXXX()`                  | Run time | Spec     | Compiler |
 | -------------------- | ------------------------------ | ------- | -------- | -------- |
-| `@Component`         | ✅ `ΔdefineComponent()`         |    ✅    |  ✅      |  ✅      |
-| `@Directive`         | ✅ `ΔdefineDirective()`         |    ✅    |  ✅      |  ✅      |
-| `@Directive`         | ✅ `ΔdefineBase()`              |    ✅    |  ✅      |  ✅      |
-| `@Pipe`              | ✅ `ΔdefinePipe()`              |    ✅    |  ✅      |  ✅      |
-| `@Injectable`        | ✅ `ΔdefineInjectable()`        |    ✅    |  ✅      |  ✅      |
-| `@NgModule`          | ✅ `ΔdefineInjector()`          |    ✅    |  ✅      |  ✅      |
-| `@ConfigureInjector` | ✅ `ΔdefineInjector()`          |    ❌    |  ❌      |  ❌      |
+| `@Component`         | ✅ `ɵɵdefineComponent()`         |    ✅    |  ✅      |  ✅      |
+| `@Directive`         | ✅ `ɵɵdefineDirective()`         |    ✅    |  ✅      |  ✅      |
+| `@Directive`         | ✅ `ɵɵdefineBase()`              |    ✅    |  ✅      |  ✅      |
+| `@Pipe`              | ✅ `ɵɵdefinePipe()`              |    ✅    |  ✅      |  ✅      |
+| `@Injectable`        | ✅ `ɵɵdefineInjectable()`        |    ✅    |  ✅      |  ✅      |
+| `@NgModule`          | ✅ `ɵɵdefineInjector()`          |    ✅    |  ✅      |  ✅      |
+| `@ConfigureInjector` | ✅ `ɵɵdefineInjector()`          |    ❌    |  ❌      |  ❌      |
 
 
 
diff --git a/packages/core/src/render3/STORING_METADATA_IN_D.TS.md b/packages/core/src/render3/STORING_METADATA_IN_D.TS.md
index 82690386b2..9b2f9b7517 100644
--- a/packages/core/src/render3/STORING_METADATA_IN_D.TS.md
+++ b/packages/core/src/render3/STORING_METADATA_IN_D.TS.md
@@ -13,7 +13,7 @@ Here is an abbreviated example of breakage of tree-shake-ability.
 })
 export class TooltipDirective {
   // ngtsc generates this:
-  static ngDirectiveDef = ΔdefineDirective(...);
+  static ngDirectiveDef = ɵɵdefineDirective(...);
 }
 
 @Component({
@@ -22,7 +22,7 @@ export class TooltipDirective {
 })
 class MyAppComponent {
   // ngtsc generates this:
-  static ngDirectiveDef = ΔdefineComponent({
+  static ngDirectiveDef = ɵɵdefineComponent({
     ...
     directives: [
       // BREAKS TREE-SHAKING!!!
@@ -41,7 +41,7 @@ class MyAppComponent {
 })
 class MyAppModule {
     // ngtsc generates this:
-  static ngDirectiveDef = ΔdefineNgModule(...);
+  static ngDirectiveDef = ɵɵdefineNgModule(...);
 }
 ```
 
diff --git a/packages/core/src/render3/VIEW_DATA.md b/packages/core/src/render3/VIEW_DATA.md
index 607b6b48c8..4cab860b01 100644
--- a/packages/core/src/render3/VIEW_DATA.md
+++ b/packages/core/src/render3/VIEW_DATA.md
@@ -36,18 +36,18 @@ The size of the `CONSTS` section is declared in the property `consts` of the com
 })
 class MyApp {
 
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     ...,
     consts: 5,
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        Δtext(1, 'Hello ');
-        ΔelementStart(2, 'b');
-        Δtext(3, 'World');
-        ΔelementEnd();
-        Δtext(4, '!');
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        ɵɵtext(1, 'Hello ');
+        ɵɵelementStart(2, 'b');
+        ɵɵtext(3, 'World');
+        ɵɵelementEnd();
+        ɵɵtext(4, '!');
+        ɵɵelementEnd();
       }
       ...
     }
@@ -87,19 +87,19 @@ The size of the `VARS `section is declared in the property `vars` of the compone
 class MyApp {
   name = 'World';
 
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     ...,
     consts: 2, // Two DOM Elements.
     vars: 2,   // Two bindings.
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        Δtext(1);
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        ɵɵtext(1);
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔelementProperty(0, 'title', Δbind(ctx.name));
-        ΔtextBinding(1, Δinterpolation1('Hello ', ctx.name, '!'));
+        ɵɵelementProperty(0, 'title', ɵɵbind(ctx.name));
+        ɵɵtextBinding(1, ɵɵinterpolation1('Hello ', ctx.name, '!'));
       }
       ...
     }
@@ -139,12 +139,12 @@ Examples include:
 })
 class MyApp {
 
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     ...,
     consts: 1,
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        Δelement(0, 'child', ['tooltip', null]);
+        ɵɵelement(0, 'child', ['tooltip', null]);
       }
       ...
     },
@@ -159,7 +159,7 @@ class MyApp {
 })
 class Child {
   @HostBinding('tooltip') hostTitle = 'Hello World!';
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     ...
     hostVars: 1
   });
@@ -171,7 +171,7 @@ class Child {
 })
 class Tooltip {
   @HostBinding('title') hostTitle = 'greeting';
-  static ngDirectiveDef = ΔdefineDirective({
+  static ngDirectiveDef = ɵɵdefineDirective({
     ...
     hostVars: 1
   });
@@ -273,12 +273,12 @@ Injection tokens are sorted into three sections:
 })
 class MyApp {
 
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     ...,
     consts: 1,
     template: function(rf: RenderFlags, ctx: MyApp) {
       if (rf & RenderFlags.Create) {
-        Δelement(0, 'child');
+        ɵɵelement(0, 'child');
       }
       ...
     },
@@ -301,7 +301,7 @@ class MyApp {
 })
 class Child {
   construction(injector: Injector) {}
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     ...
     features: [
       ProvidesFeature(
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index 979f5aa113..77fca80daf 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -9,7 +9,7 @@
 import {ChangeDetectorRef as ViewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {InjectionToken} from '../di/injection_token';
 import {Injector} from '../di/injector';
-import {Δinject} from '../di/injector_compatibility';
+import {ɵɵinject} from '../di/injector_compatibility';
 import {InjectFlags} from '../di/interface/injector';
 import {Type} from '../interface/type';
 import {ComponentFactory as viewEngine_ComponentFactory, ComponentRef as viewEngine_ComponentRef} from '../linker/component_factory';
@@ -66,7 +66,7 @@ function toRefArray(map: {[key: string]: string}): {propName: string; templateNa
  */
 export const ROOT_CONTEXT = new InjectionToken<RootContext>(
     'ROOT_CONTEXT_TOKEN',
-    {providedIn: 'root', factory: () => createRootContext(Δinject(SCHEDULER))});
+    {providedIn: 'root', factory: () => createRootContext(ɵɵinject(SCHEDULER))});
 
 /**
  * A change detection scheduler token for {@link RootContext}. This token is the default value used
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index 6e3126fd20..b2637ef8db 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -9,7 +9,7 @@
 import '../util/ng_dev_mode';
 
 import {ChangeDetectionStrategy} from '../change_detection/constants';
-import {NG_INJECTABLE_DEF, ΔdefineInjectable} from '../di/interface/defs';
+import {NG_INJECTABLE_DEF, ɵɵdefineInjectable} from '../di/interface/defs';
 import {Mutable, Type} from '../interface/type';
 import {NgModuleDef} from '../metadata/ng_module';
 import {SchemaMetadata} from '../metadata/schema';
@@ -19,7 +19,7 @@ import {stringify} from '../util/stringify';
 
 import {EMPTY_ARRAY, EMPTY_OBJ} from './empty';
 import {NG_BASE_DEF, NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
-import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature, DirectiveType, DirectiveTypesOrFactory, FactoryFn, HostBindingsFunction, PipeDef, PipeType, PipeTypesOrFactory, ViewQueriesFunction, ΔBaseDef} from './interfaces/definition';
+import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature, DirectiveType, DirectiveTypesOrFactory, FactoryFn, HostBindingsFunction, PipeDef, PipeType, PipeTypesOrFactory, ViewQueriesFunction, ɵɵBaseDef} from './interfaces/definition';
 // while SelectorFlags is unused here, it's required so that types don't get resolved lazily
 // see: https://github.com/Microsoft/web-build-tools/issues/1050
 import {CssSelectorList, SelectorFlags} from './interfaces/projection';
@@ -42,7 +42,7 @@ let _renderCompCount = 0;
  * ```
  * @codeGenApi
  */
-export function ΔdefineComponent<T>(componentDefinition: {
+export function ɵɵdefineComponent<T>(componentDefinition: {
   /**
    * Directive type, needed to configure the injector.
    */
@@ -309,7 +309,7 @@ export function ΔdefineComponent<T>(componentDefinition: {
     // be retrieved through the node injector, so this isn't a problem.
     if (!type.hasOwnProperty(NG_INJECTABLE_DEF)) {
       (type as any)[NG_INJECTABLE_DEF] =
-          ΔdefineInjectable<T>({factory: componentDefinition.factory as() => T});
+          ɵɵdefineInjectable<T>({factory: componentDefinition.factory as() => T});
     }
   }) as never;
 
@@ -319,7 +319,7 @@ export function ΔdefineComponent<T>(componentDefinition: {
 /**
  * @codeGenApi
  */
-export function ΔsetComponentScope(
+export function ɵɵsetComponentScope(
     type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void {
   const def = (type.ngComponentDef as ComponentDef<any>);
   def.directiveDefs = () => directives.map(extractDirectiveDef);
@@ -346,7 +346,7 @@ export function extractPipeDef(type: PipeType<any>): PipeDef<any> {
 /**
  * @codeGenApi
  */
-export function ΔdefineNgModule<T>(def: {
+export function ɵɵdefineNgModule<T>(def: {
   /** Token representing the module. Used by DI. */
   type: T;
 
@@ -394,7 +394,7 @@ export function ΔdefineNgModule<T>(def: {
  *
  * @codeGenApi
  */
-export function ΔsetNgModuleScope(type: any, scope: {
+export function ɵɵsetNgModuleScope(type: any, scope: {
   /** List of components, directives, and pipes declared by this module. */
   declarations?: Type<any>[] | (() => Type<any>[]);
 
@@ -498,7 +498,7 @@ function invertObject<T>(
  * # Example
  * ```ts
  * class ShouldBeInherited {
- *   static ngBaseDef = ΔdefineBase({
+ *   static ngBaseDef = ɵɵdefineBase({
  *      ...
  *   })
  * }
@@ -508,7 +508,7 @@ function invertObject<T>(
  *
  * @codeGenApi
  */
-export function ΔdefineBase<T>(baseDefinition: {
+export function ɵɵdefineBase<T>(baseDefinition: {
   /**
    * A map of input names.
    *
@@ -581,7 +581,7 @@ export function ΔdefineBase<T>(baseDefinition: {
    * Function executed by the parent template to allow children to apply host bindings.
    */
   hostBindings?: HostBindingsFunction<T>;
-}): ΔBaseDef<T> {
+}): ɵɵBaseDef<T> {
   const declaredInputs: {[P in keyof T]: string} = {} as any;
   return {
     inputs: invertObject<T>(baseDefinition.inputs as any, declaredInputs),
@@ -601,7 +601,7 @@ export function ΔdefineBase<T>(baseDefinition: {
  * class MyDirective {
  *   // Generated by Angular Template Compiler
  *   // [Symbol] syntax will not be supported by TypeScript until v2.7
- *   static ngDirectiveDef = ΔdefineDirective({
+ *   static ngDirectiveDef = ɵɵdefineDirective({
  *     ...
  *   });
  * }
@@ -609,7 +609,7 @@ export function ΔdefineBase<T>(baseDefinition: {
  *
  * @codeGenApi
  */
-export const ΔdefineDirective = ΔdefineComponent as any as<T>(directiveDefinition: {
+export const ɵɵdefineDirective = ɵɵdefineComponent as any as<T>(directiveDefinition: {
   /**
    * Directive type, needed to configure the injector.
    */
@@ -727,7 +727,7 @@ export const ΔdefineDirective = ΔdefineComponent as any as<T>(directiveDefinit
  *
  * @codeGenApi
  */
-export function ΔdefinePipe<T>(pipeDef: {
+export function ɵɵdefinePipe<T>(pipeDef: {
   /** Name of the pipe. Used for matching pipes in template to pipe defs. */
   name: string,
 
@@ -766,7 +766,7 @@ export function getPipeDef<T>(type: any): PipeDef<T>|null {
   return (type as any)[NG_PIPE_DEF] || null;
 }
 
-export function getBaseDef<T>(type: any): ΔBaseDef<T>|null {
+export function getBaseDef<T>(type: any): ɵɵBaseDef<T>|null {
   return (type as any)[NG_BASE_DEF] || null;
 }
 
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 6302c26ea3..c8507b871a 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -637,7 +637,7 @@ export class NodeInjector implements Injector {
 /**
  * @codeGenApi
  */
-export function ΔgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T)|null {
+export function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T)|null {
   const typeAny = type as any;
   const def = getComponentDef<T>(typeAny) || getDirectiveDef<T>(typeAny) ||
       getPipeDef<T>(typeAny) || getInjectableDef<T>(typeAny) || getInjectorDef<T>(typeAny);
@@ -650,9 +650,9 @@ export function ΔgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T)
 /**
  * @codeGenApi
  */
-export function ΔgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T {
+export function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T {
   const proto = Object.getPrototypeOf(type.prototype).constructor as Type<any>;
-  const factory = ΔgetFactoryOf<T>(proto);
+  const factory = ɵɵgetFactoryOf<T>(proto);
   if (factory !== null) {
     return factory;
   } else {
diff --git a/packages/core/src/render3/di_setup.ts b/packages/core/src/render3/di_setup.ts
index 9d177153d4..3dfb9bbb70 100644
--- a/packages/core/src/render3/di_setup.ts
+++ b/packages/core/src/render3/di_setup.ts
@@ -12,7 +12,7 @@ import {ClassProvider, Provider} from '../di/interface/provider';
 import {isClassProvider, isTypeProvider, providerToFactory} from '../di/r3_injector';
 
 import {diPublicInInjector, getNodeInjectable, getOrCreateNodeInjectorForNode} from './di';
-import {ΔdirectiveInject} from './instructions/all';
+import {ɵɵdirectiveInject} from './instructions/all';
 import {DirectiveDef} from './interfaces/definition';
 import {NodeInjectorFactory} from './interfaces/injector';
 import {TContainerNode, TElementContainerNode, TElementNode, TNodeProviderIndexes} from './interfaces/node';
@@ -93,7 +93,7 @@ function resolveProvider(
 
     if (isTypeProvider(provider) || !provider.multi) {
       // Single provider case: the factory is created and pushed immediately
-      const factory = new NodeInjectorFactory(providerFactory, isViewProvider, ΔdirectiveInject);
+      const factory = new NodeInjectorFactory(providerFactory, isViewProvider, ɵɵdirectiveInject);
       const existingFactoryIndex = indexOf(
           token, tInjectables, isViewProvider ? beginIndex : beginIndex + cptViewProvidersCount,
           endIndex);
@@ -255,7 +255,7 @@ function multiFactory(
         this: NodeInjectorFactory, _: null, tData: TData, lData: LView, tNode: TElementNode) => any,
     index: number, isViewProvider: boolean, isComponent: boolean,
     f: () => any): NodeInjectorFactory {
-  const factory = new NodeInjectorFactory(factoryFn, isViewProvider, ΔdirectiveInject);
+  const factory = new NodeInjectorFactory(factoryFn, isViewProvider, ɵɵdirectiveInject);
   factory.multi = [];
   factory.index = index;
   factory.componentProviders = 0;
diff --git a/packages/core/src/render3/features/inherit_definition_feature.ts b/packages/core/src/render3/features/inherit_definition_feature.ts
index a025ab9375..441af1e386 100644
--- a/packages/core/src/render3/features/inherit_definition_feature.ts
+++ b/packages/core/src/render3/features/inherit_definition_feature.ts
@@ -13,7 +13,7 @@ import {ComponentDef, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature,
 import {adjustActiveDirectiveSuperClassDepthPosition} from '../state';
 import {isComponentDef} from '../util/view_utils';
 
-import {ΔNgOnChangesFeature} from './ng_onchanges_feature';
+import {ɵɵNgOnChangesFeature} from './ng_onchanges_feature';
 
 function getSuperType(type: Type<any>): Type<any>&
     {ngComponentDef?: ComponentDef<any>, ngDirectiveDef?: DirectiveDef<any>} {
@@ -26,7 +26,7 @@ function getSuperType(type: Type<any>): Type<any>&
  *
  * @codeGenApi
  */
-export function ΔInheritDefinitionFeature(definition: DirectiveDef<any>| ComponentDef<any>): void {
+export function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any>| ComponentDef<any>): void {
   let superType = getSuperType(definition.type);
 
   while (superType) {
@@ -117,7 +117,7 @@ export function ΔInheritDefinitionFeature(definition: DirectiveDef<any>| Compon
         definition.onInit = definition.onInit || superPrototype.ngOnInit;
 
         if (superPrototype.ngOnChanges) {
-          ΔNgOnChangesFeature()(definition);
+          ɵɵNgOnChangesFeature()(definition);
         }
       }
     }
diff --git a/packages/core/src/render3/features/ng_onchanges_feature.ts b/packages/core/src/render3/features/ng_onchanges_feature.ts
index a237afe9ea..1b37fc752c 100644
--- a/packages/core/src/render3/features/ng_onchanges_feature.ts
+++ b/packages/core/src/render3/features/ng_onchanges_feature.ts
@@ -41,7 +41,7 @@ type OnChangesExpando = OnChanges & {
  *
  * @codeGenApi
  */
-export function ΔNgOnChangesFeature<T>(): DirectiveDefFeature {
+export function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature {
   // This option ensures that the ngOnChanges lifecycle hook will be inherited
   // from superclasses (in InheritDefinitionFeature).
   (NgOnChangesFeatureImpl as DirectiveDefFeature).ngInherit = true;
diff --git a/packages/core/src/render3/features/providers_feature.ts b/packages/core/src/render3/features/providers_feature.ts
index df6223dcf2..9c67cf0e87 100644
--- a/packages/core/src/render3/features/providers_feature.ts
+++ b/packages/core/src/render3/features/providers_feature.ts
@@ -39,7 +39,7 @@ import {DirectiveDef} from '../interfaces/definition';
  *
  * @codeGenApi
  */
-export function ΔProvidersFeature<T>(providers: Provider[], viewProviders: Provider[] = []) {
+export function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders: Provider[] = []) {
   return (definition: DirectiveDef<T>) => {
     definition.providersResolver =
         (def: DirectiveDef<T>, processProvidersFn?: ProcessProvidersFunction) => {
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 7951220236..26e7eae042 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -16,7 +16,7 @@ import {assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
 
 import {attachPatchData} from './context_discovery';
 import {attachI18nOpCodesDebug} from './debug';
-import {ΔelementAttribute, Δload, ΔtextBinding} from './instructions/all';
+import {ɵɵelementAttribute, ɵɵload, ɵɵtextBinding} from './instructions/all';
 import {allocExpando, createNodeAtIndex} from './instructions/shared';
 import {LContainer, NATIVE} from './interfaces/container';
 import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
@@ -351,7 +351,7 @@ const parentIndexStack: number[] = [];
  *
  * @codeGenApi
  */
-export function Δi18nStart(index: number, message: string, subTemplateIndex?: number): void {
+export function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void {
   const tView = getLView()[TVIEW];
   ngDevMode && assertDefined(tView, `tView should be defined`);
   i18nIndexStack[++i18nIndexStackPointer] = index;
@@ -538,7 +538,7 @@ function appendI18nNode(tNode: TNode, parentTNode: TNode, previousTNode: TNode |
  *
  * @codeGenApi
  */
-export function Δi18nPostprocess(
+export function ɵɵi18nPostprocess(
     message: string, replacements: {[key: string]: (string | string[])} = {}): string {
   /**
    * Step 1: resolve all multi-value placeholders like [�#5�|�*1:1��#2:1�|�#4:1�]
@@ -634,7 +634,7 @@ export function Δi18nPostprocess(
  *
  * @codeGenApi
  */
-export function Δi18nEnd(): void {
+export function ɵɵi18nEnd(): void {
   const tView = getLView()[TVIEW];
   ngDevMode && assertDefined(tView, `tView should be defined`);
   i18nEndFirstPass(tView);
@@ -742,7 +742,7 @@ function readCreateOpCodes(
           const elementNodeIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;
           const attrName = createOpCodes[++i] as string;
           const attrValue = createOpCodes[++i] as string;
-          ΔelementAttribute(elementNodeIndex, attrName, attrValue);
+          ɵɵelementAttribute(elementNodeIndex, attrName, attrValue);
           break;
         default:
           throw new Error(`Unable to determine the type of mutate operation for "${opCode}"`);
@@ -819,10 +819,10 @@ function readUpdateOpCodes(
               case I18nUpdateOpCode.Attr:
                 const attrName = updateOpCodes[++j] as string;
                 const sanitizeFn = updateOpCodes[++j] as SanitizerFn | null;
-                ΔelementAttribute(nodeIndex, attrName, value, sanitizeFn);
+                ɵɵelementAttribute(nodeIndex, attrName, value, sanitizeFn);
                 break;
               case I18nUpdateOpCode.Text:
-                ΔtextBinding(nodeIndex, value);
+                ɵɵtextBinding(nodeIndex, value);
                 break;
               case I18nUpdateOpCode.IcuSwitch:
                 tIcuIndex = updateOpCodes[++j] as number;
@@ -886,7 +886,7 @@ function removeNode(index: number, viewData: LView) {
     nativeRemoveNode(viewData[RENDERER], removedPhRNode);
   }
 
-  const slotValue = Δload(index) as RElement | RComment | LContainer | StylingContext;
+  const slotValue = ɵɵload(index) as RElement | RComment | LContainer | StylingContext;
   if (isLContainer(slotValue)) {
     const lContainer = slotValue as LContainer;
     if (removedPhTNode.type !== TNodeType.Container) {
@@ -923,9 +923,9 @@ function removeNode(index: number, viewData: LView) {
  *
  * @codeGenApi
  */
-export function Δi18n(index: number, message: string, subTemplateIndex?: number): void {
-  Δi18nStart(index, message, subTemplateIndex);
-  Δi18nEnd();
+export function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void {
+  ɵɵi18nStart(index, message, subTemplateIndex);
+  ɵɵi18nEnd();
 }
 
 /**
@@ -936,7 +936,7 @@ export function Δi18n(index: number, message: string, subTemplateIndex?: number
  *
  * @codeGenApi
  */
-export function Δi18nAttributes(index: number, values: string[]): void {
+export function ɵɵi18nAttributes(index: number, values: string[]): void {
   const tView = getLView()[TVIEW];
   ngDevMode && assertDefined(tView, `tView should be defined`);
   if (tView.firstTemplatePass && tView.data[index + HEADER_OFFSET] === null) {
@@ -968,7 +968,7 @@ function i18nAttributesFirstPass(tView: TView, index: number, values: string[])
           addAllToArray(
               generateBindingUpdateOpCodes(value, previousElementIndex, attrName), updateOpCodes);
         } else {
-          ΔelementAttribute(previousElementIndex, attrName, value);
+          ɵɵelementAttribute(previousElementIndex, attrName, value);
         }
       }
     }
@@ -988,7 +988,7 @@ let shiftsCounter = 0;
  *
  * @codeGenApi
  */
-export function Δi18nExp<T>(expression: T | NO_CHANGE): void {
+export function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void {
   if (expression !== NO_CHANGE) {
     changeMask = changeMask | (1 << shiftsCounter);
   }
@@ -1003,7 +1003,7 @@ export function Δi18nExp<T>(expression: T | NO_CHANGE): void {
  *
  * @codeGenApi
  */
-export function Δi18nApply(index: number) {
+export function ɵɵi18nApply(index: number) {
   if (shiftsCounter) {
     const lView = getLView();
     const tView = lView[TVIEW];
@@ -1633,7 +1633,7 @@ const LOCALIZE_PH_REGEXP = /\{\$(.*?)\}/g;
  * @publicApi
  * @deprecated this method is temporary & should not be used as it will be removed soon
  */
-export function Δi18nLocalize(input: string, placeholders: {[key: string]: string} = {}) {
+export function ɵɵi18nLocalize(input: string, placeholders: {[key: string]: string} = {}) {
   if (typeof TRANSLATIONS[input] !== 'undefined') {  // to account for empty string
     input = TRANSLATIONS[input];
   }
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index f2a0cff59e..34c39ec47f 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -6,115 +6,115 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {LifecycleHooksFeature, renderComponent, whenRendered} from './component';
-import {ΔdefineBase, ΔdefineComponent, ΔdefineDirective, ΔdefineNgModule, ΔdefinePipe, ΔsetComponentScope, ΔsetNgModuleScope} from './definition';
-import {ΔInheritDefinitionFeature} from './features/inherit_definition_feature';
-import {ΔNgOnChangesFeature} from './features/ng_onchanges_feature';
-import {ΔProvidersFeature} from './features/providers_feature';
-import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef, ΔBaseDef, ΔComponentDefWithMeta, ΔDirectiveDefWithMeta, ΔPipeDefWithMeta} from './interfaces/definition';
+import {ɵɵdefineBase, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdefineNgModule, ɵɵdefinePipe, ɵɵsetComponentScope, ɵɵsetNgModuleScope} from './definition';
+import {ɵɵInheritDefinitionFeature} from './features/inherit_definition_feature';
+import {ɵɵNgOnChangesFeature} from './features/ng_onchanges_feature';
+import {ɵɵProvidersFeature} from './features/providers_feature';
+import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveDefFlags, DirectiveType, PipeDef, ɵɵBaseDef, ɵɵComponentDefWithMeta, ɵɵDirectiveDefWithMeta, ɵɵPipeDefWithMeta} from './interfaces/definition';
 import {getComponent, getDirectives, getHostElement, getRenderedText} from './util/discovery_utils';
 
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef, injectComponentFactoryResolver} from './component_ref';
-export {ΔgetFactoryOf, ΔgetInheritedFactory} from './di';
+export {ɵɵgetFactoryOf, ɵɵgetInheritedFactory} from './di';
 // clang-format off
 export {
   detectChanges,
   markDirty,
   store,
   tick,
-  ΔallocHostVars,
-  Δbind,
-  ΔclassMap,
-  ΔclassProp,
-  ΔcomponentHostSyntheticListener,
-  ΔcomponentHostSyntheticProperty,
+  ɵɵallocHostVars,
+  ɵɵbind,
+  ɵɵclassMap,
+  ɵɵclassProp,
+  ɵɵcomponentHostSyntheticListener,
+  ɵɵcomponentHostSyntheticProperty,
 
-  Δcontainer,
-  ΔcontainerRefreshEnd,
-  ΔcontainerRefreshStart,
+  ɵɵcontainer,
+  ɵɵcontainerRefreshEnd,
+  ɵɵcontainerRefreshStart,
 
-  ΔdirectiveInject,
+  ɵɵdirectiveInject,
 
-  Δelement,
-  ΔelementAttribute,
-  ΔelementContainerEnd,
+  ɵɵelement,
+  ɵɵelementAttribute,
+  ɵɵelementContainerEnd,
 
-  ΔelementContainerStart,
-  ΔelementEnd,
+  ɵɵelementContainerStart,
+  ɵɵelementEnd,
 
-  ΔelementHostAttrs,
-  ΔelementProperty,
-  ΔelementStart,
-  ΔembeddedViewEnd,
+  ɵɵelementHostAttrs,
+  ɵɵelementProperty,
+  ɵɵelementStart,
+  ɵɵembeddedViewEnd,
 
-  ΔembeddedViewStart,
+  ɵɵembeddedViewStart,
 
-  ΔgetCurrentView,
-  ΔinjectAttribute,
+  ɵɵgetCurrentView,
+  ɵɵinjectAttribute,
 
-  Δinterpolation1,
-  Δinterpolation2,
-  Δinterpolation3,
-  Δinterpolation4,
-  Δinterpolation5,
-  Δinterpolation6,
-  Δinterpolation7,
-  Δinterpolation8,
-  ΔinterpolationV,
+  ɵɵinterpolation1,
+  ɵɵinterpolation2,
+  ɵɵinterpolation3,
+  ɵɵinterpolation4,
+  ɵɵinterpolation5,
+  ɵɵinterpolation6,
+  ɵɵinterpolation7,
+  ɵɵinterpolation8,
+  ɵɵinterpolationV,
 
-  Δlistener,
-  Δload,
+  ɵɵlistener,
+  ɵɵload,
 
-  ΔnamespaceHTML,
-  ΔnamespaceMathML,
-  ΔnamespaceSVG,
+  ɵɵnamespaceHTML,
+  ɵɵnamespaceMathML,
+  ɵɵnamespaceSVG,
 
-  ΔnextContext,
+  ɵɵnextContext,
 
-  Δprojection,
-  ΔprojectionDef,
-  Δproperty,
-  ΔpropertyInterpolate,
-  ΔpropertyInterpolate1,
-  ΔpropertyInterpolate2,
-  ΔpropertyInterpolate3,
-  ΔpropertyInterpolate4,
-  ΔpropertyInterpolate5,
-  ΔpropertyInterpolate6,
-  ΔpropertyInterpolate7,
-  ΔpropertyInterpolate8,
-  ΔpropertyInterpolateV,
+  ɵɵprojection,
+  ɵɵprojectionDef,
+  ɵɵproperty,
+  ɵɵpropertyInterpolate,
+  ɵɵpropertyInterpolate1,
+  ɵɵpropertyInterpolate2,
+  ɵɵpropertyInterpolate3,
+  ɵɵpropertyInterpolate4,
+  ɵɵpropertyInterpolate5,
+  ɵɵpropertyInterpolate6,
+  ɵɵpropertyInterpolate7,
+  ɵɵpropertyInterpolate8,
+  ɵɵpropertyInterpolateV,
 
-  Δreference,
+  ɵɵreference,
 
-  Δselect,
-  ΔstyleMap,
-  ΔstyleProp,
-  Δstyling,
-  ΔstylingApply,
-  Δtemplate,
+  ɵɵselect,
+  ɵɵstyleMap,
+  ɵɵstyleProp,
+  ɵɵstyling,
+  ɵɵstylingApply,
+  ɵɵtemplate,
 
-  Δtext,
-  ΔtextBinding} from './instructions/all';
+  ɵɵtext,
+  ɵɵtextBinding} from './instructions/all';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
 export {
-  ΔrestoreView,
+  ɵɵrestoreView,
 
-  ΔenableBindings,
-  ΔdisableBindings,
+  ɵɵenableBindings,
+  ɵɵdisableBindings,
 } from './state';
 
 export {
-  Δi18n,
-  Δi18nAttributes,
-  Δi18nExp,
-  Δi18nStart,
-  Δi18nEnd,
-  Δi18nApply,
-  Δi18nPostprocess,
+  ɵɵi18n,
+  ɵɵi18nAttributes,
+  ɵɵi18nExp,
+  ɵɵi18nStart,
+  ɵɵi18nEnd,
+  ɵɵi18nApply,
+  ɵɵi18nPostprocess,
   i18nConfigureLocalize,
-  Δi18nLocalize,
+  ɵɵi18nLocalize,
 } from './i18n';
 
 export {NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
@@ -128,71 +128,71 @@ export {
 } from './metadata';
 
 export {
-  Δpipe,
-  ΔpipeBind1,
-  ΔpipeBind2,
-  ΔpipeBind3,
-  ΔpipeBind4,
-  ΔpipeBindV,
+  ɵɵpipe,
+  ɵɵpipeBind1,
+  ɵɵpipeBind2,
+  ɵɵpipeBind3,
+  ɵɵpipeBind4,
+  ɵɵpipeBindV,
 } from './pipe';
 
 export {
-  ΔqueryRefresh,
-  ΔviewQuery,
-  ΔstaticViewQuery,
-  ΔloadViewQuery,
-  ΔcontentQuery,
-  ΔloadContentQuery,
-  ΔstaticContentQuery
+  ɵɵqueryRefresh,
+  ɵɵviewQuery,
+  ɵɵstaticViewQuery,
+  ɵɵloadViewQuery,
+  ɵɵcontentQuery,
+  ɵɵloadContentQuery,
+  ɵɵstaticContentQuery
 } from './query';
 
 export {
-  ΔpureFunction0,
-  ΔpureFunction1,
-  ΔpureFunction2,
-  ΔpureFunction3,
-  ΔpureFunction4,
-  ΔpureFunction5,
-  ΔpureFunction6,
-  ΔpureFunction7,
-  ΔpureFunction8,
-  ΔpureFunctionV,
+  ɵɵpureFunction0,
+  ɵɵpureFunction1,
+  ɵɵpureFunction2,
+  ɵɵpureFunction3,
+  ɵɵpureFunction4,
+  ɵɵpureFunction5,
+  ɵɵpureFunction6,
+  ɵɵpureFunction7,
+  ɵɵpureFunction8,
+  ɵɵpureFunctionV,
 } from './pure_function';
 
-export {ΔtemplateRefExtractor} from './view_engine_compatibility_prebound';
+export {ɵɵtemplateRefExtractor} from './view_engine_compatibility_prebound';
 
-export {ΔresolveWindow, ΔresolveDocument, ΔresolveBody} from './util/misc_utils';
+export {ɵɵresolveWindow, ɵɵresolveDocument, ɵɵresolveBody} from './util/misc_utils';
 
 // clang-format on
 
 export {
-  ΔBaseDef,
+  ɵɵBaseDef,
   ComponentDef,
-  ΔComponentDefWithMeta,
+  ɵɵComponentDefWithMeta,
   ComponentTemplate,
   ComponentType,
   DirectiveDef,
   DirectiveDefFlags,
-  ΔDirectiveDefWithMeta,
+  ɵɵDirectiveDefWithMeta,
   DirectiveType,
-  ΔNgOnChangesFeature,
-  ΔInheritDefinitionFeature,
-  ΔProvidersFeature,
+  ɵɵNgOnChangesFeature,
+  ɵɵInheritDefinitionFeature,
+  ɵɵProvidersFeature,
   PipeDef,
-  ΔPipeDefWithMeta,
+  ɵɵPipeDefWithMeta,
   LifecycleHooksFeature,
-  ΔdefineComponent,
-  ΔdefineDirective,
-  ΔdefineNgModule,
-  ΔdefineBase,
-  ΔdefinePipe,
+  ɵɵdefineComponent,
+  ɵɵdefineDirective,
+  ɵɵdefineNgModule,
+  ɵɵdefineBase,
+  ɵɵdefinePipe,
   getHostElement,
   getComponent,
   getDirectives,
   getRenderedText,
   renderComponent,
-  ΔsetComponentScope,
-  ΔsetNgModuleScope,
+  ɵɵsetComponentScope,
+  ɵɵsetNgModuleScope,
   whenRendered,
 };
 
diff --git a/packages/core/src/render3/instructions/alloc_host_vars.ts b/packages/core/src/render3/instructions/alloc_host_vars.ts
index 2e12f1a9e9..7301c9726f 100644
--- a/packages/core/src/render3/instructions/alloc_host_vars.ts
+++ b/packages/core/src/render3/instructions/alloc_host_vars.ts
@@ -19,7 +19,7 @@ import {NO_CHANGE} from '../tokens';
  *
  * @codeGenApi
  */
-export function ΔallocHostVars(count: number): void {
+export function ɵɵallocHostVars(count: number): void {
   const lView = getLView();
   const tView = lView[TVIEW];
   if (!tView.firstTemplatePass) return;
diff --git a/packages/core/src/render3/instructions/container.ts b/packages/core/src/render3/instructions/container.ts
index fcea0fbc5d..f5909b2947 100644
--- a/packages/core/src/render3/instructions/container.ts
+++ b/packages/core/src/render3/instructions/container.ts
@@ -30,7 +30,7 @@ import {addToViewTree, createDirectivesAndLocals, createLContainer, createNodeAt
  *
  * @codeGenApi
  */
-export function Δcontainer(index: number): void {
+export function ɵɵcontainer(index: number): void {
   const tNode = containerInternal(index, null, null);
   const lView = getLView();
   if (lView[TVIEW].firstTemplatePass) {
@@ -59,7 +59,7 @@ export function Δcontainer(index: number): void {
  *
  * @codeGenApi
  */
-export function Δtemplate(
+export function ɵɵtemplate(
     index: number, templateFn: ComponentTemplate<any>| null, consts: number, vars: number,
     tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null,
     localRefExtractor?: LocalRefExtractor) {
@@ -87,7 +87,7 @@ export function Δtemplate(
  *
  * @codeGenApi
  */
-export function ΔcontainerRefreshStart(index: number): void {
+export function ɵɵcontainerRefreshStart(index: number): void {
   const lView = getLView();
   const tView = lView[TVIEW];
   let previousOrParentTNode = loadInternal(tView.data, index) as TNode;
@@ -110,7 +110,7 @@ export function ΔcontainerRefreshStart(index: number): void {
  *
  * @codeGenApi
  */
-export function ΔcontainerRefreshEnd(): void {
+export function ɵɵcontainerRefreshEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
   if (getIsParent()) {
     setIsParent(false);
diff --git a/packages/core/src/render3/instructions/di.ts b/packages/core/src/render3/instructions/di.ts
index f8fc6c19c5..7bb92341a7 100644
--- a/packages/core/src/render3/instructions/di.ts
+++ b/packages/core/src/render3/instructions/di.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {InjectFlags, InjectionToken, resolveForwardRef} from '../../di';
-import {Δinject} from '../../di/injector_compatibility';
+import {ɵɵinject} from '../../di/injector_compatibility';
 import {Type} from '../../interface/type';
 import {getOrCreateInjectable, injectAttributeImpl} from '../di';
 import {TContainerNode, TElementContainerNode, TElementNode} from '../interfaces/node';
@@ -24,9 +24,9 @@ import {getLView, getPreviousOrParentTNode} from '../state';
  * class SomeDirective {
  *   constructor(directive: DirectiveA) {}
  *
- *   static ngDirectiveDef = ΔdefineDirective({
+ *   static ngDirectiveDef = ɵɵdefineDirective({
  *     type: SomeDirective,
- *     factory: () => new SomeDirective(ΔdirectiveInject(DirectiveA))
+ *     factory: () => new SomeDirective(ɵɵdirectiveInject(DirectiveA))
  *   });
  * }
  * ```
@@ -36,15 +36,15 @@ import {getLView, getPreviousOrParentTNode} from '../state';
  *
  * @codeGenApi
  */
-export function ΔdirectiveInject<T>(token: Type<T>| InjectionToken<T>): T;
-export function ΔdirectiveInject<T>(token: Type<T>| InjectionToken<T>, flags: InjectFlags): T;
-export function ΔdirectiveInject<T>(
+export function ɵɵdirectiveInject<T>(token: Type<T>| InjectionToken<T>): T;
+export function ɵɵdirectiveInject<T>(token: Type<T>| InjectionToken<T>, flags: InjectFlags): T;
+export function ɵɵdirectiveInject<T>(
     token: Type<T>| InjectionToken<T>, flags = InjectFlags.Default): T|null {
   token = resolveForwardRef(token);
   const lView = getLView();
   // Fall back to inject() if view hasn't been created. This situation can happen in tests
   // if inject utilities are used before bootstrapping.
-  if (lView == null) return Δinject(token, flags);
+  if (lView == null) return ɵɵinject(token, flags);
 
   return getOrCreateInjectable<T>(
       getPreviousOrParentTNode() as TElementNode | TContainerNode | TElementContainerNode, lView,
@@ -56,6 +56,6 @@ export function ΔdirectiveInject<T>(
  *
  * @codeGenApi
  */
-export function ΔinjectAttribute(attrNameToInject: string): string|null {
+export function ɵɵinjectAttribute(attrNameToInject: string): string|null {
   return injectAttributeImpl(getPreviousOrParentTNode(), attrNameToInject);
 }
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index 2fdb61954e..b6e859fd11 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -46,7 +46,7 @@ import {getActiveDirectiveStylingIndex} from './styling';
  *
  * @codeGenApi
  */
-export function ΔelementStart(
+export function ɵɵelementStart(
     index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
   const lView = getLView();
   const tView = lView[TVIEW];
@@ -136,7 +136,7 @@ export function ΔelementStart(
  *
  * @codeGenApi
  */
-export function ΔelementEnd(): void {
+export function ɵɵelementEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
   if (getIsParent()) {
     setIsParent(false);
@@ -190,10 +190,10 @@ export function ΔelementEnd(): void {
  *
  * @codeGenApi
  */
-export function Δelement(
+export function ɵɵelement(
     index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
-  ΔelementStart(index, name, attrs, localRefs);
-  ΔelementEnd();
+  ɵɵelementStart(index, name, attrs, localRefs);
+  ɵɵelementEnd();
 }
 
 
@@ -209,7 +209,7 @@ export function Δelement(
  *
  * @codeGenApi
  */
-export function ΔelementAttribute(
+export function ɵɵelementAttribute(
     index: number, name: string, value: any, sanitizer?: SanitizerFn | null,
     namespace?: string): void {
   if (value !== NO_CHANGE) {
@@ -277,7 +277,7 @@ export function ΔelementAttribute(
  *
  * @codeGenApi
  */
-export function ΔelementHostAttrs(attrs: TAttributes) {
+export function ɵɵelementHostAttrs(attrs: TAttributes) {
   const hostElementIndex = getSelectedIndex();
   const lView = getLView();
   const tNode = getTNode(hostElementIndex, lView);
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index 15002fc6b4..4ad34536f2 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -31,7 +31,7 @@ import {createDirectivesAndLocals, createNodeAtIndex, executeContentQueries, set
  *
  * @codeGenApi
  */
-export function ΔelementContainerStart(
+export function ɵɵelementContainerStart(
     index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void {
   const lView = getLView();
   const tView = lView[TVIEW];
@@ -72,7 +72,7 @@ export function ΔelementContainerStart(
  *
  * @codeGenApi
  */
-export function ΔelementContainerEnd(): void {
+export function ɵɵelementContainerEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
   const lView = getLView();
   const tView = lView[TVIEW];
diff --git a/packages/core/src/render3/instructions/embedded_view.ts b/packages/core/src/render3/instructions/embedded_view.ts
index 63cd9dd235..e2e5ea31f8 100644
--- a/packages/core/src/render3/instructions/embedded_view.ts
+++ b/packages/core/src/render3/instructions/embedded_view.ts
@@ -26,7 +26,8 @@ import {assignTViewNodeToLView, createLView, createTView, refreshDescendantViews
  *
  * @codeGenApi
  */
-export function ΔembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags {
+export function ɵɵembeddedViewStart(
+    viewBlockId: number, consts: number, vars: number): RenderFlags {
   const lView = getLView();
   const previousOrParentTNode = getPreviousOrParentTNode();
   // The previous node can be a view node if we are processing an inline for loop
@@ -127,7 +128,7 @@ function scanForView(lContainer: LContainer, startIdx: number, viewBlockId: numb
  *
  * @codeGenApi
  */
-export function ΔembeddedViewEnd(): void {
+export function ɵɵembeddedViewEnd(): void {
   const lView = getLView();
   const viewHost = lView[T_HOST];
 
diff --git a/packages/core/src/render3/instructions/get_current_view.ts b/packages/core/src/render3/instructions/get_current_view.ts
index f477a1e569..f8c75ffff3 100644
--- a/packages/core/src/render3/instructions/get_current_view.ts
+++ b/packages/core/src/render3/instructions/get_current_view.ts
@@ -17,6 +17,6 @@ import {getLView} from '../state';
  *
  * @codeGenApi
  */
-export function ΔgetCurrentView(): OpaqueViewState {
+export function ɵɵgetCurrentView(): OpaqueViewState {
   return getLView() as any as OpaqueViewState;
 }
diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts
index b34c35b45c..ee61c22680 100644
--- a/packages/core/src/render3/instructions/listener.ts
+++ b/packages/core/src/render3/instructions/listener.ts
@@ -31,7 +31,7 @@ import {BindingDirection, generatePropertyAliases, getCleanup, handleError, load
  *
  * @codeGenApi
  */
-export function Δlistener(
+export function ɵɵlistener(
     eventName: string, listenerFn: (e?: any) => any, useCapture = false,
     eventTargetResolver?: GlobalTargetResolver): void {
   listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver);
@@ -58,7 +58,7 @@ export function Δlistener(
  *
  * @codeGenApi
 */
-export function ΔcomponentHostSyntheticListener<T>(
+export function ɵɵcomponentHostSyntheticListener<T>(
     eventName: string, listenerFn: (e?: any) => any, useCapture = false,
     eventTargetResolver?: GlobalTargetResolver): void {
   listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver, loadComponentRenderer);
diff --git a/packages/core/src/render3/instructions/namespace.ts b/packages/core/src/render3/instructions/namespace.ts
index d2ecc7dc84..ae423a615a 100644
--- a/packages/core/src/render3/instructions/namespace.ts
+++ b/packages/core/src/render3/instructions/namespace.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {ΔnamespaceHTML, ΔnamespaceMathML, ΔnamespaceSVG} from '../state';
+export {ɵɵnamespaceHTML, ɵɵnamespaceMathML, ɵɵnamespaceSVG} from '../state';
diff --git a/packages/core/src/render3/instructions/next_context.ts b/packages/core/src/render3/instructions/next_context.ts
index 3994247692..086762c3c7 100644
--- a/packages/core/src/render3/instructions/next_context.ts
+++ b/packages/core/src/render3/instructions/next_context.ts
@@ -19,6 +19,6 @@ import {nextContextImpl} from '../state';
  *
  * @codeGenApi
  */
-export function ΔnextContext<T = any>(level: number = 1): T {
+export function ɵɵnextContext<T = any>(level: number = 1): T {
   return nextContextImpl(level);
 }
diff --git a/packages/core/src/render3/instructions/projection.ts b/packages/core/src/render3/instructions/projection.ts
index d4ce901d7f..301b43bc48 100644
--- a/packages/core/src/render3/instructions/projection.ts
+++ b/packages/core/src/render3/instructions/projection.ts
@@ -39,7 +39,7 @@ import {createNodeAtIndex} from './shared';
  *
  * @codeGenApi
  */
-export function ΔprojectionDef(selectors?: CssSelectorList[]): void {
+export function ɵɵprojectionDef(selectors?: CssSelectorList[]): void {
   const componentNode = findComponentView(getLView())[T_HOST] as TElementNode;
 
   if (!componentNode.projection) {
@@ -78,7 +78,7 @@ export function ΔprojectionDef(selectors?: CssSelectorList[]): void {
  *
  * @codeGenApi
 */
-export function Δprojection(
+export function ɵɵprojection(
     nodeIndex: number, selectorIndex: number = 0, attrs?: TAttributes): void {
   const lView = getLView();
   const tProjectionNode =
diff --git a/packages/core/src/render3/instructions/property.ts b/packages/core/src/render3/instructions/property.ts
index e93cb7eff2..4a4b14ad91 100644
--- a/packages/core/src/render3/instructions/property.ts
+++ b/packages/core/src/render3/instructions/property.ts
@@ -35,16 +35,16 @@ import {TsickleIssue1009, elementPropertyInternal, loadComponentRenderer, storeB
  *
  * @codeGenApi
  */
-export function Δproperty<T>(
+export function ɵɵproperty<T>(
     propName: string, value: T, sanitizer?: SanitizerFn | null,
     nativeOnly?: boolean): TsickleIssue1009 {
   const index = getSelectedIndex();
   ngDevMode && assertNotEqual(index, -1, 'selected index cannot be -1');
-  const bindReconciledValue = Δbind(value);
+  const bindReconciledValue = ɵɵbind(value);
   if (bindReconciledValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, bindReconciledValue, sanitizer, nativeOnly);
   }
-  return Δproperty;
+  return ɵɵproperty;
 }
 
 /**
@@ -54,7 +54,7 @@ export function Δproperty<T>(
  *
  * @codeGenApi
  */
-export function Δbind<T>(value: T): T|NO_CHANGE {
+export function ɵɵbind<T>(value: T): T|NO_CHANGE {
   const lView = getLView();
   const bindingIndex = lView[BINDING_INDEX]++;
   storeBindingMetadata(lView);
@@ -79,7 +79,7 @@ export function Δbind<T>(value: T): T|NO_CHANGE {
  *
  * @codeGenApi
 */
-export function ΔelementProperty<T>(
+export function ɵɵelementProperty<T>(
     index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
     nativeOnly?: boolean): void {
   if (value !== NO_CHANGE) {
@@ -110,7 +110,7 @@ export function ΔelementProperty<T>(
  *
  * @codeGenApi
  */
-export function ΔcomponentHostSyntheticProperty<T>(
+export function ɵɵcomponentHostSyntheticProperty<T>(
     index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
     nativeOnly?: boolean) {
   if (value !== NO_CHANGE) {
diff --git a/packages/core/src/render3/instructions/property_interpolation.ts b/packages/core/src/render3/instructions/property_interpolation.ts
index e8d53f3562..044d7d2b18 100644
--- a/packages/core/src/render3/instructions/property_interpolation.ts
+++ b/packages/core/src/render3/instructions/property_interpolation.ts
@@ -31,7 +31,7 @@ import {TsickleIssue1009, elementPropertyInternal, storeBindingMetadata} from '.
  *
  * @codeGenApi
  */
-export function ΔinterpolationV(values: any[]): string|NO_CHANGE {
+export function ɵɵinterpolationV(values: any[]): string|NO_CHANGE {
   ngDevMode && assertLessThan(2, values.length, 'should have at least 3 values');
   ngDevMode && assertEqual(values.length % 2, 1, 'should have an odd number of values');
   let different = false;
@@ -76,7 +76,7 @@ export function ΔinterpolationV(values: any[]): string|NO_CHANGE {
  *
  * @codeGenApi
  */
-export function Δinterpolation1(prefix: string, v0: any, suffix: string): string|NO_CHANGE {
+export function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
   const different = bindingUpdated(lView, lView[BINDING_INDEX]++, v0);
   storeBindingMetadata(lView, prefix, suffix);
@@ -88,7 +88,7 @@ export function Δinterpolation1(prefix: string, v0: any, suffix: string): strin
  *
  * @codeGenApi
  */
-export function Δinterpolation2(
+export function ɵɵinterpolation2(
     prefix: string, v0: any, i0: string, v1: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
   const bindingIndex = lView[BINDING_INDEX];
@@ -109,7 +109,7 @@ export function Δinterpolation2(
  *
  * @codeGenApi
  */
-export function Δinterpolation3(
+export function ɵɵinterpolation3(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string|
     NO_CHANGE {
   const lView = getLView();
@@ -135,7 +135,7 @@ export function Δinterpolation3(
  *
  * @codeGenApi
  */
-export function Δinterpolation4(
+export function ɵɵinterpolation4(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     suffix: string): string|NO_CHANGE {
   const lView = getLView();
@@ -163,7 +163,7 @@ export function Δinterpolation4(
  *
  * @codeGenApi
  */
-export function Δinterpolation5(
+export function ɵɵinterpolation5(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
@@ -193,7 +193,7 @@ export function Δinterpolation5(
  *
  * @codeGenApi
  */
-export function Δinterpolation6(
+export function ɵɵinterpolation6(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, i4: string, v5: any, suffix: string): string|NO_CHANGE {
   const lView = getLView();
@@ -224,7 +224,7 @@ export function Δinterpolation6(
  *
  * @codeGenApi
  */
-export function Δinterpolation7(
+export function ɵɵinterpolation7(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string|
     NO_CHANGE {
@@ -258,7 +258,7 @@ export function Δinterpolation7(
  *
  * @codeGenApi
  */
-export function Δinterpolation8(
+export function ɵɵinterpolation8(
     prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
     i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string): string|NO_CHANGE {
@@ -306,7 +306,7 @@ export function Δinterpolation8(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate('title', v0);
+ * ɵɵpropertyInterpolate('title', v0);
  * ```
  *
  * If the property name also exists as an input property on one of the element's directives,
@@ -321,10 +321,10 @@ export function Δinterpolation8(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate(
+export function ɵɵpropertyInterpolate(
     propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009 {
-  ΔpropertyInterpolate1(propName, '', v0, '', sanitizer);
-  return ΔpropertyInterpolate;
+  ɵɵpropertyInterpolate1(propName, '', v0, '', sanitizer);
+  return ɵɵpropertyInterpolate;
 }
 
 
@@ -341,7 +341,7 @@ export function ΔpropertyInterpolate(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate1('title', 'prefix', v0, 'suffix');
+ * ɵɵpropertyInterpolate1('title', 'prefix', v0, 'suffix');
  * ```
  *
  * If the property name also exists as an input property on one of the element's directives,
@@ -356,15 +356,15 @@ export function ΔpropertyInterpolate(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate1(
+export function ɵɵpropertyInterpolate1(
     propName: string, prefix: string, v0: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation1(prefix, v0, suffix);
+  const interpolatedValue = ɵɵinterpolation1(prefix, v0, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate1;
+  return ɵɵpropertyInterpolate1;
 }
 
 /**
@@ -380,7 +380,7 @@ export function ΔpropertyInterpolate1(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate2('title', 'prefix', v0, '-', v1, 'suffix');
+ * ɵɵpropertyInterpolate2('title', 'prefix', v0, '-', v1, 'suffix');
  * ```
  *
  * If the property name also exists as an input property on one of the element's directives,
@@ -397,15 +397,15 @@ export function ΔpropertyInterpolate1(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate2(
+export function ɵɵpropertyInterpolate2(
     propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation2(prefix, v0, i0, v1, suffix);
+  const interpolatedValue = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate2;
+  return ɵɵpropertyInterpolate2;
 }
 
 /**
@@ -421,7 +421,7 @@ export function ΔpropertyInterpolate2(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate3(
+ * ɵɵpropertyInterpolate3(
  * 'title', 'prefix', v0, '-', v1, '-', v2, 'suffix');
  * ```
  *
@@ -441,15 +441,15 @@ export function ΔpropertyInterpolate2(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate3(
+export function ɵɵpropertyInterpolate3(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  const interpolatedValue = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate3;
+  return ɵɵpropertyInterpolate3;
 }
 
 /**
@@ -465,7 +465,7 @@ export function ΔpropertyInterpolate3(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate4(
+ * ɵɵpropertyInterpolate4(
  * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, 'suffix');
  * ```
  *
@@ -487,15 +487,15 @@ export function ΔpropertyInterpolate3(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate4(
+export function ɵɵpropertyInterpolate4(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  const interpolatedValue = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate4;
+  return ɵɵpropertyInterpolate4;
 }
 
 /**
@@ -511,7 +511,7 @@ export function ΔpropertyInterpolate4(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate5(
+ * ɵɵpropertyInterpolate5(
  * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, 'suffix');
  * ```
  *
@@ -535,15 +535,15 @@ export function ΔpropertyInterpolate4(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate5(
+export function ɵɵpropertyInterpolate5(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  const interpolatedValue = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate5;
+  return ɵɵpropertyInterpolate5;
 }
 
 /**
@@ -559,7 +559,7 @@ export function ΔpropertyInterpolate5(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate6(
+ * ɵɵpropertyInterpolate6(
  *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, 'suffix');
  * ```
  *
@@ -585,17 +585,17 @@ export function ΔpropertyInterpolate5(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate6(
+export function ɵɵpropertyInterpolate6(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
   const interpolatedValue =
-      Δinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+      ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate6;
+  return ɵɵpropertyInterpolate6;
 }
 
 /**
@@ -611,7 +611,7 @@ export function ΔpropertyInterpolate6(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate7(
+ * ɵɵpropertyInterpolate7(
  *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, 'suffix');
  * ```
  *
@@ -639,17 +639,17 @@ export function ΔpropertyInterpolate6(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate7(
+export function ɵɵpropertyInterpolate7(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
     sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
   const interpolatedValue =
-      Δinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate7;
+  return ɵɵpropertyInterpolate7;
 }
 
 /**
@@ -665,7 +665,7 @@ export function ΔpropertyInterpolate7(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolate8(
+ * ɵɵpropertyInterpolate8(
  *  'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, 'suffix');
  * ```
  *
@@ -695,17 +695,17 @@ export function ΔpropertyInterpolate7(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolate8(
+export function ɵɵpropertyInterpolate8(
     propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
   const interpolatedValue =
-      Δinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolate8;
+  return ɵɵpropertyInterpolate8;
 }
 
 /**
@@ -721,7 +721,7 @@ export function ΔpropertyInterpolate8(
  * Its compiled representation is::
  *
  * ```ts
- * ΔpropertyInterpolateV(
+ * ɵɵpropertyInterpolateV(
  *  'title', ['prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, '-', v9,
  *  'suffix']);
  * ```
@@ -738,13 +738,13 @@ export function ΔpropertyInterpolate8(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔpropertyInterpolateV(
+export function ɵɵpropertyInterpolateV(
     propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009 {
   const index = getSelectedIndex();
 
-  const interpolatedValue = ΔinterpolationV(values);
+  const interpolatedValue = ɵɵinterpolationV(values);
   if (interpolatedValue !== NO_CHANGE) {
     elementPropertyInternal(index, propName, interpolatedValue, sanitizer);
   }
-  return ΔpropertyInterpolateV;
+  return ɵɵpropertyInterpolateV;
 }
diff --git a/packages/core/src/render3/instructions/select.ts b/packages/core/src/render3/instructions/select.ts
index 76816b2181..1c77ac0176 100644
--- a/packages/core/src/render3/instructions/select.ts
+++ b/packages/core/src/render3/instructions/select.ts
@@ -31,7 +31,7 @@ import {getCheckNoChangesMode, getLView, setSelectedIndex} from '../state';
  *
  * @codeGenApi
  */
-export function Δselect(index: number): void {
+export function ɵɵselect(index: number): void {
   ngDevMode && assertGreaterThan(index, -1, 'Invalid index');
   ngDevMode &&
       assertLessThan(
@@ -44,6 +44,6 @@ export function Δselect(index: number): void {
   // We must set the selected index *after* running the hooks, because hooks may have side-effects
   // that cause other template functions to run, thus updating the selected index, which is global
   // state. If we run `setSelectedIndex` *before* we run the hooks, in some cases the selected index
-  // will be altered by the time we leave the `Δselect` instruction.
+  // will be altered by the time we leave the `ɵɵselect` instruction.
   setSelectedIndex(index);
 }
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 14ad2b880a..6d5f7797ea 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -30,7 +30,7 @@ import {StylingContext} from '../interfaces/styling';
 import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_VIEW, ExpandoInstructions, FLAGS, HEADER_OFFSET, HOST, INJECTOR, InitPhaseState, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, RootContext, RootContextFlags, SANITIZER, TData, TVIEW, TView, T_HOST} from '../interfaces/view';
 import {assertNodeOfPossibleTypes, assertNodeType} from '../node_assert';
 import {isNodeMatchingSelectorList} from '../node_selector_matcher';
-import {enterView, getBindingsEnabled, getCheckNoChangesMode, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, incrementActiveDirectiveId, isCreationMode, leaveView, setActiveHostElement, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode, setSelectedIndex, ΔnamespaceHTML} from '../state';
+import {enterView, getBindingsEnabled, getCheckNoChangesMode, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, incrementActiveDirectiveId, isCreationMode, leaveView, setActiveHostElement, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode, setSelectedIndex, ɵɵnamespaceHTML} from '../state';
 import {initializeStaticContext as initializeStaticStylingContext} from '../styling/class_and_style_bindings';
 import {ANIMATION_PROP_PREFIX, isAnimationProp} from '../styling/util';
 import {NO_CHANGE} from '../tokens';
@@ -445,7 +445,7 @@ export function renderComponentOrTemplate<T>(
 }
 
 function executeTemplate<T>(templateFn: ComponentTemplate<T>, rf: RenderFlags, context: T) {
-  ΔnamespaceHTML();
+  ɵɵnamespaceHTML();
   const prevSelectedIndex = getSelectedIndex();
   try {
     setActiveHostElement(null);
diff --git a/packages/core/src/render3/instructions/storage.ts b/packages/core/src/render3/instructions/storage.ts
index 53c1944191..c95db3a1e9 100644
--- a/packages/core/src/render3/instructions/storage.ts
+++ b/packages/core/src/render3/instructions/storage.ts
@@ -33,7 +33,7 @@ export function store<T>(index: number, value: T): void {
  *
  * @codeGenApi
  */
-export function Δreference<T>(index: number) {
+export function ɵɵreference<T>(index: number) {
   const contextLView = getContextLView();
   return loadInternal<T>(contextLView, index);
 }
@@ -43,6 +43,6 @@ export function Δreference<T>(index: number) {
  *
  * @codeGenApi
  */
-export function Δload<T>(index: number): T {
+export function ɵɵload<T>(index: number): T {
   return loadInternal<T>(getLView(), index);
 }
diff --git a/packages/core/src/render3/instructions/styling.ts b/packages/core/src/render3/instructions/styling.ts
index 6fd0186849..f607d90a62 100644
--- a/packages/core/src/render3/instructions/styling.ts
+++ b/packages/core/src/render3/instructions/styling.ts
@@ -66,7 +66,7 @@ import {scheduleTick, setInputsForProperty} from './shared';
  *
  * @codeGenApi
  */
-export function Δstyling(
+export function ɵɵstyling(
     classBindingNames?: string[] | null, styleBindingNames?: string[] | null,
     styleSanitizer?: StyleSanitizeFn | null): void {
   const tNode = getPreviousOrParentTNode();
@@ -143,7 +143,7 @@ function initStyling(
  *
  * @codeGenApi
  */
-export function ΔstyleProp(
+export function ɵɵstyleProp(
     styleIndex: number, value: string | number | String | PlayerFactory | null,
     suffix?: string | null, forceOverride?: boolean): void {
   const index = getSelectedIndex();
@@ -209,7 +209,7 @@ function resolveStylePropValue(
  *
  * @codeGenApi
  */
-export function ΔclassProp(
+export function ɵɵclassProp(
     classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void {
   const index = getSelectedIndex();
   const input = (value instanceof BoundPlayerFactory) ?
@@ -262,7 +262,7 @@ function booleanOrNull(value: any): boolean|null {
  *
  * @codeGenApi
  */
-export function ΔstyleMap(styles: {[styleName: string]: any} | NO_CHANGE | null): void {
+export function ɵɵstyleMap(styles: {[styleName: string]: any} | NO_CHANGE | null): void {
   const index = getSelectedIndex();
   const lView = getLView();
   const stylingContext = getStylingContext(index, lView);
@@ -306,7 +306,7 @@ export function ΔstyleMap(styles: {[styleName: string]: any} | NO_CHANGE | null
  *
  * @codeGenApi
  */
-export function ΔclassMap(classes: {[styleName: string]: any} | NO_CHANGE | string | null): void {
+export function ɵɵclassMap(classes: {[styleName: string]: any} | NO_CHANGE | string | null): void {
   const index = getSelectedIndex();
   const lView = getLView();
   const stylingContext = getStylingContext(index, lView);
@@ -339,7 +339,7 @@ export function ΔclassMap(classes: {[styleName: string]: any} | NO_CHANGE | str
  *
  * @codeGenApi
  */
-export function ΔstylingApply(): void {
+export function ɵɵstylingApply(): void {
   const index = getSelectedIndex();
   const directiveStylingIndex =
       getActiveDirectiveStylingIndex() || DEFAULT_TEMPLATE_DIRECTIVE_INDEX;
diff --git a/packages/core/src/render3/instructions/text.ts b/packages/core/src/render3/instructions/text.ts
index 1792ed6f78..13bff5d10d 100644
--- a/packages/core/src/render3/instructions/text.ts
+++ b/packages/core/src/render3/instructions/text.ts
@@ -24,7 +24,7 @@ import {createNodeAtIndex} from './shared';
  *
  * @codeGenApi
  */
-export function Δtext(index: number, value?: any): void {
+export function ɵɵtext(index: number, value?: any): void {
   const lView = getLView();
   ngDevMode && assertEqual(
                    lView[BINDING_INDEX], lView[TVIEW].bindingStartIndex,
@@ -47,7 +47,7 @@ export function Δtext(index: number, value?: any): void {
  *
  * @codeGenApi
  */
-export function ΔtextBinding<T>(index: number, value: T | NO_CHANGE): void {
+export function ɵɵtextBinding<T>(index: number, value: T | NO_CHANGE): void {
   if (value !== NO_CHANGE) {
     const lView = getLView();
     ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 04816932f2..5817ec267e 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -89,7 +89,7 @@ export interface PipeType<T> extends Type<T> { ngPipeDef: never; }
 /**
  * @codeGenApi
  */
-export type ΔDirectiveDefWithMeta<
+export type ɵɵDirectiveDefWithMeta<
     T, Selector extends string, ExportAs extends string[], InputMap extends{[key: string]: string},
     OutputMap extends{[key: string]: string}, QueryFields extends string[]> = DirectiveDef<T>;
 
@@ -104,7 +104,7 @@ export type ΔDirectiveDefWithMeta<
  *
  * @codeGenApi
  */
-export interface ΔBaseDef<T> {
+export interface ɵɵBaseDef<T> {
   /**
    * A dictionary mapping the inputs' minified property names to their public API names, which
    * are their aliases if any, or their original unminified property names
@@ -157,7 +157,7 @@ export interface ΔBaseDef<T> {
  *
  * See: {@link defineDirective}
  */
-export interface DirectiveDef<T> extends ΔBaseDef<T> {
+export interface DirectiveDef<T> extends ɵɵBaseDef<T> {
   /** Token representing the directive. Used by DI. */
   type: Type<T>;
 
@@ -203,7 +203,7 @@ export interface DirectiveDef<T> extends ΔBaseDef<T> {
 /**
  * @codeGenApi
  */
-export type ΔComponentDefWithMeta<
+export type ɵɵComponentDefWithMeta<
     T, Selector extends String, ExportAs extends string[], InputMap extends{[key: string]: string},
     OutputMap extends{[key: string]: string}, QueryFields extends string[]> = ComponentDef<T>;
 
@@ -356,7 +356,7 @@ export interface PipeDef<T> {
 /**
  * @codeGenApi
  */
-export type ΔPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
+export type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
 
 export interface DirectiveDefFeature {
   <T>(directiveDef: DirectiveDef<T>): void;
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index c246c12672..7dcb88d3a5 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Δinject} from '../../di/injector_compatibility';
-import {ΔdefineInjectable, ΔdefineInjector} from '../../di/interface/defs';
+import {ɵɵinject} from '../../di/injector_compatibility';
+import {ɵɵdefineInjectable, ɵɵdefineInjector} from '../../di/interface/defs';
 import * as sanitization from '../../sanitization/sanitization';
 import * as r3 from '../index';
 
@@ -20,124 +20,124 @@ import * as r3 from '../index';
  */
 export const angularCoreEnv: {[name: string]: Function} =
     (() => ({
-       'ΔdefineBase': r3.ΔdefineBase,
-       'ΔdefineComponent': r3.ΔdefineComponent,
-       'ΔdefineDirective': r3.ΔdefineDirective,
-       'ΔdefineInjectable': ΔdefineInjectable,
-       'ΔdefineInjector': ΔdefineInjector,
-       'ΔdefineNgModule': r3.ΔdefineNgModule,
-       'ΔdefinePipe': r3.ΔdefinePipe,
-       'ΔdirectiveInject': r3.ΔdirectiveInject,
-       'ΔgetFactoryOf': r3.ΔgetFactoryOf,
-       'ΔgetInheritedFactory': r3.ΔgetInheritedFactory,
-       'Δinject': Δinject,
-       'ΔinjectAttribute': r3.ΔinjectAttribute,
-       'ΔtemplateRefExtractor': r3.ΔtemplateRefExtractor,
-       'ΔNgOnChangesFeature': r3.ΔNgOnChangesFeature,
-       'ΔProvidersFeature': r3.ΔProvidersFeature,
-       'ΔInheritDefinitionFeature': r3.ΔInheritDefinitionFeature,
-       'ΔelementAttribute': r3.ΔelementAttribute,
-       'Δbind': r3.Δbind,
-       'Δcontainer': r3.Δcontainer,
-       'ΔnextContext': r3.ΔnextContext,
-       'ΔcontainerRefreshStart': r3.ΔcontainerRefreshStart,
-       'ΔcontainerRefreshEnd': r3.ΔcontainerRefreshEnd,
-       'ΔnamespaceHTML': r3.ΔnamespaceHTML,
-       'ΔnamespaceMathML': r3.ΔnamespaceMathML,
-       'ΔnamespaceSVG': r3.ΔnamespaceSVG,
-       'ΔenableBindings': r3.ΔenableBindings,
-       'ΔdisableBindings': r3.ΔdisableBindings,
-       'ΔallocHostVars': r3.ΔallocHostVars,
-       'ΔelementStart': r3.ΔelementStart,
-       'ΔelementEnd': r3.ΔelementEnd,
-       'Δelement': r3.Δelement,
-       'ΔelementContainerStart': r3.ΔelementContainerStart,
-       'ΔelementContainerEnd': r3.ΔelementContainerEnd,
-       'ΔpureFunction0': r3.ΔpureFunction0,
-       'ΔpureFunction1': r3.ΔpureFunction1,
-       'ΔpureFunction2': r3.ΔpureFunction2,
-       'ΔpureFunction3': r3.ΔpureFunction3,
-       'ΔpureFunction4': r3.ΔpureFunction4,
-       'ΔpureFunction5': r3.ΔpureFunction5,
-       'ΔpureFunction6': r3.ΔpureFunction6,
-       'ΔpureFunction7': r3.ΔpureFunction7,
-       'ΔpureFunction8': r3.ΔpureFunction8,
-       'ΔpureFunctionV': r3.ΔpureFunctionV,
-       'ΔgetCurrentView': r3.ΔgetCurrentView,
-       'ΔrestoreView': r3.ΔrestoreView,
-       'Δinterpolation1': r3.Δinterpolation1,
-       'Δinterpolation2': r3.Δinterpolation2,
-       'Δinterpolation3': r3.Δinterpolation3,
-       'Δinterpolation4': r3.Δinterpolation4,
-       'Δinterpolation5': r3.Δinterpolation5,
-       'Δinterpolation6': r3.Δinterpolation6,
-       'Δinterpolation7': r3.Δinterpolation7,
-       'Δinterpolation8': r3.Δinterpolation8,
-       'ΔinterpolationV': r3.ΔinterpolationV,
-       'Δlistener': r3.Δlistener,
-       'Δload': r3.Δload,
-       'Δprojection': r3.Δprojection,
-       'ΔelementProperty': r3.ΔelementProperty,
-       'ΔcomponentHostSyntheticProperty': r3.ΔcomponentHostSyntheticProperty,
-       'ΔcomponentHostSyntheticListener': r3.ΔcomponentHostSyntheticListener,
-       'ΔpipeBind1': r3.ΔpipeBind1,
-       'ΔpipeBind2': r3.ΔpipeBind2,
-       'ΔpipeBind3': r3.ΔpipeBind3,
-       'ΔpipeBind4': r3.ΔpipeBind4,
-       'ΔpipeBindV': r3.ΔpipeBindV,
-       'ΔprojectionDef': r3.ΔprojectionDef,
-       'Δproperty': r3.Δproperty,
-       'ΔpropertyInterpolate': r3.ΔpropertyInterpolate,
-       'ΔpropertyInterpolate1': r3.ΔpropertyInterpolate1,
-       'ΔpropertyInterpolate2': r3.ΔpropertyInterpolate2,
-       'ΔpropertyInterpolate3': r3.ΔpropertyInterpolate3,
-       'ΔpropertyInterpolate4': r3.ΔpropertyInterpolate4,
-       'ΔpropertyInterpolate5': r3.ΔpropertyInterpolate5,
-       'ΔpropertyInterpolate6': r3.ΔpropertyInterpolate6,
-       'ΔpropertyInterpolate7': r3.ΔpropertyInterpolate7,
-       'ΔpropertyInterpolate8': r3.ΔpropertyInterpolate8,
-       'ΔpropertyInterpolateV': r3.ΔpropertyInterpolateV,
-       'Δpipe': r3.Δpipe,
-       'ΔqueryRefresh': r3.ΔqueryRefresh,
-       'ΔviewQuery': r3.ΔviewQuery,
-       'ΔstaticViewQuery': r3.ΔstaticViewQuery,
-       'ΔstaticContentQuery': r3.ΔstaticContentQuery,
-       'ΔloadViewQuery': r3.ΔloadViewQuery,
-       'ΔcontentQuery': r3.ΔcontentQuery,
-       'ΔloadContentQuery': r3.ΔloadContentQuery,
-       'Δreference': r3.Δreference,
-       'ΔelementHostAttrs': r3.ΔelementHostAttrs,
-       'ΔclassMap': r3.ΔclassMap,
-       'Δstyling': r3.Δstyling,
-       'ΔstyleMap': r3.ΔstyleMap,
-       'ΔstyleProp': r3.ΔstyleProp,
-       'ΔstylingApply': r3.ΔstylingApply,
-       'ΔclassProp': r3.ΔclassProp,
-       'Δselect': r3.Δselect,
-       'Δtemplate': r3.Δtemplate,
-       'Δtext': r3.Δtext,
-       'ΔtextBinding': r3.ΔtextBinding,
-       'ΔembeddedViewStart': r3.ΔembeddedViewStart,
-       'ΔembeddedViewEnd': r3.ΔembeddedViewEnd,
-       'Δi18n': r3.Δi18n,
-       'Δi18nAttributes': r3.Δi18nAttributes,
-       'Δi18nExp': r3.Δi18nExp,
-       'Δi18nStart': r3.Δi18nStart,
-       'Δi18nEnd': r3.Δi18nEnd,
-       'Δi18nApply': r3.Δi18nApply,
-       'Δi18nPostprocess': r3.Δi18nPostprocess,
-       'Δi18nLocalize': r3.Δi18nLocalize,
-       'ΔresolveWindow': r3.ΔresolveWindow,
-       'ΔresolveDocument': r3.ΔresolveDocument,
-       'ΔresolveBody': r3.ΔresolveBody,
-       'ΔsetComponentScope': r3.ΔsetComponentScope,
-       'ΔsetNgModuleScope': r3.ΔsetNgModuleScope,
+       'ɵɵdefineBase': r3.ɵɵdefineBase,
+       'ɵɵdefineComponent': r3.ɵɵdefineComponent,
+       'ɵɵdefineDirective': r3.ɵɵdefineDirective,
+       'ɵɵdefineInjectable': ɵɵdefineInjectable,
+       'ɵɵdefineInjector': ɵɵdefineInjector,
+       'ɵɵdefineNgModule': r3.ɵɵdefineNgModule,
+       'ɵɵdefinePipe': r3.ɵɵdefinePipe,
+       'ɵɵdirectiveInject': r3.ɵɵdirectiveInject,
+       'ɵɵgetFactoryOf': r3.ɵɵgetFactoryOf,
+       'ɵɵgetInheritedFactory': r3.ɵɵgetInheritedFactory,
+       'ɵɵinject': ɵɵinject,
+       'ɵɵinjectAttribute': r3.ɵɵinjectAttribute,
+       'ɵɵtemplateRefExtractor': r3.ɵɵtemplateRefExtractor,
+       'ɵɵNgOnChangesFeature': r3.ɵɵNgOnChangesFeature,
+       'ɵɵProvidersFeature': r3.ɵɵProvidersFeature,
+       'ɵɵInheritDefinitionFeature': r3.ɵɵInheritDefinitionFeature,
+       'ɵɵelementAttribute': r3.ɵɵelementAttribute,
+       'ɵɵbind': r3.ɵɵbind,
+       'ɵɵcontainer': r3.ɵɵcontainer,
+       'ɵɵnextContext': r3.ɵɵnextContext,
+       'ɵɵcontainerRefreshStart': r3.ɵɵcontainerRefreshStart,
+       'ɵɵcontainerRefreshEnd': r3.ɵɵcontainerRefreshEnd,
+       'ɵɵnamespaceHTML': r3.ɵɵnamespaceHTML,
+       'ɵɵnamespaceMathML': r3.ɵɵnamespaceMathML,
+       'ɵɵnamespaceSVG': r3.ɵɵnamespaceSVG,
+       'ɵɵenableBindings': r3.ɵɵenableBindings,
+       'ɵɵdisableBindings': r3.ɵɵdisableBindings,
+       'ɵɵallocHostVars': r3.ɵɵallocHostVars,
+       'ɵɵelementStart': r3.ɵɵelementStart,
+       'ɵɵelementEnd': r3.ɵɵelementEnd,
+       'ɵɵelement': r3.ɵɵelement,
+       'ɵɵelementContainerStart': r3.ɵɵelementContainerStart,
+       'ɵɵelementContainerEnd': r3.ɵɵelementContainerEnd,
+       'ɵɵpureFunction0': r3.ɵɵpureFunction0,
+       'ɵɵpureFunction1': r3.ɵɵpureFunction1,
+       'ɵɵpureFunction2': r3.ɵɵpureFunction2,
+       'ɵɵpureFunction3': r3.ɵɵpureFunction3,
+       'ɵɵpureFunction4': r3.ɵɵpureFunction4,
+       'ɵɵpureFunction5': r3.ɵɵpureFunction5,
+       'ɵɵpureFunction6': r3.ɵɵpureFunction6,
+       'ɵɵpureFunction7': r3.ɵɵpureFunction7,
+       'ɵɵpureFunction8': r3.ɵɵpureFunction8,
+       'ɵɵpureFunctionV': r3.ɵɵpureFunctionV,
+       'ɵɵgetCurrentView': r3.ɵɵgetCurrentView,
+       'ɵɵrestoreView': r3.ɵɵrestoreView,
+       'ɵɵinterpolation1': r3.ɵɵinterpolation1,
+       'ɵɵinterpolation2': r3.ɵɵinterpolation2,
+       'ɵɵinterpolation3': r3.ɵɵinterpolation3,
+       'ɵɵinterpolation4': r3.ɵɵinterpolation4,
+       'ɵɵinterpolation5': r3.ɵɵinterpolation5,
+       'ɵɵinterpolation6': r3.ɵɵinterpolation6,
+       'ɵɵinterpolation7': r3.ɵɵinterpolation7,
+       'ɵɵinterpolation8': r3.ɵɵinterpolation8,
+       'ɵɵinterpolationV': r3.ɵɵinterpolationV,
+       'ɵɵlistener': r3.ɵɵlistener,
+       'ɵɵload': r3.ɵɵload,
+       'ɵɵprojection': r3.ɵɵprojection,
+       'ɵɵelementProperty': r3.ɵɵelementProperty,
+       'ɵɵcomponentHostSyntheticProperty': r3.ɵɵcomponentHostSyntheticProperty,
+       'ɵɵcomponentHostSyntheticListener': r3.ɵɵcomponentHostSyntheticListener,
+       'ɵɵpipeBind1': r3.ɵɵpipeBind1,
+       'ɵɵpipeBind2': r3.ɵɵpipeBind2,
+       'ɵɵpipeBind3': r3.ɵɵpipeBind3,
+       'ɵɵpipeBind4': r3.ɵɵpipeBind4,
+       'ɵɵpipeBindV': r3.ɵɵpipeBindV,
+       'ɵɵprojectionDef': r3.ɵɵprojectionDef,
+       'ɵɵproperty': r3.ɵɵproperty,
+       'ɵɵpropertyInterpolate': r3.ɵɵpropertyInterpolate,
+       'ɵɵpropertyInterpolate1': r3.ɵɵpropertyInterpolate1,
+       'ɵɵpropertyInterpolate2': r3.ɵɵpropertyInterpolate2,
+       'ɵɵpropertyInterpolate3': r3.ɵɵpropertyInterpolate3,
+       'ɵɵpropertyInterpolate4': r3.ɵɵpropertyInterpolate4,
+       'ɵɵpropertyInterpolate5': r3.ɵɵpropertyInterpolate5,
+       'ɵɵpropertyInterpolate6': r3.ɵɵpropertyInterpolate6,
+       'ɵɵpropertyInterpolate7': r3.ɵɵpropertyInterpolate7,
+       'ɵɵpropertyInterpolate8': r3.ɵɵpropertyInterpolate8,
+       'ɵɵpropertyInterpolateV': r3.ɵɵpropertyInterpolateV,
+       'ɵɵpipe': r3.ɵɵpipe,
+       'ɵɵqueryRefresh': r3.ɵɵqueryRefresh,
+       'ɵɵviewQuery': r3.ɵɵviewQuery,
+       'ɵɵstaticViewQuery': r3.ɵɵstaticViewQuery,
+       'ɵɵstaticContentQuery': r3.ɵɵstaticContentQuery,
+       'ɵɵloadViewQuery': r3.ɵɵloadViewQuery,
+       'ɵɵcontentQuery': r3.ɵɵcontentQuery,
+       'ɵɵloadContentQuery': r3.ɵɵloadContentQuery,
+       'ɵɵreference': r3.ɵɵreference,
+       'ɵɵelementHostAttrs': r3.ɵɵelementHostAttrs,
+       'ɵɵclassMap': r3.ɵɵclassMap,
+       'ɵɵstyling': r3.ɵɵstyling,
+       'ɵɵstyleMap': r3.ɵɵstyleMap,
+       'ɵɵstyleProp': r3.ɵɵstyleProp,
+       'ɵɵstylingApply': r3.ɵɵstylingApply,
+       'ɵɵclassProp': r3.ɵɵclassProp,
+       'ɵɵselect': r3.ɵɵselect,
+       'ɵɵtemplate': r3.ɵɵtemplate,
+       'ɵɵtext': r3.ɵɵtext,
+       'ɵɵtextBinding': r3.ɵɵtextBinding,
+       'ɵɵembeddedViewStart': r3.ɵɵembeddedViewStart,
+       'ɵɵembeddedViewEnd': r3.ɵɵembeddedViewEnd,
+       'ɵɵi18n': r3.ɵɵi18n,
+       'ɵɵi18nAttributes': r3.ɵɵi18nAttributes,
+       'ɵɵi18nExp': r3.ɵɵi18nExp,
+       'ɵɵi18nStart': r3.ɵɵi18nStart,
+       'ɵɵi18nEnd': r3.ɵɵi18nEnd,
+       'ɵɵi18nApply': r3.ɵɵi18nApply,
+       'ɵɵi18nPostprocess': r3.ɵɵi18nPostprocess,
+       'ɵɵi18nLocalize': r3.ɵɵi18nLocalize,
+       'ɵɵresolveWindow': r3.ɵɵresolveWindow,
+       'ɵɵresolveDocument': r3.ɵɵresolveDocument,
+       'ɵɵresolveBody': r3.ɵɵresolveBody,
+       'ɵɵsetComponentScope': r3.ɵɵsetComponentScope,
+       'ɵɵsetNgModuleScope': r3.ɵɵsetNgModuleScope,
 
-       'ΔsanitizeHtml': sanitization.ΔsanitizeHtml,
-       'ΔsanitizeStyle': sanitization.ΔsanitizeStyle,
-       'ΔdefaultStyleSanitizer': sanitization.ΔdefaultStyleSanitizer,
-       'ΔsanitizeResourceUrl': sanitization.ΔsanitizeResourceUrl,
-       'ΔsanitizeScript': sanitization.ΔsanitizeScript,
-       'ΔsanitizeUrl': sanitization.ΔsanitizeUrl,
-       'ΔsanitizeUrlOrResourceUrl': sanitization.ΔsanitizeUrlOrResourceUrl,
+       'ɵɵsanitizeHtml': sanitization.ɵɵsanitizeHtml,
+       'ɵɵsanitizeStyle': sanitization.ɵɵsanitizeStyle,
+       'ɵɵdefaultStyleSanitizer': sanitization.ɵɵdefaultStyleSanitizer,
+       'ɵɵsanitizeResourceUrl': sanitization.ɵɵsanitizeResourceUrl,
+       'ɵɵsanitizeScript': sanitization.ɵɵsanitizeScript,
+       'ɵɵsanitizeUrl': sanitization.ɵɵsanitizeUrl,
+       'ɵɵsanitizeUrlOrResourceUrl': sanitization.ɵɵsanitizeUrlOrResourceUrl,
      }))();
diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index 10caa79a0e..a1168e366c 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -9,10 +9,10 @@
 import {WrappedValue} from '../change_detection/change_detection_util';
 import {PipeTransform} from '../change_detection/pipe_transform';
 
-import {store, Δload} from './instructions/all';
+import {store, ɵɵload} from './instructions/all';
 import {PipeDef, PipeDefList} from './interfaces/definition';
 import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
-import {ΔpureFunction1, ΔpureFunction2, ΔpureFunction3, ΔpureFunction4, ΔpureFunctionV} from './pure_function';
+import {ɵɵpureFunction1, ɵɵpureFunction2, ɵɵpureFunction3, ɵɵpureFunction4, ɵɵpureFunctionV} from './pure_function';
 import {getLView} from './state';
 import {NO_CHANGE} from './tokens';
 
@@ -27,7 +27,7 @@ import {NO_CHANGE} from './tokens';
  *
  * @codeGenApi
  */
-export function Δpipe(index: number, pipeName: string): any {
+export function ɵɵpipe(index: number, pipeName: string): any {
   const tView = getLView()[TVIEW];
   let pipeDef: PipeDef<any>;
   const adjustedIndex = index + HEADER_OFFSET;
@@ -81,10 +81,10 @@ function getPipeDef(name: string, registry: PipeDefList | null): PipeDef<any> {
  *
  * @codeGenApi
  */
-export function ΔpipeBind1(index: number, slotOffset: number, v1: any): any {
-  const pipeInstance = Δload<PipeTransform>(index);
+export function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any {
+  const pipeInstance = ɵɵload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ? ΔpureFunction1(slotOffset, pipeInstance.transform, v1, pipeInstance) :
+      isPure(index) ? ɵɵpureFunction1(slotOffset, pipeInstance.transform, v1, pipeInstance) :
                       pipeInstance.transform(v1));
 }
 
@@ -101,10 +101,10 @@ export function ΔpipeBind1(index: number, slotOffset: number, v1: any): any {
  *
  * @codeGenApi
  */
-export function ΔpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any {
-  const pipeInstance = Δload<PipeTransform>(index);
+export function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any {
+  const pipeInstance = ɵɵload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ? ΔpureFunction2(slotOffset, pipeInstance.transform, v1, v2, pipeInstance) :
+      isPure(index) ? ɵɵpureFunction2(slotOffset, pipeInstance.transform, v1, v2, pipeInstance) :
                       pipeInstance.transform(v1, v2));
 }
 
@@ -122,11 +122,12 @@ export function ΔpipeBind2(index: number, slotOffset: number, v1: any, v2: any)
  *
  * @codeGenApi
  */
-export function ΔpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any {
-  const pipeInstance = Δload<PipeTransform>(index);
+export function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any {
+  const pipeInstance = ɵɵload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ? ΔpureFunction3(slotOffset, pipeInstance.transform, v1, v2, v3, pipeInstance) :
-                      pipeInstance.transform(v1, v2, v3));
+      isPure(index) ?
+          ɵɵpureFunction3(slotOffset, pipeInstance.transform, v1, v2, v3, pipeInstance) :
+          pipeInstance.transform(v1, v2, v3));
 }
 
 /**
@@ -144,12 +145,12 @@ export function ΔpipeBind3(index: number, slotOffset: number, v1: any, v2: any,
  *
  * @codeGenApi
  */
-export function ΔpipeBind4(
+export function ɵɵpipeBind4(
     index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any {
-  const pipeInstance = Δload<PipeTransform>(index);
+  const pipeInstance = ɵɵload<PipeTransform>(index);
   return unwrapValue(
       isPure(index) ?
-          ΔpureFunction4(slotOffset, pipeInstance.transform, v1, v2, v3, v4, pipeInstance) :
+          ɵɵpureFunction4(slotOffset, pipeInstance.transform, v1, v2, v3, v4, pipeInstance) :
           pipeInstance.transform(v1, v2, v3, v4));
 }
 
@@ -165,10 +166,10 @@ export function ΔpipeBind4(
  *
  * @codeGenApi
  */
-export function ΔpipeBindV(index: number, slotOffset: number, values: any[]): any {
-  const pipeInstance = Δload<PipeTransform>(index);
+export function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any {
+  const pipeInstance = ɵɵload<PipeTransform>(index);
   return unwrapValue(
-      isPure(index) ? ΔpureFunctionV(slotOffset, pipeInstance.transform, values, pipeInstance) :
+      isPure(index) ? ɵɵpureFunctionV(slotOffset, pipeInstance.transform, values, pipeInstance) :
                       pipeInstance.transform.apply(pipeInstance, values));
 }
 
diff --git a/packages/core/src/render3/pure_function.ts b/packages/core/src/render3/pure_function.ts
index bd4f1cd255..d3a893ba6d 100644
--- a/packages/core/src/render3/pure_function.ts
+++ b/packages/core/src/render3/pure_function.ts
@@ -40,7 +40,7 @@ import {getBindingRoot, getLView, isCreationMode} from './state';
  *
  * @codeGenApi
  */
-export function ΔpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T {
+export function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
   const bindingIndex = getBindingRoot() + slotOffset;
   const lView = getLView();
@@ -61,7 +61,7 @@ export function ΔpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?
  *
  * @codeGenApi
  */
-export function ΔpureFunction1(
+export function ɵɵpureFunction1(
     slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
   const lView = getLView();
@@ -84,7 +84,7 @@ export function ΔpureFunction1(
  *
  * @codeGenApi
  */
-export function ΔpureFunction2(
+export function ɵɵpureFunction2(
     slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any,
     thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -111,7 +111,7 @@ export function ΔpureFunction2(
  *
  * @codeGenApi
  */
-export function ΔpureFunction3(
+export function ɵɵpureFunction3(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any,
     thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -139,7 +139,7 @@ export function ΔpureFunction3(
  *
  * @codeGenApi
  */
-export function ΔpureFunction4(
+export function ɵɵpureFunction4(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any,
     exp3: any, exp4: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -168,7 +168,7 @@ export function ΔpureFunction4(
  *
  * @codeGenApi
  */
-export function ΔpureFunction5(
+export function ɵɵpureFunction5(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any,
     exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -199,7 +199,7 @@ export function ΔpureFunction5(
  *
  * @codeGenApi
  */
-export function ΔpureFunction6(
+export function ɵɵpureFunction6(
     slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any,
     exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
@@ -232,7 +232,7 @@ export function ΔpureFunction6(
  *
  * @codeGenApi
  */
-export function ΔpureFunction7(
+export function ɵɵpureFunction7(
     slotOffset: number,
     pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any,
     exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any {
@@ -267,7 +267,7 @@ export function ΔpureFunction7(
  *
  * @codeGenApi
  */
-export function ΔpureFunction8(
+export function ɵɵpureFunction8(
     slotOffset: number,
     pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any,
     exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any,
@@ -299,7 +299,7 @@ export function ΔpureFunction8(
  *
  * @codeGenApi
  */
-export function ΔpureFunctionV(
+export function ɵɵpureFunctionV(
     slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any {
   // TODO(kara): use bindingRoot instead of bindingStartIndex when implementing host bindings
   let bindingIndex = getBindingRoot() + slotOffset;
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 7f1967f5a9..82d5572526 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -18,7 +18,7 @@ import {assertDataInRange, assertDefined, assertEqual} from '../util/assert';
 import {assertPreviousIsParent} from './assert';
 import {getNodeInjectable, locateDirectiveOrProvider} from './di';
 import {NG_ELEMENT_ID} from './fields';
-import {store, Δload} from './instructions/all';
+import {store, ɵɵload} from './instructions/all';
 import {storeCleanupWithContext} from './instructions/shared';
 import {unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
 import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
@@ -391,7 +391,7 @@ export function query<T>(
  *
  * @codeGenApi
  */
-export function ΔqueryRefresh(queryList: QueryList<any>): boolean {
+export function ɵɵqueryRefresh(queryList: QueryList<any>): boolean {
   const queryListImpl = (queryList as any as QueryList_<any>);
   const creationMode = isCreationMode();
 
@@ -413,10 +413,10 @@ export function ΔqueryRefresh(queryList: QueryList<any>): boolean {
  *
  * @codeGenApi
  */
-export function ΔstaticViewQuery<T>(
+export function ɵɵstaticViewQuery<T>(
     // TODO(FW-486): "read" should be an AbstractType
     predicate: Type<any>| string[], descend: boolean, read: any): void {
-  const queryList = ΔviewQuery(predicate, descend, read) as QueryList_<T>;
+  const queryList = ɵɵviewQuery(predicate, descend, read) as QueryList_<T>;
   const tView = getLView()[TVIEW];
   queryList._static = true;
   if (!tView.staticViewQueries) {
@@ -434,7 +434,7 @@ export function ΔstaticViewQuery<T>(
  *
  * @codeGenApi
  */
-export function ΔviewQuery<T>(
+export function ɵɵviewQuery<T>(
     // TODO(FW-486): "read" should be an AbstractType
     predicate: Type<any>| string[], descend: boolean, read: any): QueryList<T> {
   const lView = getLView();
@@ -454,10 +454,10 @@ export function ΔviewQuery<T>(
  *
  * @codeGenApi
  */
-export function ΔloadViewQuery<T>(): T {
+export function ɵɵloadViewQuery<T>(): T {
   const index = getCurrentQueryIndex();
   setCurrentQueryIndex(index + 1);
-  return Δload<T>(index - HEADER_OFFSET);
+  return ɵɵload<T>(index - HEADER_OFFSET);
 }
 
 /**
@@ -472,7 +472,7 @@ export function ΔloadViewQuery<T>(): T {
  *
  * @codeGenApi
  */
-export function ΔcontentQuery<T>(
+export function ɵɵcontentQuery<T>(
     directiveIndex: number, predicate: Type<any>| string[], descend: boolean,
     // TODO(FW-486): "read" should be an AbstractType
     read: any): QueryList<T> {
@@ -503,11 +503,11 @@ export function ΔcontentQuery<T>(
  *
  * @codeGenApi
  */
-export function ΔstaticContentQuery<T>(
+export function ɵɵstaticContentQuery<T>(
     directiveIndex: number, predicate: Type<any>| string[], descend: boolean,
     // TODO(FW-486): "read" should be an AbstractType
     read: any): void {
-  const queryList = ΔcontentQuery(directiveIndex, predicate, descend, read) as QueryList_<T>;
+  const queryList = ɵɵcontentQuery(directiveIndex, predicate, descend, read) as QueryList_<T>;
   const tView = getLView()[TVIEW];
   queryList._static = true;
   if (!tView.staticContentQueries) {
@@ -519,7 +519,7 @@ export function ΔstaticContentQuery<T>(
  *
  * @codeGenApi
  */
-export function ΔloadContentQuery<T>(): QueryList<T> {
+export function ɵɵloadContentQuery<T>(): QueryList<T> {
   const lView = getLView();
   ngDevMode &&
       assertDefined(
diff --git a/packages/core/src/render3/state.ts b/packages/core/src/render3/state.ts
index 647446ae32..6d409d0b83 100644
--- a/packages/core/src/render3/state.ts
+++ b/packages/core/src/render3/state.ts
@@ -83,17 +83,17 @@ export function getBindingsEnabled(): boolean {
  *   Should match component / directive.
  * </my-comp>
  * <div ngNonBindable>
- *   <!-- ΔdisableBindings() -->
+ *   <!-- ɵɵdisableBindings() -->
  *   <my-comp my-directive>
  *     Should not match component / directive because we are in ngNonBindable.
  *   </my-comp>
- *   <!-- ΔenableBindings() -->
+ *   <!-- ɵɵenableBindings() -->
  * </div>
  * ```
  *
  * @codeGenApi
  */
-export function ΔenableBindings(): void {
+export function ɵɵenableBindings(): void {
   bindingsEnabled = true;
 }
 
@@ -106,17 +106,17 @@ export function ΔenableBindings(): void {
  *   Should match component / directive.
  * </my-comp>
  * <div ngNonBindable>
- *   <!-- ΔdisableBindings() -->
+ *   <!-- ɵɵdisableBindings() -->
  *   <my-comp my-directive>
  *     Should not match component / directive because we are in ngNonBindable.
  *   </my-comp>
- *   <!-- ΔenableBindings() -->
+ *   <!-- ɵɵenableBindings() -->
  * </div>
  * ```
  *
  * @codeGenApi
  */
-export function ΔdisableBindings(): void {
+export function ɵɵdisableBindings(): void {
   bindingsEnabled = false;
 }
 
@@ -291,7 +291,7 @@ export function getActiveDirectiveSuperClassDepth() {
  *
  * @codeGenApi
  */
-export function ΔrestoreView(viewToRestore: OpaqueViewState) {
+export function ɵɵrestoreView(viewToRestore: OpaqueViewState) {
   contextLView = viewToRestore as any as LView;
 }
 
@@ -516,7 +516,7 @@ let _currentNamespace: string|null = null;
  *
  * @codeGenApi
  */
-export function ΔnamespaceSVG() {
+export function ɵɵnamespaceSVG() {
   _currentNamespace = 'http://www.w3.org/2000/svg';
 }
 
@@ -525,7 +525,7 @@ export function ΔnamespaceSVG() {
  *
  * @codeGenApi
  */
-export function ΔnamespaceMathML() {
+export function ɵɵnamespaceMathML() {
   _currentNamespace = 'http://www.w3.org/1998/MathML/';
 }
 
@@ -535,7 +535,7 @@ export function ΔnamespaceMathML() {
  *
  * @codeGenApi
  */
-export function ΔnamespaceHTML() {
+export function ɵɵnamespaceHTML() {
   _currentNamespace = null;
 }
 
diff --git a/packages/core/src/render3/util/misc_utils.ts b/packages/core/src/render3/util/misc_utils.ts
index 2deedccd18..cf45c6f6c4 100644
--- a/packages/core/src/render3/util/misc_utils.ts
+++ b/packages/core/src/render3/util/misc_utils.ts
@@ -57,7 +57,7 @@ export const defaultScheduler =
  *
  * @codeGenApi
  */
-export function ΔresolveWindow(element: RElement & {ownerDocument: Document}) {
+export function ɵɵresolveWindow(element: RElement & {ownerDocument: Document}) {
   return {name: 'window', target: element.ownerDocument.defaultView};
 }
 
@@ -65,7 +65,7 @@ export function ΔresolveWindow(element: RElement & {ownerDocument: Document}) {
  *
  * @codeGenApi
  */
-export function ΔresolveDocument(element: RElement & {ownerDocument: Document}) {
+export function ɵɵresolveDocument(element: RElement & {ownerDocument: Document}) {
   return {name: 'document', target: element.ownerDocument};
 }
 
@@ -73,7 +73,7 @@ export function ΔresolveDocument(element: RElement & {ownerDocument: Document})
  *
  * @codeGenApi
  */
-export function ΔresolveBody(element: RElement & {ownerDocument: Document}) {
+export function ɵɵresolveBody(element: RElement & {ownerDocument: Document}) {
   return {name: 'body', target: element.ownerDocument.body};
 }
 
diff --git a/packages/core/src/render3/view_engine_compatibility_prebound.ts b/packages/core/src/render3/view_engine_compatibility_prebound.ts
index a2cdbc706c..2c5505a831 100644
--- a/packages/core/src/render3/view_engine_compatibility_prebound.ts
+++ b/packages/core/src/render3/view_engine_compatibility_prebound.ts
@@ -22,6 +22,6 @@ import {createTemplateRef} from './view_engine_compatibility';
  *
  * @codeGenApi
  */
-export function ΔtemplateRefExtractor(tNode: TNode, currentView: LView) {
+export function ɵɵtemplateRefExtractor(tNode: TNode, currentView: LView) {
   return createTemplateRef(ViewEngine_TemplateRef, ViewEngine_ElementRef, tNode, currentView);
 }
diff --git a/packages/core/src/sanitization/sanitization.ts b/packages/core/src/sanitization/sanitization.ts
index 85150b3af1..1d05760c6d 100644
--- a/packages/core/src/sanitization/sanitization.ts
+++ b/packages/core/src/sanitization/sanitization.ts
@@ -33,7 +33,7 @@ import {_sanitizeUrl as _sanitizeUrl} from './url_sanitizer';
  *
  * @publicApi
  */
-export function ΔsanitizeHtml(unsafeHtml: any): string {
+export function ɵɵsanitizeHtml(unsafeHtml: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.HTML, unsafeHtml) || '';
@@ -59,7 +59,7 @@ export function ΔsanitizeHtml(unsafeHtml: any): string {
  *
  * @publicApi
  */
-export function ΔsanitizeStyle(unsafeStyle: any): string {
+export function ɵɵsanitizeStyle(unsafeStyle: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.STYLE, unsafeStyle) || '';
@@ -86,7 +86,7 @@ export function ΔsanitizeStyle(unsafeStyle: any): string {
  *
  * @publicApi
  */
-export function ΔsanitizeUrl(unsafeUrl: any): string {
+export function ɵɵsanitizeUrl(unsafeUrl: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.URL, unsafeUrl) || '';
@@ -108,7 +108,7 @@ export function ΔsanitizeUrl(unsafeUrl: any): string {
  *
  * @publicApi
  */
-export function ΔsanitizeResourceUrl(unsafeResourceUrl: any): string {
+export function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.RESOURCE_URL, unsafeResourceUrl) || '';
@@ -131,7 +131,7 @@ export function ΔsanitizeResourceUrl(unsafeResourceUrl: any): string {
  *
  * @publicApi
  */
-export function ΔsanitizeScript(unsafeScript: any): string {
+export function ɵɵsanitizeScript(unsafeScript: any): string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
     return sanitizer.sanitize(SecurityContext.SCRIPT, unsafeScript) || '';
@@ -153,9 +153,9 @@ export function getUrlSanitizer(tag: string, prop: string) {
   if ((prop === 'src' && (tag === 'embed' || tag === 'frame' || tag === 'iframe' ||
                           tag === 'media' || tag === 'script')) ||
       (prop === 'href' && (tag === 'base' || tag === 'link'))) {
-    return ΔsanitizeResourceUrl;
+    return ɵɵsanitizeResourceUrl;
   }
-  return ΔsanitizeUrl;
+  return ɵɵsanitizeUrl;
 }
 
 /**
@@ -173,7 +173,7 @@ export function getUrlSanitizer(tag: string, prop: string) {
  *
  * @publicApi
  */
-export function ΔsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any {
+export function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any {
   return getUrlSanitizer(tag, prop)(unsafeUrl);
 }
 
@@ -183,14 +183,14 @@ export function ΔsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: st
  *
  * @publicApi
  */
-export const ΔdefaultStyleSanitizer = (function(prop: string, value?: string): string | boolean {
+export const ɵɵdefaultStyleSanitizer = (function(prop: string, value?: string): string | boolean {
   if (value === undefined) {
     return prop === 'background-image' || prop === 'background' || prop === 'border-image' ||
         prop === 'filter' || prop === 'list-style' || prop === 'list-style-image' ||
         prop === 'clip-path';
   }
 
-  return ΔsanitizeStyle(value);
+  return ɵɵsanitizeStyle(value);
 } as StyleSanitizeFn);
 
 export function validateAgainstEventProperties(name: string) {
diff --git a/packages/core/src/view/ng_module.ts b/packages/core/src/view/ng_module.ts
index 5ad60881d7..6d064e91af 100644
--- a/packages/core/src/view/ng_module.ts
+++ b/packages/core/src/view/ng_module.ts
@@ -9,7 +9,7 @@
 import {resolveForwardRef} from '../di/forward_ref';
 import {Injector} from '../di/injector';
 import {INJECTOR, setCurrentInjector} from '../di/injector_compatibility';
-import {getInjectableDef, ΔInjectableDef} from '../di/interface/defs';
+import {getInjectableDef, ɵɵInjectableDef} from '../di/interface/defs';
 import {APP_ROOT} from '../di/scope';
 import {NgModuleRef} from '../linker/ng_module_factory';
 import {stringify} from '../util/stringify';
@@ -98,7 +98,7 @@ export function resolveNgModuleDep(
         return data;
     }
     const providerDef = data._def.providersByKey[tokenKey];
-    let injectableDef: ΔInjectableDef<any>|null;
+    let injectableDef: ɵɵInjectableDef<any>|null;
     if (providerDef) {
       let providerInstance = data._providers[providerDef.index];
       if (providerInstance === undefined) {
@@ -132,7 +132,7 @@ function moduleTransitivelyPresent(ngModule: NgModuleData, scope: any): boolean
   return ngModule._def.modules.indexOf(scope) > -1;
 }
 
-function targetsModule(ngModule: NgModuleData, def: ΔInjectableDef<any>): boolean {
+function targetsModule(ngModule: NgModuleData, def: ɵɵInjectableDef<any>): boolean {
   return def.providedIn != null && (moduleTransitivelyPresent(ngModule, def.providedIn) ||
                                     def.providedIn === 'root' && ngModule._def.isRoot);
 }
diff --git a/packages/core/src/view/services.ts b/packages/core/src/view/services.ts
index 55fb136989..8c705f378e 100644
--- a/packages/core/src/view/services.ts
+++ b/packages/core/src/view/services.ts
@@ -9,7 +9,7 @@
 import {DebugElement__PRE_R3__, DebugEventListener, DebugNode__PRE_R3__, getDebugNode, indexDebugNode, removeDebugNodeFromIndex} from '../debug/debug_node';
 import {Injector} from '../di';
 import {InjectableType} from '../di/injectable';
-import {getInjectableDef, ΔInjectableDef} from '../di/interface/defs';
+import {getInjectableDef, ɵɵInjectableDef} from '../di/interface/defs';
 import {ErrorHandler} from '../error_handler';
 import {Type} from '../interface/type';
 import {ComponentFactory} from '../linker/component_factory';
@@ -170,7 +170,7 @@ const viewDefOverrides = new Map<any, ViewDefinition>();
 
 function debugOverrideProvider(override: ProviderOverride) {
   providerOverrides.set(override.token, override);
-  let injectableDef: ΔInjectableDef<any>|null;
+  let injectableDef: ɵɵInjectableDef<any>|null;
   if (typeof override.token === 'function' && (injectableDef = getInjectableDef(override.token)) &&
       typeof injectableDef.providedIn === 'function') {
     providerOverridesWithScope.set(override.token as InjectableType<any>, override);
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index 94c5b7ccc8..a9e77d9110 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -732,33 +732,33 @@
     "name": "viewAttachedToChangeDetector"
   },
   {
-    "name": "ΔdefineComponent"
+    "name": "ɵɵdefineComponent"
   },
   {
-    "name": "ΔdefineInjectable"
+    "name": "ɵɵdefineInjectable"
   },
   {
-    "name": "ΔdefineInjector"
+    "name": "ɵɵdefineInjector"
   },
   {
-    "name": "ΔdefineNgModule"
+    "name": "ɵɵdefineNgModule"
   },
   {
-    "name": "Δelement"
+    "name": "ɵɵelement"
   },
   {
-    "name": "ΔelementEnd"
+    "name": "ɵɵelementEnd"
   },
   {
-    "name": "ΔelementStart"
+    "name": "ɵɵelementStart"
   },
   {
-    "name": "ΔnamespaceHTML"
+    "name": "ɵɵnamespaceHTML"
   },
   {
-    "name": "ΔsetComponentScope"
+    "name": "ɵɵsetComponentScope"
   },
   {
-    "name": "Δtext"
+    "name": "ɵɵtext"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 414f37283c..7e4eba0c56 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -498,15 +498,15 @@
     "name": "viewAttachedToChangeDetector"
   },
   {
-    "name": "ΔdefineComponent"
+    "name": "ɵɵdefineComponent"
   },
   {
-    "name": "ΔdefineInjectable"
+    "name": "ɵɵdefineInjectable"
   },
   {
-    "name": "ΔnamespaceHTML"
+    "name": "ɵɵnamespaceHTML"
   },
   {
-    "name": "Δtext"
+    "name": "ɵɵtext"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json
index 50cbf4564b..817c2a8d75 100644
--- a/packages/core/test/bundling/injection/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json
@@ -201,12 +201,12 @@
     "name": "throwMixedMultiProviderError"
   },
   {
-    "name": "ΔdefineInjectable"
+    "name": "ɵɵdefineInjectable"
   },
   {
-    "name": "ΔdefineInjector"
+    "name": "ɵɵdefineInjector"
   },
   {
-    "name": "Δinject"
+    "name": "ɵɵinject"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/injection/usage.ts b/packages/core/test/bundling/injection/usage.ts
index 777867de2e..8f4c9a1f5b 100644
--- a/packages/core/test/bundling/injection/usage.ts
+++ b/packages/core/test/bundling/injection/usage.ts
@@ -6,17 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injector, ɵcreateInjector as createInjector, ΔdefineInjectable, ΔdefineInjector} from '@angular/core';
+import {Injector, ɵcreateInjector as createInjector, ɵɵdefineInjectable, ɵɵdefineInjector} from '@angular/core';
 
 export class RootService {
-  static ngInjectableDef = ΔdefineInjectable({
+  static ngInjectableDef = ɵɵdefineInjectable({
     providedIn: 'root',
     factory: () => new RootService(),
   });
 }
 
 export class ScopedService {
-  static ngInjectableDef = ΔdefineInjectable({
+  static ngInjectableDef = ɵɵdefineInjectable({
     providedIn: null,
     factory: () => new ScopedService(),
   });
@@ -28,7 +28,7 @@ export class ScopedService {
 }
 
 export class DefinedInjector {
-  static ngInjectorDef = ΔdefineInjector({
+  static ngInjectorDef = ɵɵdefineInjector({
     factory: () => new DefinedInjector(),
     providers: [ScopedService],
   });
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index be0d39505d..8b49e0c126 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -1506,72 +1506,72 @@
     "name": "wrapListener"
   },
   {
-    "name": "Δbind"
+    "name": "ɵɵbind"
   },
   {
-    "name": "ΔclassProp"
+    "name": "ɵɵclassProp"
   },
   {
-    "name": "ΔdefineComponent"
+    "name": "ɵɵdefineComponent"
   },
   {
-    "name": "ΔdefineDirective"
+    "name": "ɵɵdefineDirective"
   },
   {
-    "name": "ΔdefineInjectable"
+    "name": "ɵɵdefineInjectable"
   },
   {
-    "name": "ΔdirectiveInject"
+    "name": "ɵɵdirectiveInject"
   },
   {
-    "name": "ΔelementEnd"
+    "name": "ɵɵelementEnd"
   },
   {
-    "name": "ΔelementStart"
+    "name": "ɵɵelementStart"
   },
   {
-    "name": "ΔgetCurrentView"
+    "name": "ɵɵgetCurrentView"
   },
   {
-    "name": "Δinject"
+    "name": "ɵɵinject"
   },
   {
-    "name": "Δinterpolation1"
+    "name": "ɵɵinterpolation1"
   },
   {
-    "name": "Δlistener"
+    "name": "ɵɵlistener"
   },
   {
-    "name": "ΔnamespaceHTML"
+    "name": "ɵɵnamespaceHTML"
   },
   {
-    "name": "ΔnextContext"
+    "name": "ɵɵnextContext"
   },
   {
-    "name": "Δproperty"
+    "name": "ɵɵproperty"
   },
   {
-    "name": "Δreference"
+    "name": "ɵɵreference"
   },
   {
-    "name": "ΔrestoreView"
+    "name": "ɵɵrestoreView"
   },
   {
-    "name": "Δselect"
+    "name": "ɵɵselect"
   },
   {
-    "name": "Δstyling"
+    "name": "ɵɵstyling"
   },
   {
-    "name": "ΔstylingApply"
+    "name": "ɵɵstylingApply"
   },
   {
-    "name": "Δtemplate"
+    "name": "ɵɵtemplate"
   },
   {
-    "name": "Δtext"
+    "name": "ɵɵtext"
   },
   {
-    "name": "ΔtextBinding"
+    "name": "ɵɵtextBinding"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/todo_i18n/index.ts b/packages/core/test/bundling/todo_i18n/index.ts
index e402eb10ae..49337f9395 100644
--- a/packages/core/test/bundling/todo_i18n/index.ts
+++ b/packages/core/test/bundling/todo_i18n/index.ts
@@ -16,7 +16,7 @@ import '@angular/core/test/bundling/util/src/reflect_metadata';
  */
 import './translations';
 import {CommonModule} from '@angular/common';
-import {Component, Injectable, NgModule, ViewEncapsulation, ɵmarkDirty as markDirty, ɵrenderComponent as renderComponent, Δi18nLocalize as localize} from '@angular/core';
+import {Component, Injectable, NgModule, ViewEncapsulation, ɵmarkDirty as markDirty, ɵrenderComponent as renderComponent, ɵɵi18nLocalize as localize} from '@angular/core';
 
 class Todo {
   editing: boolean;
diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts
index 03f142fd38..75907a1aee 100644
--- a/packages/core/test/di/r3_injector_spec.ts
+++ b/packages/core/test/di/r3_injector_spec.ts
@@ -6,34 +6,34 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {INJECTOR, InjectFlags, InjectionToken, Injector, Optional, ΔdefineInjectable, ΔdefineInjector, Δinject} from '@angular/core';
+import {INJECTOR, InjectFlags, InjectionToken, Injector, Optional, ɵɵdefineInjectable, ɵɵdefineInjector, ɵɵinject} from '@angular/core';
 import {R3Injector, createInjector} from '@angular/core/src/di/r3_injector';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 describe('InjectorDef-based createInjector()', () => {
   class CircularA {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
-      factory: () => Δinject(CircularB),
+      factory: () => ɵɵinject(CircularB),
     });
   }
 
   class CircularB {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
-      factory: () => Δinject(CircularA),
+      factory: () => ɵɵinject(CircularA),
     });
   }
 
   class Service {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
       factory: () => new Service(),
     });
   }
 
   class OptionalService {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
       factory: () => new OptionalService(),
     });
@@ -55,41 +55,41 @@ describe('InjectorDef-based createInjector()', () => {
   class ServiceWithDep {
     constructor(readonly service: Service) {}
 
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithDep(Δinject(Service)),
+      factory: () => new ServiceWithDep(ɵɵinject(Service)),
     });
   }
 
   class ServiceWithOptionalDep {
     constructor(@Optional() readonly service: OptionalService|null) {}
 
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithOptionalDep(Δinject(OptionalService, InjectFlags.Optional)),
+      factory: () => new ServiceWithOptionalDep(ɵɵinject(OptionalService, InjectFlags.Optional)),
     });
   }
 
   class ServiceWithMissingDep {
     constructor(readonly service: Service) {}
 
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithMissingDep(Δinject(Service)),
+      factory: () => new ServiceWithMissingDep(ɵɵinject(Service)),
     });
   }
 
   class ServiceWithMultiDep {
     constructor(readonly locale: string[]) {}
 
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
-      factory: () => new ServiceWithMultiDep(Δinject(LOCALE)),
+      factory: () => new ServiceWithMultiDep(ɵɵinject(LOCALE)),
     });
   }
 
   class ServiceTwo {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
       factory: () => new ServiceTwo(),
     });
@@ -97,7 +97,7 @@ describe('InjectorDef-based createInjector()', () => {
 
   let deepServiceDestroyed = false;
   class DeepService {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: null,
       factory: () => new DeepService(),
     });
@@ -107,7 +107,7 @@ describe('InjectorDef-based createInjector()', () => {
 
   let eagerServiceCreated: boolean = false;
   class EagerService {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: undefined,
       factory: () => new EagerService(),
     });
@@ -119,8 +119,8 @@ describe('InjectorDef-based createInjector()', () => {
   class DeepModule {
     constructor(eagerService: EagerService) { deepModuleCreated = true; }
 
-    static ngInjectorDef = ΔdefineInjector({
-      factory: () => new DeepModule(Δinject(EagerService)),
+    static ngInjectorDef = ɵɵdefineInjector({
+      factory: () => new DeepModule(ɵɵinject(EagerService)),
       imports: undefined,
       providers: [
         EagerService,
@@ -137,7 +137,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class IntermediateModule {
-    static ngInjectorDef = ΔdefineInjector({
+    static ngInjectorDef = ɵɵdefineInjector({
       factory: () => new IntermediateModule(),
       imports: [DeepModule.safe()],
       providers: [],
@@ -147,13 +147,13 @@ describe('InjectorDef-based createInjector()', () => {
   class InjectorWithDep {
     constructor(readonly service: Service) {}
 
-    static ngInjectorDef = ΔdefineInjector({
-      factory: () => new InjectorWithDep(Δinject(Service)),
+    static ngInjectorDef = ɵɵdefineInjector({
+      factory: () => new InjectorWithDep(ɵɵinject(Service)),
     });
   }
 
   class Module {
-    static ngInjectorDef = ΔdefineInjector({
+    static ngInjectorDef = ɵɵdefineInjector({
       factory: () => new Module(),
       imports: [IntermediateModule],
       providers: [
@@ -175,7 +175,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class OtherModule {
-    static ngInjectorDef = ΔdefineInjector({
+    static ngInjectorDef = ɵɵdefineInjector({
       factory: () => new OtherModule(),
       imports: undefined,
       providers: [],
@@ -183,7 +183,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class ModuleWithMissingDep {
-    static ngInjectorDef = ΔdefineInjector({
+    static ngInjectorDef = ɵɵdefineInjector({
       factory: () => new ModuleWithMissingDep(),
       imports: undefined,
       providers: [ServiceWithMissingDep],
@@ -193,7 +193,7 @@ describe('InjectorDef-based createInjector()', () => {
   class NotAModule {}
 
   class ImportsNotAModule {
-    static ngInjectorDef = ΔdefineInjector({
+    static ngInjectorDef = ɵɵdefineInjector({
       factory: () => new ImportsNotAModule(),
       imports: [NotAModule],
       providers: [],
@@ -202,7 +202,7 @@ describe('InjectorDef-based createInjector()', () => {
 
   let scopedServiceDestroyed = false;
   class ScopedService {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: Module,
       factory: () => new ScopedService(),
     });
@@ -211,7 +211,7 @@ describe('InjectorDef-based createInjector()', () => {
   }
 
   class WrongScopeService {
-    static ngInjectableDef = ΔdefineInjectable({
+    static ngInjectableDef = ɵɵdefineInjectable({
       providedIn: OtherModule,
       factory: () => new WrongScopeService(),
     });
@@ -367,7 +367,7 @@ describe('InjectorDef-based createInjector()', () => {
       }
       class ErrorModule {
         static ngInjectorDef =
-            ΔdefineInjector({factory: () => new ErrorModule(), providers: [MissingArgumentType]});
+            ɵɵdefineInjector({factory: () => new ErrorModule(), providers: [MissingArgumentType]});
       }
       expect(() => createInjector(ErrorModule).get(MissingArgumentType))
           .toThrowError('Can\'t resolve all parameters for MissingArgumentType: (?).');
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index 6017ee8bef..54ce976a3a 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -8,7 +8,7 @@
 
 import {ANALYZE_FOR_ENTRY_COMPONENTS, CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef, Compiler, Component, ComponentFactoryResolver, Directive, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, forwardRef, getModuleFactory, ɵivyEnabled as ivyEnabled} from '@angular/core';
 import {Console} from '@angular/core/src/console';
-import {ΔInjectableDef, ΔdefineInjectable} from '@angular/core/src/di/interface/defs';
+import {ɵɵInjectableDef, ɵɵdefineInjectable} from '@angular/core/src/di/interface/defs';
 import {getNgModuleDef} from '@angular/core/src/render3/definition';
 import {NgModuleData} from '@angular/core/src/view/types';
 import {tokenKey} from '@angular/core/src/view/util';
@@ -1374,7 +1374,7 @@ function declareTests(config?: {useJit: boolean}) {
               }
 
               class Bar {
-                static ngInjectableDef: ΔInjectableDef<Bar> = ΔdefineInjectable({
+                static ngInjectableDef: ɵɵInjectableDef<Bar> = ɵɵdefineInjectable({
                   factory: () => new Bar(),
                   providedIn: SomeModule,
                 });
@@ -1406,7 +1406,7 @@ function declareTests(config?: {useJit: boolean}) {
               }
 
               class Bar {
-                static ngInjectableDef: ΔInjectableDef<Bar> = ΔdefineInjectable({
+                static ngInjectableDef: ɵɵInjectableDef<Bar> = ɵɵdefineInjectable({
                   factory: () => new Bar(),
                   providedIn: SomeModule,
                 });
diff --git a/packages/core/test/render3/basic_perf.ts b/packages/core/test/render3/basic_perf.ts
index 7fc6aa6d75..b0595447dc 100644
--- a/packages/core/test/render3/basic_perf.ts
+++ b/packages/core/test/render3/basic_perf.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ΔdefineComponent} from '../../src/render3/index';
-import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtext} from '../../src/render3/instructions/all';
+import {ɵɵdefineComponent} from '../../src/render3/index';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {document, renderComponent} from './render_util';
@@ -33,31 +33,31 @@ describe('iv perf test', () => {
 
       it(`${iteration}. create ${count} divs in Render3`, () => {
         class Component {
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: Component,
             selectors: [['div']],
             consts: 1,
             vars: 0,
             template: function Template(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δcontainer(0);
+                ɵɵcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ΔcontainerRefreshStart(0);
+                ɵɵcontainerRefreshStart(0);
                 {
                   for (let i = 0; i < count; i++) {
-                    let rf0 = ΔembeddedViewStart(0, 2, 0);
+                    let rf0 = ɵɵembeddedViewStart(0, 2, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        ΔelementStart(0, 'div');
-                        Δtext(1, '-');
-                        ΔelementEnd();
+                        ɵɵelementStart(0, 'div');
+                        ɵɵtext(1, '-');
+                        ɵɵelementEnd();
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             },
             factory: () => new Component
diff --git a/packages/core/test/render3/change_detection_spec.ts b/packages/core/test/render3/change_detection_spec.ts
index 9660061dfc..52629da45b 100644
--- a/packages/core/test/render3/change_detection_spec.ts
+++ b/packages/core/test/render3/change_detection_spec.ts
@@ -10,8 +10,8 @@ import {withBody} from '@angular/private/testing';
 
 import {ChangeDetectionStrategy, DoCheck} from '../../src/core';
 import {whenRendered} from '../../src/render3/component';
-import {LifecycleHooksFeature, getRenderedText, ΔdefineComponent, ΔgetCurrentView} from '../../src/render3/index';
-import {detectChanges, markDirty, tick, Δbind, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, Δinterpolation1, Δinterpolation2, Δlistener, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {LifecycleHooksFeature, getRenderedText, ɵɵdefineComponent, ɵɵgetCurrentView} from '../../src/render3/index';
+import {detectChanges, markDirty, tick, ɵɵbind, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵinterpolation1, ɵɵinterpolation2, ɵɵlistener, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {Renderer3, RendererFactory3} from '../../src/render3/interfaces/renderer';
 import {FLAGS, LViewFlags} from '../../src/render3/interfaces/view';
@@ -25,7 +25,7 @@ describe('change detection', () => {
       doCheckCount = 0;
       ngDoCheck(): void { this.doCheckCount++; }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         factory: () => new MyComponent(),
@@ -33,12 +33,12 @@ describe('change detection', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'span');
-            Δtext(1);
-            ΔelementEnd();
+            ɵɵelementStart(0, 'span');
+            ɵɵtext(1);
+            ɵɵelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ΔtextBinding(1, Δbind(ctx.value));
+            ɵɵtextBinding(1, ɵɵbind(ctx.value));
           }
         }
       });
@@ -100,7 +100,7 @@ describe('change detection', () => {
 
       onClick() {}
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         factory: () => comp = new MyComponent(),
@@ -112,15 +112,15 @@ describe('change detection', () => {
          */
         template: (rf: RenderFlags, ctx: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            Δtext(0);
-            ΔelementStart(1, 'button');
+            ɵɵtext(0);
+            ɵɵelementStart(1, 'button');
             {
-              Δlistener('click', () => { ctx.onClick(); });
+              ɵɵlistener('click', () => { ctx.onClick(); });
             }
-            ΔelementEnd();
+            ɵɵelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ΔtextBinding(0, Δinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
+            ɵɵtextBinding(0, ɵɵinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
           }
         },
         changeDetection: ChangeDetectionStrategy.OnPush,
@@ -138,7 +138,7 @@ describe('change detection', () => {
 
         onClick() {}
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: ManualComponent,
           selectors: [['manual-comp']],
           factory: () => comp = new ManualComponent(),
@@ -152,18 +152,18 @@ describe('change detection', () => {
             if (rf & RenderFlags.Create) {
               // This is temporarily the only way to turn on manual change detection
               // because public API has not yet been added.
-              const view = ΔgetCurrentView() as any;
+              const view = ɵɵgetCurrentView() as any;
               view[FLAGS] |= LViewFlags.ManualOnPush;
 
-              Δtext(0);
-              ΔelementStart(1, 'button');
+              ɵɵtext(0);
+              ɵɵelementStart(1, 'button');
               {
-                Δlistener('click', () => { ctx.onClick(); });
+                ɵɵlistener('click', () => { ctx.onClick(); });
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              ΔtextBinding(0, Δinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
+              ɵɵtextBinding(0, ɵɵinterpolation2('', ctx.doCheckCount, ' - ', ctx.name, ''));
             }
           },
           changeDetection: ChangeDetectionStrategy.OnPush,
@@ -174,7 +174,7 @@ describe('change detection', () => {
       class ManualApp {
         name: string = 'Nancy';
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: ManualApp,
           selectors: [['manual-app']],
           factory: () => new ManualApp(),
@@ -183,10 +183,10 @@ describe('change detection', () => {
           /** <manual-comp [name]="name"></manual-comp> */
           template: (rf: RenderFlags, ctx: ManualApp) => {
             if (rf & RenderFlags.Create) {
-              Δelement(0, 'manual-comp');
+              ɵɵelement(0, 'manual-comp');
             }
             if (rf & RenderFlags.Update) {
-              ΔelementProperty(0, 'name', Δbind(ctx.name));
+              ɵɵelementProperty(0, 'name', ɵɵbind(ctx.name));
             }
 
           },
@@ -229,7 +229,7 @@ describe('change detection', () => {
              doCheckCount = 0;
              ngDoCheck(): void { this.doCheckCount++; }
 
-             static ngComponentDef = ΔdefineComponent({
+             static ngComponentDef = ɵɵdefineComponent({
                type: ButtonParent,
                selectors: [['button-parent']],
                factory: () => parent = new ButtonParent(),
@@ -238,11 +238,11 @@ describe('change detection', () => {
                /** {{ doCheckCount }} - <manual-comp></manual-comp> */
                template: (rf: RenderFlags, ctx: ButtonParent) => {
                  if (rf & RenderFlags.Create) {
-                   Δtext(0);
-                   Δelement(1, 'manual-comp');
+                   ɵɵtext(0);
+                   ɵɵelement(1, 'manual-comp');
                  }
                  if (rf & RenderFlags.Update) {
-                   ΔtextBinding(0, Δinterpolation1('', ctx.doCheckCount, ' - '));
+                   ɵɵtextBinding(0, ɵɵinterpolation1('', ctx.doCheckCount, ' - '));
                  }
                },
                directives: () => [ManualComponent],
@@ -252,7 +252,7 @@ describe('change detection', () => {
 
            const MyButtonApp = createComponent('my-button-app', function(rf: RenderFlags) {
              if (rf & RenderFlags.Create) {
-               Δelement(0, 'button-parent');
+               ɵɵelement(0, 'button-parent');
              }
            }, 1, 0, [ButtonParent]);
 
@@ -306,7 +306,7 @@ describe('change detection', () => {
         return 'works';
       }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         factory: () => new MyComponent(),
@@ -314,10 +314,10 @@ describe('change detection', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            Δtext(0);
+            ɵɵtext(0);
           }
           if (rf & RenderFlags.Update) {
-            ΔtextBinding(0, Δbind(ctx.value));
+            ɵɵtextBinding(0, ɵɵbind(ctx.value));
           }
         }
       });
diff --git a/packages/core/test/render3/common_with_def.ts b/packages/core/test/render3/common_with_def.ts
index c3cd705134..6e08c7ef43 100644
--- a/packages/core/test/render3/common_with_def.ts
+++ b/packages/core/test/render3/common_with_def.ts
@@ -9,18 +9,18 @@
 import {NgForOf as NgForOfDef, NgIf as NgIfDef, NgTemplateOutlet as NgTemplateOutletDef} from '@angular/common';
 import {IterableDiffers, TemplateRef, ViewContainerRef} from '@angular/core';
 
-import {DirectiveType, ΔNgOnChangesFeature, ΔdefineDirective, ΔdirectiveInject} from '../../src/render3/index';
+import {DirectiveType, ɵɵNgOnChangesFeature, ɵɵdefineDirective, ɵɵdirectiveInject} from '../../src/render3/index';
 
 export const NgForOf: DirectiveType<NgForOfDef<any>> = NgForOfDef as any;
 export const NgIf: DirectiveType<NgIfDef> = NgIfDef as any;
 export const NgTemplateOutlet: DirectiveType<NgTemplateOutletDef> = NgTemplateOutletDef as any;
 
-NgForOf.ngDirectiveDef = ΔdefineDirective({
+NgForOf.ngDirectiveDef = ɵɵdefineDirective({
   type: NgForOfDef,
   selectors: [['', 'ngForOf', '']],
   factory: () => new NgForOfDef(
-               ΔdirectiveInject(ViewContainerRef as any), ΔdirectiveInject(TemplateRef as any),
-               ΔdirectiveInject(IterableDiffers)),
+               ɵɵdirectiveInject(ViewContainerRef as any), ɵɵdirectiveInject(TemplateRef as any),
+               ɵɵdirectiveInject(IterableDiffers)),
   inputs: {
     ngForOf: 'ngForOf',
     ngForTrackBy: 'ngForTrackBy',
@@ -28,19 +28,19 @@ NgForOf.ngDirectiveDef = ΔdefineDirective({
   }
 });
 
-(NgIf as any).ngDirectiveDef = ΔdefineDirective({
+(NgIf as any).ngDirectiveDef = ɵɵdefineDirective({
   type: NgIfDef,
   selectors: [['', 'ngIf', '']],
   factory: () => new NgIfDef(
-               ΔdirectiveInject(ViewContainerRef as any), ΔdirectiveInject(TemplateRef as any)),
+               ɵɵdirectiveInject(ViewContainerRef as any), ɵɵdirectiveInject(TemplateRef as any)),
   inputs: {ngIf: 'ngIf', ngIfThen: 'ngIfThen', ngIfElse: 'ngIfElse'}
 });
 
-(NgTemplateOutlet as any).ngDirectiveDef = ΔdefineDirective({
+(NgTemplateOutlet as any).ngDirectiveDef = ɵɵdefineDirective({
   type: NgTemplateOutletDef,
   selectors: [['', 'ngTemplateOutlet', '']],
-  factory: () => new NgTemplateOutletDef(ΔdirectiveInject(ViewContainerRef as any)),
-  features: [ΔNgOnChangesFeature()],
+  factory: () => new NgTemplateOutletDef(ɵɵdirectiveInject(ViewContainerRef as any)),
+  features: [ɵɵNgOnChangesFeature()],
   inputs:
       {ngTemplateOutlet: 'ngTemplateOutlet', ngTemplateOutletContext: 'ngTemplateOutletContext'}
 });
diff --git a/packages/core/test/render3/component_ref_spec.ts b/packages/core/test/render3/component_ref_spec.ts
index bb414547ca..9af77d2d46 100644
--- a/packages/core/test/render3/component_ref_spec.ts
+++ b/packages/core/test/render3/component_ref_spec.ts
@@ -10,7 +10,7 @@ import {Injector, NgModuleRef, ViewEncapsulation} from '../../src/core';
 import {ComponentFactory} from '../../src/linker/component_factory';
 import {RendererFactory2} from '../../src/render/api';
 import {injectComponentFactoryResolver} from '../../src/render3/component_ref';
-import {ΔdefineComponent} from '../../src/render3/index';
+import {ɵɵdefineComponent} from '../../src/render3/index';
 import {domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {Sanitizer} from '../../src/sanitization/security';
 
@@ -20,7 +20,7 @@ describe('ComponentFactory', () => {
   describe('constructor()', () => {
     it('should correctly populate default properties', () => {
       class TestComponent {
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: TestComponent,
           selectors: [['test', 'foo'], ['bar']],
           consts: 0,
@@ -41,7 +41,7 @@ describe('ComponentFactory', () => {
 
     it('should correctly populate defined properties', () => {
       class TestComponent {
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: TestComponent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['test', 'foo'], ['bar']],
@@ -89,7 +89,7 @@ describe('ComponentFactory', () => {
       createRenderer3Spy = spyOn(domRendererFactory3, 'createRenderer').and.callThrough();
 
       class TestComponent {
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: TestComponent,
           encapsulation: ViewEncapsulation.None,
           selectors: [['test']],
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index f173155635..fbd43b429e 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ViewEncapsulation, ΔdefineInjectable, ΔdefineInjector} from '../../src/core';
+import {ViewEncapsulation, ɵɵdefineInjectable, ɵɵdefineInjector} from '../../src/core';
 import {createInjector} from '../../src/di/r3_injector';
-import {AttributeMarker, ComponentFactory, LifecycleHooksFeature, getRenderedText, markDirty, ΔdefineComponent, ΔdirectiveInject, Δtemplate} from '../../src/render3/index';
-import {tick, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, ΔnextContext, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {AttributeMarker, ComponentFactory, LifecycleHooksFeature, getRenderedText, markDirty, ɵɵdefineComponent, ɵɵdirectiveInject, ɵɵtemplate} from '../../src/render3/index';
+import {tick, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵnextContext, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
 import {ComponentDef, RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {NgIf} from './common_with_def';
@@ -21,7 +21,7 @@ describe('component', () => {
 
     increment() { this.count++; }
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: CounterComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['counter']],
@@ -29,10 +29,10 @@ describe('component', () => {
       vars: 1,
       template: function(rf: RenderFlags, ctx: CounterComponent) {
         if (rf & RenderFlags.Create) {
-          Δtext(0);
+          ɵɵtext(0);
         }
         if (rf & RenderFlags.Update) {
-          ΔtextBinding(0, Δbind(ctx.count));
+          ɵɵtextBinding(0, ɵɵbind(ctx.count));
         }
       },
       factory: () => new CounterComponent,
@@ -64,30 +64,30 @@ describe('component', () => {
     class MyService {
       constructor(public value: string) {}
       static ngInjectableDef =
-          ΔdefineInjectable({providedIn: 'root', factory: () => new MyService('no-injector')});
+          ɵɵdefineInjectable({providedIn: 'root', factory: () => new MyService('no-injector')});
     }
     class MyComponent {
       constructor(public myService: MyService) {}
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComponent,
         encapsulation: ViewEncapsulation.None,
         selectors: [['my-component']],
-        factory: () => new MyComponent(ΔdirectiveInject(MyService)),
+        factory: () => new MyComponent(ɵɵdirectiveInject(MyService)),
         consts: 1,
         vars: 1,
         template: function(fs: RenderFlags, ctx: MyComponent) {
           if (fs & RenderFlags.Create) {
-            Δtext(0);
+            ɵɵtext(0);
           }
           if (fs & RenderFlags.Update) {
-            ΔtextBinding(0, Δbind(ctx.myService.value));
+            ɵɵtextBinding(0, ɵɵbind(ctx.myService.value));
           }
         }
       });
     }
 
     class MyModule {
-      static ngInjectorDef = ΔdefineInjector({
+      static ngInjectorDef = ɵɵdefineInjector({
         factory: () => new MyModule(),
         providers: [{provide: MyService, useValue: new MyService('injector')}]
       });
@@ -112,7 +112,7 @@ describe('component', () => {
       // @Input
       name = '';
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: Comp,
         selectors: [['comp']],
         factory: () => new Comp(),
@@ -120,10 +120,10 @@ describe('component', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: Comp) => {
           if (rf & RenderFlags.Create) {
-            Δtext(0);
+            ɵɵtext(0);
           }
           if (rf & RenderFlags.Update) {
-            ΔtextBinding(0, Δbind(ctx.name));
+            ɵɵtextBinding(0, ɵɵbind(ctx.name));
           }
         },
         inputs: {name: 'name'}
@@ -134,10 +134,10 @@ describe('component', () => {
     // with a very large view
     const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        Δelement(4097, 'comp');
+        ɵɵelement(4097, 'comp');
       }
       if (rf & RenderFlags.Update) {
-        ΔelementProperty(4097, 'name', Δbind(ctx.name));
+        ɵɵelementProperty(4097, 'name', ɵɵbind(ctx.name));
       }
     }, 4098, 1, [Comp]);
 
@@ -156,16 +156,16 @@ it('should not invoke renderer destroy method for embedded views', () => {
 
   function MyComponent_div_Template_2(rf: any, ctx: any) {
     if (rf & RenderFlags.Create) {
-      ΔelementStart(0, 'div');
-      Δtext(1, 'Child view');
-      ΔelementEnd();
+      ɵɵelementStart(0, 'div');
+      ɵɵtext(1, 'Child view');
+      ɵɵelementEnd();
     }
   }
 
   class Comp {
     visible = true;
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: Comp,
       selectors: [['comp']],
       consts: 3,
@@ -181,13 +181,14 @@ it('should not invoke renderer destroy method for embedded views', () => {
        */
       template: function(rf: RenderFlags, ctx: Comp) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'div');
-          Δtext(1, 'Root view');
-          ΔelementEnd();
-          Δtemplate(2, MyComponent_div_Template_2, 2, 0, 'div', [AttributeMarker.Template, 'ngIf']);
+          ɵɵelementStart(0, 'div');
+          ɵɵtext(1, 'Root view');
+          ɵɵelementEnd();
+          ɵɵtemplate(
+              2, MyComponent_div_Template_2, 2, 0, 'div', [AttributeMarker.Template, 'ngIf']);
         }
         if (rf & RenderFlags.Update) {
-          ΔelementProperty(2, 'ngIf', Δbind(ctx.visible));
+          ɵɵelementProperty(2, 'ngIf', ɵɵbind(ctx.visible));
         }
       }
     });
@@ -213,32 +214,32 @@ it('should not invoke renderer destroy method for embedded views', () => {
 describe('component with a container', () => {
   function showItems(rf: RenderFlags, ctx: {items: string[]}) {
     if (rf & RenderFlags.Create) {
-      Δcontainer(0);
+      ɵɵcontainer(0);
     }
     if (rf & RenderFlags.Update) {
-      ΔcontainerRefreshStart(0);
+      ɵɵcontainerRefreshStart(0);
       {
         for (const item of ctx.items) {
-          const rf0 = ΔembeddedViewStart(0, 1, 1);
+          const rf0 = ɵɵembeddedViewStart(0, 1, 1);
           {
             if (rf0 & RenderFlags.Create) {
-              Δtext(0);
+              ɵɵtext(0);
             }
             if (rf0 & RenderFlags.Update) {
-              ΔtextBinding(0, Δbind(item));
+              ɵɵtextBinding(0, ɵɵbind(item));
             }
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
       }
-      ΔcontainerRefreshEnd();
+      ɵɵcontainerRefreshEnd();
     }
   }
 
   class WrapperComponent {
     // TODO(issue/24571): remove '!'.
     items !: string[];
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: WrapperComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['wrapper']],
@@ -246,16 +247,16 @@ describe('component with a container', () => {
       vars: 0,
       template: function ChildComponentTemplate(rf: RenderFlags, ctx: {items: string[]}) {
         if (rf & RenderFlags.Create) {
-          Δcontainer(0);
+          ɵɵcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
+          ɵɵcontainerRefreshStart(0);
           {
-            const rf0 = ΔembeddedViewStart(0, 1, 0);
+            const rf0 = ɵɵembeddedViewStart(0, 1, 0);
             { showItems(rf0, {items: ctx.items}); }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         }
       },
       factory: () => new WrapperComponent,
@@ -265,10 +266,10 @@ describe('component with a container', () => {
 
   function template(rf: RenderFlags, ctx: {items: string[]}) {
     if (rf & RenderFlags.Create) {
-      Δelement(0, 'wrapper');
+      ɵɵelement(0, 'wrapper');
     }
     if (rf & RenderFlags.Update) {
-      ΔelementProperty(0, 'items', Δbind(ctx.items));
+      ɵɵelementProperty(0, 'items', ɵɵbind(ctx.items));
     }
   }
 
@@ -315,7 +316,7 @@ describe('recursive components', () => {
 
     ngOnDestroy() { events.push('destroy' + this.data.value); }
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: TreeComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['tree-comp']],
@@ -324,40 +325,40 @@ describe('recursive components', () => {
       vars: 1,
       template: (rf: RenderFlags, ctx: TreeComponent) => {
         if (rf & RenderFlags.Create) {
-          Δtext(0);
-          Δcontainer(1);
-          Δcontainer(2);
+          ɵɵtext(0);
+          ɵɵcontainer(1);
+          ɵɵcontainer(2);
         }
         if (rf & RenderFlags.Update) {
-          ΔtextBinding(0, Δbind(ctx.data.value));
-          ΔcontainerRefreshStart(1);
+          ɵɵtextBinding(0, ɵɵbind(ctx.data.value));
+          ɵɵcontainerRefreshStart(1);
           {
             if (ctx.data.left != null) {
-              let rf0 = ΔembeddedViewStart(0, 1, 1);
+              let rf0 = ɵɵembeddedViewStart(0, 1, 1);
               if (rf0 & RenderFlags.Create) {
-                Δelement(0, 'tree-comp');
+                ɵɵelement(0, 'tree-comp');
               }
               if (rf0 & RenderFlags.Update) {
-                ΔelementProperty(0, 'data', Δbind(ctx.data.left));
+                ɵɵelementProperty(0, 'data', ɵɵbind(ctx.data.left));
               }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
           }
-          ΔcontainerRefreshEnd();
-          ΔcontainerRefreshStart(2);
+          ɵɵcontainerRefreshEnd();
+          ɵɵcontainerRefreshStart(2);
           {
             if (ctx.data.right != null) {
-              let rf0 = ΔembeddedViewStart(0, 1, 1);
+              let rf0 = ɵɵembeddedViewStart(0, 1, 1);
               if (rf0 & RenderFlags.Create) {
-                Δelement(0, 'tree-comp');
+                ɵɵelement(0, 'tree-comp');
               }
               if (rf0 & RenderFlags.Update) {
-                ΔelementProperty(0, 'data', Δbind(ctx.data.right));
+                ɵɵelementProperty(0, 'data', ɵɵbind(ctx.data.right));
               }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
           }
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         }
       },
       inputs: {data: 'data'}
@@ -379,7 +380,7 @@ describe('recursive components', () => {
 
     ngOnDestroy() { events.push('destroy' + this.data.value); }
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: NgIfTree,
       encapsulation: ViewEncapsulation.None,
       selectors: [['ng-if-tree']],
@@ -389,18 +390,18 @@ describe('recursive components', () => {
       template: (rf: RenderFlags, ctx: NgIfTree) => {
 
         if (rf & RenderFlags.Create) {
-          Δtext(0);
-          Δtemplate(
+          ɵɵtext(0);
+          ɵɵtemplate(
               1, IfTemplate, 1, 1, 'ng-if-tree',
               [AttributeMarker.Bindings, 'data', AttributeMarker.Template, 'ngIf']);
-          Δtemplate(
+          ɵɵtemplate(
               2, IfTemplate2, 1, 1, 'ng-if-tree',
               [AttributeMarker.Bindings, 'data', AttributeMarker.Template, 'ngIf']);
         }
         if (rf & RenderFlags.Update) {
-          ΔtextBinding(0, Δbind(ctx.data.value));
-          ΔelementProperty(1, 'ngIf', Δbind(ctx.data.left));
-          ΔelementProperty(2, 'ngIf', Δbind(ctx.data.right));
+          ɵɵtextBinding(0, ɵɵbind(ctx.data.value));
+          ɵɵelementProperty(1, 'ngIf', ɵɵbind(ctx.data.left));
+          ɵɵelementProperty(2, 'ngIf', ɵɵbind(ctx.data.right));
         }
 
       },
@@ -410,23 +411,23 @@ describe('recursive components', () => {
 
   function IfTemplate(rf: RenderFlags, left: any) {
     if (rf & RenderFlags.Create) {
-      ΔelementStart(0, 'ng-if-tree');
-      ΔelementEnd();
+      ɵɵelementStart(0, 'ng-if-tree');
+      ɵɵelementEnd();
     }
     if (rf & RenderFlags.Update) {
-      const parent = ΔnextContext();
-      ΔelementProperty(0, 'data', Δbind(parent.data.left));
+      const parent = ɵɵnextContext();
+      ɵɵelementProperty(0, 'data', ɵɵbind(parent.data.left));
     }
   }
 
   function IfTemplate2(rf: RenderFlags, right: any) {
     if (rf & RenderFlags.Create) {
-      ΔelementStart(0, 'ng-if-tree');
-      ΔelementEnd();
+      ɵɵelementStart(0, 'ng-if-tree');
+      ɵɵelementEnd();
     }
     if (rf & RenderFlags.Update) {
-      const parent = ΔnextContext();
-      ΔelementProperty(0, 'data', Δbind(parent.data.right));
+      const parent = ɵɵnextContext();
+      ɵɵelementProperty(0, 'data', ɵɵbind(parent.data.right));
     }
   }
 
@@ -459,19 +460,19 @@ describe('recursive components', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         if (!ctx.skipContent) {
-          const rf0 = ΔembeddedViewStart(0, 1, 0);
+          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
           if (rf0 & RenderFlags.Create) {
-            ΔelementStart(0, 'tree-comp');
-            ΔelementEnd();
+            ɵɵelementStart(0, 'tree-comp');
+            ɵɵelementEnd();
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 1, 0, [TreeComponent]);
 
@@ -493,19 +494,19 @@ describe('recursive components', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         if (!ctx.skipContent) {
-          const rf0 = ΔembeddedViewStart(0, 1, 0);
+          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
           if (rf0 & RenderFlags.Create) {
-            ΔelementStart(0, 'ng-if-tree');
-            ΔelementEnd();
+            ɵɵelementStart(0, 'ng-if-tree');
+            ɵɵelementEnd();
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 1, 0, [NgIfTree]);
 
@@ -524,7 +525,7 @@ describe('recursive components', () => {
     class TestInputsComponent {
       // TODO(issue/24571): remove '!'.
       minifiedName !: string;
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: TestInputsComponent,
         encapsulation: ViewEncapsulation.None,
         selectors: [['test-inputs']],
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index f241610077..49aa362f8f 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -9,7 +9,7 @@
 import {SelectorFlags} from '@angular/core/src/render3/interfaces/projection';
 
 import {AttributeMarker, detectChanges} from '../../src/render3/index';
-import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δprojection, ΔprojectionDef, Δtext} from '../../src/render3/instructions/all';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵprojection, ɵɵprojectionDef, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {ComponentFixture, createComponent, getDirectiveOnNode, renderComponent, toHtml} from './render_util';
 
@@ -18,10 +18,10 @@ describe('content projection', () => {
     /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δprojection(1); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
+        { ɵɵprojection(1); }
+        ɵɵelementEnd();
       }
     }, 2);
 
@@ -36,26 +36,26 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
+        ɵɵelementStart(0, 'child');
         {
-          Δtext(1, '(');
-          Δcontainer(2);
-          Δtext(3, ')');
+          ɵɵtext(1, '(');
+          ɵɵcontainer(2);
+          ɵɵtext(3, ')');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (ctx.value) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δtext(0, 'content');
+              ɵɵtext(0, 'content');
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -75,8 +75,8 @@ describe('content projection', () => {
     /** <ng-content></ng-content> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δprojection(0);
+        ɵɵprojectionDef();
+        ɵɵprojection(0);
       }
     }, 1);
 
@@ -89,22 +89,22 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'child');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           if (ctx.value) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δtext(0, 'content');
+              ɵɵtext(0, 'content');
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2, 0, [Child]);
 
@@ -124,10 +124,10 @@ describe('content projection', () => {
     /** <div><ng-content></ng-content></div> */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δprojection(1); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
+        { ɵɵprojection(1); }
+        ɵɵelementEnd();
       }
     }, 2);
 
@@ -144,31 +144,31 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: {value: any}) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
+        ɵɵelementStart(0, 'child');
         {
-          Δtext(1, '(');
-          Δcontainer(2);
-          Δtext(3, ')');
+          ɵɵtext(1, '(');
+          ɵɵcontainer(2);
+          ɵɵtext(3, ')');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (ctx.value) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δtext(0, 'content');
+              ɵɵtext(0, 'content');
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           } else {
-            if (ΔembeddedViewStart(1, 1, 0)) {
-              Δtext(0, 'else');
+            if (ɵɵembeddedViewStart(1, 1, 0)) {
+              ɵɵtext(0, 'else');
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -196,25 +196,25 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           if (!ctx.skipContent) {
-            let rf0 = ΔembeddedViewStart(0, 2, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 2, 0);
             if (rf0 & RenderFlags.Create) {
-              ΔelementStart(0, 'span');
-              Δprojection(1);
-              ΔelementEnd();
+              ɵɵelementStart(0, 'span');
+              ɵɵprojection(1);
+              ɵɵelementEnd();
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2, 0);
 
@@ -226,14 +226,14 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
+        ɵɵelementStart(0, 'child');
         {
-          ΔelementStart(1, 'div');
-          { Δtext(2, 'text'); }
-          ΔelementEnd();
-          Δtext(3, 'content');
+          ɵɵelementStart(1, 'div');
+          { ɵɵtext(2, 'text'); }
+          ɵɵelementEnd();
+          ɵɵtext(3, 'content');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
 
         // testing
         childCmptInstance = getDirectiveOnNode(0);
@@ -261,31 +261,31 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           if (!ctx.skipContent) {
-            let rf0 = ΔembeddedViewStart(0, 2, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 2, 0);
             if (rf0 & RenderFlags.Create) {
-              Δprojection(0);
-              Δtext(1, 'text');
+              ɵɵprojection(0);
+              ɵɵtext(1, 'text');
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
     /** <child></child> */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δelement(0, 'child');
+        ɵɵelement(0, 'child');
 
         // testing
         childCmptInstance = getDirectiveOnNode(0);
@@ -313,23 +313,23 @@ describe('content projection', () => {
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ΔprojectionDef();
-           ΔelementStart(0, 'div');
-           { Δcontainer(1); }
-           ΔelementEnd();
+           ɵɵprojectionDef();
+           ɵɵelementStart(0, 'div');
+           { ɵɵcontainer(1); }
+           ɵɵelementEnd();
          }
          if (rf & RenderFlags.Update) {
-           ΔcontainerRefreshStart(1);
+           ɵɵcontainerRefreshStart(1);
            {
              if (!ctx.skipContent) {
-               let rf0 = ΔembeddedViewStart(0, 1, 0);
+               let rf0 = ɵɵembeddedViewStart(0, 1, 0);
                if (rf0 & RenderFlags.Create) {
-                 Δprojection(0);
+                 ɵɵprojection(0);
                }
-               ΔembeddedViewEnd();
+               ɵɵembeddedViewEnd();
              }
            }
-           ΔcontainerRefreshEnd();
+           ɵɵcontainerRefreshEnd();
          }
        }, 2);
 
@@ -338,12 +338,12 @@ describe('content projection', () => {
         */
        const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ΔelementStart(0, 'child');
+           ɵɵelementStart(0, 'child');
            {
              childCmptInstance = getDirectiveOnNode(0);
-             Δtext(1, 'content');
+             ɵɵtext(1, 'content');
            }
-           ΔelementEnd();
+           ɵɵelementEnd();
          }
        }, 2, 0, [Child]);
 
@@ -367,27 +367,27 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
         {
-          Δtext(1, 'Before (inside)-');
-          Δcontainer(2);
-          Δtext(3, '-After (inside)');
+          ɵɵtext(1, 'Before (inside)-');
+          ɵɵcontainer(2);
+          ɵɵtext(3, '-After (inside)');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (!ctx.skipContent) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δprojection(0);
+              ɵɵprojection(0);
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 4);
 
@@ -402,26 +402,26 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
+        ɵɵelementStart(0, 'child');
         {
-          Δtext(1, 'Before text-');
-          Δcontainer(2);
-          Δtext(3, '-After text');
+          ɵɵtext(1, 'Before text-');
+          ɵɵcontainer(2);
+          ɵɵtext(3, '-After text');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (!ctx.skipContent) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δtext(0, 'content');
+              ɵɵtext(0, 'content');
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -447,23 +447,23 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           if (!ctx.skipContent) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δprojection(0);
+              ɵɵprojection(0);
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
@@ -478,27 +478,27 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'child');
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'child');
         {
-          Δtext(1, 'Before text');
-          Δcontainer(2);
-          Δtext(3, '-After text');
+          ɵɵtext(1, 'Before text');
+          ɵɵcontainer(2);
+          ɵɵtext(3, '-After text');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (!ctx.skipContent) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δprojection(0);
+              ɵɵprojection(0);
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 4, 0, [Child]);
 
@@ -506,13 +506,13 @@ describe('content projection', () => {
     /** <parent><p>text</p></parent> */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'parent');
+        ɵɵelementStart(0, 'parent');
         {
-          ΔelementStart(1, 'p');
-          { Δtext(2, 'text'); }
-          ΔelementEnd();
+          ɵɵelementStart(1, 'p');
+          { ɵɵtext(2, 'text'); }
+          ɵɵelementEnd();
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
         // testing
         parent = getDirectiveOnNode(0);
       }
@@ -541,25 +541,25 @@ describe('content projection', () => {
         */
        const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ΔprojectionDef();
-           ΔelementStart(0, 'div');
-           { Δcontainer(1); }
-           ΔelementEnd();
+           ɵɵprojectionDef();
+           ɵɵelementStart(0, 'div');
+           { ɵɵcontainer(1); }
+           ɵɵelementEnd();
          }
          if (rf & RenderFlags.Update) {
-           ΔcontainerRefreshStart(1);
+           ɵɵcontainerRefreshStart(1);
            {
              if (!ctx.skipContent) {
-               let rf0 = ΔembeddedViewStart(0, 3, 0);
+               let rf0 = ɵɵembeddedViewStart(0, 3, 0);
                if (rf0 & RenderFlags.Create) {
-                 Δtext(0, 'before-');
-                 Δprojection(1);
-                 Δtext(2, '-after');
+                 ɵɵtext(0, 'before-');
+                 ɵɵprojection(1);
+                 ɵɵtext(2, '-after');
                }
-               ΔembeddedViewEnd();
+               ɵɵembeddedViewEnd();
              }
            }
-           ΔcontainerRefreshEnd();
+           ɵɵcontainerRefreshEnd();
          }
        }, 2);
 
@@ -568,12 +568,12 @@ describe('content projection', () => {
         */
        const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
          if (rf & RenderFlags.Create) {
-           ΔelementStart(0, 'child');
+           ɵɵelementStart(0, 'child');
            {
              childCmptInstance = getDirectiveOnNode(0);
-             Δtext(1, 'content');
+             ɵɵtext(1, 'content');
            }
-           ΔelementEnd();
+           ɵɵelementEnd();
          }
        }, 2, 0, [Child]);
 
@@ -592,13 +592,13 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δprojection(1); }
-        ΔelementEnd();
-        ΔelementStart(2, 'span');
-        { Δprojection(3); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
+        { ɵɵprojection(1); }
+        ɵɵelementEnd();
+        ɵɵelementStart(2, 'span');
+        { ɵɵprojection(3); }
+        ɵɵelementEnd();
       }
     }, 4);
 
@@ -607,9 +607,9 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
-        { Δtext(1, 'content'); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'child');
+        { ɵɵtext(1, 'content'); }
+        ɵɵelementEnd();
       }
     }, 2, 0, [Child]);
 
@@ -638,24 +638,24 @@ describe('content projection', () => {
      */
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δprojection(0);
-        ΔelementStart(1, 'div');
-        { Δcontainer(2); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵprojection(0);
+        ɵɵelementStart(1, 'div');
+        { ɵɵcontainer(2); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (ctx.show) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf0 & RenderFlags.Create) {
-              Δprojection(0);
+              ɵɵprojection(0);
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 3);
 
@@ -664,12 +664,12 @@ describe('content projection', () => {
      */
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
+        ɵɵelementStart(0, 'child');
         {
           childCmptInstance = getDirectiveOnNode(0);
-          Δtext(1, 'content');
+          ɵɵtext(1, 'content');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
     }, 2, 0, [Child]);
 
@@ -684,10 +684,10 @@ describe('content projection', () => {
   it('should project with multiple instances of a component with projection', () => {
     const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δtext(0, 'Before');
-        Δprojection(1);
-        Δtext(2, 'After');
+        ɵɵprojectionDef();
+        ɵɵtext(0, 'Before');
+        ɵɵprojection(1);
+        ɵɵtext(2, 'After');
       }
     }, 3);
 
@@ -703,26 +703,26 @@ describe('content projection', () => {
      */
     const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'projection-comp');
+        ɵɵelementStart(0, 'projection-comp');
         {
-          ΔelementStart(1, 'div');
-          { Δtext(2, 'A'); }
-          ΔelementEnd();
-          ΔelementStart(3, 'p');
-          { Δtext(4, '123'); }
-          ΔelementEnd();
+          ɵɵelementStart(1, 'div');
+          { ɵɵtext(2, 'A'); }
+          ɵɵelementEnd();
+          ɵɵelementStart(3, 'p');
+          { ɵɵtext(4, '123'); }
+          ɵɵelementEnd();
         }
-        ΔelementEnd();
-        ΔelementStart(5, 'projection-comp');
+        ɵɵelementEnd();
+        ɵɵelementStart(5, 'projection-comp');
         {
-          ΔelementStart(6, 'div');
-          { Δtext(7, 'B'); }
-          ΔelementEnd();
-          ΔelementStart(8, 'p');
-          { Δtext(9, '456'); }
-          ΔelementEnd();
+          ɵɵelementStart(6, 'div');
+          { ɵɵtext(7, 'B'); }
+          ɵɵelementEnd();
+          ɵɵelementStart(8, 'p');
+          { ɵɵtext(9, '456'); }
+          ɵɵelementEnd();
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
     }, 10, 0, [ProjectionComp]);
 
@@ -742,10 +742,10 @@ describe('content projection', () => {
      */
     const ProjectionComp = createComponent('projection-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δtext(0, 'Before');
-        Δprojection(1);
-        Δtext(2, 'After');
+        ɵɵprojectionDef();
+        ɵɵtext(0, 'Before');
+        ɵɵprojection(1);
+        ɵɵtext(2, 'After');
       }
     }, 3);
 
@@ -762,28 +762,28 @@ describe('content projection', () => {
      */
     const ProjectionParent = createComponent('parent-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'projection-comp');
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'projection-comp');
         {
-          ΔelementStart(1, 'div');
-          { Δtext(2, 'A'); }
-          ΔelementEnd();
-          Δprojection(3, 0);
-          ΔelementStart(4, 'p');
-          { Δtext(5, '123'); }
-          ΔelementEnd();
+          ɵɵelementStart(1, 'div');
+          { ɵɵtext(2, 'A'); }
+          ɵɵelementEnd();
+          ɵɵprojection(3, 0);
+          ɵɵelementStart(4, 'p');
+          { ɵɵtext(5, '123'); }
+          ɵɵelementEnd();
         }
-        ΔelementEnd();
-        ΔelementStart(6, 'projection-comp');
+        ɵɵelementEnd();
+        ɵɵelementStart(6, 'projection-comp');
         {
-          ΔelementStart(7, 'div');
-          { Δtext(8, 'B'); }
-          ΔelementEnd();
-          ΔelementStart(9, 'p');
-          { Δtext(10, '456'); }
-          ΔelementEnd();
+          ɵɵelementStart(7, 'div');
+          { ɵɵtext(8, 'B'); }
+          ɵɵelementEnd();
+          ɵɵelementStart(9, 'p');
+          { ɵɵtext(10, '456'); }
+          ɵɵelementEnd();
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
     }, 11, 0, [ProjectionComp]);
 
@@ -797,12 +797,12 @@ describe('content projection', () => {
      */
     const AppComp = createComponent('app-comp', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'parent-comp');
-        { Δtext(1, '**ABC**'); }
-        ΔelementEnd();
-        ΔelementStart(2, 'parent-comp');
-        { Δtext(3, '**DEF**'); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'parent-comp');
+        { ɵɵtext(1, '**ABC**'); }
+        ɵɵelementEnd();
+        ɵɵelementStart(2, 'parent-comp');
+        { ɵɵtext(3, '**DEF**'); }
+        ɵɵelementEnd();
       }
     }, 4, 0, [ProjectionParent]);
 
@@ -823,8 +823,8 @@ describe('content projection', () => {
     `<ng-content></ng-content>`;
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δprojection(0);
+        ɵɵprojectionDef();
+        ɵɵprojection(0);
       }
     }, 1);
 
@@ -837,17 +837,17 @@ describe('content projection', () => {
     </child>`;
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
+        ɵɵelementStart(0, 'child');
         {
-          ΔelementContainerStart(1);
+          ɵɵelementContainerStart(1);
           {
-            ΔelementContainerStart(2);
-            { Δtext(3, 'content'); }
-            ΔelementContainerEnd();
+            ɵɵelementContainerStart(2);
+            { ɵɵtext(3, 'content'); }
+            ɵɵelementContainerEnd();
           }
-          ΔelementContainerEnd();
+          ɵɵelementContainerEnd();
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
     }, 4, 0, [Child]);
 
@@ -860,8 +860,8 @@ describe('content projection', () => {
     `<ng-content></ng-content>`;
     const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        Δprojection(0);
+        ɵɵprojectionDef();
+        ɵɵprojection(0);
       }
     }, 1);
 
@@ -870,10 +870,10 @@ describe('content projection', () => {
     </grand-child>`;
     const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'grand-child');
-        { Δprojection(1); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'grand-child');
+        { ɵɵprojection(1); }
+        ɵɵelementEnd();
       }
     }, 2, 0, [GrandChild]);
 
@@ -886,17 +886,17 @@ describe('content projection', () => {
     </child>`;
     const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
+        ɵɵelementStart(0, 'child');
         {
-          ΔelementContainerStart(1);
+          ɵɵelementContainerStart(1);
           {
-            ΔelementContainerStart(2);
-            { Δtext(3, 'content'); }
-            ΔelementContainerEnd();
+            ɵɵelementContainerStart(2);
+            { ɵɵtext(3, 'content'); }
+            ɵɵelementContainerEnd();
           }
-          ΔelementContainerEnd();
+          ɵɵelementContainerEnd();
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
     }, 4, 0, [Child]);
 
@@ -913,13 +913,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([[['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]]);
-          ΔelementStart(0, 'div', ['id', 'first']);
-          { Δprojection(1, 1); }
-          ΔelementEnd();
-          ΔelementStart(2, 'div', ['id', 'second']);
-          { Δprojection(3, 2); }
-          ΔelementEnd();
+          ɵɵprojectionDef([[['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]]);
+          ɵɵelementStart(0, 'div', ['id', 'first']);
+          { ɵɵprojection(1, 1); }
+          ɵɵelementEnd();
+          ɵɵelementStart(2, 'div', ['id', 'second']);
+          { ɵɵprojection(3, 2); }
+          ɵɵelementEnd();
         }
       }, 4);
 
@@ -931,16 +931,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'span', ['title', 'toFirst']);
-            { Δtext(2, '1'); }
-            ΔelementEnd();
-            ΔelementStart(3, 'span', ['title', 'toSecond']);
-            { Δtext(4, '2'); }
-            ΔelementEnd();
+            ɵɵelementStart(1, 'span', ['title', 'toFirst']);
+            { ɵɵtext(2, '1'); }
+            ɵɵelementEnd();
+            ɵɵelementStart(3, 'span', ['title', 'toSecond']);
+            { ɵɵtext(4, '2'); }
+            ɵɵelementEnd();
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -957,16 +957,16 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([
+          ɵɵprojectionDef([
             [['span', SelectorFlags.CLASS, 'toFirst']],
             [['span', SelectorFlags.CLASS, 'toSecond']]
           ]);
-          ΔelementStart(0, 'div', ['id', 'first']);
-          { Δprojection(1, 1); }
-          ΔelementEnd();
-          ΔelementStart(2, 'div', ['id', 'second']);
-          { Δprojection(3, 2); }
-          ΔelementEnd();
+          ɵɵelementStart(0, 'div', ['id', 'first']);
+          { ɵɵprojection(1, 1); }
+          ɵɵelementEnd();
+          ɵɵelementStart(2, 'div', ['id', 'second']);
+          { ɵɵprojection(3, 2); }
+          ɵɵelementEnd();
         }
       }, 4);
 
@@ -978,16 +978,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'span', ['class', 'toFirst']);
-            { Δtext(2, '1'); }
-            ΔelementEnd();
-            ΔelementStart(3, 'span', ['class', 'toSecond']);
-            { Δtext(4, '2'); }
-            ΔelementEnd();
+            ɵɵelementStart(1, 'span', ['class', 'toFirst']);
+            { ɵɵtext(2, '1'); }
+            ɵɵelementEnd();
+            ɵɵelementStart(3, 'span', ['class', 'toSecond']);
+            { ɵɵtext(4, '2'); }
+            ɵɵelementEnd();
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -1004,16 +1004,16 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([
+          ɵɵprojectionDef([
             [['span', SelectorFlags.CLASS, 'toFirst']],
             [['span', SelectorFlags.CLASS, 'toSecond']]
           ]);
-          ΔelementStart(0, 'div', ['id', 'first']);
-          { Δprojection(1, 1); }
-          ΔelementEnd();
-          ΔelementStart(2, 'div', ['id', 'second']);
-          { Δprojection(3, 2); }
-          ΔelementEnd();
+          ɵɵelementStart(0, 'div', ['id', 'first']);
+          { ɵɵprojection(1, 1); }
+          ɵɵelementEnd();
+          ɵɵelementStart(2, 'div', ['id', 'second']);
+          { ɵɵprojection(3, 2); }
+          ɵɵelementEnd();
         }
       }, 4);
 
@@ -1025,16 +1025,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'span', ['class', 'other toFirst']);
-            { Δtext(2, '1'); }
-            ΔelementEnd();
-            ΔelementStart(3, 'span', ['class', 'toSecond noise']);
-            { Δtext(4, '2'); }
-            ΔelementEnd();
+            ɵɵelementStart(1, 'span', ['class', 'other toFirst']);
+            { ɵɵtext(2, '1'); }
+            ɵɵelementEnd();
+            ɵɵelementStart(3, 'span', ['class', 'toSecond noise']);
+            { ɵɵtext(4, '2'); }
+            ɵɵelementEnd();
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -1051,13 +1051,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([[['span']], [['span', SelectorFlags.CLASS, 'toSecond']]]);
-          ΔelementStart(0, 'div', ['id', 'first']);
-          { Δprojection(1, 1); }
-          ΔelementEnd();
-          ΔelementStart(2, 'div', ['id', 'second']);
-          { Δprojection(3, 2); }
-          ΔelementEnd();
+          ɵɵprojectionDef([[['span']], [['span', SelectorFlags.CLASS, 'toSecond']]]);
+          ɵɵelementStart(0, 'div', ['id', 'first']);
+          { ɵɵprojection(1, 1); }
+          ɵɵelementEnd();
+          ɵɵelementStart(2, 'div', ['id', 'second']);
+          { ɵɵprojection(3, 2); }
+          ɵɵelementEnd();
         }
       }, 4);
 
@@ -1069,16 +1069,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'span', ['class', 'toFirst']);
-            { Δtext(2, '1'); }
-            ΔelementEnd();
-            ΔelementStart(3, 'span', ['class', 'toSecond']);
-            { Δtext(4, '2'); }
-            ΔelementEnd();
+            ɵɵelementStart(1, 'span', ['class', 'toFirst']);
+            { ɵɵtext(2, '1'); }
+            ɵɵelementEnd();
+            ɵɵelementStart(3, 'span', ['class', 'toSecond']);
+            { ɵɵtext(4, '2'); }
+            ɵɵelementEnd();
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 5, 0, [Child]);
 
@@ -1095,13 +1095,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([[['span', SelectorFlags.CLASS, 'toFirst']]]);
-          ΔelementStart(0, 'div', ['id', 'first']);
-          { Δprojection(1, 1); }
-          ΔelementEnd();
-          ΔelementStart(2, 'div', ['id', 'second']);
-          { Δprojection(3); }
-          ΔelementEnd();
+          ɵɵprojectionDef([[['span', SelectorFlags.CLASS, 'toFirst']]]);
+          ɵɵelementStart(0, 'div', ['id', 'first']);
+          { ɵɵprojection(1, 1); }
+          ɵɵelementEnd();
+          ɵɵelementStart(2, 'div', ['id', 'second']);
+          { ɵɵprojection(3); }
+          ɵɵelementEnd();
         }
       }, 4);
 
@@ -1113,17 +1113,17 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'span', ['class', 'toFirst']);
-            { Δtext(2, '1'); }
-            ΔelementEnd();
-            ΔelementStart(3, 'span');
-            { Δtext(4, 'remaining'); }
-            ΔelementEnd();
-            Δtext(5, 'more remaining');
+            ɵɵelementStart(1, 'span', ['class', 'toFirst']);
+            { ɵɵtext(2, '1'); }
+            ɵɵelementEnd();
+            ɵɵelementStart(3, 'span');
+            { ɵɵtext(4, 'remaining'); }
+            ɵɵelementEnd();
+            ɵɵtext(5, 'more remaining');
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 6, 0, [Child]);
 
@@ -1140,13 +1140,13 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([[['span', SelectorFlags.CLASS, 'toSecond']]]);
-          ΔelementStart(0, 'div', ['id', 'first']);
-          { Δprojection(1); }
-          ΔelementEnd();
-          ΔelementStart(2, 'div', ['id', 'second']);
-          { Δprojection(3, 1); }
-          ΔelementEnd();
+          ɵɵprojectionDef([[['span', SelectorFlags.CLASS, 'toSecond']]]);
+          ɵɵelementStart(0, 'div', ['id', 'first']);
+          { ɵɵprojection(1); }
+          ɵɵelementEnd();
+          ɵɵelementStart(2, 'div', ['id', 'second']);
+          { ɵɵprojection(3, 1); }
+          ɵɵelementEnd();
         }
       }, 4);
 
@@ -1159,17 +1159,17 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'span');
-            { Δtext(2, '1'); }
-            ΔelementEnd();
-            ΔelementStart(3, 'span', ['class', 'toSecond']);
-            { Δtext(4, '2'); }
-            ΔelementEnd();
-            Δtext(5, 'remaining');
+            ɵɵelementStart(1, 'span');
+            { ɵɵtext(2, '1'); }
+            ɵɵelementEnd();
+            ɵɵelementStart(3, 'span', ['class', 'toSecond']);
+            { ɵɵtext(4, '2'); }
+            ɵɵelementEnd();
+            ɵɵtext(5, 'remaining');
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 6, 0, [Child]);
 
@@ -1192,10 +1192,10 @@ describe('content projection', () => {
        */
       const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([[['span']]]);
-          Δprojection(0, 1);
-          Δelement(1, 'hr');
-          Δprojection(2);
+          ɵɵprojectionDef([[['span']]]);
+          ɵɵprojection(0, 1);
+          ɵɵelement(1, 'hr');
+          ɵɵprojection(2);
         }
       }, 3);
 
@@ -1207,15 +1207,15 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef();
-          ΔelementStart(0, 'grand-child');
+          ɵɵprojectionDef();
+          ɵɵelementStart(0, 'grand-child');
           {
-            Δprojection(1);
-            ΔelementStart(2, 'span');
-            { Δtext(3, 'in child template'); }
-            ΔelementEnd();
+            ɵɵprojection(1);
+            ɵɵelementStart(2, 'span');
+            { ɵɵtext(3, 'in child template'); }
+            ɵɵelementEnd();
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 4, 0, [GrandChild]);
 
@@ -1228,13 +1228,13 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'span');
-            { Δtext(2, 'parent content'); }
-            ΔelementEnd();
+            ɵɵelementStart(1, 'span');
+            { ɵɵtext(2, 'parent content'); }
+            ɵɵelementEnd();
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 3, 0, [Child]);
 
@@ -1253,10 +1253,10 @@ describe('content projection', () => {
        */
       const Card = createComponent('card', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([[['', 'card-title', '']], [['', 'card-content', '']]]);
-          Δprojection(0, 1);
-          Δelement(1, 'hr');
-          Δprojection(2, 2);
+          ɵɵprojectionDef([[['', 'card-title', '']], [['', 'card-content', '']]]);
+          ɵɵprojection(0, 1);
+          ɵɵelement(1, 'hr');
+          ɵɵprojection(2, 2);
         }
       }, 3);
 
@@ -1268,15 +1268,15 @@ describe('content projection', () => {
        */
       const CardWithTitle = createComponent('card-with-title', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef();
-          ΔelementStart(0, 'card');
+          ɵɵprojectionDef();
+          ɵɵelementStart(0, 'card');
           {
-            ΔelementStart(1, 'h1', ['card-title', '']);
-            { Δtext(2, 'Title'); }
-            ΔelementEnd();
-            Δprojection(3, 0, ['card-content', '']);
+            ɵɵelementStart(1, 'h1', ['card-title', '']);
+            { ɵɵtext(2, 'Title'); }
+            ɵɵelementEnd();
+            ɵɵprojection(3, 0, ['card-content', '']);
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 4, 0, [Card]);
 
@@ -1287,9 +1287,9 @@ describe('content projection', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'card-with-title');
-          { Δtext(1, 'content'); }
-          ΔelementEnd();
+          ɵɵelementStart(0, 'card-with-title');
+          { ɵɵtext(1, 'content'); }
+          ɵɵelementEnd();
         }
       }, 2, 0, [CardWithTitle]);
 
@@ -1306,8 +1306,8 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔprojectionDef([[['div']]]);
-          Δprojection(0, 1);
+          ɵɵprojectionDef([[['div']]]);
+          ɵɵprojection(0, 1);
         }
       }, 1);
 
@@ -1319,16 +1319,16 @@ describe('content projection', () => {
        */
       const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'child');
+          ɵɵelementStart(0, 'child');
           {
-            ΔelementStart(1, 'div', [AttributeMarker.ProjectAs, ['span']]);
-            { Δtext(2, 'should not project'); }
-            ΔelementEnd();
-            ΔelementStart(3, 'div');
-            { Δtext(4, 'should project'); }
-            ΔelementEnd();
+            ɵɵelementStart(1, 'div', [AttributeMarker.ProjectAs, ['span']]);
+            { ɵɵtext(2, 'should not project'); }
+            ɵɵelementEnd();
+            ɵɵelementStart(3, 'div');
+            { ɵɵtext(4, 'should project'); }
+            ɵɵelementEnd();
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }, 5, 0, [Child]);
 
diff --git a/packages/core/test/render3/control_flow_spec.ts b/packages/core/test/render3/control_flow_spec.ts
index 8a9f3eb094..3de917fcd0 100644
--- a/packages/core/test/render3/control_flow_spec.ts
+++ b/packages/core/test/render3/control_flow_spec.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ΔdefineComponent} from '../../src/render3/definition';
-import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {ɵɵdefineComponent} from '../../src/render3/definition';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {ComponentFixture, TemplateFixture, createComponent} from './render_util';
@@ -16,29 +16,29 @@ describe('JS control flow', () => {
   it('should work with if block', () => {
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           if (ctx.condition) {
-            let rf1 = ΔembeddedViewStart(1, 2, 1);
+            let rf1 = ɵɵembeddedViewStart(1, 2, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'span');
-                { Δtext(1); }
-                ΔelementEnd();
+                ɵɵelementStart(0, 'span');
+                { ɵɵtext(1); }
+                ɵɵelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ΔtextBinding(1, Δbind(ctx.message));
+                ɵɵtextBinding(1, ɵɵbind(ctx.message));
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
@@ -72,41 +72,41 @@ describe('JS control flow', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           if (ctx.condition) {
-            let rf1 = ΔembeddedViewStart(1, 2, 0);
+            let rf1 = ɵɵembeddedViewStart(1, 2, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'span');
-                { Δcontainer(1); }
-                ΔelementEnd();
+                ɵɵelementStart(0, 'span');
+                { ɵɵcontainer(1); }
+                ɵɵelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ΔcontainerRefreshStart(1);
+                ɵɵcontainerRefreshStart(1);
                 {
                   if (ctx.condition2) {
-                    let rf2 = ΔembeddedViewStart(2, 1, 0);
+                    let rf2 = ɵɵembeddedViewStart(2, 1, 0);
                     {
                       if (rf2 & RenderFlags.Create) {
-                        Δtext(0, 'Hello');
+                        ɵɵtext(0, 'Hello');
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
@@ -164,51 +164,51 @@ describe('JS control flow', () => {
      *   % }
      * % }
      */
-    function createTemplate() { Δcontainer(0); }
+    function createTemplate() { ɵɵcontainer(0); }
 
     function updateTemplate() {
-      ΔcontainerRefreshStart(0);
+      ɵɵcontainerRefreshStart(0);
       {
         if (ctx.condition) {
-          let rf1 = ΔembeddedViewStart(1, 2, 0);
+          let rf1 = ɵɵembeddedViewStart(1, 2, 0);
           {
             if (rf1 & RenderFlags.Create) {
-              { Δcontainer(0); }
-              { Δcontainer(1); }
+              { ɵɵcontainer(0); }
+              { ɵɵcontainer(1); }
             }
             if (rf1 & RenderFlags.Update) {
-              ΔcontainerRefreshStart(0);
+              ɵɵcontainerRefreshStart(0);
               {
                 if (ctx.condition2) {
-                  let rf2 = ΔembeddedViewStart(2, 1, 0);
+                  let rf2 = ɵɵembeddedViewStart(2, 1, 0);
                   {
                     if (rf2 & RenderFlags.Create) {
-                      Δtext(0, 'Hello');
+                      ɵɵtext(0, 'Hello');
                     }
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
-              ΔcontainerRefreshStart(1);
+              ɵɵcontainerRefreshEnd();
+              ɵɵcontainerRefreshStart(1);
               {
                 if (ctx.condition3) {
-                  let rf2 = ΔembeddedViewStart(2, 1, 0);
+                  let rf2 = ɵɵembeddedViewStart(2, 1, 0);
                   {
                     if (rf2 & RenderFlags.Create) {
-                      Δtext(0, 'World');
+                      ɵɵtext(0, 'World');
                     }
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
+              ɵɵcontainerRefreshEnd();
             }
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
       }
-      ΔcontainerRefreshEnd();
+      ɵɵcontainerRefreshEnd();
     }
 
     const fixture = new TemplateFixture(createTemplate, updateTemplate, 1);
@@ -231,32 +231,32 @@ describe('JS control flow', () => {
     */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         if (ctx.condition1) {
-          const rf1 = ΔembeddedViewStart(1, 1, 0);
+          const rf1 = ɵɵembeddedViewStart(1, 1, 0);
           if (rf1 & RenderFlags.Create) {
-            Δtext(0, '1');
+            ɵɵtext(0, '1');
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }  // can't have ; here due linting rules
         if (ctx.condition2) {
-          const rf2 = ΔembeddedViewStart(2, 1, 0);
+          const rf2 = ɵɵembeddedViewStart(2, 1, 0);
           if (rf2 & RenderFlags.Create) {
-            Δtext(0, '2');
+            ɵɵtext(0, '2');
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }  // can't have ; here due linting rules
         if (ctx.condition3) {
-          const rf3 = ΔembeddedViewStart(3, 1, 0);
+          const rf3 = ɵɵembeddedViewStart(3, 1, 0);
           if (rf3 & RenderFlags.Create) {
-            Δtext(0, '3');
+            ɵɵtext(0, '3');
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 1);
 
@@ -275,40 +275,40 @@ describe('JS control flow', () => {
   it('should work with containers with views as parents', () => {
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        { Δtext(1, 'hello'); }
-        ΔelementEnd();
-        Δcontainer(2);
+        ɵɵelementStart(0, 'div');
+        { ɵɵtext(1, 'hello'); }
+        ɵɵelementEnd();
+        ɵɵcontainer(2);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (ctx.condition1) {
-            let rf0 = ΔembeddedViewStart(0, 1, 0);
+            let rf0 = ɵɵembeddedViewStart(0, 1, 0);
             {
               if (rf0 & RenderFlags.Create) {
-                Δcontainer(0);
+                ɵɵcontainer(0);
               }
               if (rf0 & RenderFlags.Update) {
-                ΔcontainerRefreshStart(0);
+                ɵɵcontainerRefreshStart(0);
                 {
                   if (ctx.condition2) {
-                    let rf0 = ΔembeddedViewStart(0, 1, 0);
+                    let rf0 = ɵɵembeddedViewStart(0, 1, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        Δtext(0, 'world');
+                        ɵɵtext(0, 'world');
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 3);
 
@@ -328,29 +328,29 @@ describe('JS control flow', () => {
     let data: string[] = ['a', 'b', 'c'];
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'ul');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'ul');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           for (let i = 0; i < data.length; i++) {
-            let rf1 = ΔembeddedViewStart(1, 2, 1);
+            let rf1 = ɵɵembeddedViewStart(1, 2, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'li');
-                { Δtext(1); }
-                ΔelementEnd();
+                ɵɵelementStart(0, 'li');
+                { ɵɵtext(1); }
+                ɵɵelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ΔtextBinding(1, Δbind(data[i]));
+                ɵɵtextBinding(1, ɵɵbind(data[i]));
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
@@ -384,42 +384,42 @@ describe('JS control flow', () => {
 
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'ul');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'ul');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           for (let i = 0; i < data[0].length; i++) {
-            let rf1 = ΔembeddedViewStart(1, 2, 0);
+            let rf1 = ɵɵembeddedViewStart(1, 2, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'li');
-                { Δcontainer(1); }
-                ΔelementEnd();
+                ɵɵelementStart(0, 'li');
+                { ɵɵcontainer(1); }
+                ɵɵelementEnd();
               }
               if (rf1 & RenderFlags.Update) {
-                ΔcontainerRefreshStart(1);
+                ɵɵcontainerRefreshStart(1);
                 {
                   data[1].forEach((value: string, ind: number) => {
-                    let rf2 = ΔembeddedViewStart(2, 1, 1);
+                    let rf2 = ɵɵembeddedViewStart(2, 1, 1);
                     if (rf2 & RenderFlags.Create) {
-                      Δtext(0);
+                      ɵɵtext(0);
                     }
                     if (rf2 & RenderFlags.Update) {
-                      ΔtextBinding(0, Δbind(data[0][i] + value));
+                      ɵɵtextBinding(0, ɵɵbind(data[0][i] + value));
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   });
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
@@ -453,49 +453,49 @@ describe('JS control flow', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
+        ɵɵelementStart(0, 'div');
         {
-          Δtext(1, 'Before');
-          Δcontainer(2);
-          Δtext(3, 'After');
+          ɵɵtext(1, 'Before');
+          ɵɵcontainer(2);
+          ɵɵtext(3, 'After');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           for (let i = 0; i < cafes.length; i++) {
-            let rf1 = ΔembeddedViewStart(1, 4, 1);
+            let rf1 = ɵɵembeddedViewStart(1, 4, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'h2');
-                { Δtext(1); }
-                ΔelementEnd();
-                Δcontainer(2);
-                Δtext(3, '-');
+                ɵɵelementStart(0, 'h2');
+                { ɵɵtext(1); }
+                ɵɵelementEnd();
+                ɵɵcontainer(2);
+                ɵɵtext(3, '-');
               }
               if (rf1 & RenderFlags.Update) {
-                ΔtextBinding(1, Δbind(cafes[i].name));
-                ΔcontainerRefreshStart(2);
+                ɵɵtextBinding(1, ɵɵbind(cafes[i].name));
+                ɵɵcontainerRefreshStart(2);
                 {
                   for (let j = 0; j < cafes[i].entrees.length; j++) {
-                    let rf2 = ΔembeddedViewStart(2, 1, 1);
+                    let rf2 = ɵɵembeddedViewStart(2, 1, 1);
                     if (rf2 & RenderFlags.Create) {
-                      Δtext(0);
+                      ɵɵtext(0);
                     }
                     if (rf2 & RenderFlags.Update) {
-                      ΔtextBinding(0, Δbind(cafes[i].entrees[j]));
+                      ɵɵtextBinding(0, ɵɵbind(cafes[i].entrees[j]));
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 4);
 
@@ -548,68 +548,68 @@ describe('JS control flow', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
+        ɵɵelementStart(0, 'div');
         {
-          Δtext(1, 'Before');
-          Δcontainer(2);
-          Δtext(3, 'After');
+          ɵɵtext(1, 'Before');
+          ɵɵcontainer(2);
+          ɵɵtext(3, 'After');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           for (let i = 0; i < cafes.length; i++) {
-            let rf1 = ΔembeddedViewStart(1, 4, 1);
+            let rf1 = ɵɵembeddedViewStart(1, 4, 1);
             {
               if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'h2');
-                { Δtext(1); }
-                ΔelementEnd();
-                Δcontainer(2);
-                Δtext(3, '-');
+                ɵɵelementStart(0, 'h2');
+                { ɵɵtext(1); }
+                ɵɵelementEnd();
+                ɵɵcontainer(2);
+                ɵɵtext(3, '-');
               }
               if (rf1 & RenderFlags.Update) {
-                ΔtextBinding(1, Δbind(cafes[i].name));
-                ΔcontainerRefreshStart(2);
+                ɵɵtextBinding(1, ɵɵbind(cafes[i].name));
+                ɵɵcontainerRefreshStart(2);
                 {
                   for (let j = 0; j < cafes[i].entrees.length; j++) {
-                    let rf1 = ΔembeddedViewStart(1, 3, 1);
+                    let rf1 = ɵɵembeddedViewStart(1, 3, 1);
                     {
                       if (rf1 & RenderFlags.Create) {
-                        ΔelementStart(0, 'h3');
-                        { Δtext(1); }
-                        ΔelementEnd();
-                        Δcontainer(2);
+                        ɵɵelementStart(0, 'h3');
+                        { ɵɵtext(1); }
+                        ɵɵelementEnd();
+                        ɵɵcontainer(2);
                       }
                       if (rf1 & RenderFlags.Update) {
-                        ΔtextBinding(1, Δbind(cafes[i].entrees[j].name));
-                        ΔcontainerRefreshStart(2);
+                        ɵɵtextBinding(1, ɵɵbind(cafes[i].entrees[j].name));
+                        ɵɵcontainerRefreshStart(2);
                         {
                           for (let k = 0; k < cafes[i].entrees[j].foods.length; k++) {
-                            let rf2 = ΔembeddedViewStart(1, 1, 1);
+                            let rf2 = ɵɵembeddedViewStart(1, 1, 1);
                             if (rf2 & RenderFlags.Create) {
-                              Δtext(0);
+                              ɵɵtext(0);
                             }
                             if (rf2 & RenderFlags.Update) {
-                              ΔtextBinding(0, Δbind(cafes[i].entrees[j].foods[k]));
+                              ɵɵtextBinding(0, ɵɵbind(cafes[i].entrees[j].foods[k]));
                             }
-                            ΔembeddedViewEnd();
+                            ɵɵembeddedViewEnd();
                           }
                         }
-                        ΔcontainerRefreshEnd();
+                        ɵɵcontainerRefreshEnd();
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 4);
 
@@ -632,36 +632,36 @@ describe('JS control flow', () => {
   it('should work with if/else blocks', () => {
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           if (ctx.condition) {
-            let rf1 = ΔembeddedViewStart(1, 2, 0);
+            let rf1 = ɵɵembeddedViewStart(1, 2, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                ΔelementStart(0, 'span');
-                { Δtext(1, 'Hello'); }
-                ΔelementEnd();
+                ɵɵelementStart(0, 'span');
+                { ɵɵtext(1, 'Hello'); }
+                ɵɵelementEnd();
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           } else {
-            let rf2 = ΔembeddedViewStart(2, 2, 0);
+            let rf2 = ɵɵembeddedViewStart(2, 2, 0);
             {
               if (rf2) {
-                ΔelementStart(0, 'div');
-                { Δtext(1, 'Goodbye'); }
-                ΔelementEnd();
+                ɵɵelementStart(0, 'div');
+                { ɵɵtext(1, 'Goodbye'); }
+                ɵɵelementEnd();
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
@@ -685,7 +685,7 @@ describe('JS control flow', () => {
     // Intentionally duplicating the templates in test below so we are
     // testing the behavior on firstTemplatePass for each of these tests
     class Comp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: Comp,
         selectors: [['comp']],
         consts: 0,
@@ -702,7 +702,7 @@ describe('JS control flow', () => {
       condition = true;
       condition2 = true;
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: App,
         selectors: [['app']],
         factory: () => new App(),
@@ -710,33 +710,33 @@ describe('JS control flow', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'div');
-            Δcontainer(1);
-            Δcontainer(2);
+            ɵɵelement(0, 'div');
+            ɵɵcontainer(1);
+            ɵɵcontainer(2);
           }
           if (rf & RenderFlags.Update) {
-            ΔcontainerRefreshStart(1);
+            ɵɵcontainerRefreshStart(1);
             {
               if (ctx.condition) {
-                let rf1 = ΔembeddedViewStart(0, 1, 0);
+                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  Δelement(0, 'comp');
+                  ɵɵelement(0, 'comp');
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
-            ΔcontainerRefreshStart(2);
+            ɵɵcontainerRefreshEnd();
+            ɵɵcontainerRefreshStart(2);
             {
               if (ctx.condition2) {
-                let rf1 = ΔembeddedViewStart(0, 1, 0);
+                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  Δelement(0, 'comp');
+                  ɵɵelement(0, 'comp');
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
+            ɵɵcontainerRefreshEnd();
           }
         },
         directives: () => [Comp]
@@ -753,7 +753,7 @@ describe('JS control flow', () => {
     // Intentionally duplicating the templates from above so we are
     // testing the behavior on firstTemplatePass for each of these tests
     class Comp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: Comp,
         selectors: [['comp']],
         consts: 0,
@@ -770,7 +770,7 @@ describe('JS control flow', () => {
       condition = false;
       condition2 = true;
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: App,
         selectors: [['app']],
         factory: () => new App(),
@@ -778,33 +778,33 @@ describe('JS control flow', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'div');
-            Δcontainer(1);
-            Δcontainer(2);
+            ɵɵelement(0, 'div');
+            ɵɵcontainer(1);
+            ɵɵcontainer(2);
           }
           if (rf & RenderFlags.Update) {
-            ΔcontainerRefreshStart(1);
+            ɵɵcontainerRefreshStart(1);
             {
               if (ctx.condition) {
-                let rf1 = ΔembeddedViewStart(0, 1, 0);
+                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  Δelement(0, 'comp');
+                  ɵɵelement(0, 'comp');
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
-            ΔcontainerRefreshStart(2);
+            ɵɵcontainerRefreshEnd();
+            ɵɵcontainerRefreshStart(2);
             {
               if (ctx.condition2) {
-                let rf1 = ΔembeddedViewStart(0, 1, 0);
+                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
                 if (rf1 & RenderFlags.Create) {
-                  Δelement(0, 'comp');
+                  ɵɵelement(0, 'comp');
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
+            ɵɵcontainerRefreshEnd();
           }
         },
         directives: () => [Comp]
@@ -835,35 +835,35 @@ describe('JS for loop', () => {
      */
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshStart(1);
         {
           for (let i = 0; i < config.data1.length; i++) {
-            let rf2 = ΔembeddedViewStart(1, 1, 1);
+            let rf2 = ɵɵembeddedViewStart(1, 1, 1);
             if (rf2 & RenderFlags.Create) {
-              Δtext(0);
+              ɵɵtext(0);
             }
             if (rf2 & RenderFlags.Update) {
-              ΔtextBinding(0, Δbind(config.data1[i]));
+              ɵɵtextBinding(0, ɵɵbind(config.data1[i]));
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
           for (let j = 0; j < config.data2.length; j++) {
-            let rf2 = ΔembeddedViewStart(1, 1, 1);
+            let rf2 = ɵɵembeddedViewStart(1, 1, 1);
             if (rf2 & RenderFlags.Create) {
-              Δtext(0);
+              ɵɵtext(0);
             }
             if (rf2 & RenderFlags.Update) {
-              ΔtextBinding(0, Δbind(config.data2[j]));
+              ɵɵtextBinding(0, ɵɵbind(config.data2[j]));
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 2);
 
@@ -891,41 +891,41 @@ describe('function calls', () => {
     function spanify(rf: RenderFlags, ctx: {message: string | null}) {
       const message = ctx.message;
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'span');
-        { Δtext(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'span');
+        { ɵɵtext(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔtextBinding(1, Δbind(message));
+        ɵɵtextBinding(1, ɵɵbind(message));
       }
     }
 
     const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
+        ɵɵelementStart(0, 'div');
         {
-          Δtext(1, 'Before');
-          Δcontainer(2);
-          Δcontainer(3);
-          Δtext(4, 'After');
+          ɵɵtext(1, 'Before');
+          ɵɵcontainer(2);
+          ɵɵcontainer(3);
+          ɵɵtext(4, 'After');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
-          let rf0 = ΔembeddedViewStart(0, 2, 1);
+          let rf0 = ɵɵembeddedViewStart(0, 2, 1);
           { spanify(rf0, {message: data[0]}); }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
-        ΔcontainerRefreshStart(3);
+        ɵɵcontainerRefreshEnd();
+        ɵɵcontainerRefreshStart(3);
         {
-          let rf0 = ΔembeddedViewStart(0, 2, 1);
+          let rf0 = ɵɵembeddedViewStart(0, 2, 1);
           { spanify(rf0, {message: data[1]}); }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }, 5);
 
diff --git a/packages/core/test/render3/debug_spec.ts b/packages/core/test/render3/debug_spec.ts
index e1c15ab002..794dfb9d56 100644
--- a/packages/core/test/render3/debug_spec.ts
+++ b/packages/core/test/render3/debug_spec.ts
@@ -8,14 +8,14 @@
 
 import {getLContext} from '../../src/render3/context_discovery';
 import {LViewDebug, toDebug} from '../../src/render3/debug';
-import {RenderFlags, ΔdefineComponent, ΔelementEnd, ΔelementStart, Δtext} from '../../src/render3/index';
+import {RenderFlags, ɵɵdefineComponent, ɵɵelementEnd, ɵɵelementStart, ɵɵtext} from '../../src/render3/index';
 
 import {ComponentFixture} from './render_util';
 
 describe('Debug Representation', () => {
   it('should generate a human readable version', () => {
     class MyComponent {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComponent,
         selectors: [['my-comp']],
         vars: 0,
@@ -23,9 +23,9 @@ describe('Debug Representation', () => {
         factory: () => new MyComponent(),
         template: function(rf: RenderFlags, ctx: MyComponent) {
           if (rf == RenderFlags.Create) {
-            ΔelementStart(0, 'div', ['id', '123']);
-            Δtext(1, 'Hello World');
-            ΔelementEnd();
+            ɵɵelementStart(0, 'div', ['id', '123']);
+            ɵɵtext(1, 'Hello World');
+            ɵɵelementEnd();
           }
         }
       });
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 6d10532cc8..7ad45750f1 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -10,9 +10,9 @@ import {ChangeDetectorRef, Host, InjectFlags, Injector, Optional, Renderer2, Sel
 import {createLView, createNodeAtIndex, createTView} from '@angular/core/src/render3/instructions/shared';
 import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
 
-import {ΔdefineComponent} from '../../src/render3/definition';
+import {ɵɵdefineComponent} from '../../src/render3/definition';
 import {bloomAdd, bloomHasToken, bloomHashBitOrFactory as bloomHash, getOrCreateNodeInjectorForNode} from '../../src/render3/di';
-import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdefineDirective, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation2, Δprojection, ΔprojectionDef, Δreference, Δtext, ΔtextBinding} from '../../src/render3/index';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation2, ɵɵprojection, ɵɵprojectionDef, ɵɵreference, ɵɵtext, ɵɵtextBinding} from '../../src/render3/index';
 import {TNODE} from '../../src/render3/interfaces/injector';
 import {TNodeType} from '../../src/render3/interfaces/node';
 import {isProceduralRenderer} from '../../src/render3/interfaces/renderer';
@@ -31,7 +31,7 @@ describe('di', () => {
       value = 'DirB';
       constructor() { log.push(this.value); }
 
-      static ngDirectiveDef = ΔdefineDirective({
+      static ngDirectiveDef = ɵɵdefineDirective({
         selectors: [['', 'dirB', '']],
         type: DirB,
         factory: () => new DirB(),
@@ -49,10 +49,10 @@ describe('di', () => {
       class DirA {
         constructor(dir: DirB) { log.push(`DirA (dep: ${dir.value})`); }
 
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           selectors: [['', 'dirA', '']],
           type: DirA,
-          factory: () => new DirA(ΔdirectiveInject(DirB))
+          factory: () => new DirA(ɵɵdirectiveInject(DirB))
         });
       }
 
@@ -63,19 +63,19 @@ describe('di', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          Δcontainer(0);
+          ɵɵcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
+          ɵɵcontainerRefreshStart(0);
           {
             for (let i = 0; i < 3; i++) {
-              if (ΔembeddedViewStart(0, 1, 0)) {
-                Δelement(0, 'div', ['dirA', '', 'dirB', '']);
+              if (ɵɵembeddedViewStart(0, 1, 0)) {
+                ɵɵelement(0, 'div', ['dirA', '', 'dirB', '']);
               }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
           }
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         }
       }, 1, 0, [DirA, DirB]);
 
@@ -92,11 +92,11 @@ describe('di', () => {
           this.injector = vcr.injector;
         }
 
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: DirA,
           selectors: [['', 'dirA', '']],
-          factory: () =>
-                       new DirA(ΔdirectiveInject(DirB), ΔdirectiveInject(ViewContainerRef as any)),
+          factory:
+              () => new DirA(ɵɵdirectiveInject(DirB), ɵɵdirectiveInject(ViewContainerRef as any)),
           exportAs: ['dirA']
         });
       }
@@ -117,45 +117,45 @@ describe('di', () => {
          */
         const App = createComponent('app', (rf: RenderFlags, ctx: any) => {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'div', ['dirB', '']);
-            { Δcontainer(1); }
-            ΔelementEnd();
+            ɵɵelementStart(0, 'div', ['dirB', '']);
+            { ɵɵcontainer(1); }
+            ɵɵelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ΔcontainerRefreshStart(1);
+            ɵɵcontainerRefreshStart(1);
             {
               if (!ctx.skipContent) {
-                let rf1 = ΔembeddedViewStart(0, 1, 0);
+                let rf1 = ɵɵembeddedViewStart(0, 1, 0);
                 {
                   if (rf1 & RenderFlags.Create) {
-                    Δcontainer(0);
+                    ɵɵcontainer(0);
                   }
                   if (rf1 & RenderFlags.Update) {
-                    ΔcontainerRefreshStart(0);
+                    ɵɵcontainerRefreshStart(0);
                     {
                       if (!ctx.skipContent2) {
-                        let rf2 = ΔembeddedViewStart(0, 3, 1);
+                        let rf2 = ɵɵembeddedViewStart(0, 3, 1);
                         {
                           if (rf2 & RenderFlags.Create) {
-                            ΔelementStart(0, 'div', ['dirA', ''], ['dir', 'dirA']);
-                            { Δtext(2); }
-                            ΔelementEnd();
+                            ɵɵelementStart(0, 'div', ['dirA', ''], ['dir', 'dirA']);
+                            { ɵɵtext(2); }
+                            ɵɵelementEnd();
                           }
                           if (rf2 & RenderFlags.Update) {
-                            const dir = Δreference(1) as DirA;
-                            ΔtextBinding(2, Δbind(dir.dirB.value));
+                            const dir = ɵɵreference(1) as DirA;
+                            ɵɵtextBinding(2, ɵɵbind(dir.dirB.value));
                           }
                         }
-                        ΔembeddedViewEnd();
+                        ɵɵembeddedViewEnd();
                       }
                     }
-                    ΔcontainerRefreshEnd();
+                    ɵɵcontainerRefreshEnd();
                   }
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
+            ɵɵcontainerRefreshEnd();
           }
         }, 2, 0, [DirA, DirB]);
 
@@ -170,7 +170,7 @@ describe('di', () => {
         // TODO(issue/24571): remove '!'.
         value !: string;
 
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: DirB,
           selectors: [['', 'dirB', '']],
           factory: () => new DirB(),
@@ -184,10 +184,10 @@ describe('di', () => {
         class DirA {
           constructor(@Optional() public dirB: DirB|null) {}
 
-          static ngDirectiveDef = ΔdefineDirective({
+          static ngDirectiveDef = ɵɵdefineDirective({
             type: DirA,
             selectors: [['', 'dirA', '']],
-            factory: () => dirA = new DirA(ΔdirectiveInject(DirB, InjectFlags.Optional))
+            factory: () => dirA = new DirA(ɵɵdirectiveInject(DirB, InjectFlags.Optional))
           });
         }
 
@@ -198,7 +198,7 @@ describe('di', () => {
           /** <div dirA></div> */
           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              Δelement(0, 'div', ['dirA', '']);
+              ɵɵelement(0, 'div', ['dirA', '']);
             }
           }, 1, 0, [DirA, DirB]);
 
@@ -213,10 +213,10 @@ describe('di', () => {
         class DirA {
           constructor(@Self() public dirB: DirB) {}
 
-          static ngDirectiveDef = ΔdefineDirective({
+          static ngDirectiveDef = ɵɵdefineDirective({
             type: DirA,
             selectors: [['', 'dirA', '']],
-            factory: () => dirA = new DirA(ΔdirectiveInject(DirB, InjectFlags.Self))
+            factory: () => dirA = new DirA(ɵɵdirectiveInject(DirB, InjectFlags.Self))
           });
         }
 
@@ -229,9 +229,9 @@ describe('di', () => {
          */
         const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'div', ['dirB', '']);
-            Δelement(1, 'div', ['dirA', '', 'dirC', '']);
-            ΔelementEnd();
+            ɵɵelementStart(0, 'div', ['dirB', '']);
+            ɵɵelement(1, 'div', ['dirA', '', 'dirC', '']);
+            ɵɵelementEnd();
           }
         }, 2, 0, [DirA, DirB, DirC]);
 
@@ -250,10 +250,10 @@ describe('di', () => {
         class DirA {
           constructor(@Host() public dirB: DirB) {}
 
-          static ngDirectiveDef = ΔdefineDirective({
+          static ngDirectiveDef = ɵɵdefineDirective({
             type: DirA,
             selectors: [['', 'dirA', '']],
-            factory: () => dirA = new DirA(ΔdirectiveInject(DirB, InjectFlags.Host))
+            factory: () => dirA = new DirA(ɵɵdirectiveInject(DirB, InjectFlags.Host))
           });
         }
 
@@ -271,27 +271,27 @@ describe('di', () => {
            */
           const Comp = createComponent('comp', function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              Δcontainer(0);
+              ɵɵcontainer(0);
             }
             if (rf & RenderFlags.Update) {
-              ΔcontainerRefreshStart(0);
+              ɵɵcontainerRefreshStart(0);
               {
                 if (ctx.showing) {
-                  let rf1 = ΔembeddedViewStart(0, 1, 0);
+                  let rf1 = ɵɵembeddedViewStart(0, 1, 0);
                   if (rf1 & RenderFlags.Create) {
-                    Δelement(0, 'div', ['dirA', '']);
+                    ɵɵelement(0, 'div', ['dirA', '']);
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
+              ɵɵcontainerRefreshEnd();
             }
           }, 1, 0, [DirA, DirB]);
 
           /* <comp dirB></comp> */
           const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              Δelement(0, 'comp', ['dirB', '']);
+              ɵɵelement(0, 'comp', ['dirB', '']);
             }
             if (rf & RenderFlags.Update) {
               comp = getDirectiveOnNode(0);
@@ -318,16 +318,16 @@ describe('di', () => {
       class MyComp {
         constructor(public cdr: ChangeDetectorRef) {}
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: MyComp,
           selectors: [['my-comp']],
-          factory: () => comp = new MyComp(ΔdirectiveInject(ChangeDetectorRef as any)),
+          factory: () => comp = new MyComp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
           consts: 1,
           vars: 0,
           template: function(rf: RenderFlags, ctx: MyComp) {
             if (rf & RenderFlags.Create) {
-              ΔprojectionDef();
-              Δprojection(0);
+              ɵɵprojectionDef();
+              ɵɵprojection(0);
             }
           }
         });
@@ -338,10 +338,10 @@ describe('di', () => {
 
         constructor(public cdr: ChangeDetectorRef) { this.value = (cdr.constructor as any).name; }
 
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: Directive,
           selectors: [['', 'dir', '']],
-          factory: () => dir = new Directive(ΔdirectiveInject(ChangeDetectorRef as any)),
+          factory: () => dir = new Directive(ɵɵdirectiveInject(ChangeDetectorRef as any)),
           exportAs: ['dir']
         });
       }
@@ -349,11 +349,11 @@ describe('di', () => {
       class DirectiveSameInstance {
         constructor(public cdr: ChangeDetectorRef) {}
 
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: DirectiveSameInstance,
           selectors: [['', 'dirSame', '']],
           factory: () => dirSameInstance =
-                       new DirectiveSameInstance(ΔdirectiveInject(ChangeDetectorRef as any))
+                       new DirectiveSameInstance(ɵɵdirectiveInject(ChangeDetectorRef as any))
         });
       }
 
@@ -370,10 +370,10 @@ describe('di', () => {
 
           constructor(public cdr: ChangeDetectorRef) {}
 
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: MyApp,
             selectors: [['my-app']],
-            factory: () => new MyApp(ΔdirectiveInject(ChangeDetectorRef as any)),
+            factory: () => new MyApp(ɵɵdirectiveInject(ChangeDetectorRef as any)),
             consts: 1,
             vars: 0,
             /**
@@ -383,26 +383,26 @@ describe('di', () => {
              */
             template: function(rf: RenderFlags, ctx: MyApp) {
               if (rf & RenderFlags.Create) {
-                Δcontainer(0);
+                ɵɵcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ΔcontainerRefreshStart(0);
+                ɵɵcontainerRefreshStart(0);
                 {
                   if (ctx.showing) {
-                    let rf1 = ΔembeddedViewStart(0, 3, 1);
+                    let rf1 = ɵɵembeddedViewStart(0, 3, 1);
                     if (rf1 & RenderFlags.Create) {
-                      ΔelementStart(0, 'div', ['dir', '', 'dirSame', ''], ['dir', 'dir']);
-                      { Δtext(2); }
-                      ΔelementEnd();
+                      ɵɵelementStart(0, 'div', ['dir', '', 'dirSame', ''], ['dir', 'dir']);
+                      { ɵɵtext(2); }
+                      ɵɵelementEnd();
                     }
                     if (rf1 & RenderFlags.Update) {
-                      const tmp = Δreference(1) as any;
-                      ΔtextBinding(2, Δbind(tmp.value));
+                      const tmp = ɵɵreference(1) as any;
+                      ɵɵtextBinding(2, ɵɵbind(tmp.value));
                     }
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             },
             directives: directives
@@ -424,15 +424,15 @@ describe('di', () => {
     class MyComp {
       constructor(public renderer: Renderer2) {}
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComp,
         selectors: [['my-comp']],
-        factory: () => new MyComp(ΔdirectiveInject(Renderer2 as any)),
+        factory: () => new MyComp(ɵɵdirectiveInject(Renderer2 as any)),
         consts: 1,
         vars: 0,
         template: function(rf: RenderFlags, ctx: MyComp) {
           if (rf & RenderFlags.Create) {
-            Δtext(0, 'Foo');
+            ɵɵtext(0, 'Foo');
           }
         }
       });
@@ -448,7 +448,7 @@ describe('di', () => {
        () => { expect(() => new ComponentFixture(MyComp)).toThrow(); });
   });
 
-  describe('Δinject', () => {
+  describe('ɵɵinject', () => {
     describe('bloom filter', () => {
       let mockTView: any;
       beforeEach(() => {
@@ -535,10 +535,10 @@ describe('di', () => {
       class ChildDirective {
         value: string;
         constructor(public parent: any) { this.value = (parent.constructor as any).name; }
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: ChildDirective,
           selectors: [['', 'childDir', '']],
-          factory: () => new ChildDirective(ΔdirectiveInject(ParentDirective)),
+          factory: () => new ChildDirective(ɵɵdirectiveInject(ParentDirective)),
           exportAs: ['childDir']
         });
       }
@@ -546,11 +546,11 @@ describe('di', () => {
       class Child2Directive {
         value: boolean;
         constructor(parent: any, child: ChildDirective) { this.value = parent === child.parent; }
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           selectors: [['', 'child2Dir', '']],
           type: Child2Directive,
           factory: () => new Child2Directive(
-                       ΔdirectiveInject(ParentDirective), ΔdirectiveInject(ChildDirective)),
+                       ɵɵdirectiveInject(ParentDirective), ɵɵdirectiveInject(ChildDirective)),
           exportAs: ['child2Dir']
         });
       }
@@ -566,29 +566,29 @@ describe('di', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'div', ['parentDir', '']);
-          { Δcontainer(1); }
-          ΔelementEnd();
+          ɵɵelementStart(0, 'div', ['parentDir', '']);
+          { ɵɵcontainer(1); }
+          ɵɵelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(1);
+          ɵɵcontainerRefreshStart(1);
           {
-            let rf1 = ΔembeddedViewStart(0, 4, 2);
+            let rf1 = ɵɵembeddedViewStart(0, 4, 2);
             if (rf1 & RenderFlags.Create) {
-              ΔelementStart(
+              ɵɵelementStart(
                   0, 'span', ['childDir', '', 'child2Dir', ''],
                   ['child1', 'childDir', 'child2', 'child2Dir']);
-              { Δtext(3); }
-              ΔelementEnd();
+              { ɵɵtext(3); }
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              const tmp1 = Δreference(1) as any;
-              const tmp2 = Δreference(2) as any;
-              ΔtextBinding(3, Δinterpolation2('', tmp1.value, '-', tmp2.value, ''));
+              const tmp1 = ɵɵreference(1) as any;
+              const tmp2 = ɵɵreference(2) as any;
+              ɵɵtextBinding(3, ɵɵinterpolation2('', tmp1.value, '-', tmp2.value, ''));
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         }
       }, 2, 0, [ChildDirective, Child2Directive, ParentDirective]);
 
diff --git a/packages/core/test/render3/exports_spec.ts b/packages/core/test/render3/exports_spec.ts
index 461eb685d2..4a1fd89b1d 100644
--- a/packages/core/test/render3/exports_spec.ts
+++ b/packages/core/test/render3/exports_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δreference, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵreference, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {ComponentFixture, createComponent} from './render_util';
@@ -23,29 +23,29 @@ describe('exports', () => {
     it('should work inside a view container', () => {
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'div');
-          { Δcontainer(1); }
-          ΔelementEnd();
+          ɵɵelementStart(0, 'div');
+          { ɵɵcontainer(1); }
+          ɵɵelementEnd();
         }
         if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(1);
+          ɵɵcontainerRefreshStart(1);
           {
             if (ctx.condition) {
-              let rf1 = ΔembeddedViewStart(1, 2, 1);
+              let rf1 = ɵɵembeddedViewStart(1, 2, 1);
               {
                 if (rf1 & RenderFlags.Create) {
-                  Δtext(0);
-                  Δelement(1, 'input', ['value', 'one'], ['myInput', '']);
+                  ɵɵtext(0);
+                  ɵɵelement(1, 'input', ['value', 'one'], ['myInput', '']);
                 }
                 if (rf1 & RenderFlags.Update) {
-                  const tmp = Δreference(2) as any;
-                  ΔtextBinding(0, Δbind(tmp.value));
+                  const tmp = ɵɵreference(2) as any;
+                  ɵɵtextBinding(0, ɵɵbind(tmp.value));
                 }
               }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
           }
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         }
       }, 2);
 
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index 1f21500068..10df144f31 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {noop} from '../../../compiler/src/render3/view/util';
-import {getTranslationForTemplate, Δi18nAttributes, Δi18nPostprocess, Δi18nStart} from '../../src/render3/i18n';
-import {ΔelementEnd, ΔelementStart} from '../../src/render3/instructions/all';
+import {getTranslationForTemplate, ɵɵi18nAttributes, ɵɵi18nPostprocess, ɵɵi18nStart} from '../../src/render3/i18n';
+import {ɵɵelementEnd, ɵɵelementStart} from '../../src/render3/instructions/all';
 import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nUpdateOpCode, I18nUpdateOpCodes, TI18n} from '../../src/render3/interfaces/i18n';
 import {HEADER_OFFSET, LView, TVIEW} from '../../src/render3/interfaces/view';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
@@ -68,7 +68,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV = `simple text`;
       const nbConsts = 1;
       const index = 0;
-      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       // Check debug
       const debugOps = (opCodes as any).create.debug !.operations;
@@ -99,7 +99,7 @@ describe('Runtime i18n', () => {
       const index = 1;
       const elementIndex = 2;
       const elementIndex2 = 3;
-      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 5,
@@ -135,7 +135,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV = `Hello �0�!`;
       const nbConsts = 2;
       const index = 1;
-      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect((opCodes as any).update.debug.operations).toEqual([
         {__raw_opCode: 8, checkBit: 1, type: 'Text', nodeIndex: 2, text: 'Hello �0�!'}
@@ -160,7 +160,7 @@ describe('Runtime i18n', () => {
       const MSG_DIV = `Hello �0� and �1�, again �0�!`;
       const nbConsts = 2;
       const index = 1;
-      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 1,
@@ -193,7 +193,7 @@ describe('Runtime i18n', () => {
       let nbConsts = 3;
       let index = 1;
       const firstTextNode = 3;
-      let opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      let opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 2,
@@ -223,7 +223,7 @@ describe('Runtime i18n', () => {
       index = 0;
       const spanElement = 1;
       const bElementSubTemplate = 2;
-      opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV, 1); }, null, nbConsts, index);
+      opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV, 1); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 2,
@@ -250,7 +250,7 @@ describe('Runtime i18n', () => {
       nbConsts = 2;
       index = 0;
       const bElement = 1;
-      opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV, 2); }, null, nbConsts, index);
+      opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV, 2); }, null, nbConsts, index);
 
       expect(opCodes).toEqual({
         vars: 1,
@@ -275,7 +275,7 @@ describe('Runtime i18n', () => {
       }`;
       const nbConsts = 1;
       const index = 0;
-      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
       const tIcuIndex = 0;
       const icuCommentNodeIndex = index + 1;
       const firstTextNodeIndex = index + 2;
@@ -463,7 +463,7 @@ describe('Runtime i18n', () => {
       }`;
       const nbConsts = 1;
       const index = 0;
-      const opCodes = getOpCodes(() => { Δi18nStart(index, MSG_DIV); }, null, nbConsts, index);
+      const opCodes = getOpCodes(() => { ɵɵi18nStart(index, MSG_DIV); }, null, nbConsts, index);
       const icuCommentNodeIndex = index + 1;
       const firstTextNodeIndex = index + 2;
       const nestedIcuCommentNodeIndex = index + 3;
@@ -579,9 +579,9 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const fixture = prepareFixture(() => {
-        ΔelementStart(0, 'div');
-        Δi18nAttributes(index, MSG_div_attr);
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nAttributes(index, MSG_div_attr);
+        ɵɵelementEnd();
       }, null, nbConsts, index);
       const tView = fixture.hostView[TVIEW];
       const opCodes = tView.data[index + HEADER_OFFSET] as I18nUpdateOpCodes;
@@ -598,7 +598,7 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const opCodes =
-          getOpCodes(() => { Δi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
+          getOpCodes(() => { ɵɵi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
 
       expect(opCodes).toEqual([
         0b1,  // bindings mask
@@ -615,7 +615,7 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const opCodes =
-          getOpCodes(() => { Δi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
+          getOpCodes(() => { ɵɵi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
 
       expect(opCodes).toEqual([
         0b11,  // bindings mask
@@ -631,7 +631,7 @@ describe('Runtime i18n', () => {
       const nbConsts = 2;
       const index = 1;
       const opCodes =
-          getOpCodes(() => { Δi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
+          getOpCodes(() => { ɵɵi18nAttributes(index, MSG_div_attr); }, null, nbConsts, index);
 
       expect(opCodes).toEqual([
         0b1,  // bindings mask
@@ -724,7 +724,7 @@ describe('Runtime i18n', () => {
         ],
       ];
       cases.forEach(([input, replacements, output]) => {
-        expect(Δi18nPostprocess(input as string, replacements as any)).toEqual(output as string);
+        expect(ɵɵi18nPostprocess(input as string, replacements as any)).toEqual(output as string);
       });
     });
 
@@ -776,7 +776,7 @@ describe('Runtime i18n', () => {
         �/*3:1�
         �#4� Bonjour - 5 �/#4�
       `;
-      expect(Δi18nPostprocess(generated.replace(/\s+/g, ''))).toEqual(final.replace(/\s+/g, ''));
+      expect(ɵɵi18nPostprocess(generated.replace(/\s+/g, ''))).toEqual(final.replace(/\s+/g, ''));
     });
 
     it('should throw in case we have invalid string', () => {
@@ -794,7 +794,7 @@ describe('Runtime i18n', () => {
         ['My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�', {ICU: ['ICU_VALUE_1']}]
       ];
       cases.forEach(([input, replacements, output]) => {
-        expect(() => Δi18nPostprocess(input as string, replacements as any)).toThrowError();
+        expect(() => ɵɵi18nPostprocess(input as string, replacements as any)).toThrowError();
       });
     });
   });
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 90ec5eb979..cc75beec31 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -8,11 +8,11 @@
 
 import {NgForOfContext} from '@angular/common';
 
-import {ΔdefineComponent} from '../../src/render3/definition';
-import {RenderFlags, Δbind, ΔclassMap, Δelement, ΔelementAttribute, ΔelementEnd, ΔelementProperty, ΔelementStart, Δinterpolation1, Δproperty, Δselect, ΔstyleMap, ΔstyleProp, Δstyling, ΔstylingApply, Δtemplate, Δtext, ΔtextBinding} from '../../src/render3/index';
+import {ɵɵdefineComponent} from '../../src/render3/definition';
+import {RenderFlags, ɵɵbind, ɵɵclassMap, ɵɵelement, ɵɵelementAttribute, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵinterpolation1, ɵɵproperty, ɵɵselect, ɵɵstyleMap, ɵɵstyleProp, ɵɵstyling, ɵɵstylingApply, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/index';
 import {AttributeMarker} from '../../src/render3/interfaces/node';
 import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl} from '../../src/sanitization/bypass';
-import {ΔdefaultStyleSanitizer, ΔsanitizeHtml, ΔsanitizeResourceUrl, ΔsanitizeScript, ΔsanitizeStyle, ΔsanitizeUrl} from '../../src/sanitization/sanitization';
+import {ɵɵdefaultStyleSanitizer, ɵɵsanitizeHtml, ɵɵsanitizeResourceUrl, ɵɵsanitizeScript, ɵɵsanitizeStyle, ɵɵsanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 import {StyleSanitizeFn} from '../../src/sanitization/style_sanitizer';
 
@@ -21,9 +21,9 @@ import {ComponentFixture, TemplateFixture} from './render_util';
 
 describe('instructions', () => {
   function createAnchor() {
-    ΔelementStart(0, 'a');
-    Δstyling();
-    ΔelementEnd();
+    ɵɵelementStart(0, 'a');
+    ɵɵstyling();
+    ɵɵelementEnd();
   }
 
   function createDiv(
@@ -37,20 +37,20 @@ describe('instructions', () => {
     if (initialStyles) {
       attrs.push(AttributeMarker.Styles, ...initialStyles);
     }
-    ΔelementStart(0, 'div', attrs);
-    Δstyling(classBindingNames || null, styleBindingNames || null, styleSanitizer);
-    ΔelementEnd();
+    ɵɵelementStart(0, 'div', attrs);
+    ɵɵstyling(classBindingNames || null, styleBindingNames || null, styleSanitizer);
+    ɵɵelementEnd();
   }
 
-  function createScript() { Δelement(0, 'script'); }
+  function createScript() { ɵɵelement(0, 'script'); }
 
-  describe('Δselect', () => {
+  describe('ɵɵselect', () => {
     it('should error in DevMode if index is out of range', () => {
       // Only one constant added, meaning only index `0` is valid.
       const t = new TemplateFixture(createDiv, () => {}, 1, 0);
-      expect(() => { t.update(() => { Δselect(-1); }); }).toThrow();
-      expect(() => { t.update(() => { Δselect(1); }); }).toThrow();
-      expect(() => { t.update(() => { Δselect(0); }); }).not.toThrow();
+      expect(() => { t.update(() => { ɵɵselect(-1); }); }).toThrow();
+      expect(() => { t.update(() => { ɵɵselect(1); }); }).toThrow();
+      expect(() => { t.update(() => { ɵɵselect(0); }); }).not.toThrow();
     });
   });
 
@@ -58,10 +58,10 @@ describe('instructions', () => {
     it('should update bindings when value changes with the correct perf counters', () => {
       const t = new TemplateFixture(createAnchor, () => {}, 1, 1);
 
-      t.update(() => ΔelementProperty(0, 'title', Δbind('Hello')));
+      t.update(() => ɵɵelementProperty(0, 'title', ɵɵbind('Hello')));
       expect(t.html).toEqual('<a title="Hello"></a>');
 
-      t.update(() => ΔelementProperty(0, 'title', Δbind('World')));
+      t.update(() => ɵɵelementProperty(0, 'title', ɵɵbind('World')));
       expect(t.html).toEqual('<a title="World"></a>');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
@@ -74,7 +74,7 @@ describe('instructions', () => {
 
     it('should not update bindings when value does not change, with the correct perf counters',
        () => {
-         const idempotentUpdate = () => ΔelementProperty(0, 'title', Δbind('Hello'));
+         const idempotentUpdate = () => ɵɵelementProperty(0, 'title', ɵɵbind('Hello'));
          const t = new TemplateFixture(createAnchor, idempotentUpdate, 1, 1);
 
          t.update();
@@ -95,7 +95,7 @@ describe('instructions', () => {
   describe('element', () => {
     it('should create an element with the correct perf counters', () => {
       const t = new TemplateFixture(() => {
-        Δelement(0, 'div', ['id', 'test', 'title', 'Hello']);
+        ɵɵelement(0, 'div', ['id', 'test', 'title', 'Hello']);
       }, () => {}, 1);
 
       const div = (t.hostElement as HTMLElement).querySelector('div') !;
@@ -114,12 +114,12 @@ describe('instructions', () => {
     it('should use sanitizer function', () => {
       const t = new TemplateFixture(createDiv, () => {}, 1);
 
-      t.update(() => ΔelementAttribute(0, 'title', 'javascript:true', ΔsanitizeUrl));
+      t.update(() => ɵɵelementAttribute(0, 'title', 'javascript:true', ɵɵsanitizeUrl));
       expect(t.html).toEqual('<div title="unsafe:javascript:true"></div>');
 
       t.update(
-          () => ΔelementAttribute(
-              0, 'title', bypassSanitizationTrustUrl('javascript:true'), ΔsanitizeUrl));
+          () => ɵɵelementAttribute(
+              0, 'title', bypassSanitizationTrustUrl('javascript:true'), ɵɵsanitizeUrl));
       expect(t.html).toEqual('<div title="javascript:true"></div>');
       expect(ngDevMode).toHaveProperties({
         firstTemplatePass: 1,
@@ -141,13 +141,13 @@ describe('instructions', () => {
       // <div [title]="title" [accesskey]="key"></div>
       const t = new TemplateFixture(createDiv, () => {}, 1, 2);
       t.update(() => {
-        Δselect(0);
-        Δproperty('title', 'one')('accessKey', 'A');
+        ɵɵselect(0);
+        ɵɵproperty('title', 'one')('accessKey', 'A');
       });
       expect(t.html).toEqual('<div accesskey="A" title="one"></div>');
       t.update(() => {
-        Δselect(0);
-        Δproperty('title', 'two')('accessKey', 'B');
+        ɵɵselect(0);
+        ɵɵproperty('title', 'two')('accessKey', 'B');
       });
       expect(t.html).toEqual('<div accesskey="B" title="two"></div>');
       expect(ngDevMode).toHaveProperties({
@@ -159,13 +159,13 @@ describe('instructions', () => {
       });
     });
 
-    it('should error in dev mode if Δselect was not called prior', () => {
+    it('should error in dev mode if ɵɵselect was not called prior', () => {
       const t = new TemplateFixture(createDiv, () => {}, 1, 1);
-      expect(() => { t.update(() => { Δproperty('title', 'test'); }); }).toThrow();
+      expect(() => { t.update(() => { ɵɵproperty('title', 'test'); }); }).toThrow();
       expect(() => {
         t.update(() => {
-          Δselect(0);
-          Δproperty('title', 'test');
+          ɵɵselect(0);
+          ɵɵproperty('title', 'test');
         });
       }).not.toThrow();
     });
@@ -174,20 +174,20 @@ describe('instructions', () => {
   describe('styleProp', () => {
     it('should automatically sanitize unless a bypass operation is applied', () => {
       const t = new TemplateFixture(() => {
-        return createDiv(null, null, null, ['background-image'], ΔdefaultStyleSanitizer);
+        return createDiv(null, null, null, ['background-image'], ɵɵdefaultStyleSanitizer);
       }, () => {}, 1);
       t.update(() => {
-        Δselect(0);
-        ΔstyleProp(0, 'url("http://server")');
-        ΔstylingApply();
+        ɵɵselect(0);
+        ɵɵstyleProp(0, 'url("http://server")');
+        ɵɵstylingApply();
       });
       // nothing is set because sanitizer suppresses it.
       expect(t.html).toEqual('<div></div>');
 
       t.update(() => {
-        Δselect(0);
-        ΔstyleProp(0, bypassSanitizationTrustStyle('url("http://server2")'));
-        ΔstylingApply();
+        ɵɵselect(0);
+        ɵɵstyleProp(0, bypassSanitizationTrustStyle('url("http://server2")'));
+        ɵɵstylingApply();
       });
       expect((t.hostElement.firstChild as HTMLElement).style.getPropertyValue('background-image'))
           .toEqual('url("http://server2")');
@@ -201,18 +201,18 @@ describe('instructions', () => {
           1, sanitizerInterceptor);
 
       t.update(() => {
-        Δselect(0);
-        ΔstyleProp(0, bypassSanitizationTrustStyle('apple'));
-        ΔstylingApply();
+        ɵɵselect(0);
+        ɵɵstyleProp(0, bypassSanitizationTrustStyle('apple'));
+        ɵɵstylingApply();
       });
 
       expect(sanitizerInterceptor.lastValue !).toEqual('apple');
       sanitizerInterceptor.lastValue = null;
 
       t.update(() => {
-        Δselect(0);
-        ΔstyleProp(0, bypassSanitizationTrustStyle('apple'));
-        ΔstylingApply();
+        ɵɵselect(0);
+        ɵɵstyleProp(0, bypassSanitizationTrustStyle('apple'));
+        ɵɵstylingApply();
       });
       expect(sanitizerInterceptor.lastValue).toEqual(null);
     });
@@ -220,17 +220,17 @@ describe('instructions', () => {
 
   describe('styleMap', () => {
     function createDivWithStyle() {
-      ΔelementStart(0, 'div', [AttributeMarker.Styles, 'height', '10px']);
-      Δstyling([], ['height']);
-      ΔelementEnd();
+      ɵɵelementStart(0, 'div', [AttributeMarker.Styles, 'height', '10px']);
+      ɵɵstyling([], ['height']);
+      ɵɵelementEnd();
     }
 
     it('should add style', () => {
       const fixture = new TemplateFixture(createDivWithStyle, () => {}, 1);
       fixture.update(() => {
-        Δselect(0);
-        ΔstyleMap({'background-color': 'red'});
-        ΔstylingApply();
+        ɵɵselect(0);
+        ɵɵstyleMap({'background-color': 'red'});
+        ɵɵstylingApply();
       });
       expect(fixture.html).toEqual('<div style="background-color: red; height: 10px;"></div>');
     });
@@ -244,8 +244,8 @@ describe('instructions', () => {
           sanitizerInterceptor);
 
       fixture.update(() => {
-        Δselect(0);
-        ΔstyleMap({
+        ɵɵselect(0);
+        ɵɵstyleMap({
           'background-image': 'background-image',
           'background': 'background',
           'border-image': 'border-image',
@@ -254,7 +254,7 @@ describe('instructions', () => {
           'filter': 'filter',
           'width': 'width'
         });
-        ΔstylingApply();
+        ɵɵstylingApply();
       });
 
       const props = detectedValues.sort();
@@ -266,17 +266,17 @@ describe('instructions', () => {
 
   describe('elementClass', () => {
     function createDivWithStyling() {
-      ΔelementStart(0, 'div');
-      Δstyling();
-      ΔelementEnd();
+      ɵɵelementStart(0, 'div');
+      ɵɵstyling();
+      ɵɵelementEnd();
     }
 
     it('should add class', () => {
       const fixture = new TemplateFixture(createDivWithStyling, () => {}, 1);
       fixture.update(() => {
-        Δselect(0);
-        ΔclassMap('multiple classes');
-        ΔstylingApply();
+        ɵɵselect(0);
+        ɵɵclassMap('multiple classes');
+        ɵɵstylingApply();
       });
       expect(fixture.html).toEqual('<div class="multiple classes"></div>');
     });
@@ -289,26 +289,26 @@ describe('instructions', () => {
 
       function ToDoAppComponent_NgForOf_Template_0(rf: RenderFlags, ctx0: NgForOfContext<any>) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'ul');
-          Δtemplate(1, ToDoAppComponent_NgForOf_NgForOf_Template_1, 2, 1, 'li', _c1);
-          ΔelementEnd();
+          ɵɵelementStart(0, 'ul');
+          ɵɵtemplate(1, ToDoAppComponent_NgForOf_NgForOf_Template_1, 2, 1, 'li', _c1);
+          ɵɵelementEnd();
         }
         if (rf & RenderFlags.Update) {
           const row_r2 = ctx0.$implicit;
-          ΔelementProperty(1, 'ngForOf', Δbind(row_r2));
+          ɵɵelementProperty(1, 'ngForOf', ɵɵbind(row_r2));
         }
       }
 
       function ToDoAppComponent_NgForOf_NgForOf_Template_1(
           rf: RenderFlags, ctx1: NgForOfContext<any>) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'li');
-          Δtext(1);
-          ΔelementEnd();
+          ɵɵelementStart(0, 'li');
+          ɵɵtext(1);
+          ɵɵelementEnd();
         }
         if (rf & RenderFlags.Update) {
           const col_r3 = ctx1.$implicit;
-          ΔtextBinding(1, Δinterpolation1('', col_r3, ''));
+          ɵɵtextBinding(1, ɵɵinterpolation1('', col_r3, ''));
         }
       }
 
@@ -320,7 +320,7 @@ describe('instructions', () => {
       class NestedLoops {
         rows = [['a', 'b'], ['A', 'B'], ['a', 'b'], ['A', 'B']];
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: NestedLoops,
           selectors: [['nested-loops']],
           factory: function ToDoAppComponent_Factory() { return new NestedLoops(); },
@@ -328,10 +328,10 @@ describe('instructions', () => {
           vars: 1,
           template: function ToDoAppComponent_Template(rf: RenderFlags, ctx: NestedLoops) {
             if (rf & RenderFlags.Create) {
-              Δtemplate(0, ToDoAppComponent_NgForOf_Template_0, 2, 1, 'ul', _c0);
+              ɵɵtemplate(0, ToDoAppComponent_NgForOf_Template_0, 2, 1, 'ul', _c0);
             }
             if (rf & RenderFlags.Update) {
-              ΔelementProperty(0, 'ngForOf', Δbind(ctx.rows));
+              ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.rows));
             }
           },
           directives: [NgForOf]
@@ -353,7 +353,7 @@ describe('instructions', () => {
       const inputValue = 'http://foo';
       const outputValue = 'http://foo-sanitized';
 
-      t.update(() => ΔelementAttribute(0, 'href', inputValue, ΔsanitizeUrl));
+      t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
       expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -364,7 +364,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustUrl('http://foo');
       const outputValue = 'http://foo';
 
-      t.update(() => ΔelementAttribute(0, 'href', inputValue, ΔsanitizeUrl));
+      t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
       expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -375,7 +375,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustUrl('http://foo');
       const outputValue = 'http://foo-ivy';
 
-      t.update(() => ΔelementAttribute(0, 'href', inputValue, ΔsanitizeUrl));
+      t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
       expect(t.html).toEqual(`<a href="${outputValue}"></a>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -386,7 +386,7 @@ describe('instructions', () => {
       const inputValue = 'color:red';
       const outputValue = 'color:blue';
 
-      t.update(() => ΔelementAttribute(0, 'style', inputValue, ΔsanitizeStyle));
+      t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
       expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -397,7 +397,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustStyle('color:maroon');
       const outputValue = 'color:maroon';
 
-      t.update(() => ΔelementAttribute(0, 'style', inputValue, ΔsanitizeStyle));
+      t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
       expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -408,7 +408,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustStyle('font-family:foo');
       const outputValue = 'font-family:foo-ivy';
 
-      t.update(() => ΔelementAttribute(0, 'style', inputValue, ΔsanitizeStyle));
+      t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
       expect(stripStyleWsCharacters(t.html)).toEqual(`<div style="${outputValue}"></div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -419,7 +419,7 @@ describe('instructions', () => {
       const inputValue = 'http://resource';
       const outputValue = 'http://resource-sanitized';
 
-      t.update(() => ΔelementAttribute(0, 'src', inputValue, ΔsanitizeResourceUrl));
+      t.update(() => ɵɵelementAttribute(0, 'src', inputValue, ɵɵsanitizeResourceUrl));
       expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -430,7 +430,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustResourceUrl('file://all-my-secrets.pdf');
       const outputValue = 'file://all-my-secrets.pdf';
 
-      t.update(() => ΔelementAttribute(0, 'src', inputValue, ΔsanitizeResourceUrl));
+      t.update(() => ɵɵelementAttribute(0, 'src', inputValue, ɵɵsanitizeResourceUrl));
       expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -441,7 +441,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustResourceUrl('file://all-my-secrets.pdf');
       const outputValue = 'file://all-my-secrets.pdf-ivy';
 
-      t.update(() => ΔelementAttribute(0, 'src', inputValue, ΔsanitizeResourceUrl));
+      t.update(() => ɵɵelementAttribute(0, 'src', inputValue, ɵɵsanitizeResourceUrl));
       expect(t.html).toEqual(`<script src="${outputValue}"></script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -452,7 +452,7 @@ describe('instructions', () => {
       const inputValue = 'fn();';
       const outputValue = 'fn(); //sanitized';
 
-      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeScript));
+      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
       expect(t.html).toEqual(`<script>${outputValue}</script>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -463,7 +463,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustScript('alert("bar")');
       const outputValue = 'alert("bar")';
 
-      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeScript));
+      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
       expect(t.html).toEqual(`<script>${outputValue}</script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -474,7 +474,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustScript('alert("bar")');
       const outputValue = 'alert("bar")-ivy';
 
-      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeScript));
+      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
       expect(t.html).toEqual(`<script>${outputValue}</script>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -485,7 +485,7 @@ describe('instructions', () => {
       const inputValue = '<header></header>';
       const outputValue = '<header></header> <!--sanitized-->';
 
-      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeHtml));
+      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
       expect(t.html).toEqual(`<div>${outputValue}</div>`);
       expect(s.lastSanitizedValue).toEqual(outputValue);
     });
@@ -496,7 +496,7 @@ describe('instructions', () => {
       const inputValue = s.bypassSecurityTrustHtml('<div onclick="alert(123)"></div>');
       const outputValue = '<div onclick="alert(123)"></div>';
 
-      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeHtml));
+      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
       expect(t.html).toEqual(`<div>${outputValue}</div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -507,7 +507,7 @@ describe('instructions', () => {
       const inputValue = bypassSanitizationTrustHtml('<div onclick="alert(123)"></div>');
       const outputValue = '<div onclick="alert(123)"></div>-ivy';
 
-      t.update(() => ΔelementProperty(0, 'innerHTML', inputValue, ΔsanitizeHtml));
+      t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
       expect(t.html).toEqual(`<div>${outputValue}</div>`);
       expect(s.lastSanitizedValue).toBeFalsy();
     });
@@ -552,7 +552,7 @@ class LocalMockSanitizer implements Sanitizer {
 class MockSanitizerInterceptor {
   public lastValue: string|null = null;
   constructor(private _interceptorFn?: ((value: any) => any)|null) {}
-  getStyleSanitizer() { return ΔdefaultStyleSanitizer; }
+  getStyleSanitizer() { return ɵɵdefaultStyleSanitizer; }
   sanitize(context: SecurityContext, value: LocalSanitizedValue|string|null|any): string|null {
     if (this._interceptorFn) {
       this._interceptorFn(value);
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 6994ec97bf..0674229a90 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -8,14 +8,14 @@
 
 import {RendererType2} from '../../src/render/api';
 import {getLContext} from '../../src/render3/context_discovery';
-import {AttributeMarker, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
-import {ΔallocHostVars, Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementAttribute, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δprojection, ΔprojectionDef, Δselect, Δstyling, ΔstylingApply, Δtemplate, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {AttributeMarker, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
+import {ɵɵallocHostVars, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementAttribute, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵprojection, ɵɵprojectionDef, ɵɵselect, ɵɵstyling, ɵɵstylingApply, ɵɵtemplate, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
 import {MONKEY_PATCH_KEY_NAME} from '../../src/render3/interfaces/context';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {RElement, Renderer3, RendererFactory3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
 import {StylingIndex} from '../../src/render3/interfaces/styling';
 import {CONTEXT, HEADER_OFFSET} from '../../src/render3/interfaces/view';
-import {ΔsanitizeUrl} from '../../src/sanitization/sanitization';
+import {ɵɵsanitizeUrl} from '../../src/sanitization/sanitization';
 import {Sanitizer, SecurityContext} from '../../src/sanitization/security';
 
 import {NgIf} from './common_with_def';
@@ -28,8 +28,8 @@ describe('render3 integration test', () => {
       it('should support creation-time values in text nodes', () => {
         function Template(rf: RenderFlags, value: string) {
           if (rf & RenderFlags.Create) {
-            Δtext(0);
-            ΔtextBinding(0, value);
+            ɵɵtext(0);
+            ɵɵtextBinding(0, value);
           }
         }
         expect(renderToHtml(Template, 'once', 1, 1)).toEqual('once');
@@ -59,56 +59,56 @@ describe('render3 integration test', () => {
 
     function showLabel(rf: RenderFlags, ctx: {label: string | undefined}) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
           if (ctx.label != null) {
-            let rf1 = ΔembeddedViewStart(0, 1, 1);
+            let rf1 = ɵɵembeddedViewStart(0, 1, 1);
             if (rf1 & RenderFlags.Create) {
-              Δtext(0);
+              ɵɵtext(0);
             }
             if (rf1 & RenderFlags.Update) {
-              ΔtextBinding(0, Δbind(ctx.label));
+              ɵɵtextBinding(0, ɵɵbind(ctx.label));
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
     function showTree(rf: RenderFlags, ctx: {tree: Tree}) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
-        Δcontainer(1);
-        Δcontainer(2);
+        ɵɵcontainer(0);
+        ɵɵcontainer(1);
+        ɵɵcontainer(2);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
-          const rf0 = ΔembeddedViewStart(0, 1, 0);
+          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
           { showLabel(rf0, {label: ctx.tree.beforeLabel}); }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
-        ΔcontainerRefreshStart(1);
+        ɵɵcontainerRefreshEnd();
+        ɵɵcontainerRefreshStart(1);
         {
           for (let subTree of ctx.tree.subTrees || []) {
-            const rf0 = ΔembeddedViewStart(0, 3, 0);
+            const rf0 = ɵɵembeddedViewStart(0, 3, 0);
             { showTree(rf0, {tree: subTree}); }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshEnd();
+        ɵɵcontainerRefreshStart(2);
         {
-          const rf0 = ΔembeddedViewStart(0, 1, 0);
+          const rf0 = ɵɵembeddedViewStart(0, 1, 0);
           { showLabel(rf0, {label: ctx.tree.afterLabel}); }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
@@ -117,7 +117,7 @@ describe('render3 integration test', () => {
       beforeTree !: Tree;
       // TODO(issue/24571): remove '!'.
       afterTree !: Tree;
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         selectors: [['child']],
         type: ChildComponent,
         consts: 3,
@@ -125,26 +125,26 @@ describe('render3 integration test', () => {
         template: function ChildComponentTemplate(
             rf: RenderFlags, ctx: {beforeTree: Tree, afterTree: Tree}) {
           if (rf & RenderFlags.Create) {
-            ΔprojectionDef();
-            Δcontainer(0);
-            Δprojection(1);
-            Δcontainer(2);
+            ɵɵprojectionDef();
+            ɵɵcontainer(0);
+            ɵɵprojection(1);
+            ɵɵcontainer(2);
           }
           if (rf & RenderFlags.Update) {
-            ΔcontainerRefreshStart(0);
+            ɵɵcontainerRefreshStart(0);
             {
-              const rf0 = ΔembeddedViewStart(0, 3, 0);
+              const rf0 = ɵɵembeddedViewStart(0, 3, 0);
               { showTree(rf0, {tree: ctx.beforeTree}); }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
-            ΔcontainerRefreshEnd();
-            ΔcontainerRefreshStart(2);
+            ɵɵcontainerRefreshEnd();
+            ɵɵcontainerRefreshStart(2);
             {
-              const rf0 = ΔembeddedViewStart(0, 3, 0);
+              const rf0 = ɵɵembeddedViewStart(0, 3, 0);
               { showTree(rf0, {tree: ctx.afterTree}); }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
-            ΔcontainerRefreshEnd();
+            ɵɵcontainerRefreshEnd();
           }
         },
         factory: () => new ChildComponent,
@@ -154,20 +154,20 @@ describe('render3 integration test', () => {
 
     function parentTemplate(rf: RenderFlags, ctx: ParentCtx) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'child');
-        { Δcontainer(1); }
-        ΔelementEnd();
+        ɵɵelementStart(0, 'child');
+        { ɵɵcontainer(1); }
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        ΔelementProperty(0, 'beforeTree', Δbind(ctx.beforeTree));
-        ΔelementProperty(0, 'afterTree', Δbind(ctx.afterTree));
-        ΔcontainerRefreshStart(1);
+        ɵɵelementProperty(0, 'beforeTree', ɵɵbind(ctx.beforeTree));
+        ɵɵelementProperty(0, 'afterTree', ɵɵbind(ctx.afterTree));
+        ɵɵcontainerRefreshStart(1);
         {
-          const rf0 = ΔembeddedViewStart(0, 3, 0);
+          const rf0 = ɵɵembeddedViewStart(0, 3, 0);
           { showTree(rf0, {tree: ctx.projectedTree}); }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
@@ -199,7 +199,7 @@ describe('render3 integration test', () => {
 describe('component styles', () => {
   it('should pass in the component styles directly into the underlying renderer', () => {
     class StyledComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: StyledComp,
         styles: ['div { color: red; }'],
         consts: 1,
@@ -209,7 +209,7 @@ describe('component styles', () => {
         factory: () => new StyledComp(),
         template: (rf: RenderFlags, ctx: StyledComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'div');
+            ɵɵelement(0, 'div');
           }
         }
       });
@@ -227,7 +227,7 @@ describe('component animations', () => {
     const animB = {name: 'b'};
 
     class AnimComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AnimComp,
         consts: 0,
         vars: 0,
@@ -254,7 +254,7 @@ describe('component animations', () => {
 
   it('should include animations in the renderType data array even if the array is empty', () => {
     class AnimComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AnimComp,
         consts: 0,
         vars: 0,
@@ -274,7 +274,7 @@ describe('component animations', () => {
 
   it('should allow [@trigger] bindings to be picked up by the underlying renderer', () => {
     class AnimComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AnimComp,
         consts: 1,
         vars: 1,
@@ -282,10 +282,10 @@ describe('component animations', () => {
         factory: () => new AnimComp(),
         template: (rf: RenderFlags, ctx: AnimComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'div', [AttributeMarker.Bindings, '@fooAnimation']);
+            ɵɵelement(0, 'div', [AttributeMarker.Bindings, '@fooAnimation']);
           }
           if (rf & RenderFlags.Update) {
-            ΔelementAttribute(0, '@fooAnimation', Δbind(ctx.animationValue));
+            ɵɵelementAttribute(0, '@fooAnimation', ɵɵbind(ctx.animationValue));
           }
         }
       });
@@ -310,7 +310,7 @@ describe('component animations', () => {
   it('should allow creation-level [@trigger] properties to be picked up by the underlying renderer',
      () => {
        class AnimComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: AnimComp,
            consts: 1,
            vars: 1,
@@ -318,7 +318,7 @@ describe('component animations', () => {
            factory: () => new AnimComp(),
            template: (rf: RenderFlags, ctx: AnimComp) => {
              if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', ['@fooAnimation', '']);
+               ɵɵelement(0, 'div', ['@fooAnimation', '']);
              }
            }
          });
@@ -337,13 +337,13 @@ describe('component animations', () => {
 
   it('should allow host binding animations to be picked up and rendered', () => {
     class ChildCompWithAnim {
-      static ngDirectiveDef = ΔdefineDirective({
+      static ngDirectiveDef = ɵɵdefineDirective({
         type: ChildCompWithAnim,
         factory: () => new ChildCompWithAnim(),
         selectors: [['child-comp-with-anim']],
         hostBindings: function(rf: RenderFlags, ctx: any, elementIndex: number): void {
           if (rf & RenderFlags.Update) {
-            ΔelementProperty(0, '@fooAnim', ctx.exp);
+            ɵɵelementProperty(0, '@fooAnim', ctx.exp);
           }
         },
       });
@@ -352,7 +352,7 @@ describe('component animations', () => {
     }
 
     class ParentComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: ParentComp,
         consts: 1,
         vars: 1,
@@ -360,7 +360,7 @@ describe('component animations', () => {
         factory: () => new ParentComp(),
         template: (rf: RenderFlags, ctx: ParentComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'child-comp-with-anim');
+            ɵɵelement(0, 'child-comp-with-anim');
           }
         },
         directives: [ChildCompWithAnim]
@@ -382,7 +382,7 @@ describe('component animations', () => {
 describe('element discovery', () => {
   it('should only monkey-patch immediate child nodes in a component', () => {
     class StructuredComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         factory: () => new StructuredComp(),
@@ -390,10 +390,10 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'div');
-            ΔelementStart(1, 'p');
-            ΔelementEnd();
-            ΔelementEnd();
+            ɵɵelementStart(0, 'div');
+            ɵɵelementStart(1, 'p');
+            ɵɵelementEnd();
+            ɵɵelementEnd();
           }
           if (rf & RenderFlags.Update) {
           }
@@ -414,7 +414,7 @@ describe('element discovery', () => {
 
   it('should only monkey-patch immediate child nodes in a sub component', () => {
     class ChildComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: ChildComp,
         selectors: [['child-comp']],
         factory: () => new ChildComp(),
@@ -422,16 +422,16 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: ChildComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'div');
-            Δelement(1, 'div');
-            Δelement(2, 'div');
+            ɵɵelement(0, 'div');
+            ɵɵelement(1, 'div');
+            ɵɵelement(2, 'div');
           }
         }
       });
     }
 
     class ParentComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: ParentComp,
         selectors: [['parent-comp']],
         directives: [ChildComp],
@@ -440,10 +440,10 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: ParentComp) => {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'section');
-            ΔelementStart(1, 'child-comp');
-            ΔelementEnd();
-            ΔelementEnd();
+            ɵɵelementStart(0, 'section');
+            ɵɵelementStart(1, 'child-comp');
+            ɵɵelementEnd();
+            ɵɵelementEnd();
           }
         }
       });
@@ -464,7 +464,7 @@ describe('element discovery', () => {
 
   it('should only monkey-patch immediate child nodes in an embedded template container', () => {
     class StructuredComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         directives: [NgIf],
@@ -473,19 +473,19 @@ describe('element discovery', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'section');
-            Δtemplate(1, (rf, ctx) => {
+            ɵɵelementStart(0, 'section');
+            ɵɵtemplate(1, (rf, ctx) => {
               if (rf & RenderFlags.Create) {
-                ΔelementStart(0, 'div');
-                Δelement(1, 'p');
-                ΔelementEnd();
-                Δelement(2, 'div');
+                ɵɵelementStart(0, 'div');
+                ɵɵelement(1, 'p');
+                ɵɵelementEnd();
+                ɵɵelement(2, 'div');
               }
             }, 3, 0, 'ng-template', ['ngIf', '']);
-            ΔelementEnd();
+            ɵɵelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            ΔelementProperty(1, 'ngIf', true);
+            ɵɵelementProperty(1, 'ngIf', true);
           }
         }
       });
@@ -512,7 +512,7 @@ describe('element discovery', () => {
 
   it('should return a context object from a given dom node', () => {
     class StructuredComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         directives: [NgIf],
@@ -521,8 +521,8 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'section');
-            Δelement(1, 'div');
+            ɵɵelement(0, 'section');
+            ɵɵelement(1, 'div');
           }
         }
       });
@@ -550,7 +550,7 @@ describe('element discovery', () => {
 
   it('should cache the element context on a element was pre-emptively monkey-patched', () => {
     class StructuredComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         factory: () => new StructuredComp(),
@@ -558,7 +558,7 @@ describe('element discovery', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: StructuredComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'section');
+            ɵɵelement(0, 'section');
           }
         }
       });
@@ -582,7 +582,7 @@ describe('element discovery', () => {
   it('should cache the element context on an intermediate element that isn\'t pre-emptively monkey-patched',
      () => {
        class StructuredComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            factory: () => new StructuredComp(),
@@ -590,9 +590,9 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'section');
-               Δelement(1, 'p');
-               ΔelementEnd();
+               ɵɵelementStart(0, 'section');
+               ɵɵelement(1, 'p');
+               ɵɵelementEnd();
              }
            }
          });
@@ -615,7 +615,7 @@ describe('element discovery', () => {
   it('should be able to pull in element context data even if the element is decorated using styling',
      () => {
        class StructuredComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            factory: () => new StructuredComp(),
@@ -623,13 +623,13 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'section');
-               Δstyling(['class-foo']);
-               ΔelementEnd();
+               ɵɵelementStart(0, 'section');
+               ɵɵstyling(['class-foo']);
+               ɵɵelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔstylingApply();
+               ɵɵselect(0);
+               ɵɵstylingApply();
              }
            }
          });
@@ -670,7 +670,7 @@ describe('element discovery', () => {
          </section>
        */
        class ProjectorComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: ProjectorComp,
            selectors: [['projector-comp']],
            factory: () => new ProjectorComp(),
@@ -678,13 +678,13 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ProjectorComp) => {
              if (rf & RenderFlags.Create) {
-               ΔprojectionDef();
-               Δtext(0, 'welcome');
-               ΔelementStart(1, 'header');
-               ΔelementStart(2, 'h1');
-               Δprojection(3);
-               ΔelementEnd();
-               ΔelementEnd();
+               ɵɵprojectionDef();
+               ɵɵtext(0, 'welcome');
+               ɵɵelementStart(1, 'header');
+               ɵɵelementStart(2, 'h1');
+               ɵɵprojection(3);
+               ɵɵelementEnd();
+               ɵɵelementEnd();
              }
              if (rf & RenderFlags.Update) {
              }
@@ -693,7 +693,7 @@ describe('element discovery', () => {
        }
 
        class ParentComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: ParentComp,
            selectors: [['parent-comp']],
            directives: [ProjectorComp],
@@ -702,14 +702,14 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ParentComp) => {
              if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'section');
-               ΔelementStart(1, 'projector-comp');
-               ΔelementStart(2, 'p');
-               Δtext(3, 'this content is projected');
-               ΔelementEnd();
-               Δtext(4, 'this content is projected also');
-               ΔelementEnd();
-               ΔelementEnd();
+               ɵɵelementStart(0, 'section');
+               ɵɵelementStart(1, 'projector-comp');
+               ɵɵelementStart(2, 'p');
+               ɵɵtext(3, 'this content is projected');
+               ɵɵelementEnd();
+               ɵɵtext(4, 'this content is projected also');
+               ɵɵelementEnd();
+               ɵɵelementEnd();
              }
            }
          });
@@ -767,7 +767,7 @@ describe('element discovery', () => {
   it('should return `null` when an element context is retrieved that is a DOM node that was not created by Angular',
      () => {
        class StructuredComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            factory: () => new StructuredComp(),
@@ -775,7 +775,7 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               Δelement(0, 'section');
+               ɵɵelement(0, 'section');
              }
            }
          });
@@ -794,7 +794,7 @@ describe('element discovery', () => {
 
   it('should by default monkey-patch the bootstrap component with context details', () => {
     class StructuredComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: StructuredComp,
         selectors: [['structured-comp']],
         factory: () => new StructuredComp(),
@@ -833,7 +833,7 @@ describe('element discovery', () => {
        let myDir3Instance: MyDir2|null = null;
 
        class MyDir1 {
-         static ngDirectiveDef = ΔdefineDirective({
+         static ngDirectiveDef = ɵɵdefineDirective({
            type: MyDir1,
            selectors: [['', 'my-dir-1', '']],
            factory: () => myDir1Instance = new MyDir1()
@@ -841,7 +841,7 @@ describe('element discovery', () => {
        }
 
        class MyDir2 {
-         static ngDirectiveDef = ΔdefineDirective({
+         static ngDirectiveDef = ɵɵdefineDirective({
            type: MyDir2,
            selectors: [['', 'my-dir-2', '']],
            factory: () => myDir2Instance = new MyDir2()
@@ -849,7 +849,7 @@ describe('element discovery', () => {
        }
 
        class MyDir3 {
-         static ngDirectiveDef = ΔdefineDirective({
+         static ngDirectiveDef = ɵɵdefineDirective({
            type: MyDir3,
            selectors: [['', 'my-dir-3', '']],
            factory: () => myDir3Instance = new MyDir2()
@@ -857,7 +857,7 @@ describe('element discovery', () => {
        }
 
        class StructuredComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: StructuredComp,
            selectors: [['structured-comp']],
            directives: [MyDir1, MyDir2, MyDir3],
@@ -866,8 +866,8 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: StructuredComp) => {
              if (rf & RenderFlags.Create) {
-               Δelement(0, 'div', ['my-dir-1', '', 'my-dir-2', '']);
-               Δelement(1, 'div', ['my-dir-3']);
+               ɵɵelement(0, 'div', ['my-dir-1', '', 'my-dir-2', '']);
+               ɵɵelement(1, 'div', ['my-dir-3']);
              }
            }
          });
@@ -922,7 +922,7 @@ describe('element discovery', () => {
        let childComponentInstance: ChildComp|null = null;
 
        class MyDir1 {
-         static ngDirectiveDef = ΔdefineDirective({
+         static ngDirectiveDef = ɵɵdefineDirective({
            type: MyDir1,
            selectors: [['', 'my-dir-1', '']],
            factory: () => myDir1Instance = new MyDir1()
@@ -930,7 +930,7 @@ describe('element discovery', () => {
        }
 
        class MyDir2 {
-         static ngDirectiveDef = ΔdefineDirective({
+         static ngDirectiveDef = ɵɵdefineDirective({
            type: MyDir2,
            selectors: [['', 'my-dir-2', '']],
            factory: () => myDir2Instance = new MyDir2()
@@ -938,7 +938,7 @@ describe('element discovery', () => {
        }
 
        class ChildComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: ChildComp,
            selectors: [['child-comp']],
            factory: () => childComponentInstance = new ChildComp(),
@@ -946,14 +946,14 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ChildComp) => {
              if (rf & RenderFlags.Create) {
-               Δelement(0, 'div');
+               ɵɵelement(0, 'div');
              }
            }
          });
        }
 
        class ParentComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: ParentComp,
            selectors: [['parent-comp']],
            directives: [ChildComp, MyDir1, MyDir2],
@@ -962,7 +962,7 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ParentComp) => {
              if (rf & RenderFlags.Create) {
-               Δelement(0, 'child-comp', ['my-dir-1', '', 'my-dir-2', '']);
+               ɵɵelement(0, 'child-comp', ['my-dir-1', '', 'my-dir-2', '']);
              }
            }
          });
@@ -1015,7 +1015,7 @@ describe('element discovery', () => {
   it('should monkey-patch sub components with the view data and then replace them with the context result once a lookup occurs',
      () => {
        class ChildComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: ChildComp,
            selectors: [['child-comp']],
            factory: () => new ChildComp(),
@@ -1023,16 +1023,16 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ChildComp) => {
              if (rf & RenderFlags.Create) {
-               Δelement(0, 'div');
-               Δelement(1, 'div');
-               Δelement(2, 'div');
+               ɵɵelement(0, 'div');
+               ɵɵelement(1, 'div');
+               ɵɵelement(2, 'div');
              }
            }
          });
        }
 
        class ParentComp {
-         static ngComponentDef = ΔdefineComponent({
+         static ngComponentDef = ɵɵdefineComponent({
            type: ParentComp,
            selectors: [['parent-comp']],
            directives: [ChildComp],
@@ -1041,10 +1041,10 @@ describe('element discovery', () => {
            vars: 0,
            template: (rf: RenderFlags, ctx: ParentComp) => {
              if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'section');
-               ΔelementStart(1, 'child-comp');
-               ΔelementEnd();
-               ΔelementEnd();
+               ɵɵelementStart(0, 'section');
+               ɵɵelementStart(1, 'child-comp');
+               ɵɵelementEnd();
+               ɵɵelementEnd();
              }
            }
          });
@@ -1076,7 +1076,7 @@ describe('element discovery', () => {
 describe('sanitization', () => {
   it('should sanitize data using the provided sanitization interface', () => {
     class SanitizationComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: SanitizationComp,
         selectors: [['sanitize-this']],
         factory: () => new SanitizationComp(),
@@ -1084,10 +1084,10 @@ describe('sanitization', () => {
         vars: 1,
         template: (rf: RenderFlags, ctx: SanitizationComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'a');
+            ɵɵelement(0, 'a');
           }
           if (rf & RenderFlags.Update) {
-            ΔelementProperty(0, 'href', Δbind(ctx.href), ΔsanitizeUrl);
+            ɵɵelementProperty(0, 'href', ɵɵbind(ctx.href), ɵɵsanitizeUrl);
           }
         }
       });
@@ -1118,23 +1118,23 @@ describe('sanitization', () => {
       // @HostBinding()
       cite: any = 'http://cite-dir-value';
 
-      static ngDirectiveDef = ΔdefineDirective({
+      static ngDirectiveDef = ɵɵdefineDirective({
         type: UnsafeUrlHostBindingDir,
         selectors: [['', 'unsafeUrlHostBindingDir', '']],
         factory: () => hostBindingDir = new UnsafeUrlHostBindingDir(),
         hostBindings: (rf: RenderFlags, ctx: any, elementIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ΔallocHostVars(1);
+            ɵɵallocHostVars(1);
           }
           if (rf & RenderFlags.Update) {
-            ΔelementProperty(elementIndex, 'cite', Δbind(ctx.cite), ΔsanitizeUrl, true);
+            ɵɵelementProperty(elementIndex, 'cite', ɵɵbind(ctx.cite), ɵɵsanitizeUrl, true);
           }
         }
       });
     }
 
     class SimpleComp {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: SimpleComp,
         selectors: [['sanitize-this']],
         factory: () => new SimpleComp(),
@@ -1142,7 +1142,7 @@ describe('sanitization', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: SimpleComp) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'blockquote', ['unsafeUrlHostBindingDir', '']);
+            ɵɵelement(0, 'blockquote', ['unsafeUrlHostBindingDir', '']);
           }
         },
         directives: [UnsafeUrlHostBindingDir]
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
index c58d0fa88d..6fb5771030 100644
--- a/packages/core/test/render3/ivy/jit_spec.ts
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -7,10 +7,10 @@
  */
 import 'reflect-metadata';
 
-import {ElementRef, QueryList, ΔsetComponentScope as setComponentScope} from '@angular/core';
+import {ElementRef, QueryList, ɵɵsetComponentScope as setComponentScope} from '@angular/core';
 import {Injectable} from '@angular/core/src/di/injectable';
-import {setCurrentInjector, Δinject} from '@angular/core/src/di/injector_compatibility';
-import {ΔInjectorDef, ΔdefineInjectable} from '@angular/core/src/di/interface/defs';
+import {setCurrentInjector, ɵɵinject} from '@angular/core/src/di/injector_compatibility';
+import {ɵɵInjectorDef, ɵɵdefineInjectable} from '@angular/core/src/di/interface/defs';
 import {ivyEnabled} from '@angular/core/src/ivy_switch';
 import {ContentChild, ContentChildren, ViewChild, ViewChildren} from '@angular/core/src/metadata/di';
 import {Component, Directive, HostBinding, HostListener, Input, Output, Pipe} from '@angular/core/src/metadata/directives';
@@ -45,7 +45,7 @@ ivyEnabled && describe('render3 jit', () => {
 
     expect(ServiceAny.ngInjectableDef).toBeDefined();
     expect(ServiceAny.ngInjectableDef.providedIn).toBe('root');
-    expect(Δinject(Service) instanceof Service).toBe(true);
+    expect(ɵɵinject(Service) instanceof Service).toBe(true);
   });
 
   it('compiles an injectable with a useValue provider', () => {
@@ -53,7 +53,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(Δinject(Service)).toBe('test');
+    expect(ɵɵinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useExisting provider', () => {
@@ -65,7 +65,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(Δinject(Service)).toBe('test');
+    expect(ɵɵinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useFactory provider, without deps', () => {
@@ -74,7 +74,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(Δinject(Service)).toBe('test');
+    expect(ɵɵinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useFactory provider, with deps', () => {
@@ -86,7 +86,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Service {
     }
 
-    expect(Δinject(Service)).toBe('test');
+    expect(ɵɵinject(Service)).toBe('test');
   });
 
   it('compiles an injectable with a useClass provider, with deps', () => {
@@ -104,7 +104,7 @@ ivyEnabled && describe('render3 jit', () => {
     }
     const ServiceAny = Service as any;
 
-    expect(Δinject(Service).value).toBe('test');
+    expect(ɵɵinject(Service).value).toBe('test');
   });
 
   it('compiles an injectable with a useClass provider, without deps', () => {
@@ -119,8 +119,8 @@ ivyEnabled && describe('render3 jit', () => {
       get value(): number { return 0; }
     }
 
-    expect(Δinject(Existing).value).toBe(1);
-    const injected = Δinject(Service);
+    expect(ɵɵinject(Existing).value).toBe(1);
+    const injected = ɵɵinject(Service);
     expect(injected instanceof Existing).toBe(true);
     expect(injected.value).toBe(2);
   });
@@ -139,7 +139,7 @@ ivyEnabled && describe('render3 jit', () => {
     class Child extends Base {
     }
 
-    expect(Δinject(Child).dep instanceof Dep).toBe(true);
+    expect(ɵɵinject(Child).dep instanceof Dep).toBe(true);
   });
 
   it('compiles a module to a definition', () => {
@@ -167,7 +167,7 @@ ivyEnabled && describe('render3 jit', () => {
 
   it('compiles a module to an ngInjectorDef with the providers', () => {
     class Token {
-      static ngInjectableDef = ΔdefineInjectable({
+      static ngInjectableDef = ɵɵdefineInjectable({
         providedIn: 'root',
         factory: () => 'default',
       });
@@ -180,7 +180,7 @@ ivyEnabled && describe('render3 jit', () => {
       constructor(public token: Token) {}
     }
 
-    const injectorDef: ΔInjectorDef<Module> = (Module as any).ngInjectorDef;
+    const injectorDef: ɵɵInjectorDef<Module> = (Module as any).ngInjectorDef;
     const instance = injectorDef.factory();
 
     // Since the instance was created outside of an injector using the module, the
diff --git a/packages/core/test/render3/jit_environment_spec.ts b/packages/core/test/render3/jit_environment_spec.ts
index e256047c21..659066d30f 100644
--- a/packages/core/test/render3/jit_environment_spec.ts
+++ b/packages/core/test/render3/jit_environment_spec.ts
@@ -12,12 +12,12 @@ import {Identifiers} from '@angular/compiler/src/render3/r3_identifiers';
 import {angularCoreEnv} from '../../src/render3/jit/environment';
 
 const INTERFACE_EXCEPTIONS = new Set<string>([
-  'ΔBaseDef',
-  'ΔComponentDefWithMeta',
-  'ΔDirectiveDefWithMeta',
-  'ΔInjectorDef',
-  'ΔNgModuleDefWithMeta',
-  'ΔPipeDefWithMeta',
+  'ɵɵBaseDef',
+  'ɵɵComponentDefWithMeta',
+  'ɵɵDirectiveDefWithMeta',
+  'ɵɵInjectorDef',
+  'ɵɵNgModuleDefWithMeta',
+  'ɵɵPipeDefWithMeta',
 ]);
 
 describe('r3 jit environment', () => {
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index b0883302c2..2c69104aad 100644
--- a/packages/core/test/render3/lifecycle_spec.ts
+++ b/packages/core/test/render3/lifecycle_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {OnDestroy} from '../../src/core';
-import {AttributeMarker, ComponentTemplate, ΔNgOnChangesFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
-import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δprojection, ΔprojectionDef, Δselect, Δtemplate, Δtext} from '../../src/render3/instructions/all';
+import {AttributeMarker, ComponentTemplate, ɵɵNgOnChangesFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵprojection, ɵɵprojectionDef, ɵɵselect, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {NgIf} from './common_with_def';
@@ -19,10 +19,10 @@ describe('lifecycles', () => {
   function getParentTemplate(name: string) {
     return (rf: RenderFlags, ctx: any) => {
       if (rf & RenderFlags.Create) {
-        Δelement(0, name);
+        ɵɵelement(0, name);
       }
       if (rf & RenderFlags.Update) {
-        ΔelementProperty(0, 'val', Δbind(ctx.val));
+        ɵɵelementProperty(0, 'val', ɵɵbind(ctx.val));
       }
     };
   }
@@ -34,16 +34,16 @@ describe('lifecycles', () => {
 
     let Comp = createOnInitComponent('comp', (rf: RenderFlags) => {
       if (rf & RenderFlags.Create) {
-        ΔprojectionDef();
-        ΔelementStart(0, 'div');
-        { Δprojection(1); }
-        ΔelementEnd();
+        ɵɵprojectionDef();
+        ɵɵelementStart(0, 'div');
+        { ɵɵprojection(1); }
+        ɵɵelementEnd();
       }
     }, 2);
     let Parent = createOnInitComponent('parent', getParentTemplate('comp'), 1, 1, [Comp]);
     let ProjectedComp = createOnInitComponent('projected', (rf: RenderFlags) => {
       if (rf & RenderFlags.Create) {
-        Δtext(0, 'content');
+        ɵɵtext(0, 'content');
       }
     }, 1);
 
@@ -57,7 +57,7 @@ describe('lifecycles', () => {
           events.push(`${name}${this.val}`);
         }
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: Component,
           selectors: [[name]],
           consts: consts,
@@ -72,7 +72,7 @@ describe('lifecycles', () => {
     class Directive {
       ngOnInit() { events.push('dir'); }
 
-      static ngDirectiveDef = ΔdefineDirective(
+      static ngDirectiveDef = ɵɵdefineDirective(
           {type: Directive, selectors: [['', 'dir', '']], factory: () => new Directive()});
     }
 
@@ -86,20 +86,20 @@ describe('lifecycles', () => {
        */
       const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          Δcontainer(0);
+          ɵɵcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
+          ɵɵcontainerRefreshStart(0);
           {
             if (!ctx.skip) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
+              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
+                ɵɵelement(0, 'comp');
               }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
           }
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         }
       }, 1, 0, directives);
 
diff --git a/packages/core/test/render3/listeners_spec.ts b/packages/core/test/render3/listeners_spec.ts
index b37695351e..546c1155e3 100644
--- a/packages/core/test/render3/listeners_spec.ts
+++ b/packages/core/test/render3/listeners_spec.ts
@@ -8,11 +8,11 @@
 
 import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
 
-import {markDirty, Δbind, ΔdefineComponent, ΔdefineDirective, Δreference, ΔresolveBody, ΔresolveDocument, ΔtextBinding} from '../../src/render3/index';
-import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, ΔgetCurrentView, Δlistener, Δtext} from '../../src/render3/instructions/all';
+import {markDirty, ɵɵbind, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵreference, ɵɵresolveBody, ɵɵresolveDocument, ɵɵtextBinding} from '../../src/render3/index';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵgetCurrentView, ɵɵlistener, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {GlobalTargetResolver} from '../../src/render3/interfaces/renderer';
-import {ΔrestoreView} from '../../src/render3/state';
+import {ɵɵrestoreView} from '../../src/render3/state';
 
 import {getRendererFactory2} from './imported_renderer2';
 import {ComponentFixture, TemplateFixture, containerEl, createComponent, getDirectiveOnNode, renderToHtml, requestAnimationFrame} from './render_util';
@@ -28,7 +28,7 @@ describe('event listeners', () => {
 
     onClick() { this.counter++; }
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: MyComp,
       selectors: [['comp']],
       consts: 2,
@@ -36,12 +36,12 @@ describe('event listeners', () => {
       /** <button (click)="onClick()"> Click me </button> */
       template: function CompTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'button');
+          ɵɵelementStart(0, 'button');
           {
-            Δlistener('click', function() { return ctx.onClick(); });
-            Δtext(1, 'Click me');
+            ɵɵlistener('click', function() { return ctx.onClick(); });
+            ɵɵtext(1, 'Click me');
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       },
       factory: () => {
@@ -59,14 +59,14 @@ describe('event listeners', () => {
     /* @HostListener('body:click') */
     onBodyClick() { events.push('component - body:click'); }
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: MyCompWithGlobalListeners,
       selectors: [['comp']],
       consts: 1,
       vars: 0,
       template: function CompTemplate(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          Δtext(0, 'Some text');
+          ɵɵtext(0, 'Some text');
         }
       },
       factory: () => {
@@ -77,12 +77,12 @@ describe('event listeners', () => {
       hostBindings: function HostListenerDir_HostBindings(
           rf: RenderFlags, ctx: any, elIndex: number) {
         if (rf & RenderFlags.Create) {
-          Δlistener('custom', function() {
+          ɵɵlistener('custom', function() {
             return ctx.onDocumentCustomEvent();
-          }, false, ΔresolveDocument as GlobalTargetResolver);
-          Δlistener('click', function() {
+          }, false, ɵɵresolveDocument as GlobalTargetResolver);
+          ɵɵlistener('click', function() {
             return ctx.onBodyClick();
-          }, false, ΔresolveBody as GlobalTargetResolver);
+          }, false, ɵɵresolveBody as GlobalTargetResolver);
         }
       }
     });
@@ -95,19 +95,19 @@ describe('event listeners', () => {
     /* @HostListener('body:click') */
     onBodyClick() { events.push('directive - body:click'); }
 
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: GlobalHostListenerDir,
       selectors: [['', 'hostListenerDir', '']],
       factory: function HostListenerDir_Factory() { return new GlobalHostListenerDir(); },
       hostBindings: function HostListenerDir_HostBindings(
           rf: RenderFlags, ctx: any, elIndex: number) {
         if (rf & RenderFlags.Create) {
-          Δlistener('custom', function() {
+          ɵɵlistener('custom', function() {
             return ctx.onDocumentCustomEvent();
-          }, false, ΔresolveDocument as GlobalTargetResolver);
-          Δlistener('click', function() {
+          }, false, ɵɵresolveDocument as GlobalTargetResolver);
+          ɵɵlistener('click', function() {
             return ctx.onBodyClick();
-          }, false, ΔresolveBody as GlobalTargetResolver);
+          }, false, ɵɵresolveBody as GlobalTargetResolver);
         }
       }
     });
@@ -129,7 +129,7 @@ describe('event listeners', () => {
       return this.handlerReturnValue;
     }
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: PreventDefaultComp,
       selectors: [['prevent-default-comp']],
       factory: () => new PreventDefaultComp(),
@@ -138,12 +138,12 @@ describe('event listeners', () => {
       /** <button (click)="onClick($event)">Click</button> */
       template: (rf: RenderFlags, ctx: PreventDefaultComp) => {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'button');
+          ɵɵelementStart(0, 'button');
           {
-            Δlistener('click', function($event: any) { return ctx.onClick($event); });
-            Δtext(1, 'Click');
+            ɵɵlistener('click', function($event: any) { return ctx.onClick($event); });
+            ɵɵtext(1, 'Click');
           }
-          ΔelementEnd();
+          ɵɵelementEnd();
         }
       }
     });
@@ -205,15 +205,15 @@ describe('event listeners', () => {
     /** <button (click)="onClick(); onClick2(); "> Click me </button> */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'button');
+        ɵɵelementStart(0, 'button');
         {
-          Δlistener('click', function() {
+          ɵɵlistener('click', function() {
             ctx.onClick();
             return ctx.onClick2();
           });
-          Δtext(1, 'Click me');
+          ɵɵtext(1, 'Click me');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
     }
 
@@ -240,12 +240,12 @@ describe('event listeners', () => {
     /** <button (click)="showing=!showing"> Click me </button> */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'button');
+        ɵɵelementStart(0, 'button');
         {
-          Δlistener('click', function() { return ctx.showing = !ctx.showing; });
-          Δtext(1, 'Click me');
+          ɵɵlistener('click', function() { return ctx.showing = !ctx.showing; });
+          ɵɵtext(1, 'Click me');
         }
-        ΔelementEnd();
+        ɵɵelementEnd();
       }
     }
 
@@ -269,24 +269,24 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
           if (ctx.showing) {
-            if (ΔembeddedViewStart(1, 2, 0)) {
-              ΔelementStart(0, 'button');
+            if (ɵɵembeddedViewStart(1, 2, 0)) {
+              ɵɵelementStart(0, 'button');
               {
-                Δlistener('click', function() { return ctx.onClick(); });
-                Δtext(1, 'Click me');
+                ɵɵlistener('click', function() { return ctx.onClick(); });
+                ɵɵtext(1, 'Click me');
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
@@ -320,7 +320,7 @@ describe('event listeners', () => {
 
       onClick() { this.counter++; }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AppComp,
         selectors: [['app-comp']],
         factory: () => new AppComp(),
@@ -328,24 +328,24 @@ describe('event listeners', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            Δcontainer(0);
+            ɵɵcontainer(0);
           }
           if (rf & RenderFlags.Update) {
-            ΔcontainerRefreshStart(0);
+            ɵɵcontainerRefreshStart(0);
             {
               if (ctx.showing) {
-                if (ΔembeddedViewStart(0, 2, 0)) {
-                  ΔelementStart(0, 'button');
+                if (ɵɵembeddedViewStart(0, 2, 0)) {
+                  ɵɵelementStart(0, 'button');
                   {
-                    Δlistener('click', function() { return ctx.onClick(); });
-                    Δtext(1, 'Click me');
+                    ɵɵlistener('click', function() { return ctx.onClick(); });
+                    ɵɵtext(1, 'Click me');
                   }
-                  ΔelementEnd();
+                  ɵɵelementEnd();
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
+            ɵɵcontainerRefreshEnd();
           }
         }
       });
@@ -381,7 +381,7 @@ describe('event listeners', () => {
 
       onClick(index: number) { this.counters[index]++; }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AppComp,
         selectors: [['app-comp']],
         factory: () => new AppComp(),
@@ -389,24 +389,24 @@ describe('event listeners', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            Δcontainer(0);
+            ɵɵcontainer(0);
           }
           if (rf & RenderFlags.Update) {
-            ΔcontainerRefreshStart(0);
+            ɵɵcontainerRefreshStart(0);
             {
               for (let i = 0; i < ctx.buttons; i++) {
-                if (ΔembeddedViewStart(0, 2, 0)) {
-                  ΔelementStart(0, 'button');
+                if (ɵɵembeddedViewStart(0, 2, 0)) {
+                  ɵɵelementStart(0, 'button');
                   {
-                    Δlistener('click', function() { return ctx.onClick(i); });
-                    Δtext(1, 'Click me');
+                    ɵɵlistener('click', function() { return ctx.onClick(i); });
+                    ɵɵtext(1, 'Click me');
                   }
-                  ΔelementEnd();
+                  ɵɵelementEnd();
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
+            ɵɵcontainerRefreshEnd();
           }
         }
       });
@@ -445,7 +445,7 @@ describe('event listeners', () => {
 
       onClick(index: number) { this.counters[index]++; }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AppComp,
         selectors: [['app-comp']],
         factory: () => new AppComp(),
@@ -453,31 +453,31 @@ describe('event listeners', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            Δcontainer(0);
+            ɵɵcontainer(0);
           }
           if (rf & RenderFlags.Update) {
-            ΔcontainerRefreshStart(0);
+            ɵɵcontainerRefreshStart(0);
             {
               for (let i = 0; i < ctx.buttons; i++) {
-                const rf1 = ΔembeddedViewStart(1, 4, 1);
+                const rf1 = ɵɵembeddedViewStart(1, 4, 1);
                 if (rf1 & RenderFlags.Create) {
-                  ΔelementStart(0, 'button');
+                  ɵɵelementStart(0, 'button');
                   {
-                    Δlistener('click', function() { return ctx.onClick(i); });
-                    Δtext(1, 'Click me');
+                    ɵɵlistener('click', function() { return ctx.onClick(i); });
+                    ɵɵtext(1, 'Click me');
                   }
-                  ΔelementEnd();
-                  ΔelementStart(2, 'div');
-                  { Δtext(3); }
-                  ΔelementEnd();
+                  ɵɵelementEnd();
+                  ɵɵelementStart(2, 'div');
+                  { ɵɵtext(3); }
+                  ɵɵelementEnd();
                 }
                 if (rf1 & RenderFlags.Update) {
-                  ΔtextBinding(3, Δbind(ctx.counters[i]));
+                  ɵɵtextBinding(3, ɵɵbind(ctx.counters[i]));
                 }
-                ΔembeddedViewEnd();
+                ɵɵembeddedViewEnd();
               }
             }
-            ΔcontainerRefreshEnd();
+            ɵɵcontainerRefreshEnd();
           }
         }
       });
@@ -523,21 +523,21 @@ describe('event listeners', () => {
       /* @HostListener('click') */
       onClick() { events.push('click!'); }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComp,
         selectors: [['comp']],
         consts: 1,
         vars: 0,
         template: function CompTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            Δtext(0, 'Some text');
+            ɵɵtext(0, 'Some text');
           }
         },
         factory: () => { return new MyComp(); },
         hostBindings: function HostListenerDir_HostBindings(
             rf: RenderFlags, ctx: any, elIndex: number) {
           if (rf & RenderFlags.Create) {
-            Δlistener('click', function() { return ctx.onClick(); });
+            ɵɵlistener('click', function() { return ctx.onClick(); });
           }
         }
       });
@@ -574,23 +574,23 @@ describe('event listeners', () => {
       /* @HostListener('click') */
       onClick() { events.push('click!'); }
 
-      static ngDirectiveDef = ΔdefineDirective({
+      static ngDirectiveDef = ɵɵdefineDirective({
         type: HostListenerDir,
         selectors: [['', 'hostListenerDir', '']],
         factory: function HostListenerDir_Factory() { return new HostListenerDir(); },
         hostBindings: function HostListenerDir_HostBindings(
             rf: RenderFlags, ctx: any, elIndex: number) {
           if (rf & RenderFlags.Create) {
-            Δlistener('click', function() { return ctx.onClick(); });
+            ɵɵlistener('click', function() { return ctx.onClick(); });
           }
         }
       });
     }
 
     const fixture = new TemplateFixture(() => {
-      ΔelementStart(0, 'button', ['hostListenerDir', '']);
-      Δtext(1, 'Click');
-      ΔelementEnd();
+      ɵɵelementStart(0, 'button', ['hostListenerDir', '']);
+      ɵɵtext(1, 'Click');
+      ɵɵelementEnd();
     }, () => {}, 2, 0, [HostListenerDir]);
 
     const button = fixture.hostElement.querySelector('button') !;
@@ -604,7 +604,7 @@ describe('event listeners', () => {
 
   it('should support global host listeners on directives', () => {
     const fixture = new TemplateFixture(() => {
-      Δelement(0, 'div', ['hostListenerDir', '']);
+      ɵɵelement(0, 'div', ['hostListenerDir', '']);
     }, () => {}, 1, 0, [GlobalHostListenerDir]);
 
     const doc = fixture.hostElement.ownerDocument !;
@@ -626,7 +626,7 @@ describe('event listeners', () => {
 
       onClick(a: any, b: any) { this.counter += a + b; }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComp,
         selectors: [['comp']],
         consts: 2,
@@ -634,12 +634,12 @@ describe('event listeners', () => {
         /** <button (click)="onClick(data.a, data.b)"> Click me </button> */
         template: function CompTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'button');
+            ɵɵelementStart(0, 'button');
             {
-              Δlistener('click', function() { return ctx.onClick(ctx.data.a, ctx.data.b); });
-              Δtext(1, 'Click me');
+              ɵɵlistener('click', function() { return ctx.onClick(ctx.data.a, ctx.data.b); });
+              ɵɵtext(1, 'Click me');
             }
-            ΔelementEnd();
+            ɵɵelementEnd();
           }
         },
         factory: () => new MyComp()
@@ -669,39 +669,39 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
           if (ctx.showing) {
-            let rf1 = ΔembeddedViewStart(0, 2, 0);
+            let rf1 = ɵɵembeddedViewStart(0, 2, 0);
             if (rf1 & RenderFlags.Create) {
-              Δtext(0, 'Hello');
-              Δcontainer(1);
+              ɵɵtext(0, 'Hello');
+              ɵɵcontainer(1);
             }
             if (rf1 & RenderFlags.Update) {
-              ΔcontainerRefreshStart(1);
+              ɵɵcontainerRefreshStart(1);
               {
                 if (ctx.button) {
-                  let rf1 = ΔembeddedViewStart(0, 2, 0);
+                  let rf1 = ɵɵembeddedViewStart(0, 2, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ΔelementStart(0, 'button');
+                    ɵɵelementStart(0, 'button');
                     {
-                      Δlistener('click', function() { return ctx.onClick(); });
-                      Δtext(1, 'Click');
+                      ɵɵlistener('click', function() { return ctx.onClick(); });
+                      ɵɵtext(1, 'Click');
                     }
-                    ΔelementEnd();
+                    ɵɵelementEnd();
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
+              ɵɵcontainerRefreshEnd();
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
@@ -733,22 +733,22 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
           if (ctx.showing) {
-            let rf1 = ΔembeddedViewStart(0, 3, 0);
+            let rf1 = ɵɵembeddedViewStart(0, 3, 0);
             if (rf1 & RenderFlags.Create) {
-              Δtext(0, 'Hello');
-              Δelement(1, 'comp');
-              Δelement(2, 'comp');
+              ɵɵtext(0, 'Hello');
+              ɵɵelement(1, 'comp');
+              ɵɵelement(2, 'comp');
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
@@ -775,19 +775,19 @@ describe('event listeners', () => {
     const ctx = {showing: true};
 
     const fixture = new TemplateFixture(
-        () => { Δcontainer(0); },
+        () => { ɵɵcontainer(0); },
         () => {
-          ΔcontainerRefreshStart(0);
+          ɵɵcontainerRefreshStart(0);
           {
             if (ctx.showing) {
-              let rf1 = ΔembeddedViewStart(0, 1, 0);
+              let rf1 = ɵɵembeddedViewStart(0, 1, 0);
               if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'comp');
+                ɵɵelement(0, 'comp');
               }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
           }
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         },
         1, 0, [MyCompWithGlobalListeners]);
 
@@ -820,56 +820,56 @@ describe('event listeners', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
           if (ctx.condition) {
-            let rf1 = ΔembeddedViewStart(0, 3, 0);
+            let rf1 = ɵɵembeddedViewStart(0, 3, 0);
             if (rf1 & RenderFlags.Create) {
-              Δtext(0, 'Hello');
-              Δcontainer(1);
-              Δcontainer(2);
+              ɵɵtext(0, 'Hello');
+              ɵɵcontainer(1);
+              ɵɵcontainer(2);
             }
             if (rf1 & RenderFlags.Update) {
-              ΔcontainerRefreshStart(1);
+              ɵɵcontainerRefreshStart(1);
               {
                 if (ctx.sub1) {
-                  let rf1 = ΔembeddedViewStart(0, 2, 0);
+                  let rf1 = ɵɵembeddedViewStart(0, 2, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ΔelementStart(0, 'button');
+                    ɵɵelementStart(0, 'button');
                     {
-                      Δlistener('click', function() { return ctx.counter1++; });
-                      Δtext(1, 'Click');
+                      ɵɵlistener('click', function() { return ctx.counter1++; });
+                      ɵɵtext(1, 'Click');
                     }
-                    ΔelementEnd();
+                    ɵɵelementEnd();
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
-              ΔcontainerRefreshStart(2);
+              ɵɵcontainerRefreshEnd();
+              ɵɵcontainerRefreshStart(2);
               {
                 if (ctx.sub2) {
-                  let rf1 = ΔembeddedViewStart(0, 2, 0);
+                  let rf1 = ɵɵembeddedViewStart(0, 2, 0);
                   if (rf1 & RenderFlags.Create) {
-                    ΔelementStart(0, 'button');
+                    ɵɵelementStart(0, 'button');
                     {
-                      Δlistener('click', function() { return ctx.counter2++; });
-                      Δtext(1, 'Click');
+                      ɵɵlistener('click', function() { return ctx.counter2++; });
+                      ɵɵtext(1, 'Click');
                     }
-                    ΔelementEnd();
+                    ɵɵelementEnd();
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
+              ɵɵcontainerRefreshEnd();
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
@@ -907,7 +907,7 @@ describe('event listeners', () => {
 
       onClick(comp: any) { this.comp = comp; }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: App,
         selectors: [['app']],
         factory: () => new App(),
@@ -915,17 +915,17 @@ describe('event listeners', () => {
         vars: 0,
         template: (rf: RenderFlags, ctx: App) => {
           if (rf & RenderFlags.Create) {
-            const state = ΔgetCurrentView();
-            Δelement(0, 'comp', null, ['comp', '']);
-            ΔelementStart(2, 'button');
+            const state = ɵɵgetCurrentView();
+            ɵɵelement(0, 'comp', null, ['comp', '']);
+            ɵɵelementStart(2, 'button');
             {
-              Δlistener('click', function() {
-                ΔrestoreView(state);
-                const comp = Δreference(1);
+              ɵɵlistener('click', function() {
+                ɵɵrestoreView(state);
+                const comp = ɵɵreference(1);
                 return ctx.onClick(comp);
               });
             }
-            ΔelementEnd();
+            ɵɵelementEnd();
           }
 
           // testing only
diff --git a/packages/core/test/render3/outputs_spec.ts b/packages/core/test/render3/outputs_spec.ts
index efc1c8605f..58607ea713 100644
--- a/packages/core/test/render3/outputs_spec.ts
+++ b/packages/core/test/render3/outputs_spec.ts
@@ -8,8 +8,8 @@
 
 import {EventEmitter} from '@angular/core';
 
-import {ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
-import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δlistener, Δtext} from '../../src/render3/instructions/all';
+import {ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵlistener, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {renderToHtml} from './render_util';
@@ -21,7 +21,7 @@ describe('outputs', () => {
     change = new EventEmitter();
     resetStream = new EventEmitter();
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: ButtonToggle,
       selectors: [['button-toggle']],
       template: function(rf: RenderFlags, ctx: any) {},
@@ -37,7 +37,7 @@ describe('outputs', () => {
   class OtherDir {
     changeStream = new EventEmitter();
 
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: OtherDir,
       selectors: [['', 'otherDir', '']],
       factory: () => otherDir = new OtherDir,
@@ -60,39 +60,39 @@ describe('outputs', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'button');
+        ɵɵelementStart(0, 'button');
         {
-          Δlistener('click', function() { return ctx.onClick(); });
-          Δtext(1, 'Click me');
+          ɵɵlistener('click', function() { return ctx.onClick(); });
+          ɵɵtext(1, 'Click me');
         }
-        ΔelementEnd();
-        Δcontainer(2);
+        ɵɵelementEnd();
+        ɵɵcontainer(2);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(2);
+        ɵɵcontainerRefreshStart(2);
         {
           if (ctx.condition) {
-            let rf1 = ΔembeddedViewStart(0, 1, 0);
+            let rf1 = ɵɵembeddedViewStart(0, 1, 0);
             if (rf1 & RenderFlags.Create) {
-              ΔelementStart(0, 'button-toggle');
+              ɵɵelementStart(0, 'button-toggle');
               {
-                Δlistener('change', function() { return ctx.onChange(); });
+                ɵɵlistener('change', function() { return ctx.onChange(); });
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           } else {
-            if (ΔembeddedViewStart(1, 1, 0)) {
-              ΔelementStart(0, 'div', ['otherDir', '']);
+            if (ɵɵembeddedViewStart(1, 1, 0)) {
+              ɵɵelementStart(0, 'div', ['otherDir', '']);
               {
-                Δlistener('change', function() { return ctx.onChange(); });
+                ɵɵlistener('change', function() { return ctx.onChange(); });
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
diff --git a/packages/core/test/render3/pipe_spec.ts b/packages/core/test/render3/pipe_spec.ts
index 44f0464af3..e91dadd74a 100644
--- a/packages/core/test/render3/pipe_spec.ts
+++ b/packages/core/test/render3/pipe_spec.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive as _Directive, Pipe as _Pipe, PipeTransform, WrappedValue, ΔdefinePipe} from '@angular/core';
+import {Directive as _Directive, Pipe as _Pipe, PipeTransform, WrappedValue, ɵɵdefinePipe} from '@angular/core';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
-import {Δinterpolation1, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
-import {Δpipe, ΔpipeBind1} from '../../src/render3/pipe';
+import {ɵɵinterpolation1, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
+import {ɵɵpipe, ɵɵpipeBind1} from '../../src/render3/pipe';
 
 import {TemplateFixture} from './render_util';
 
@@ -29,7 +29,7 @@ describe('pipe', () => {
     class WrappingPipe implements PipeTransform {
       transform(value: any) { return new WrappedValue('Bar'); }
 
-      static ngPipeDef = ΔdefinePipe({
+      static ngPipeDef = ɵɵdefinePipe({
         name: 'wrappingPipe',
         type: WrappingPipe,
         factory: function WrappingPipe_Factory() { return new WrappingPipe(); },
@@ -38,11 +38,13 @@ describe('pipe', () => {
     }
 
     function createTemplate() {
-      Δtext(0);
-      Δpipe(1, 'wrappingPipe');
+      ɵɵtext(0);
+      ɵɵpipe(1, 'wrappingPipe');
     }
 
-    function updateTemplate() { ΔtextBinding(0, Δinterpolation1('', ΔpipeBind1(1, 1, null), '')); }
+    function updateTemplate() {
+      ɵɵtextBinding(0, ɵɵinterpolation1('', ɵɵpipeBind1(1, 1, null), ''));
+    }
 
     it('should unwrap', () => {
       const fixture =
diff --git a/packages/core/test/render3/providers_spec.ts b/packages/core/test/render3/providers_spec.ts
index 021b7a18db..0e64029c90 100644
--- a/packages/core/test/render3/providers_spec.ts
+++ b/packages/core/test/render3/providers_spec.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component as _Component, ComponentFactoryResolver, ElementRef, InjectFlags, Injectable as _Injectable, InjectionToken, InjectorType, Provider, RendererFactory2, ViewContainerRef, ɵNgModuleDef as NgModuleDef, ΔdefineInjectable, ΔdefineInjector, Δinject} from '../../src/core';
+import {Component as _Component, ComponentFactoryResolver, ElementRef, InjectFlags, Injectable as _Injectable, InjectionToken, InjectorType, Provider, RendererFactory2, ViewContainerRef, ɵNgModuleDef as NgModuleDef, ɵɵdefineInjectable, ɵɵdefineInjector, ɵɵinject} from '../../src/core';
 import {forwardRef} from '../../src/di/forward_ref';
 import {createInjector} from '../../src/di/r3_injector';
-import {injectComponentFactoryResolver, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective, ΔdirectiveInject} from '../../src/render3/index';
-import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δtext, ΔtextBinding} from '../../src/render3/instructions/all';
+import {injectComponentFactoryResolver, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdirectiveInject} from '../../src/render3/index';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵtext, ɵɵtextBinding} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {NgModuleFactory} from '../../src/render3/ng_module_ref';
 import {getInjector} from '../../src/render3/util/discovery_utils';
@@ -59,7 +59,7 @@ describe('providers', () => {
       constructor(private provider: GreeterProvider) { this.greet = this.provider.provide(); }
 
       static ngInjectableDef =
-          ΔdefineInjectable({factory: () => new GreeterInj(Δinject(GreeterProvider as any))});
+          ɵɵdefineInjectable({factory: () => new GreeterInj(ɵɵinject(GreeterProvider as any))});
     }
 
     it('TypeProvider', () => {
@@ -67,7 +67,7 @@ describe('providers', () => {
         parent: {
           providers: [GreeterClass],
           componentAssertion:
-              () => { expect(ΔdirectiveInject(GreeterClass).greet).toEqual('Class'); }
+              () => { expect(ɵɵdirectiveInject(GreeterClass).greet).toEqual('Class'); }
         }
       });
     });
@@ -76,7 +76,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [{provide: GREETER, useValue: {greet: 'Value'}}],
-          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Value'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Value'); }
         }
       });
     });
@@ -85,7 +85,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [{provide: GREETER, useClass: GreeterClass}],
-          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
         }
       });
     });
@@ -94,7 +94,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [GreeterClass, {provide: GREETER, useExisting: GreeterClass}],
-          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
         }
       });
     });
@@ -103,7 +103,7 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [GreeterClass, {provide: GREETER, useFactory: () => new GreeterClass()}],
-          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
         }
       });
     });
@@ -117,7 +117,7 @@ describe('providers', () => {
             {provide: MESSAGE, useValue: 'Message'},
             {provide: GREETER, useClass: GreeterDeps, deps: [MESSAGE]}
           ],
-          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message'); }
         }
       });
     });
@@ -130,7 +130,7 @@ describe('providers', () => {
             {provide: GREETER, useClass: GreeterBuiltInDeps, deps: [MESSAGE, ElementRef]}
           ],
           componentAssertion:
-              () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
+              () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
         }
       });
     });
@@ -142,7 +142,7 @@ describe('providers', () => {
             {provide: MESSAGE, useValue: 'Message'},
             {provide: GREETER, useFactory: (msg: string) => new GreeterDeps(msg), deps: [MESSAGE]}
           ],
-          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message'); }
         }
       });
     });
@@ -159,7 +159,7 @@ describe('providers', () => {
             }
           ],
           componentAssertion:
-              () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
+              () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Message from PARENT'); }
         }
       });
     });
@@ -168,7 +168,8 @@ describe('providers', () => {
       expectProvidersScenario({
         parent: {
           providers: [GreeterProvider, {provide: GREETER, useClass: GreeterInj}],
-          componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Provided'); }
+          componentAssertion:
+              () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Provided'); }
         }
       });
     });
@@ -180,7 +181,7 @@ describe('providers', () => {
             parent: {
               providers: [forwardRef(() => ForLater)],
               componentAssertion:
-                  () => { expect(ΔdirectiveInject(ForLater) instanceof ForLater).toBeTruthy(); }
+                  () => { expect(ɵɵdirectiveInject(ForLater) instanceof ForLater).toBeTruthy(); }
             }
           });
           done();
@@ -195,7 +196,7 @@ describe('providers', () => {
           parent: {
             providers:
                 [{provide: GREETER, useValue: forwardRef(() => { return {greet: 'Value'}; })}],
-            componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Value'); }
+            componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Value'); }
           }
         });
       });
@@ -204,7 +205,7 @@ describe('providers', () => {
         expectProvidersScenario({
           parent: {
             providers: [{provide: GREETER, useClass: forwardRef(() => GreeterClass)}],
-            componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
+            componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
           }
         });
       });
@@ -214,7 +215,7 @@ describe('providers', () => {
           parent: {
             providers:
                 [GreeterClass, {provide: GREETER, useExisting: forwardRef(() => GreeterClass)}],
-            componentAssertion: () => { expect(ΔdirectiveInject(GREETER).greet).toEqual('Class'); }
+            componentAssertion: () => { expect(ɵɵdirectiveInject(GREETER).greet).toEqual('Class'); }
           }
         });
       });
@@ -225,7 +226,7 @@ describe('providers', () => {
           parent: {
             providers: [{provide: GREETER, useValue: {greet: 'Value'}}],
             componentAssertion: () => {
-              expect(ΔdirectiveInject(forwardRef(() => GREETER)).greet).toEqual('Value');
+              expect(ɵɵdirectiveInject(forwardRef(() => GREETER)).greet).toEqual('Value');
             }
           }
         });
@@ -255,7 +256,7 @@ describe('providers', () => {
         parent: {
           providers: [{provide: String, useValue: 'Message 1'}],
           directiveProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -265,7 +266,7 @@ describe('providers', () => {
         parent: {
           providers: [{provide: String, useValue: 'Message 1'}],
           viewProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -275,7 +276,7 @@ describe('providers', () => {
         parent: {
           directiveProviders: [{provide: String, useValue: 'Message 1'}],
           viewProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -285,7 +286,7 @@ describe('providers', () => {
         parent: {
           directive2Providers: [{provide: String, useValue: 'Message 1'}],
           directiveProviders: [{provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -295,7 +296,7 @@ describe('providers', () => {
         parent: {
           providers:
               [{provide: String, useValue: 'Message 1'}, {provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -305,7 +306,7 @@ describe('providers', () => {
         parent: {
           viewProviders:
               [{provide: String, useValue: 'Message 1'}, {provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -315,7 +316,7 @@ describe('providers', () => {
         parent: {
           directiveProviders:
               [{provide: String, useValue: 'Message 1'}, {provide: String, useValue: 'Message 2'}],
-          componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('Message 2'); }
+          componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('Message 2'); }
         }
       });
     });
@@ -323,7 +324,7 @@ describe('providers', () => {
 
   describe('single', () => {
     class MyModule {
-      static ngInjectorDef = ΔdefineInjector(
+      static ngInjectorDef = ɵɵdefineInjector(
           {factory: () => new MyModule(), providers: [{provide: String, useValue: 'From module'}]});
     }
 
@@ -331,16 +332,16 @@ describe('providers', () => {
       it('should work without providers nor viewProviders in component', () => {
         expectProvidersScenario({
           parent: {
-            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
           },
           viewChild: {
-            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
           },
           contentChild: {
-            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
           },
           ngModule: MyModule
         });
@@ -351,21 +352,21 @@ describe('providers', () => {
           parent: {
             providers: [{provide: String, useValue: 'From providers'}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
           },
           ngModule: MyModule
         });
@@ -376,18 +377,18 @@ describe('providers', () => {
           parent: {
             viewProviders: [{provide: String, useValue: 'From viewProviders'}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
+            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
-            componentAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual('From module'); }
+            componentAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); },
+            directiveAssertion: () => { expect(ɵɵdirectiveInject(String)).toEqual('From module'); }
           },
           ngModule: MyModule
         });
@@ -399,21 +400,21 @@ describe('providers', () => {
             providers: [{provide: String, useValue: 'From providers'}],
             viewProviders: [{provide: String, useValue: 'From viewProviders'}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From providers'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From providers'); }
           },
           ngModule: MyModule
         });
@@ -427,21 +428,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -454,21 +455,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -481,21 +482,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -509,21 +510,21 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive'}],
             directive2Providers: [{provide: String, useValue: 'Never'}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From viewProviders'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From viewProviders'); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual('From directive'); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual('From directive'); }
           },
           ngModule: MyModule
         });
@@ -533,7 +534,7 @@ describe('providers', () => {
 
   describe('multi', () => {
     class MyModule {
-      static ngInjectorDef = ΔdefineInjector({
+      static ngInjectorDef = ɵɵdefineInjector({
         factory: () => new MyModule(),
         providers: [{provide: String, useValue: 'From module', multi: true}]
       });
@@ -544,18 +545,21 @@ describe('providers', () => {
         expectProvidersScenario({
           parent: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion:
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion:
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion:
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
           },
           ngModule: MyModule
         });
@@ -566,21 +570,21 @@ describe('providers', () => {
           parent: {
             providers: [{provide: String, useValue: 'From providers', multi: true}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
           },
           ngModule: MyModule
         });
@@ -591,19 +595,21 @@ describe('providers', () => {
           parent: {
             viewProviders: [{provide: String, useValue: 'From viewProviders', multi: true}],
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From viewProviders']); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From viewProviders']); },
+            directiveAssertion:
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
           },
           viewChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From viewProviders']); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From viewProviders']); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From viewProviders']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From viewProviders']); }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); },
-            directiveAssertion: () => { expect(ΔdirectiveInject(String)).toEqual(['From module']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); },
+            directiveAssertion:
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From module']); }
           },
           ngModule: MyModule
         });
@@ -615,24 +621,24 @@ describe('providers', () => {
             providers: [{provide: String, useValue: 'From providers', multi: true}],
             viewProviders: [{provide: String, useValue: 'From viewProviders', multi: true}],
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
             },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From providers', 'From viewProviders']);
             }
           },
           contentChild: {
             componentAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); },
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); },
             directiveAssertion:
-                () => { expect(ΔdirectiveInject(String)).toEqual(['From providers']); }
+                () => { expect(ɵɵdirectiveInject(String)).toEqual(['From providers']); }
           },
           ngModule: MyModule
         });
@@ -646,26 +652,26 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           ngModule: MyModule
@@ -679,36 +685,36 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
@@ -724,32 +730,32 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
+              expect(ɵɵdirectiveInject(String)).toEqual(['From directive 2', 'From directive 1']);
             }
           },
           ngModule: MyModule
@@ -764,36 +770,36 @@ describe('providers', () => {
             directiveProviders: [{provide: String, useValue: 'From directive 1', multi: true}],
             directive2Providers: [{provide: String, useValue: 'From directive 2', multi: true}],
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           viewChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From viewProviders', 'From directive 2', 'From directive 1'
               ]);
             }
           },
           contentChild: {
             componentAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             },
             directiveAssertion: () => {
-              expect(ΔdirectiveInject(String)).toEqual([
+              expect(ɵɵdirectiveInject(String)).toEqual([
                 'From providers', 'From directive 2', 'From directive 1'
               ]);
             }
@@ -809,20 +815,20 @@ describe('providers', () => {
       @Injectable({providedIn: 'root'})
       class FooForRoot {
         static ngInjectableDef =
-            ΔdefineInjectable({factory: () => new FooForRoot(), providedIn: 'root'});
+            ɵɵdefineInjectable({factory: () => new FooForRoot(), providedIn: 'root'});
       }
 
       expectProvidersScenario({
         parent: {
           componentAssertion:
-              () => { expect(ΔdirectiveInject(FooForRoot) instanceof FooForRoot).toBeTruthy(); }
+              () => { expect(ɵɵdirectiveInject(FooForRoot) instanceof FooForRoot).toBeTruthy(); }
         }
       });
     });
 
     it('should work with a module', () => {
       class MyModule {
-        static ngInjectorDef = ΔdefineInjector({
+        static ngInjectorDef = ɵɵdefineInjector({
           factory: () => new MyModule(),
           providers: [{provide: String, useValue: 'From module'}]
         });
@@ -831,13 +837,14 @@ describe('providers', () => {
       @Injectable({providedIn: MyModule})
       class FooForModule {
         static ngInjectableDef =
-            ΔdefineInjectable({factory: () => new FooForModule(), providedIn: MyModule});
+            ɵɵdefineInjectable({factory: () => new FooForModule(), providedIn: MyModule});
       }
 
       expectProvidersScenario({
         parent: {
-          componentAssertion:
-              () => { expect(ΔdirectiveInject(FooForModule) instanceof FooForModule).toBeTruthy(); }
+          componentAssertion: () => {
+            expect(ɵɵdirectiveInject(FooForModule) instanceof FooForModule).toBeTruthy();
+          }
         },
         ngModule: MyModule
       });
@@ -852,20 +859,20 @@ describe('providers', () => {
       class Repeated {
         constructor(private s: String, private n: Number) {}
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: Repeated,
           selectors: [['repeated']],
-          factory: () => new Repeated(ΔdirectiveInject(String), ΔdirectiveInject(Number)),
+          factory: () => new Repeated(ɵɵdirectiveInject(String), ɵɵdirectiveInject(Number)),
           consts: 2,
           vars: 2,
           template: function(fs: RenderFlags, ctx: Repeated) {
             if (fs & RenderFlags.Create) {
-              Δtext(0);
-              Δtext(1);
+              ɵɵtext(0);
+              ɵɵtext(1);
             }
             if (fs & RenderFlags.Update) {
-              ΔtextBinding(0, Δbind(ctx.s));
-              ΔtextBinding(1, Δbind(ctx.n));
+              ɵɵtextBinding(0, ɵɵbind(ctx.s));
+              ɵɵtextBinding(1, ɵɵbind(ctx.n));
             }
           }
         });
@@ -882,7 +889,7 @@ describe('providers', () => {
             [{provide: String, useValue: 'foo'}, {provide: Number, useValue: 2, multi: true}],
       })
       class ComponentWithProviders {
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: ComponentWithProviders,
           selectors: [['component-with-providers']],
           factory: () => new ComponentWithProviders(),
@@ -890,28 +897,28 @@ describe('providers', () => {
           vars: 0,
           template: function(fs: RenderFlags, ctx: ComponentWithProviders) {
             if (fs & RenderFlags.Create) {
-              ΔelementStart(0, 'div');
-              { Δcontainer(1); }
-              ΔelementEnd();
+              ɵɵelementStart(0, 'div');
+              { ɵɵcontainer(1); }
+              ɵɵelementEnd();
             }
             if (fs & RenderFlags.Update) {
-              ΔcontainerRefreshStart(1);
+              ɵɵcontainerRefreshStart(1);
               {
                 for (let i = 0; i < 3; i++) {
-                  let rf1 = ΔembeddedViewStart(1, 1, 0);
+                  let rf1 = ɵɵembeddedViewStart(1, 1, 0);
                   {
                     if (rf1 & RenderFlags.Create) {
-                      Δelement(0, 'repeated');
+                      ɵɵelement(0, 'repeated');
                     }
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
+              ɵɵcontainerRefreshEnd();
             }
           },
           features: [
-            ΔProvidersFeature(
+            ɵɵProvidersFeature(
                 [{provide: Number, useValue: 1, multi: true}],
                 [{provide: String, useValue: 'foo'}, {provide: Number, useValue: 2, multi: true}]),
           ],
@@ -935,24 +942,24 @@ describe('providers', () => {
       class Repeated {
         constructor(private s: String, private n: Number) {}
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: Repeated,
           selectors: [['repeated']],
-          factory: () => new Repeated(ΔdirectiveInject(String), ΔdirectiveInject(Number)),
+          factory: () => new Repeated(ɵɵdirectiveInject(String), ɵɵdirectiveInject(Number)),
           consts: 2,
           vars: 2,
           template: function(fs: RenderFlags, ctx: Repeated) {
             if (fs & RenderFlags.Create) {
-              Δtext(0);
-              Δtext(1);
+              ɵɵtext(0);
+              ɵɵtext(1);
             }
             if (fs & RenderFlags.Update) {
-              ΔtextBinding(0, Δbind(ctx.s));
-              ΔtextBinding(1, Δbind(ctx.n));
+              ɵɵtextBinding(0, ɵɵbind(ctx.s));
+              ɵɵtextBinding(1, ɵɵbind(ctx.n));
             }
           },
           features: [
-            ΔProvidersFeature(
+            ɵɵProvidersFeature(
                 [{provide: Number, useValue: 1, multi: true}],
                 [{provide: String, useValue: 'bar'}, {provide: Number, useValue: 2, multi: true}]),
           ],
@@ -968,7 +975,7 @@ describe('providers', () => {
         viewProviders: [{provide: toString, useValue: 'foo'}],
       })
       class ComponentWithProviders {
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: ComponentWithProviders,
           selectors: [['component-with-providers']],
           factory: () => new ComponentWithProviders(),
@@ -976,27 +983,27 @@ describe('providers', () => {
           vars: 0,
           template: function(fs: RenderFlags, ctx: ComponentWithProviders) {
             if (fs & RenderFlags.Create) {
-              ΔelementStart(0, 'div');
-              { Δcontainer(1); }
-              ΔelementEnd();
+              ɵɵelementStart(0, 'div');
+              { ɵɵcontainer(1); }
+              ɵɵelementEnd();
             }
             if (fs & RenderFlags.Update) {
-              ΔcontainerRefreshStart(1);
+              ɵɵcontainerRefreshStart(1);
               {
                 for (let i = 0; i < 3; i++) {
-                  let rf1 = ΔembeddedViewStart(1, 1, 0);
+                  let rf1 = ɵɵembeddedViewStart(1, 1, 0);
                   {
                     if (rf1 & RenderFlags.Create) {
-                      Δelement(0, 'repeated');
+                      ɵɵelement(0, 'repeated');
                     }
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
+              ɵɵcontainerRefreshEnd();
             }
           },
-          features: [ΔProvidersFeature([], [{provide: String, useValue: 'foo'}])],
+          features: [ɵɵProvidersFeature([], [{provide: String, useValue: 'foo'}])],
           directives: [Repeated]
         });
       }
@@ -1017,18 +1024,18 @@ describe('providers', () => {
     class EmbeddedComponent {
       constructor(private s: String) {}
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: EmbeddedComponent,
         selectors: [['embedded-cmp']],
-        factory: () => new EmbeddedComponent(ΔdirectiveInject(String)),
+        factory: () => new EmbeddedComponent(ɵɵdirectiveInject(String)),
         consts: 1,
         vars: 1,
         template: (rf: RenderFlags, cmp: EmbeddedComponent) => {
           if (rf & RenderFlags.Create) {
-            Δtext(0);
+            ɵɵtext(0);
           }
           if (rf & RenderFlags.Update) {
-            ΔtextBinding(0, Δinterpolation1('', cmp.s, ''));
+            ɵɵtextBinding(0, ɵɵinterpolation1('', cmp.s, ''));
           }
         }
       });
@@ -1038,20 +1045,20 @@ describe('providers', () => {
     class HostComponent {
       constructor(public vcref: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: HostComponent,
         selectors: [['host-cmp']],
         factory: () => hostComponent = new HostComponent(
-                     ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                     ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
         consts: 1,
         vars: 0,
         template: (rf: RenderFlags, cmp: HostComponent) => {
           if (rf & RenderFlags.Create) {
-            Δtext(0, 'foo');
+            ɵɵtext(0, 'foo');
           }
         },
         features: [
-          ΔProvidersFeature([{provide: String, useValue: 'From host component'}]),
+          ɵɵProvidersFeature([{provide: String, useValue: 'From host component'}]),
         ],
       });
     }
@@ -1063,7 +1070,7 @@ describe('providers', () => {
     class AppComponent {
       constructor() {}
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AppComponent,
         selectors: [['app-cmp']],
         factory: () => new AppComponent(),
@@ -1071,11 +1078,11 @@ describe('providers', () => {
         vars: 0,
         template: (rf: RenderFlags, cmp: AppComponent) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'host-cmp');
+            ɵɵelement(0, 'host-cmp');
           }
         },
         features: [
-          ΔProvidersFeature([{provide: String, useValue: 'From app component'}]),
+          ɵɵProvidersFeature([{provide: String, useValue: 'From app component'}]),
         ],
         directives: [HostComponent]
       });
@@ -1104,7 +1111,7 @@ describe('providers', () => {
          expect(fixture.html).toEqual('<host-cmp>foo</host-cmp>');
 
          class MyAppModule {
-           static ngInjectorDef = ΔdefineInjector({
+           static ngInjectorDef = ɵɵdefineInjector({
              factory: () => new MyAppModule(),
              imports: [],
              providers: [
@@ -1147,7 +1154,7 @@ describe('providers', () => {
            constructor(public value: String) {}
 
            static ngInjectableDef =
-               ΔdefineInjectable({factory: () => new MyService(Δinject(String))});
+               ɵɵdefineInjectable({factory: () => new MyService(ɵɵinject(String))});
          }
 
          expectProvidersScenario({
@@ -1155,8 +1162,8 @@ describe('providers', () => {
              providers: [MyService, {provide: String, useValue: 'providers'}],
              viewProviders: [{provide: String, useValue: 'viewProviders'}],
              componentAssertion: () => {
-               expect(ΔdirectiveInject(String)).toEqual('viewProviders');
-               expect(ΔdirectiveInject(MyService).value).toEqual('providers');
+               expect(ɵɵdirectiveInject(String)).toEqual('viewProviders');
+               expect(ɵɵdirectiveInject(MyService).value).toEqual('providers');
              }
            }
          });
@@ -1164,7 +1171,7 @@ describe('providers', () => {
 
     it('should make sure that parent service does not see overrides in child directives', () => {
       class Greeter {
-        static ngInjectableDef = ΔdefineInjectable({factory: () => new Greeter(Δinject(String))});
+        static ngInjectableDef = ɵɵdefineInjectable({factory: () => new Greeter(ɵɵinject(String))});
         constructor(public greeting: String) {}
       }
 
@@ -1175,7 +1182,7 @@ describe('providers', () => {
         viewChild: {
           providers: [{provide: String, useValue: 'view'}],
           componentAssertion:
-              () => { expect(ΔdirectiveInject(Greeter).greeting).toEqual('parent'); },
+              () => { expect(ɵɵdirectiveInject(Greeter).greeting).toEqual('parent'); },
         },
       });
     });
@@ -1183,7 +1190,7 @@ describe('providers', () => {
 
   describe('injection flags', () => {
     class MyModule {
-      static ngInjectorDef = ΔdefineInjector(
+      static ngInjectorDef = ɵɵdefineInjector(
           {factory: () => new MyModule(), providers: [{provide: String, useValue: 'Module'}]});
     }
     it('should not fall through to ModuleInjector if flags limit the scope', () => {
@@ -1191,9 +1198,9 @@ describe('providers', () => {
         ngModule: MyModule,
         parent: {
           componentAssertion: () => {
-            expect(ΔdirectiveInject(String)).toEqual('Module');
-            expect(ΔdirectiveInject(String, InjectFlags.Optional | InjectFlags.Self)).toBeNull();
-            expect(ΔdirectiveInject(String, InjectFlags.Optional | InjectFlags.Host)).toBeNull();
+            expect(ɵɵdirectiveInject(String)).toEqual('Module');
+            expect(ɵɵdirectiveInject(String, InjectFlags.Optional | InjectFlags.Self)).toBeNull();
+            expect(ɵɵdirectiveInject(String, InjectFlags.Optional | InjectFlags.Host)).toBeNull();
           }
         }
       });
@@ -1206,7 +1213,7 @@ describe('providers', () => {
     class SomeInj implements Some {
       constructor(public location: String) {}
 
-      static ngInjectableDef = ΔdefineInjectable({factory: () => new SomeInj(Δinject(String))});
+      static ngInjectableDef = ɵɵdefineInjectable({factory: () => new SomeInj(ɵɵinject(String))});
     }
 
     @Component({
@@ -1217,7 +1224,7 @@ describe('providers', () => {
     class MyComponent {
       constructor() {}
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: MyComponent,
         selectors: [['my-cmp']],
         factory: () => new MyComponent(),
@@ -1225,11 +1232,11 @@ describe('providers', () => {
         vars: 0,
         template: (rf: RenderFlags, cmp: MyComponent) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'p');
+            ɵɵelement(0, 'p');
           }
         },
         features: [
-          ΔProvidersFeature(
+          ɵɵProvidersFeature(
               [{provide: String, useValue: 'From my component'}],
               [{provide: Number, useValue: 123}]),
         ],
@@ -1244,7 +1251,7 @@ describe('providers', () => {
     class AppComponent {
       constructor() {}
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AppComponent,
         selectors: [['app-cmp']],
         factory: () => new AppComponent(),
@@ -1252,11 +1259,11 @@ describe('providers', () => {
         vars: 0,
         template: (rf: RenderFlags, cmp: AppComponent) => {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'my-cmp');
+            ɵɵelement(0, 'my-cmp');
           }
         },
         features: [
-          ΔProvidersFeature([
+          ɵɵProvidersFeature([
             {provide: String, useValue: 'From app component'}, {provide: Some, useClass: SomeInj}
           ]),
         ],
@@ -1307,18 +1314,18 @@ describe('providers', () => {
       class MyComponent {
         constructor(foo: InjectableWithLifeCycleHooks) {}
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: MyComponent,
           selectors: [['my-comp']],
-          factory: () => new MyComponent(ΔdirectiveInject(InjectableWithLifeCycleHooks)),
+          factory: () => new MyComponent(ɵɵdirectiveInject(InjectableWithLifeCycleHooks)),
           consts: 1,
           vars: 0,
           template: (rf: RenderFlags, ctx: MyComponent) => {
             if (rf & RenderFlags.Create) {
-              Δelement(0, 'span');
+              ɵɵelement(0, 'span');
             }
           },
-          features: [ΔProvidersFeature([InjectableWithLifeCycleHooks])]
+          features: [ɵɵProvidersFeature([InjectableWithLifeCycleHooks])]
         });
       }
 
@@ -1334,7 +1341,7 @@ describe('providers', () => {
       class App {
         public condition = true;
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: App,
           selectors: [['app-cmp']],
           factory: () => new App(),
@@ -1342,24 +1349,24 @@ describe('providers', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: App) => {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div');
-              { Δcontainer(1); }
-              ΔelementEnd();
+              ɵɵelementStart(0, 'div');
+              { ɵɵcontainer(1); }
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              ΔcontainerRefreshStart(1);
+              ɵɵcontainerRefreshStart(1);
               {
                 if (ctx.condition) {
-                  let rf1 = ΔembeddedViewStart(1, 2, 1);
+                  let rf1 = ɵɵembeddedViewStart(1, 2, 1);
                   {
                     if (rf1 & RenderFlags.Create) {
-                      Δelement(0, 'my-comp');
+                      ɵɵelement(0, 'my-comp');
                     }
                   }
-                  ΔembeddedViewEnd();
+                  ɵɵembeddedViewEnd();
                 }
               }
-              ΔcontainerRefreshEnd();
+              ɵɵcontainerRefreshEnd();
             }
           },
           directives: [MyComponent]
@@ -1409,7 +1416,7 @@ function expectProvidersScenario(defs: {
   }
 
   class ViewChildComponent {
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: ViewChildComponent,
       selectors: [['view-child']],
       consts: 1,
@@ -1417,27 +1424,27 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.viewChild, new ViewChildComponent()),
       template: function(fs: RenderFlags, ctx: ViewChildComponent) {
         if (fs & RenderFlags.Create) {
-          Δtext(0, 'view-child');
+          ɵɵtext(0, 'view-child');
         }
       },
       features: defs.viewChild &&
           [
-            ΔProvidersFeature(defs.viewChild.providers || [], defs.viewChild.viewProviders || []),
+            ɵɵProvidersFeature(defs.viewChild.providers || [], defs.viewChild.viewProviders || []),
           ],
     });
   }
 
   class ViewChildDirective {
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: ViewChildDirective,
       selectors: [['view-child']],
       factory: () => testDirectiveInjection(defs.viewChild, new ViewChildDirective()),
-      features: defs.viewChild && [ΔProvidersFeature(defs.viewChild.directiveProviders || [])],
+      features: defs.viewChild && [ɵɵProvidersFeature(defs.viewChild.directiveProviders || [])],
     });
   }
 
   class ContentChildComponent {
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: ContentChildComponent,
       selectors: [['content-child']],
       consts: 1,
@@ -1445,28 +1452,28 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.contentChild, new ContentChildComponent()),
       template: function(fs: RenderFlags, ctx: ParentComponent) {
         if (fs & RenderFlags.Create) {
-          Δtext(0, 'content-child');
+          ɵɵtext(0, 'content-child');
         }
       },
       features: defs.contentChild &&
-          [ΔProvidersFeature(
+          [ɵɵProvidersFeature(
               defs.contentChild.providers || [], defs.contentChild.viewProviders || [])],
     });
   }
 
   class ContentChildDirective {
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: ContentChildDirective,
       selectors: [['content-child']],
       factory: () => testDirectiveInjection(defs.contentChild, new ContentChildDirective()),
       features:
-          defs.contentChild && [ΔProvidersFeature(defs.contentChild.directiveProviders || [])],
+          defs.contentChild && [ɵɵProvidersFeature(defs.contentChild.directiveProviders || [])],
     });
   }
 
 
   class ParentComponent {
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: ParentComponent,
       selectors: [['parent']],
       consts: 1,
@@ -1474,36 +1481,36 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.parent, new ParentComponent()),
       template: function(fs: RenderFlags, ctx: ParentComponent) {
         if (fs & RenderFlags.Create) {
-          Δelement(0, 'view-child');
+          ɵɵelement(0, 'view-child');
         }
       },
       features: defs.parent &&
-          [ΔProvidersFeature(defs.parent.providers || [], defs.parent.viewProviders || [])],
+          [ɵɵProvidersFeature(defs.parent.providers || [], defs.parent.viewProviders || [])],
       directives: [ViewChildComponent, ViewChildDirective]
     });
   }
 
   class ParentDirective {
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: ParentDirective,
       selectors: [['parent']],
       factory: () => testDirectiveInjection(defs.parent, new ParentDirective()),
-      features: defs.parent && [ΔProvidersFeature(defs.parent.directiveProviders || [])],
+      features: defs.parent && [ɵɵProvidersFeature(defs.parent.directiveProviders || [])],
     });
   }
 
   class ParentDirective2 {
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: ParentDirective2,
       selectors: [['parent']],
       factory: () => testDirectiveInjection(defs.parent, new ParentDirective2()),
-      features: defs.parent && [ΔProvidersFeature(defs.parent.directive2Providers || [])],
+      features: defs.parent && [ɵɵProvidersFeature(defs.parent.directive2Providers || [])],
     });
   }
 
 
   class App {
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: App,
       selectors: [['app']],
       consts: 2,
@@ -1511,13 +1518,13 @@ function expectProvidersScenario(defs: {
       factory: () => testComponentInjection(defs.app, new App()),
       template: function(fs: RenderFlags, ctx: App) {
         if (fs & RenderFlags.Create) {
-          ΔelementStart(0, 'parent');
-          Δelement(1, 'content-child');
-          ΔelementEnd();
+          ɵɵelementStart(0, 'parent');
+          ɵɵelement(1, 'content-child');
+          ɵɵelementEnd();
         }
       },
       features:
-          defs.app && [ΔProvidersFeature(defs.app.providers || [], defs.app.viewProviders || [])],
+          defs.app && [ɵɵProvidersFeature(defs.app.providers || [], defs.app.viewProviders || [])],
       directives: [
         ParentComponent, ParentDirective2, ParentDirective, ContentChildComponent,
         ContentChildDirective
diff --git a/packages/core/test/render3/pure_function_spec.ts b/packages/core/test/render3/pure_function_spec.ts
index f8a99c225a..42f7a17476 100644
--- a/packages/core/test/render3/pure_function_spec.ts
+++ b/packages/core/test/render3/pure_function_spec.ts
@@ -5,10 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {ΔdefineComponent} from '../../src/render3/index';
-import {Δbind, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔelementEnd, ΔelementProperty, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart} from '../../src/render3/instructions/all';
+import {ɵɵdefineComponent} from '../../src/render3/index';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementProperty, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {ΔpureFunction2} from '../../src/render3/pure_function';
+import {ɵɵpureFunction2} from '../../src/render3/pure_function';
 import {getDirectiveOnNode, renderToHtml} from '../../test/render3/render_util';
 
 
@@ -19,7 +19,7 @@ describe('object literals', () => {
     // TODO(issue/24571): remove '!'.
     config !: {[key: string]: any};
 
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: ObjectComp,
       selectors: [['object-comp']],
       factory: function ObjectComp_Factory() { return objectComp = new ObjectComp(); },
@@ -45,27 +45,27 @@ describe('object literals', () => {
      */
     function Template(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δcontainer(0);
+        ɵɵcontainer(0);
       }
       if (rf & RenderFlags.Update) {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
           for (let i = 0; i < 2; i++) {
-            let rf1 = ΔembeddedViewStart(0, 1, 4);
+            let rf1 = ɵɵembeddedViewStart(0, 1, 4);
             if (rf1 & RenderFlags.Create) {
-              ΔelementStart(0, 'object-comp');
+              ɵɵelementStart(0, 'object-comp');
               objectComps.push(getDirectiveOnNode(0));
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
             if (rf1 & RenderFlags.Update) {
-              ΔelementProperty(
-                  0, 'config',
-                  Δbind(ΔpureFunction2(1, e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration)));
+              ɵɵelementProperty(
+                  0, 'config', ɵɵbind(ɵɵpureFunction2(
+                                   1, e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration)));
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
     }
 
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 0ee0ff8859..bc54502ab9 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -9,13 +9,13 @@
 import {ElementRef, QueryList, TemplateRef, ViewContainerRef} from '@angular/core';
 
 import {EventEmitter} from '../..';
-import {AttributeMarker, detectChanges, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
-import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementContainerEnd, ΔelementContainerStart, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δload, Δtemplate, Δtext} from '../../src/render3/instructions/all';
+import {AttributeMarker, detectChanges, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵload, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {query, ΔcontentQuery, ΔloadContentQuery, ΔloadViewQuery, ΔqueryRefresh, ΔviewQuery} from '../../src/render3/query';
+import {query, ɵɵcontentQuery, ɵɵloadContentQuery, ɵɵloadViewQuery, ɵɵqueryRefresh, ɵɵviewQuery} from '../../src/render3/query';
 import {getLView} from '../../src/render3/state';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
-import {ΔtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
+import {ɵɵtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
 
 import {ComponentFixture, TemplateFixture, createComponent, createDirective, getDirectiveOnNode, renderComponent} from './render_util';
 
@@ -68,9 +68,9 @@ describe('query', () => {
            * }
            */
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'child');
-            { Δelement(1, 'child'); }
-            ΔelementEnd();
+            ɵɵelementStart(0, 'child');
+            { ɵɵelement(1, 'child'); }
+            ɵɵelementEnd();
           }
           if (rf & RenderFlags.Update) {
             child1 = getDirectiveOnNode(0);
@@ -80,14 +80,14 @@ describe('query', () => {
         2, 0, [Child], [],
         function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ΔviewQuery(Child, false, null);
-            ΔviewQuery(Child, true, null);
+            ɵɵviewQuery(Child, false, null);
+            ɵɵviewQuery(Child, true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                 (ctx.query0 = tmp as QueryList<any>);
-            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                 (ctx.query1 = tmp as QueryList<any>);
           }
         });
@@ -113,18 +113,18 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', '']);
+                ɵɵelement(0, 'div', ['child', '']);
                 elToQuery = getNativeByIndex(0, getLView());
               }
             },
             1, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(Child, false, ElementRef);
+                ɵɵviewQuery(Child, false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -150,19 +150,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔelementStart(0, 'div', ['child', '', 'otherChild', '']);
+                ɵɵelementStart(0, 'div', ['child', '', 'otherChild', '']);
                 { otherChildInstance = getDirectiveOnNode(0, 1); }
-                ΔelementEnd();
+                ɵɵelementEnd();
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(Child, false, OtherChild);
+                ɵɵviewQuery(Child, false, OtherChild);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -186,17 +186,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', '']);
+                ɵɵelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(Child, false, OtherChild);
+                ɵɵviewQuery(Child, false, OtherChild);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -217,13 +217,13 @@ describe('query', () => {
       class MyDirective {
         constructor(public service: Service) {}
 
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: MyDirective,
           selectors: [['', 'myDir', '']],
           factory: function MyDirective_Factory() {
-            return directive = new MyDirective(ΔdirectiveInject(Service));
+            return directive = new MyDirective(ɵɵdirectiveInject(Service));
           },
-          features: [ΔProvidersFeature([Service, {provide: Alias, useExisting: Service}])],
+          features: [ɵɵProvidersFeature([Service, {provide: Alias, useExisting: Service}])],
         });
       }
 
@@ -245,7 +245,7 @@ describe('query', () => {
           service?: Service;
           alias?: Alias;
 
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: App,
             selectors: [['app']],
             consts: 1,
@@ -253,21 +253,22 @@ describe('query', () => {
             factory: function App_Factory() { return new App(); },
             template: function App_Template(rf: RenderFlags, ctx: App) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['myDir']);
+                ɵɵelement(0, 'div', ['myDir']);
               }
             },
             viewQuery: function(rf: RenderFlags, ctx: App) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(MyDirective, false, null);
-                ΔviewQuery(Service, false, null);
-                ΔviewQuery(Alias, false, null);
+                ɵɵviewQuery(MyDirective, false, null);
+                ɵɵviewQuery(Service, false, null);
+                ɵɵviewQuery(Alias, false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.directive = tmp.first);
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) && (ctx.service = tmp.first);
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) && (ctx.alias = tmp.first);
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                    (ctx.service = tmp.first);
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && (ctx.alias = tmp.first);
               }
             },
             directives: [MyDirective]
@@ -291,7 +292,7 @@ describe('query', () => {
         class App {
           service?: Service;
 
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: App,
             selectors: [['app']],
             consts: 1,
@@ -299,16 +300,17 @@ describe('query', () => {
             factory: function App_Factory() { return new App(); },
             template: function App_Template(rf: RenderFlags, ctx: App) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['myDir']);
+                ɵɵelement(0, 'div', ['myDir']);
               }
             },
             viewQuery: function(rf: RenderFlags, ctx: App) {
               let tmp: any;
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(MyDirective, false, Alias);
+                ɵɵviewQuery(MyDirective, false, Alias);
               }
               if (rf & RenderFlags.Update) {
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) && (ctx.service = tmp.first);
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
+                    (ctx.service = tmp.first);
               }
             },
             directives: [MyDirective]
@@ -337,19 +339,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', null, ['foo', '']);
+                ɵɵelement(0, 'div', null, ['foo', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                Δelement(2, 'div');
+                ɵɵelement(2, 'div');
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, null);
+                ɵɵviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -375,22 +377,22 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', null, ['foo', '', 'bar', '']);
+                ɵɵelement(0, 'div', null, ['foo', '', 'bar', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                Δelement(3, 'div');
+                ɵɵelement(3, 'div');
               }
             },
             4, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, null);
-                ΔviewQuery(['bar'], false, null);
+                ɵɵviewQuery(['foo'], false, null);
+                ɵɵviewQuery(['bar'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.fooQuery = tmp as QueryList<any>);
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.barQuery = tmp as QueryList<any>);
               }
             });
@@ -422,21 +424,21 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', null, ['foo', '']);
+                ɵɵelement(0, 'div', null, ['foo', '']);
                 el1ToQuery = getNativeByIndex(0, getLView());
-                Δelement(2, 'div');
-                Δelement(3, 'div', null, ['bar', '']);
+                ɵɵelement(2, 'div');
+                ɵɵelement(3, 'div', null, ['bar', '']);
                 el2ToQuery = getNativeByIndex(3, getLView());
               }
             },
             5, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo', 'bar'], false, null);
+                ɵɵviewQuery(['foo', 'bar'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -462,19 +464,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', null, ['foo', '']);
+                ɵɵelement(0, 'div', null, ['foo', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                Δelement(2, 'div');
+                ɵɵelement(2, 'div');
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, null);
+                ɵɵviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -499,19 +501,19 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ΔelementContainerStart(0, null, ['foo', '']);
+                   ɵɵelementContainerStart(0, null, ['foo', '']);
                    elToQuery = getNativeByIndex(0, getLView());
-                   ΔelementContainerEnd();
+                   ɵɵelementContainerEnd();
                  }
                },
                2, 0, [], [],
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ΔviewQuery(['foo'], false, ElementRef);
+                   ɵɵviewQuery(['foo'], false, ElementRef);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -535,19 +537,19 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔelementContainerStart(0, null, ['foo', '']);
+                ɵɵelementContainerStart(0, null, ['foo', '']);
                 elToQuery = getNativeByIndex(0, getLView());
-                ΔelementContainerEnd();
+                ɵɵelementContainerEnd();
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -597,25 +599,25 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔelementContainerStart(0);
+                ɵɵelementContainerStart(0);
                 {
-                  Δelement(1, 'div', null, ['foo', '']);
+                  ɵɵelement(1, 'div', null, ['foo', '']);
                   elToQuery = getNativeByIndex(3, getLView());
                 }
-                ΔelementContainerEnd();
+                ɵɵelementContainerEnd();
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, ElementRef);
-                ΔviewQuery(['foo'], false, ElementRef);
+                ɵɵviewQuery(['foo'], true, ElementRef);
+                ɵɵviewQuery(['foo'], false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.deep = tmp as QueryList<any>);
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.shallow = tmp as QueryList<any>);
               }
             });
@@ -638,17 +640,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', null, ['foo', '']);
+                ɵɵelement(0, 'div', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, ViewContainerRef);
+                ɵɵviewQuery(['foo'], false, ViewContainerRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -670,17 +672,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, ViewContainerRef);
+                ɵɵviewQuery(['foo'], false, ViewContainerRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -703,18 +705,18 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                   ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
                  }
                },
                2, 0, [], [],
                function(rf: RenderFlags, ctx: any) {
 
                  if (rf & RenderFlags.Create) {
-                   ΔviewQuery(['foo'], false, ElementRef);
+                   ɵɵviewQuery(['foo'], false, ElementRef);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -738,17 +740,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, null);
+                ɵɵviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -771,17 +773,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
+                ɵɵtemplate(0, null, 0, 0, 'ng-template', null, ['foo', '']);
               }
             },
             2, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, TemplateRef);
+                ɵɵviewQuery(['foo'], false, TemplateRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -806,7 +808,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'child', null, ['foo', '']);
+                ɵɵelement(0, 'child', null, ['foo', '']);
               }
               if (rf & RenderFlags.Update) {
                 childInstance = getDirectiveOnNode(0);
@@ -815,11 +817,11 @@ describe('query', () => {
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -834,7 +836,7 @@ describe('query', () => {
         let childInstance: Child;
 
         class Child {
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: Child,
             selectors: [['child']],
             factory: () => childInstance = new Child(),
@@ -855,17 +857,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'child', null, ['foo', 'child']);
+                ɵɵelement(0, 'child', null, ['foo', 'child']);
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -891,7 +893,7 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   Δelement(0, 'div', ['child', ''], ['foo', 'child']);
+                   ɵɵelement(0, 'div', ['child', ''], ['foo', 'child']);
                  }
                  if (rf & RenderFlags.Update) {
                    childInstance = getDirectiveOnNode(0);
@@ -900,11 +902,11 @@ describe('query', () => {
                2, 0, [Child], [],
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ΔviewQuery(['foo'], true, null);
+                   ɵɵviewQuery(['foo'], true, null);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -930,7 +932,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(
+                ɵɵelement(
                     0, 'div', ['child1', '', 'child2', ''], ['foo', 'child1', 'bar', 'child2']);
               }
               if (rf & RenderFlags.Update) {
@@ -941,11 +943,11 @@ describe('query', () => {
             3, 0, [Child1, Child2], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo', 'bar'], true, null);
+                ɵɵviewQuery(['foo', 'bar'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -972,7 +974,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', ''], ['foo', 'child', 'bar', 'child']);
+                ɵɵelement(0, 'div', ['child', ''], ['foo', 'child', 'bar', 'child']);
               }
               if (rf & RenderFlags.Update) {
                 childInstance = getDirectiveOnNode(0);
@@ -981,14 +983,14 @@ describe('query', () => {
             3, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
-                ΔviewQuery(['bar'], true, null);
+                ɵɵviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['bar'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.fooQuery = tmp as QueryList<any>);
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.barQuery = tmp as QueryList<any>);
               }
             });
@@ -1018,18 +1020,18 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', ''], ['foo', 'child']);
+                ɵɵelement(0, 'div', ['child', ''], ['foo', 'child']);
                 div = getNativeByIndex(0, getLView());
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, ElementRef);
+                ɵɵviewQuery(['foo'], false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1054,7 +1056,7 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', ''], ['foo', '', 'bar', 'child']);
+                ɵɵelement(0, 'div', ['child', ''], ['foo', '', 'bar', 'child']);
                 div = getNativeByIndex(0, getLView());
               }
               if (rf & RenderFlags.Update) {
@@ -1064,11 +1066,11 @@ describe('query', () => {
             3, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo', 'bar'], false, null);
+                ɵɵviewQuery(['foo', 'bar'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1093,17 +1095,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['foo', '']);
+                ɵɵelement(0, 'div', ['foo', '']);
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, Child);
+                ɵɵviewQuery(['foo'], false, Child);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1127,17 +1129,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', '']);
+                ɵɵelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(Child, false, OtherChild);
+                ɵɵviewQuery(Child, false, OtherChild);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1161,17 +1163,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', '']);
+                ɵɵelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child, OtherChild], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(OtherChild, false, Child);
+                ɵɵviewQuery(OtherChild, false, Child);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1192,17 +1194,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div');
+                ɵɵelement(0, 'div');
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(TemplateRef as any, false, ElementRef);
+                ɵɵviewQuery(TemplateRef as any, false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1225,17 +1227,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', ''], ['foo', '']);
+                ɵɵelement(0, 'div', ['child', ''], ['foo', '']);
               }
             },
             2, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], false, Child);
+                ɵɵviewQuery(['foo'], false, Child);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1259,17 +1261,17 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δelement(0, 'div', ['child', '']);
+                ɵɵelement(0, 'div', ['child', '']);
               }
             },
             1, 0, [Child], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(TemplateRef as any, false, null);
+                ɵɵviewQuery(TemplateRef as any, false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1282,9 +1284,9 @@ describe('query', () => {
       it('should query templates if the type is TemplateRef (and respect "read" option)', () => {
         function Cmpt_Template_1(rf: RenderFlags, ctx1: any) {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'div');
-            Δtext(1, 'Test');
-            ΔelementEnd();
+            ɵɵelementStart(0, 'div');
+            ɵɵtext(1, 'Test');
+            ɵɵelementEnd();
           }
         }
         /**
@@ -1300,28 +1302,28 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δtemplate(
+                ɵɵtemplate(
                     0, Cmpt_Template_1, 2, 0, 'ng-template', null, ['foo', ''],
-                    ΔtemplateRefExtractor);
-                Δtemplate(
+                    ɵɵtemplateRefExtractor);
+                ɵɵtemplate(
                     2, Cmpt_Template_1, 2, 0, 'ng-template', null, ['bar', ''],
-                    ΔtemplateRefExtractor);
-                Δtemplate(
+                    ɵɵtemplateRefExtractor);
+                ɵɵtemplate(
                     4, Cmpt_Template_1, 2, 0, 'ng-template', null, ['baz', ''],
-                    ΔtemplateRefExtractor);
+                    ɵɵtemplateRefExtractor);
               }
             },
             6, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(TemplateRef as any, false, null);
-                ΔviewQuery(TemplateRef as any, false, ElementRef);
+                ɵɵviewQuery(TemplateRef as any, false, null);
+                ɵɵviewQuery(TemplateRef as any, false, ElementRef);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.tmplQuery = tmp as QueryList<any>);
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.elemQuery = tmp as QueryList<any>);
               }
             });
@@ -1360,33 +1362,33 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δcontainer(0);
+                ɵɵcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ΔcontainerRefreshStart(0);
+                ɵɵcontainerRefreshStart(0);
                 {
                   if (ctx.exp) {
-                    let rf1 = ΔembeddedViewStart(1, 2, 0);
+                    let rf1 = ɵɵembeddedViewStart(1, 2, 0);
                     {
                       if (rf1 & RenderFlags.Create) {
-                        Δelement(0, 'div', null, ['foo', '']);
+                        ɵɵelement(0, 'div', null, ['foo', '']);
                         firstEl = getNativeByIndex(0, getLView());
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1422,37 +1424,37 @@ describe('query', () => {
                'cmpt',
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   Δelement(0, 'span', null, ['foo', '']);
+                   ɵɵelement(0, 'span', null, ['foo', '']);
                    firstEl = getNativeByIndex(0, getLView());
-                   Δcontainer(2);
-                   Δelement(3, 'span', null, ['foo', '']);
+                   ɵɵcontainer(2);
+                   ɵɵelement(3, 'span', null, ['foo', '']);
                    lastEl = getNativeByIndex(3, getLView());
                  }
                  if (rf & RenderFlags.Update) {
-                   ΔcontainerRefreshStart(2);
+                   ɵɵcontainerRefreshStart(2);
                    {
                      if (ctx.exp) {
-                       let rf1 = ΔembeddedViewStart(1, 2, 0);
+                       let rf1 = ɵɵembeddedViewStart(1, 2, 0);
                        {
                          if (rf1 & RenderFlags.Create) {
-                           Δelement(0, 'div', null, ['foo', '']);
+                           ɵɵelement(0, 'div', null, ['foo', '']);
                            viewEl = getNativeByIndex(0, getLView());
                          }
                        }
-                       ΔembeddedViewEnd();
+                       ɵɵembeddedViewEnd();
                      }
                    }
-                   ΔcontainerRefreshEnd();
+                   ɵɵcontainerRefreshEnd();
                  }
                },
                5, 0, [], [],
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
-                   ΔviewQuery(['foo'], true, null);
+                   ɵɵviewQuery(['foo'], true, null);
                  }
                  if (rf & RenderFlags.Update) {
                    let tmp: any;
-                   ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                   ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                        (ctx.query = tmp as QueryList<any>);
                  }
                });
@@ -1493,43 +1495,43 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δcontainer(0);
+                ɵɵcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ΔcontainerRefreshStart(0);
+                ɵɵcontainerRefreshStart(0);
                 {
                   if (ctx.exp1) {
-                    let rf0 = ΔembeddedViewStart(0, 2, 0);
+                    let rf0 = ɵɵembeddedViewStart(0, 2, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        Δelement(0, 'div', null, ['foo', '']);
+                        ɵɵelement(0, 'div', null, ['foo', '']);
                         firstEl = getNativeByIndex(0, getLView());
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                   if (ctx.exp2) {
-                    let rf1 = ΔembeddedViewStart(1, 2, 0);
+                    let rf1 = ɵɵembeddedViewStart(1, 2, 0);
                     {
                       if (rf1 & RenderFlags.Create) {
-                        Δelement(0, 'span', null, ['foo', '']);
+                        ɵɵelement(0, 'span', null, ['foo', '']);
                         lastEl = getNativeByIndex(0, getLView());
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1567,50 +1569,50 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δcontainer(0);
+                ɵɵcontainer(0);
               }
               if (rf & RenderFlags.Update) {
-                ΔcontainerRefreshStart(0);
+                ɵɵcontainerRefreshStart(0);
                 {
                   if (ctx.exp1) {
-                    let rf0 = ΔembeddedViewStart(0, 3, 0);
+                    let rf0 = ɵɵembeddedViewStart(0, 3, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        Δelement(0, 'div', null, ['foo', '']);
+                        ɵɵelement(0, 'div', null, ['foo', '']);
                         firstEl = getNativeByIndex(0, getLView());
-                        Δcontainer(2);
+                        ɵɵcontainer(2);
                       }
                       if (rf0 & RenderFlags.Update) {
-                        ΔcontainerRefreshStart(2);
+                        ɵɵcontainerRefreshStart(2);
                         {
                           if (ctx.exp2) {
-                            let rf2 = ΔembeddedViewStart(0, 2, 0);
+                            let rf2 = ɵɵembeddedViewStart(0, 2, 0);
                             {
                               if (rf2) {
-                                Δelement(0, 'span', null, ['foo', '']);
+                                ɵɵelement(0, 'span', null, ['foo', '']);
                                 lastEl = getNativeByIndex(0, getLView());
                               }
                             }
-                            ΔembeddedViewEnd();
+                            ɵɵembeddedViewEnd();
                           }
                         }
-                        ΔcontainerRefreshEnd();
+                        ɵɵcontainerRefreshEnd();
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             },
             1, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['foo'], true, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.query = tmp as QueryList<any>);
               }
             });
@@ -1652,38 +1654,38 @@ describe('query', () => {
             'cmpt',
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                Δcontainer(0);
-                Δelement(1, 'span', null, ['foo', '']);
+                ɵɵcontainer(0);
+                ɵɵelement(1, 'span', null, ['foo', '']);
               }
               if (rf & RenderFlags.Update) {
-                ΔcontainerRefreshStart(0);
+                ɵɵcontainerRefreshStart(0);
                 {
                   if (ctx.exp) {
-                    let rf0 = ΔembeddedViewStart(0, 4, 0);
+                    let rf0 = ɵɵembeddedViewStart(0, 4, 0);
                     {
                       if (rf0 & RenderFlags.Create) {
-                        ΔelementStart(0, 'div', null, ['foo', '']);
-                        { Δelement(2, 'div', null, ['foo', '']); }
-                        ΔelementEnd();
+                        ɵɵelementStart(0, 'div', null, ['foo', '']);
+                        { ɵɵelement(2, 'div', null, ['foo', '']); }
+                        ɵɵelementEnd();
                       }
                     }
-                    ΔembeddedViewEnd();
+                    ɵɵembeddedViewEnd();
                   }
                 }
-                ΔcontainerRefreshEnd();
+                ɵɵcontainerRefreshEnd();
               }
             },
             3, 0, [], [],
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
-                ΔviewQuery(['foo'], true, null);
-                ΔviewQuery(['foo'], false, null);
+                ɵɵviewQuery(['foo'], true, null);
+                ɵɵviewQuery(['foo'], false, null);
               }
               if (rf & RenderFlags.Update) {
                 let tmp: any;
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.deep = tmp as QueryList<any>);
-                ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+                ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                     (ctx.shallow = tmp as QueryList<any>);
               }
             });
@@ -1722,37 +1724,37 @@ describe('query', () => {
           'some-component-with-query',
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              Δelement(0, 'div', null, ['foo', '']);
+              ɵɵelement(0, 'div', null, ['foo', '']);
             }
           },
           2, 0, [], [],
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔviewQuery(['foo'], false, null);
+              ɵɵviewQuery(['foo'], false, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                   (ctx.query = queryInstance = tmp as QueryList<any>);
             }
           });
 
-      function createTemplate() { Δcontainer(0); }
+      function createTemplate() { ɵɵcontainer(0); }
 
       function updateTemplate() {
-        ΔcontainerRefreshStart(0);
+        ɵɵcontainerRefreshStart(0);
         {
           if (condition) {
-            let rf1 = ΔembeddedViewStart(1, 1, 0);
+            let rf1 = ɵɵembeddedViewStart(1, 1, 0);
             {
               if (rf1 & RenderFlags.Create) {
-                Δelement(0, 'some-component-with-query');
+                ɵɵelement(0, 'some-component-with-query');
               }
             }
-            ΔembeddedViewEnd();
+            ɵɵembeddedViewEnd();
           }
         }
-        ΔcontainerRefreshEnd();
+        ɵɵcontainerRefreshEnd();
       }
 
       /**
@@ -1779,18 +1781,18 @@ describe('query', () => {
         this.vcr.createEmbeddedView(this.temp);
       }
 
-      static ngDirectiveDef = ΔdefineDirective({
+      static ngDirectiveDef = ɵɵdefineDirective({
         type: SomeDir,
         selectors: [['', 'someDir', '']],
         factory:
             () => new SomeDir(
-                ΔdirectiveInject(ViewContainerRef as any), ΔdirectiveInject(TemplateRef as any))
+                ɵɵdirectiveInject(ViewContainerRef as any), ɵɵdirectiveInject(TemplateRef as any))
       });
     }
 
     function AppComponent_Template_1(rf: RenderFlags, ctx: any) {
       if (rf & RenderFlags.Create) {
-        Δelement(0, 'div');
+        ɵɵelement(0, 'div');
       }
     }
 
@@ -1802,19 +1804,19 @@ describe('query', () => {
         'app',
         function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            Δtemplate(
+            ɵɵtemplate(
                 0, AppComponent_Template_1, 1, 0, 'div', [AttributeMarker.Template, 'someDir']);
-            Δelement(1, 'div', null, ['foo', '']);
+            ɵɵelement(1, 'div', null, ['foo', '']);
           }
         },
         3, 0, [SomeDir], [],
         function(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ΔviewQuery(['foo'], true, null);
+            ɵɵviewQuery(['foo'], true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+            ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                 (ctx.query = tmp as QueryList<any>);
           }
         });
@@ -1840,17 +1842,17 @@ describe('query', () => {
         this.contentCheckedQuerySnapshot = this.foos ? this.foos.length : 0;
       }
 
-      static ngDirectiveDef = ΔdefineDirective({
+      static ngDirectiveDef = ɵɵdefineDirective({
         type: WithContentDirective,
         selectors: [['', 'with-content', '']],
         factory: () => withContentInstance = new WithContentDirective(),
         contentQueries: (rf: RenderFlags, ctx: any, dirIndex: number) => {
           if (rf & RenderFlags.Create) {
-            ΔcontentQuery(dirIndex, ['foo'], true, null);
+            ɵɵcontentQuery(dirIndex, ['foo'], true, null);
           }
           if (rf & RenderFlags.Update) {
             let tmp: any;
-            ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+            ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
           }
         }
       });
@@ -1864,9 +1866,9 @@ describe('query', () => {
        */
       const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
-          { Δelement(1, 'span', null, ['foo', '']); }
-          ΔelementEnd();
+          ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
+          { ɵɵelement(1, 'span', null, ['foo', '']); }
+          ɵɵelementEnd();
         }
       }, 3, 0, [WithContentDirective]);
 
@@ -1895,23 +1897,23 @@ describe('query', () => {
        */
       const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          Δcontainer(0);
+          ɵɵcontainer(0);
         }
         if (rf & RenderFlags.Update) {
-          ΔcontainerRefreshStart(0);
+          ɵɵcontainerRefreshStart(0);
           {
             for (let i = 0; i < 3; i++) {
-              let rf = ΔembeddedViewStart(1, 3, 0);
+              let rf = ɵɵembeddedViewStart(1, 3, 0);
               if (rf & RenderFlags.Create) {
-                ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
-                { Δelement(1, 'span', null, ['foo', '']); }
-                ΔelementEnd();
+                ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'with-content']);
+                { ɵɵelement(1, 'span', null, ['foo', '']); }
+                ɵɵelementEnd();
               }
-              ΔembeddedViewEnd();
+              ɵɵembeddedViewEnd();
             }
           }
 
-          ΔcontainerRefreshEnd();
+          ɵɵcontainerRefreshEnd();
         }
       }, 1, 0, [WithContentDirective]);
 
@@ -1937,7 +1939,7 @@ describe('query', () => {
        */
       const AppComponent = createComponent('app-component', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          Δelement(0, 'div', ['with-content', ''], ['foo', '']);
+          ɵɵelement(0, 'div', ['with-content', ''], ['foo', '']);
         }
       }, 2, 0, [WithContentDirective]);
 
@@ -1961,20 +1963,20 @@ describe('query', () => {
           'app-component',
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div', ['with-content', '']);
-              { Δelement(1, 'div', null, ['foo', '']); }
-              ΔelementEnd();
-              Δelement(3, 'div', ['id', 'after'], ['bar', '']);
+              ɵɵelementStart(0, 'div', ['with-content', '']);
+              { ɵɵelement(1, 'div', null, ['foo', '']); }
+              ɵɵelementEnd();
+              ɵɵelement(3, 'div', ['id', 'after'], ['bar', '']);
             }
           },
           5, 0, [WithContentDirective], [],
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔviewQuery(['foo', 'bar'], true, null);
+              ɵɵviewQuery(['foo', 'bar'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                   (ctx.foos = tmp as QueryList<any>);
             }
           });
@@ -2002,20 +2004,20 @@ describe('query', () => {
           'app-component',
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div', ['with-content', '']);
-              { Δelement(1, 'div', ['id', 'yes'], ['foo', '']); }
-              ΔelementEnd();
-              Δelement(3, 'div', null, ['foo', '']);
+              ɵɵelementStart(0, 'div', ['with-content', '']);
+              { ɵɵelement(1, 'div', ['id', 'yes'], ['foo', '']); }
+              ɵɵelementEnd();
+              ɵɵelement(3, 'div', null, ['foo', '']);
             }
           },
           5, 0, [WithContentDirective], [],
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔviewQuery(['bar'], true, null);
+              ɵɵviewQuery(['bar'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                   (ctx.bars = tmp as QueryList<any>);
             }
           });
@@ -2028,7 +2030,7 @@ describe('query', () => {
     it('should report results to appropriate queries where deep content queries are nested', () => {
       class QueryDirective {
         fooBars: any;
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: QueryDirective,
           selectors: [['', 'query', '']],
           exportAs: ['query'],
@@ -2037,11 +2039,11 @@ describe('query', () => {
             // @ContentChildren('foo, bar, baz', {descendants: true})
             // fooBars: QueryList<ElementRef>;
             if (rf & RenderFlags.Create) {
-              ΔcontentQuery(dirIndex, ['foo', 'bar', 'baz'], true, null);
+              ɵɵcontentQuery(dirIndex, ['foo', 'bar', 'baz'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
+              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
             }
           }
         });
@@ -2063,19 +2065,19 @@ describe('query', () => {
            */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div', [AttributeMarker.Bindings, 'query'], ['out', 'query']);
+              ɵɵelementStart(0, 'div', [AttributeMarker.Bindings, 'query'], ['out', 'query']);
               {
-                Δelement(2, 'span', ['id', 'foo'], ['foo', '']);
-                ΔelementStart(4, 'div', [AttributeMarker.Bindings, 'query'], ['in', 'query']);
-                { Δelement(6, 'span', ['id', 'bar'], ['bar', '']); }
-                ΔelementEnd();
-                Δelement(8, 'span', ['id', 'baz'], ['baz', '']);
+                ɵɵelement(2, 'span', ['id', 'foo'], ['foo', '']);
+                ɵɵelementStart(4, 'div', [AttributeMarker.Bindings, 'query'], ['in', 'query']);
+                { ɵɵelement(6, 'span', ['id', 'bar'], ['bar', '']); }
+                ɵɵelementEnd();
+                ɵɵelement(8, 'span', ['id', 'baz'], ['baz', '']);
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              outInstance = Δload<QueryDirective>(1);
-              inInstance = Δload<QueryDirective>(5);
+              outInstance = ɵɵload<QueryDirective>(1);
+              inInstance = ɵɵload<QueryDirective>(5);
             }
           },
           10, 0, [QueryDirective]);
@@ -2092,7 +2094,7 @@ describe('query', () => {
 
       class QueryDirective {
         fooBars: any;
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: QueryDirective,
           selectors: [['', 'query', '']],
           exportAs: ['query'],
@@ -2101,11 +2103,11 @@ describe('query', () => {
             // @ContentChildren('foo', {descendants: true})
             // fooBars: QueryList<ElementRef>;
             if (rf & RenderFlags.Create) {
-              ΔcontentQuery(dirIndex, ['foo'], false, null);
+              ɵɵcontentQuery(dirIndex, ['foo'], false, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
+              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
             }
           }
         });
@@ -2122,17 +2124,17 @@ describe('query', () => {
            */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div', ['query', ''], ['out', 'query']);
+              ɵɵelementStart(0, 'div', ['query', ''], ['out', 'query']);
               {
-                ΔelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
-                { Δelement(5, 'span', ['id', 'bar'], ['foo', '']); }
-                ΔelementEnd();
+                ɵɵelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
+                { ɵɵelement(5, 'span', ['id', 'bar'], ['foo', '']); }
+                ɵɵelementEnd();
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              outInstance = Δload<QueryDirective>(1);
-              inInstance = Δload<QueryDirective>(3);
+              outInstance = ɵɵload<QueryDirective>(1);
+              inInstance = ɵɵload<QueryDirective>(3);
             }
           },
           7, 0, [QueryDirective]);
@@ -2148,7 +2150,7 @@ describe('query', () => {
 
       class QueryDirective {
         fooBars: any;
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: QueryDirective,
           selectors: [['', 'query', '']],
           exportAs: ['query'],
@@ -2157,11 +2159,11 @@ describe('query', () => {
             // @ContentChildren('foo', {descendants: true})
             // fooBars: QueryList<ElementRef>;
             if (rf & RenderFlags.Create) {
-              ΔcontentQuery(dirIndex, ['foo'], false, null);
+              ɵɵcontentQuery(dirIndex, ['foo'], false, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
+              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp);
             }
           }
         });
@@ -2178,17 +2180,17 @@ describe('query', () => {
            */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div', ['query', ''], ['out', 'query']);
+              ɵɵelementStart(0, 'div', ['query', ''], ['out', 'query']);
               {
-                ΔelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
-                { Δelement(5, 'span', ['id', 'bar'], ['foo', '']); }
-                ΔelementEnd();
+                ɵɵelementStart(2, 'div', ['query', ''], ['in', 'query', 'foo', '']);
+                { ɵɵelement(5, 'span', ['id', 'bar'], ['foo', '']); }
+                ɵɵelementEnd();
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              outInstance = Δload<QueryDirective>(1);
-              inInstance = Δload<QueryDirective>(3);
+              outInstance = ɵɵload<QueryDirective>(1);
+              inInstance = ɵɵload<QueryDirective>(3);
             }
           },
           7, 0, [QueryDirective]);
@@ -2208,7 +2210,7 @@ describe('query', () => {
        () => {
          class ShallowQueryDirective {
            foos: any;
-           static ngDirectiveDef = ΔdefineDirective({
+           static ngDirectiveDef = ɵɵdefineDirective({
              type: ShallowQueryDirective,
              selectors: [['', 'shallow-query', '']],
              exportAs: ['shallow-query'],
@@ -2217,11 +2219,11 @@ describe('query', () => {
                // @ContentChildren('foo', {descendants: false})
                // foos: QueryList<ElementRef>;
                if (rf & RenderFlags.Create) {
-                 ΔcontentQuery(dirIndex, ['foo'], false, null);
+                 ɵɵcontentQuery(dirIndex, ['foo'], false, null);
                }
                if (rf & RenderFlags.Update) {
                  let tmp: any;
-                 ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+                 ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
                }
              }
            });
@@ -2229,7 +2231,7 @@ describe('query', () => {
 
          class DeepQueryDirective {
            foos: any;
-           static ngDirectiveDef = ΔdefineDirective({
+           static ngDirectiveDef = ɵɵdefineDirective({
              type: DeepQueryDirective,
              selectors: [['', 'deep-query', '']],
              exportAs: ['deep-query'],
@@ -2238,11 +2240,11 @@ describe('query', () => {
                // @ContentChildren('foo', {descendants: true})
                // foos: QueryList<ElementRef>;
                if (rf & RenderFlags.Create) {
-                 ΔcontentQuery(dirIndex, ['foo'], true, null);
+                 ɵɵcontentQuery(dirIndex, ['foo'], true, null);
                }
                if (rf & RenderFlags.Update) {
                  let tmp: any;
-                 ΔqueryRefresh(tmp = ΔloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
+                 ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp);
                }
              }
            });
@@ -2263,20 +2265,20 @@ describe('query', () => {
               */
              function(rf: RenderFlags, ctx: any) {
                if (rf & RenderFlags.Create) {
-                 ΔelementStart(
+                 ɵɵelementStart(
                      0, 'div', [AttributeMarker.Bindings, 'shallow-query', 'deep-query'],
                      ['shallow', 'shallow-query', 'deep', 'deep-query']);
                  {
-                   Δelement(3, 'span', null, ['foo', '']);
-                   ΔelementStart(5, 'div');
-                   { Δelement(6, 'span', null, ['foo', '']); }
-                   ΔelementEnd();
+                   ɵɵelement(3, 'span', null, ['foo', '']);
+                   ɵɵelementStart(5, 'div');
+                   { ɵɵelement(6, 'span', null, ['foo', '']); }
+                   ɵɵelementEnd();
                  }
-                 ΔelementEnd();
+                 ɵɵelementEnd();
                }
                if (rf & RenderFlags.Update) {
-                 shallowInstance = Δload<ShallowQueryDirective>(1);
-                 deepInstance = Δload<DeepQueryDirective>(2);
+                 shallowInstance = ɵɵload<ShallowQueryDirective>(1);
+                 deepInstance = ɵɵload<DeepQueryDirective>(2);
                }
              },
              8, 0, [ShallowQueryDirective, DeepQueryDirective]);
@@ -2291,7 +2293,7 @@ describe('query', () => {
     class TextDirective {
       value !: string;
 
-      static ngDirectiveDef = ΔdefineDirective({
+      static ngDirectiveDef = ɵɵdefineDirective({
         type: TextDirective,
         selectors: [['', 'text', '']],
         factory: () => new TextDirective(),
@@ -2306,7 +2308,7 @@ describe('query', () => {
         // @ContentChildren(TextDirective)
         texts !: QueryList<TextDirective>;
 
-        static ngComponentDef = ΔdefineDirective({
+        static ngComponentDef = ɵɵdefineDirective({
           type: ContentQueryDirective,
           selectors: [['', 'content-query', '']],
           factory: () => contentQueryDirective = new ContentQueryDirective(),
@@ -2314,11 +2316,11 @@ describe('query', () => {
             // @ContentChildren(TextDirective, {descendants: true})
             // texts: QueryList<TextDirective>;
             if (rf & RenderFlags.Create) {
-              ΔcontentQuery(dirIndex, TextDirective, true, null);
+              ɵɵcontentQuery(dirIndex, TextDirective, true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadContentQuery<TextDirective>()) && (ctx.texts = tmp);
+              ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<TextDirective>()) && (ctx.texts = tmp);
             }
           }
         });
@@ -2339,17 +2341,17 @@ describe('query', () => {
           */
           function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div', ['content-query']);
+              ɵɵelementStart(0, 'div', ['content-query']);
               {
-                Δelement(1, 'span', ['text', 'A']);
-                ΔelementStart(2, 'div', ['text', 'B']);
-                ΔelementStart(3, 'span', ['text', 'C']);
-                { Δelement(4, 'span', ['text', 'D']); }
-                ΔelementEnd();
-                ΔelementEnd();
-                Δelement(5, 'span', ['text', 'E']);
+                ɵɵelement(1, 'span', ['text', 'A']);
+                ɵɵelementStart(2, 'div', ['text', 'B']);
+                ɵɵelementStart(3, 'span', ['text', 'C']);
+                { ɵɵelement(4, 'span', ['text', 'D']); }
+                ɵɵelementEnd();
+                ɵɵelementEnd();
+                ɵɵelement(5, 'span', ['text', 'E']);
               }
-              ΔelementEnd();
+              ɵɵelementEnd();
             }
           },
           6, 0, [TextDirective, ContentQueryDirective]);
@@ -2374,19 +2376,19 @@ describe('query', () => {
         // @ViewChildren(TextDirective)
         texts !: QueryList<TextDirective>;
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: ViewQueryComponent,
           selectors: [['view-query']],
           factory: () => new ViewQueryComponent(),
           template: function(rf: RenderFlags, ctx: ViewQueryComponent) {
             if (rf & RenderFlags.Create) {
-              Δelement(0, 'span', ['text', 'A']);
-              ΔelementStart(1, 'div', ['text', 'B']);
-              ΔelementStart(2, 'span', ['text', 'C']);
-              { Δelement(3, 'span', ['text', 'D']); }
-              ΔelementEnd();
-              ΔelementEnd();
-              Δelement(4, 'span', ['text', 'E']);
+              ɵɵelement(0, 'span', ['text', 'A']);
+              ɵɵelementStart(1, 'div', ['text', 'B']);
+              ɵɵelementStart(2, 'span', ['text', 'C']);
+              { ɵɵelement(3, 'span', ['text', 'D']); }
+              ɵɵelementEnd();
+              ɵɵelementEnd();
+              ɵɵelement(4, 'span', ['text', 'E']);
             }
           },
           consts: 5,
@@ -2394,10 +2396,10 @@ describe('query', () => {
           viewQuery: function(rf: RenderFlags, ctx: ViewQueryComponent) {
             let tmp: any;
             if (rf & RenderFlags.Create) {
-              ΔviewQuery(TextDirective, true, null);
+              ɵɵviewQuery(TextDirective, true, null);
             }
             if (rf & RenderFlags.Update) {
-              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<TextDirective>>()) &&
+              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<TextDirective>>()) &&
                   (ctx.texts = tmp as QueryList<TextDirective>);
             }
           },
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 37c836b80a..51e8d418d5 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -28,7 +28,7 @@ import {CreateComponentOptions} from '../../src/render3/component';
 import {getDirectivesAtNodeIndex, getLContext, isComponentInstance} from '../../src/render3/context_discovery';
 import {extractDirectiveDef, extractPipeDef} from '../../src/render3/definition';
 import {NG_ELEMENT_ID} from '../../src/render3/fields';
-import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, RenderFlags, renderComponent as _renderComponent, tick, ΔProvidersFeature, ΔdefineComponent, ΔdefineDirective} from '../../src/render3/index';
+import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveType, RenderFlags, renderComponent as _renderComponent, tick, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
 import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {PlayerHandler} from '../../src/render3/interfaces/player';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, RendererFactory3, RendererStyleFlags3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
@@ -258,7 +258,7 @@ export function renderTemplate<T>(
         LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null, providedRendererFactory, renderer);
     enterView(hostLView, null);  // SUSPECT! why do we need to enter the View?
 
-    const def: ComponentDef<any> = ΔdefineComponent({
+    const def: ComponentDef<any> = ɵɵdefineComponent({
       factory: () => null,
       selectors: [],
       type: Object,
@@ -367,7 +367,7 @@ export function createComponent(
     viewProviders: Provider[] = [], hostBindings?: HostBindingsFunction<any>): ComponentType<any> {
   return class Component {
     value: any;
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: Component,
       selectors: [[name]],
       consts: consts,
@@ -378,7 +378,7 @@ export function createComponent(
       directives: directives, hostBindings,
       pipes: pipes,
       features: (providers.length > 0 || viewProviders.length > 0)?
-      [ΔProvidersFeature(providers || [], viewProviders || [])]: []
+      [ɵɵProvidersFeature(providers || [], viewProviders || [])]: []
     });
   };
 }
@@ -386,7 +386,7 @@ export function createComponent(
 export function createDirective(
     name: string, {exportAs}: {exportAs?: string[]} = {}): DirectiveType<any> {
   return class Directive {
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: Directive,
       selectors: [['', name, '']],
       factory: () => new Directive(),
diff --git a/packages/core/test/render3/renderer_factory_spec.ts b/packages/core/test/render3/renderer_factory_spec.ts
index b13582d769..1e7473bdbd 100644
--- a/packages/core/test/render3/renderer_factory_spec.ts
+++ b/packages/core/test/render3/renderer_factory_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {RendererType2, ViewEncapsulation} from '../../src/core';
-import {ΔdefineComponent} from '../../src/render3/index';
-import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtext} from '../../src/render3/instructions/all';
+import {ɵɵdefineComponent} from '../../src/render3/index';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 
 import {getRendererFactory2} from './imported_renderer2';
@@ -26,7 +26,7 @@ describe('renderer factory lifecycle', () => {
   rendererFactory.end = () => logs.push('end');
 
   class SomeComponent {
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: SomeComponent,
       encapsulation: ViewEncapsulation.None,
       selectors: [['some-component']],
@@ -35,7 +35,7 @@ describe('renderer factory lifecycle', () => {
       template: function(rf: RenderFlags, ctx: SomeComponent) {
         if (rf & RenderFlags.Create) {
           logs.push('component create');
-          Δtext(0, 'foo');
+          ɵɵtext(0, 'foo');
         }
         if (rf & RenderFlags.Update) {
           logs.push('component update');
@@ -46,7 +46,7 @@ describe('renderer factory lifecycle', () => {
   }
 
   class SomeComponentWhichThrows {
-    static ngComponentDef = ΔdefineComponent({
+    static ngComponentDef = ɵɵdefineComponent({
       type: SomeComponentWhichThrows,
       encapsulation: ViewEncapsulation.None,
       selectors: [['some-component-with-Error']],
@@ -62,7 +62,7 @@ describe('renderer factory lifecycle', () => {
   function Template(rf: RenderFlags, ctx: any) {
     if (rf & RenderFlags.Create) {
       logs.push('function create');
-      Δtext(0, 'bar');
+      ɵɵtext(0, 'bar');
     }
     if (rf & RenderFlags.Update) {
       logs.push('function update');
@@ -74,8 +74,8 @@ describe('renderer factory lifecycle', () => {
   function TemplateWithComponent(rf: RenderFlags, ctx: any) {
     if (rf & RenderFlags.Create) {
       logs.push('function_with_component create');
-      Δtext(0, 'bar');
-      Δelement(1, 'some-component');
+      ɵɵtext(0, 'bar');
+      ɵɵelement(1, 'some-component');
     }
     if (rf & RenderFlags.Update) {
       logs.push('function_with_component update');
@@ -114,27 +114,27 @@ describe('Renderer2 destruction hooks', () => {
     let condition = true;
 
     function createTemplate() {
-      ΔelementStart(0, 'div');
-      { Δcontainer(1); }
-      ΔelementEnd();
+      ɵɵelementStart(0, 'div');
+      { ɵɵcontainer(1); }
+      ɵɵelementEnd();
     }
 
     function updateTemplate() {
-      ΔcontainerRefreshStart(1);
+      ɵɵcontainerRefreshStart(1);
       {
         if (condition) {
-          let rf1 = ΔembeddedViewStart(1, 3, 0);
+          let rf1 = ɵɵembeddedViewStart(1, 3, 0);
           {
             if (rf1 & RenderFlags.Create) {
-              Δelement(0, 'span');
-              Δelement(1, 'span');
-              Δelement(2, 'span');
+              ɵɵelement(0, 'span');
+              ɵɵelement(1, 'span');
+              ɵɵelement(2, 'span');
             }
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
       }
-      ΔcontainerRefreshEnd();
+      ɵɵcontainerRefreshEnd();
     }
 
     const t = new TemplateFixture(
@@ -150,7 +150,7 @@ describe('Renderer2 destruction hooks', () => {
 
   it('should call renderer.destroy for each component destroyed', () => {
     class SimpleComponent {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: SimpleComponent,
         encapsulation: ViewEncapsulation.None,
         selectors: [['simple']],
@@ -158,7 +158,7 @@ describe('Renderer2 destruction hooks', () => {
         vars: 0,
         template: function(rf: RenderFlags, ctx: SimpleComponent) {
           if (rf & RenderFlags.Create) {
-            Δelement(0, 'span');
+            ɵɵelement(0, 'span');
           }
         },
         factory: () => new SimpleComponent,
@@ -168,27 +168,27 @@ describe('Renderer2 destruction hooks', () => {
     let condition = true;
 
     function createTemplate() {
-      ΔelementStart(0, 'div');
-      { Δcontainer(1); }
-      ΔelementEnd();
+      ɵɵelementStart(0, 'div');
+      { ɵɵcontainer(1); }
+      ɵɵelementEnd();
     }
 
     function updateTemplate() {
-      ΔcontainerRefreshStart(1);
+      ɵɵcontainerRefreshStart(1);
       {
         if (condition) {
-          let rf1 = ΔembeddedViewStart(1, 3, 0);
+          let rf1 = ɵɵembeddedViewStart(1, 3, 0);
           {
             if (rf1 & RenderFlags.Create) {
-              Δelement(0, 'simple');
-              Δelement(1, 'span');
-              Δelement(2, 'simple');
+              ɵɵelement(0, 'simple');
+              ɵɵelement(1, 'span');
+              ɵɵelement(2, 'simple');
             }
           }
-          ΔembeddedViewEnd();
+          ɵɵembeddedViewEnd();
         }
       }
-      ΔcontainerRefreshEnd();
+      ɵɵcontainerRefreshEnd();
     }
 
     const t = new TemplateFixture(
diff --git a/packages/core/test/render3/styling/class_and_style_bindings_spec.ts b/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
index f85cc1e3af..3dfecb239f 100644
--- a/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
+++ b/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
@@ -9,7 +9,7 @@ import {createLView, createTView} from '@angular/core/src/render3/instructions/s
 
 import {createRootContext} from '../../../src/render3/component';
 import {getLContext} from '../../../src/render3/context_discovery';
-import {ΔclassMap, ΔclassProp, ΔdefineComponent, ΔdefineDirective, ΔelementEnd, ΔelementStart, ΔnamespaceSVG, Δselect, ΔstyleMap, ΔstyleProp, Δstyling, ΔstylingApply} from '../../../src/render3/index';
+import {ɵɵclassMap, ɵɵclassProp, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵelementEnd, ɵɵelementStart, ɵɵnamespaceSVG, ɵɵselect, ɵɵstyleMap, ɵɵstyleProp, ɵɵstyling, ɵɵstylingApply} from '../../../src/render3/index';
 import {RenderFlags} from '../../../src/render3/interfaces/definition';
 import {AttributeMarker, TAttributes} from '../../../src/render3/interfaces/node';
 import {BindingStore, BindingType, PlayState, Player, PlayerContext, PlayerFactory, PlayerHandler} from '../../../src/render3/interfaces/player';
@@ -22,7 +22,7 @@ import {CorePlayerHandler} from '../../../src/render3/styling/core_player_handle
 import {registerHostDirective} from '../../../src/render3/styling/host_instructions_queue';
 import {BoundPlayerFactory, bindPlayerFactory} from '../../../src/render3/styling/player_factory';
 import {allocStylingContext, createEmptyStylingContext} from '../../../src/render3/styling/util';
-import {ΔdefaultStyleSanitizer} from '../../../src/sanitization/sanitization';
+import {ɵɵdefaultStyleSanitizer} from '../../../src/sanitization/sanitization';
 import {StyleSanitizeFn} from '../../../src/sanitization/style_sanitizer';
 import {ComponentFixture, renderToHtml} from '../render_util';
 
@@ -383,7 +383,7 @@ describe('style and class based bindings', () => {
          () => {
            function Template(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               ΔelementStart(0, 'span', [
+               ɵɵelementStart(0, 'span', [
                  AttributeMarker.Styles,
                  'width',
                  '200px',
@@ -392,14 +392,14 @@ describe('style and class based bindings', () => {
                  'opacity',
                  '0.5',
                ]);
-               Δstyling(null, ['width']);
-               ΔelementEnd();
+               ɵɵstyling(null, ['width']);
+               ɵɵelementEnd();
              }
              if (rf & RenderFlags.Update) {
-               Δselect(0);
-               ΔstyleMap(ctx.myStyles);
-               ΔstyleProp(0, ctx.myWidth);
-               ΔstylingApply();
+               ɵɵselect(0);
+               ɵɵstyleMap(ctx.myStyles);
+               ɵɵstyleProp(0, ctx.myWidth);
+               ɵɵstylingApply();
              }
            }
 
@@ -419,7 +419,7 @@ describe('style and class based bindings', () => {
         class Comp {
           diameter: number = 100;
 
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: Comp,
             selectors: [['comp']],
             factory: () => new Comp(),
@@ -427,18 +427,18 @@ describe('style and class based bindings', () => {
             vars: 0,
             template: (rf: RenderFlags, ctx: Comp) => {
               if (rf & RenderFlags.Create) {
-                ΔnamespaceSVG();
-                ΔelementStart(0, 'svg');
-                Δstyling(null, ['width', 'height']);
-                ΔelementStart(1, 'circle', ['stroke', 'green', 'fill', 'yellow']);
-                ΔelementEnd();
-                ΔelementEnd();
+                ɵɵnamespaceSVG();
+                ɵɵelementStart(0, 'svg');
+                ɵɵstyling(null, ['width', 'height']);
+                ɵɵelementStart(1, 'circle', ['stroke', 'green', 'fill', 'yellow']);
+                ɵɵelementEnd();
+                ɵɵelementEnd();
               }
               if (rf & RenderFlags.Update) {
-                Δselect(0);
-                ΔstyleProp(0, ctx.diameter, 'px');
-                ΔstyleProp(1, ctx.diameter, 'px');
-                ΔstylingApply();
+                ɵɵselect(0);
+                ɵɵstyleProp(0, ctx.diameter, 'px');
+                ɵɵstyleProp(1, ctx.diameter, 'px');
+                ɵɵstylingApply();
               }
             }
           });
@@ -462,7 +462,7 @@ describe('style and class based bindings', () => {
           borderWidth: string = '3px';
           borderColor: string = 'red';
 
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: Comp,
             selectors: [['comp']],
             factory: () => new Comp(),
@@ -470,15 +470,15 @@ describe('style and class based bindings', () => {
             vars: 0,
             template: (rf: RenderFlags, ctx: Comp) => {
               if (rf & RenderFlags.Create) {
-                ΔelementStart(0, 'div');
-                Δstyling(null, ['borderWidth', 'border-color']);
-                ΔelementEnd();
+                ɵɵelementStart(0, 'div');
+                ɵɵstyling(null, ['borderWidth', 'border-color']);
+                ɵɵelementEnd();
               }
               if (rf & RenderFlags.Update) {
-                Δselect(0);
-                ΔstyleProp(0, ctx.borderWidth);
-                ΔstyleProp(1, ctx.borderColor);
-                ΔstylingApply();
+                ɵɵselect(0);
+                ɵɵstyleProp(0, ctx.borderWidth);
+                ɵɵstyleProp(1, ctx.borderColor);
+                ɵɵstylingApply();
               }
             }
           });
@@ -1279,7 +1279,7 @@ describe('style and class based bindings', () => {
          () => {
            const getStyles = trackStylesFactory();
            const styleBindings = ['border-image', 'border-width'];
-           const styleSanitizer = ΔdefaultStyleSanitizer;
+           const styleSanitizer = ɵɵdefaultStyleSanitizer;
            const stylingContext =
                createStylingContext(null, styleBindings, null, null, styleSanitizer);
 
@@ -3099,7 +3099,7 @@ describe('style and class based bindings', () => {
          const fooFactory = bindPlayerFactory(classBuildFn, true);
 
          class Comp {
-           static ngComponentDef = ΔdefineComponent({
+           static ngComponentDef = ɵɵdefineComponent({
              type: Comp,
              selectors: [['comp']],
              directives: [Comp],
@@ -3108,17 +3108,17 @@ describe('style and class based bindings', () => {
              vars: 0,
              template: (rf: RenderFlags, ctx: Comp) => {
                if (rf & RenderFlags.Create) {
-                 ΔelementStart(0, 'div');
-                 Δstyling(['foo'], ['width']);
-                 ΔelementEnd();
+                 ɵɵelementStart(0, 'div');
+                 ɵɵstyling(['foo'], ['width']);
+                 ɵɵelementEnd();
                }
                if (rf & RenderFlags.Update) {
-                 Δselect(0);
-                 ΔstyleMap(styleMapFactory);
-                 ΔclassMap(classMapFactory);
-                 ΔstyleProp(0, widthFactory);
-                 ΔclassProp(0, fooFactory);
-                 ΔstylingApply();
+                 ɵɵselect(0);
+                 ɵɵstyleMap(styleMapFactory);
+                 ɵɵclassMap(classMapFactory);
+                 ɵɵstyleProp(0, widthFactory);
+                 ɵɵclassProp(0, fooFactory);
+                 ɵɵstylingApply();
                }
              }
            });
@@ -3174,7 +3174,7 @@ describe('style and class based bindings', () => {
       let fooFactory = bindPlayerFactory(buildFn, true) as BoundPlayerFactory<any>;
 
       class Comp {
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: Comp,
           selectors: [['comp']],
           directives: [Comp],
@@ -3183,17 +3183,17 @@ describe('style and class based bindings', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: Comp) => {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div');
-              Δstyling(['foo'], ['width']);
-              ΔelementEnd();
+              ɵɵelementStart(0, 'div');
+              ɵɵstyling(['foo'], ['width']);
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              Δselect(0);
-              ΔstyleMap(styleMapFactory);
-              ΔclassMap(classMapFactory);
-              ΔstyleProp(0, widthFactory);
-              ΔclassProp(0, fooFactory);
-              ΔstylingApply();
+              ɵɵselect(0);
+              ɵɵstyleMap(styleMapFactory);
+              ɵɵclassMap(classMapFactory);
+              ɵɵstyleProp(0, widthFactory);
+              ɵɵclassProp(0, fooFactory);
+              ɵɵstylingApply();
             }
           }
         });
@@ -3251,18 +3251,18 @@ describe('style and class based bindings', () => {
       const fooFactory2 = bindPlayerFactory(classBuildFn, true);
 
       class MyDir {
-        static ngDirectiveDef = ΔdefineDirective({
+        static ngDirectiveDef = ɵɵdefineDirective({
           type: MyDir,
           selectors: [['', 'my-dir', '']],
           factory: () => new MyDir(),
           hostBindings: function(rf: RenderFlags, ctx: MyDir, elementIndex: number) {
             if (rf & RenderFlags.Create) {
-              Δstyling(['foo'], ['width']);
+              ɵɵstyling(['foo'], ['width']);
             }
             if (rf & RenderFlags.Update) {
-              ΔstyleProp(0, ctx.widthFactory);
-              ΔclassProp(0, ctx.fooFactory);
-              ΔstylingApply();
+              ɵɵstyleProp(0, ctx.widthFactory);
+              ɵɵclassProp(0, ctx.fooFactory);
+              ɵɵstylingApply();
             }
           }
         });
@@ -3272,7 +3272,7 @@ describe('style and class based bindings', () => {
       }
 
       class Comp {
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: Comp,
           selectors: [['comp']],
           directives: [Comp, MyDir],
@@ -3281,15 +3281,15 @@ describe('style and class based bindings', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: Comp) => {
             if (rf & RenderFlags.Create) {
-              ΔelementStart(0, 'div', ['my-dir', '']);
-              Δstyling(['foo'], ['width']);
-              ΔelementEnd();
+              ɵɵelementStart(0, 'div', ['my-dir', '']);
+              ɵɵstyling(['foo'], ['width']);
+              ɵɵelementEnd();
             }
             if (rf & RenderFlags.Update) {
-              Δselect(0);
-              ΔstyleProp(0, ctx.widthFactory);
-              ΔclassProp(0, ctx.fooFactory);
-              ΔstylingApply();
+              ɵɵselect(0);
+              ɵɵstyleProp(0, ctx.widthFactory);
+              ɵɵclassProp(0, ctx.fooFactory);
+              ɵɵstylingApply();
             }
           }
         });
diff --git a/packages/core/test/render3/styling/players_spec.ts b/packages/core/test/render3/styling/players_spec.ts
index 5f73651386..f0b494ddf5 100644
--- a/packages/core/test/render3/styling/players_spec.ts
+++ b/packages/core/test/render3/styling/players_spec.ts
@@ -8,12 +8,12 @@
 import {QueryList} from '@angular/core';
 import {RenderFlags} from '@angular/core/src/render3';
 
-import {getHostElement, ΔdefineComponent, ΔloadViewQuery, ΔviewQuery} from '../../../src/render3/index';
-import {markDirty, Δelement, ΔelementEnd, ΔelementStart, Δselect, Δstyling, ΔstylingApply} from '../../../src/render3/instructions/all';
+import {getHostElement, ɵɵdefineComponent, ɵɵloadViewQuery, ɵɵviewQuery} from '../../../src/render3/index';
+import {markDirty, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵselect, ɵɵstyling, ɵɵstylingApply} from '../../../src/render3/instructions/all';
 import {PlayState, Player, PlayerHandler} from '../../../src/render3/interfaces/player';
 import {RElement} from '../../../src/render3/interfaces/renderer';
 import {addPlayer, getPlayers} from '../../../src/render3/players';
-import {ΔqueryRefresh} from '../../../src/render3/query';
+import {ɵɵqueryRefresh} from '../../../src/render3/query';
 import {getOrCreatePlayerContext} from '../../../src/render3/styling/util';
 import {ComponentFixture} from '../render_util';
 
@@ -228,7 +228,7 @@ function buildElementWithStyling() {
 }
 
 class Comp {
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     type: Comp,
     exportAs: ['child'],
     selectors: [['child-comp']],
@@ -237,7 +237,7 @@ class Comp {
     vars: 0,
     template: (rf: RenderFlags, ctx: Comp) => {
       if (rf & RenderFlags.Create) {
-        Δelement(0, 'div');
+        ɵɵelement(0, 'div');
       }
       ctx.logger();
     }
@@ -248,7 +248,7 @@ class Comp {
 }
 
 class CompWithStyling {
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     type: CompWithStyling,
     exportAs: ['child-styled'],
     selectors: [['child-styled-comp']],
@@ -257,13 +257,13 @@ class CompWithStyling {
     vars: 0,
     template: (rf: RenderFlags, ctx: CompWithStyling) => {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        Δstyling(['fooClass']);
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        ɵɵstyling(['fooClass']);
+        ɵɵelementEnd();
       }
       if (rf & RenderFlags.Update) {
-        Δselect(0);
-        ΔstylingApply();
+        ɵɵselect(0);
+        ɵɵstylingApply();
       }
     }
   });
@@ -272,7 +272,7 @@ class CompWithStyling {
 }
 
 class SuperComp {
-  static ngComponentDef = ΔdefineComponent({
+  static ngComponentDef = ɵɵdefineComponent({
     type: SuperComp,
     selectors: [['super-comp']],
     factory: () => new SuperComp(),
@@ -280,18 +280,18 @@ class SuperComp {
     vars: 0,
     template: (rf: RenderFlags, ctx: SuperComp) => {
       if (rf & RenderFlags.Create) {
-        ΔelementStart(0, 'div');
-        Δelement(1, 'child-comp', ['child', ''], ['child', 'child']);
-        ΔelementEnd();
+        ɵɵelementStart(0, 'div');
+        ɵɵelement(1, 'child-comp', ['child', ''], ['child', 'child']);
+        ɵɵelementEnd();
       }
     },
     viewQuery: function(rf: RenderFlags, ctx: SuperComp) {
       if (rf & RenderFlags.Create) {
-        ΔviewQuery(['child'], true, null);
+        ɵɵviewQuery(['child'], true, null);
       }
       if (rf & RenderFlags.Update) {
         let tmp: any;
-        ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+        ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
             (ctx.query = tmp as QueryList<any>);
       }
     },
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index bfdadb8472..a56f0834ae 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -8,9 +8,9 @@
 
 import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ComponentRef, ElementRef, QueryList, TemplateRef, ViewContainerRef, ViewRef,} from '../../src/core';
 import {ViewEncapsulation} from '../../src/metadata';
-import {injectComponentFactoryResolver, ΔdefineComponent, ΔdefineDirective, Δlistener, ΔloadViewQuery, ΔqueryRefresh, ΔviewQuery,} from '../../src/render3/index';
+import {injectComponentFactoryResolver, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵlistener, ɵɵloadViewQuery, ɵɵqueryRefresh, ɵɵviewQuery,} from '../../src/render3/index';
 
-import {Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdirectiveInject, Δelement, ΔelementEnd, ΔelementStart, ΔembeddedViewEnd, ΔembeddedViewStart, Δtemplate, Δtext,} from '../../src/render3/instructions/all';
+import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtemplate, ɵɵtext,} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {RElement} from '../../src/render3/interfaces/renderer';
 import {getLView} from '../../src/render3/state';
@@ -29,12 +29,12 @@ describe('ViewContainerRef', () => {
   beforeEach(() => directiveInstance = null);
 
   class DirectiveWithVCRef {
-    static ngDirectiveDef = ΔdefineDirective({
+    static ngDirectiveDef = ɵɵdefineDirective({
       type: DirectiveWithVCRef,
       selectors: [['', 'vcref', '']],
       factory: () => directiveInstance = new DirectiveWithVCRef(
 
-                   ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                   ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
       inputs: {tplRef: 'tplRef', name: 'name'}
     });
 
@@ -57,13 +57,13 @@ describe('ViewContainerRef', () => {
            let directiveInstances: TestDirective[] = [];
 
            class TestDirective {
-             static ngDirectiveDef = ΔdefineDirective({
+             static ngDirectiveDef = ɵɵdefineDirective({
                type: TestDirective,
                selectors: [['', 'testdir', '']],
                factory: () => {
                  const instance = new TestDirective(
-                     ΔdirectiveInject(ViewContainerRef as any),
-                     ΔdirectiveInject(TemplateRef as any));
+                     ɵɵdirectiveInject(ViewContainerRef as any),
+                     ɵɵdirectiveInject(TemplateRef as any));
 
                  directiveInstances.push(instance);
 
@@ -80,13 +80,13 @@ describe('ViewContainerRef', () => {
 
            function EmbeddedTemplateA(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               Δtext(0, 'A');
+               ɵɵtext(0, 'A');
              }
            }
 
            function EmbeddedTemplateB(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               Δtext(0, 'B');
+               ɵɵtext(0, 'B');
              }
            }
 
@@ -99,7 +99,7 @@ describe('ViewContainerRef', () => {
            class TestComponent {
              // TODO(issue/24571): remove '!'.
              testDir !: TestDirective;
-             static ngComponentDef = ΔdefineComponent({
+             static ngComponentDef = ɵɵdefineComponent({
                type: TestComponent,
                encapsulation: ViewEncapsulation.None,
                selectors: [['test-cmp']],
@@ -108,10 +108,10 @@ describe('ViewContainerRef', () => {
                vars: 0,
                template: (rf: RenderFlags, cmp: TestComponent) => {
                  if (rf & RenderFlags.Create) {
-                   Δtext(0, 'before|');
-                   Δtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
-                   Δtemplate(2, EmbeddedTemplateB, 1, 0, 'ng-template', ['testdir', '']);
-                   Δtext(3, '|after');
+                   ɵɵtext(0, 'before|');
+                   ɵɵtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
+                   ɵɵtemplate(2, EmbeddedTemplateB, 1, 0, 'ng-template', ['testdir', '']);
+                   ɵɵtext(3, '|after');
                  }
                },
                directives: [TestDirective]
@@ -134,12 +134,12 @@ describe('ViewContainerRef', () => {
            let directiveInstance: TestDirective;
 
            class TestDirective {
-             static ngDirectiveDef = ΔdefineDirective({
+             static ngDirectiveDef = ɵɵdefineDirective({
                type: TestDirective,
                selectors: [['', 'testdir', '']],
                factory: () => directiveInstance = new TestDirective(
-                            ΔdirectiveInject(ViewContainerRef as any),
-                            ΔdirectiveInject(TemplateRef as any))
+                            ɵɵdirectiveInject(ViewContainerRef as any),
+                            ɵɵdirectiveInject(TemplateRef as any))
              });
 
              constructor(private _vcRef: ViewContainerRef, private _tplRef: TemplateRef<{}>) {}
@@ -156,7 +156,7 @@ describe('ViewContainerRef', () => {
 
            function EmbeddedTemplateA(rf: RenderFlags, ctx: any) {
              if (rf & RenderFlags.Create) {
-               Δtext(0, 'A');
+               ɵɵtext(0, 'A');
              }
            }
 
@@ -172,7 +172,7 @@ describe('ViewContainerRef', () => {
              condition = false;
              // TODO(issue/24571): remove '!'.
              testDir !: TestDirective;
-             static ngComponentDef = ΔdefineComponent({
+             static ngComponentDef = ɵɵdefineComponent({
                type: TestComponent,
                encapsulation: ViewEncapsulation.None,
                selectors: [['test-cmp']],
@@ -181,25 +181,25 @@ describe('ViewContainerRef', () => {
                factory: () => new TestComponent(),
                template: (rf: RenderFlags, cmp: TestComponent) => {
                  if (rf & RenderFlags.Create) {
-                   Δtext(0, 'before|');
-                   Δtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
-                   Δcontainer(2);
-                   Δtext(3, '|after');
+                   ɵɵtext(0, 'before|');
+                   ɵɵtemplate(1, EmbeddedTemplateA, 1, 0, 'ng-template', ['testdir', '']);
+                   ɵɵcontainer(2);
+                   ɵɵtext(3, '|after');
                  }
                  if (rf & RenderFlags.Update) {
-                   ΔcontainerRefreshStart(2);
+                   ɵɵcontainerRefreshStart(2);
                    {
                      if (cmp.condition) {
-                       let rf1 = ΔembeddedViewStart(0, 1, 0);
+                       let rf1 = ɵɵembeddedViewStart(0, 1, 0);
                        {
                          if (rf1 & RenderFlags.Create) {
-                           Δtext(0, 'B');
+                           ɵɵtext(0, 'B');
                          }
                        }
-                       ΔembeddedViewEnd();
+                       ɵɵembeddedViewEnd();
                      }
                    }
-                   ΔcontainerRefreshEnd();
+                   ɵɵcontainerRefreshEnd();
                  }
                },
                directives: [TestDirective]
@@ -239,12 +239,12 @@ describe('ViewContainerRef', () => {
         class AppComp {
           constructor(public vcr: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
 
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: AppComp,
             selectors: [['app-comp']],
             factory:
                 () => new AppComp(
-                    ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                    ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
             consts: 0,
             vars: 0,
             template: (rf: RenderFlags, cmp: AppComp) => {}
@@ -256,7 +256,7 @@ describe('ViewContainerRef', () => {
 
           ngDoCheck() { this.doCheckCount++; }
 
-          static ngComponentDef = ΔdefineComponent({
+          static ngComponentDef = ɵɵdefineComponent({
             type: DynamicComp,
             selectors: [['dynamic-comp']],
             factory: () => dynamicComp = new DynamicComp(),
@@ -316,8 +316,8 @@ describe('ViewContainerRef', () => {
     describe('getters', () => {
       it('should work on elements', () => {
         function createTemplate() {
-          Δelement(0, 'header', ['vcref', '']);
-          Δelement(1, 'footer');
+          ɵɵelement(0, 'header', ['vcref', '']);
+          ɵɵelement(1, 'footer');
         }
 
         new TemplateFixture(createTemplate, undefined, 2, 0, [DirectiveWithVCRef]);
@@ -335,8 +335,8 @@ describe('ViewContainerRef', () => {
             createComponent('header-cmp', function(rf: RenderFlags, ctx: any) {});
 
         function createTemplate() {
-          Δelement(0, 'header-cmp', ['vcref', '']);
-          Δelement(1, 'footer');
+          ɵɵelement(0, 'header-cmp', ['vcref', '']);
+          ɵɵelement(1, 'footer');
         }
 
         new TemplateFixture(createTemplate, undefined, 2, 0, [HeaderComponent, DirectiveWithVCRef]);
@@ -355,11 +355,11 @@ describe('ViewContainerRef', () => {
 
     @Component({selector: 'app', template: ''})
     class AppCmpt {
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: AppCmpt,
         selectors: [['app']],
         factory: () => new AppCmpt(
-                     ΔdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
+                     ɵɵdirectiveInject(ViewContainerRef as any), injectComponentFactoryResolver()),
         consts: 0,
         vars: 0,
         template: (rf: RenderFlags, cmp: AppCmpt) => {}
@@ -383,7 +383,7 @@ describe('ViewContainerRef', () => {
       const DynamicComponent =
           createComponent('dynamic-cmpt', function(rf: RenderFlags, parent: any) {
             if (rf & RenderFlags.Create) {
-              Δtext(0, 'inserted dynamically');
+              ɵɵtext(0, 'inserted dynamically');
             }
           }, 1, 0);
 
@@ -424,7 +424,7 @@ describe('ViewContainerRef', () => {
         // @ViewChildren('foo')
         foo !: QueryList<any>;
 
-        static ngComponentDef = ΔdefineComponent({
+        static ngComponentDef = ɵɵdefineComponent({
           type: DynamicCompWithViewQueries,
           selectors: [['dynamic-cmpt-with-view-queries']],
           factory: () => dynamicComp = new DynamicCompWithViewQueries(),
@@ -432,18 +432,18 @@ describe('ViewContainerRef', () => {
           vars: 0,
           template: (rf: RenderFlags, ctx: DynamicCompWithViewQueries) => {
             if (rf & RenderFlags.Create) {
-              Δelement(0, 'div', ['bar', ''], ['foo', '']);
+              ɵɵelement(0, 'div', ['bar', ''], ['foo', '']);
             }
             // testing only
             fooEl = getNativeByIndex(0, getLView()) as RElement;
           },
           viewQuery: function(rf: RenderFlags, ctx: any) {
             if (rf & RenderFlags.Create) {
-              ΔviewQuery(['foo'], true, null);
+              ɵɵviewQuery(['foo'], true, null);
             }
             if (rf & RenderFlags.Update) {
               let tmp: any;
-              ΔqueryRefresh(tmp = ΔloadViewQuery<QueryList<any>>()) &&
+              ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) &&
                   (ctx.foo = tmp as QueryList<any>);
             }
           }
@@ -468,7 +468,7 @@ describe('ViewContainerRef', () => {
 
       ngOnDestroy() { this.viewRef.destroy(); }
 
-      static ngComponentDef = ΔdefineComponent({
+      static ngComponentDef = ɵɵdefineComponent({
         type: CompWithListenerThatDestroysItself,
         selectors: [['comp-with-listener-and-on-destroy']],
         consts: 2,
@@ -476,18 +476,18 @@ describe('ViewContainerRef', () => {
         /** <button (click)="onClick()"> Click me </button> */
         template: function CompTemplate(rf: RenderFlags, ctx: any) {
           if (rf & RenderFlags.Create) {
-            ΔelementStart(0, 'button');
+            ɵɵelementStart(0, 'button');
             {
-              Δlistener('click', function() { return ctx.onClick(); });
-              Δtext(1, 'Click me');
+              ɵɵlistener('click', function() { return ctx.onClick(); });
+              ɵɵtext(1, 'Click me');
             }
-            ΔelementEnd();
+            ɵɵelementEnd();
           }
         },
         // We want the ViewRef, so we rely on the knowledge that `ViewRef` is actually given
         // when injecting `ChangeDetectorRef`.
         factory: () => new CompWithListenerThatDestroysItself(
-                     ΔdirectiveInject(ChangeDetectorRef as any)),
+                     ɵɵdirectiveInject(ChangeDetectorRef as any)),
       });
     }
 
@@ -495,7 +495,7 @@ describe('ViewContainerRef', () => {
     it('should not error when destroying a view with listeners twice', () => {
       const CompWithChildListener = createComponent('test-app', (rf: RenderFlags, ctx: any) => {
         if (rf & RenderFlags.Create) {
-          Δelement(0, 'comp-with-listener-and-on-destroy');
+          ɵɵelement(0, 'comp-with-listener-and-on-destroy');
         }
       }, 1, 0, [CompWithListenerThatDestroysItself]);
 
diff --git a/packages/core/test/sanitization/sanatization_spec.ts b/packages/core/test/sanitization/sanatization_spec.ts
index 2b5b2eee51..6c42ec2120 100644
--- a/packages/core/test/sanitization/sanatization_spec.ts
+++ b/packages/core/test/sanitization/sanatization_spec.ts
@@ -12,7 +12,7 @@ import {HEADER_OFFSET, LView} from '@angular/core/src/render3/interfaces/view';
 import {setTNodeAndViewData} from '@angular/core/src/render3/state';
 
 import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl} from '../../src/sanitization/bypass';
-import {getUrlSanitizer, ΔsanitizeHtml, ΔsanitizeResourceUrl, ΔsanitizeScript, ΔsanitizeStyle, ΔsanitizeUrl, ΔsanitizeUrlOrResourceUrl} from '../../src/sanitization/sanitization';
+import {getUrlSanitizer, ɵɵsanitizeHtml, ɵɵsanitizeResourceUrl, ɵɵsanitizeScript, ɵɵsanitizeStyle, ɵɵsanitizeUrl, ɵɵsanitizeUrlOrResourceUrl} from '../../src/sanitization/sanitization';
 import {SecurityContext} from '../../src/sanitization/security';
 
 function fakeLView(): LView {
@@ -27,54 +27,54 @@ describe('sanitization', () => {
     toString() { return this.value; }
   }
   it('should sanitize html', () => {
-    expect(ΔsanitizeHtml('<div></div>')).toEqual('<div></div>');
-    expect(ΔsanitizeHtml(new Wrap('<div></div>'))).toEqual('<div></div>');
-    expect(ΔsanitizeHtml('<img src="javascript:true">'))
+    expect(ɵɵsanitizeHtml('<div></div>')).toEqual('<div></div>');
+    expect(ɵɵsanitizeHtml(new Wrap('<div></div>'))).toEqual('<div></div>');
+    expect(ɵɵsanitizeHtml('<img src="javascript:true">'))
         .toEqual('<img src="unsafe:javascript:true">');
-    expect(ΔsanitizeHtml(new Wrap('<img src="javascript:true">')))
+    expect(ɵɵsanitizeHtml(new Wrap('<img src="javascript:true">')))
         .toEqual('<img src="unsafe:javascript:true">');
-    expect(ΔsanitizeHtml(bypassSanitizationTrustUrl('<img src="javascript:true">')))
+    expect(ɵɵsanitizeHtml(bypassSanitizationTrustUrl('<img src="javascript:true">')))
         .toEqual('<img src="unsafe:javascript:true">');
-    expect(ΔsanitizeHtml(bypassSanitizationTrustHtml('<img src="javascript:true">')))
+    expect(ɵɵsanitizeHtml(bypassSanitizationTrustHtml('<img src="javascript:true">')))
         .toEqual('<img src="javascript:true">');
   });
 
   it('should sanitize url', () => {
-    expect(ΔsanitizeUrl('http://server')).toEqual('http://server');
-    expect(ΔsanitizeUrl(new Wrap('http://server'))).toEqual('http://server');
-    expect(ΔsanitizeUrl('javascript:true')).toEqual('unsafe:javascript:true');
-    expect(ΔsanitizeUrl(new Wrap('javascript:true'))).toEqual('unsafe:javascript:true');
-    expect(ΔsanitizeUrl(bypassSanitizationTrustHtml('javascript:true')))
+    expect(ɵɵsanitizeUrl('http://server')).toEqual('http://server');
+    expect(ɵɵsanitizeUrl(new Wrap('http://server'))).toEqual('http://server');
+    expect(ɵɵsanitizeUrl('javascript:true')).toEqual('unsafe:javascript:true');
+    expect(ɵɵsanitizeUrl(new Wrap('javascript:true'))).toEqual('unsafe:javascript:true');
+    expect(ɵɵsanitizeUrl(bypassSanitizationTrustHtml('javascript:true')))
         .toEqual('unsafe:javascript:true');
-    expect(ΔsanitizeUrl(bypassSanitizationTrustUrl('javascript:true'))).toEqual('javascript:true');
+    expect(ɵɵsanitizeUrl(bypassSanitizationTrustUrl('javascript:true'))).toEqual('javascript:true');
   });
 
   it('should sanitize resourceUrl', () => {
     const ERROR = 'unsafe value used in a resource URL context (see http://g.co/ng/security#xss)';
-    expect(() => ΔsanitizeResourceUrl('http://server')).toThrowError(ERROR);
-    expect(() => ΔsanitizeResourceUrl('javascript:true')).toThrowError(ERROR);
-    expect(() => ΔsanitizeResourceUrl(bypassSanitizationTrustHtml('javascript:true')))
+    expect(() => ɵɵsanitizeResourceUrl('http://server')).toThrowError(ERROR);
+    expect(() => ɵɵsanitizeResourceUrl('javascript:true')).toThrowError(ERROR);
+    expect(() => ɵɵsanitizeResourceUrl(bypassSanitizationTrustHtml('javascript:true')))
         .toThrowError(ERROR);
-    expect(ΔsanitizeResourceUrl(bypassSanitizationTrustResourceUrl('javascript:true')))
+    expect(ɵɵsanitizeResourceUrl(bypassSanitizationTrustResourceUrl('javascript:true')))
         .toEqual('javascript:true');
   });
 
   it('should sanitize style', () => {
-    expect(ΔsanitizeStyle('red')).toEqual('red');
-    expect(ΔsanitizeStyle(new Wrap('red'))).toEqual('red');
-    expect(ΔsanitizeStyle('url("http://server")')).toEqual('unsafe');
-    expect(ΔsanitizeStyle(new Wrap('url("http://server")'))).toEqual('unsafe');
-    expect(ΔsanitizeStyle(bypassSanitizationTrustHtml('url("http://server")'))).toEqual('unsafe');
-    expect(ΔsanitizeStyle(bypassSanitizationTrustStyle('url("http://server")')))
+    expect(ɵɵsanitizeStyle('red')).toEqual('red');
+    expect(ɵɵsanitizeStyle(new Wrap('red'))).toEqual('red');
+    expect(ɵɵsanitizeStyle('url("http://server")')).toEqual('unsafe');
+    expect(ɵɵsanitizeStyle(new Wrap('url("http://server")'))).toEqual('unsafe');
+    expect(ɵɵsanitizeStyle(bypassSanitizationTrustHtml('url("http://server")'))).toEqual('unsafe');
+    expect(ɵɵsanitizeStyle(bypassSanitizationTrustStyle('url("http://server")')))
         .toEqual('url("http://server")');
   });
 
   it('should sanitize script', () => {
     const ERROR = 'unsafe value used in a script context';
-    expect(() => ΔsanitizeScript('true')).toThrowError(ERROR);
-    expect(() => ΔsanitizeScript('true')).toThrowError(ERROR);
-    expect(() => ΔsanitizeScript(bypassSanitizationTrustHtml('true'))).toThrowError(ERROR);
-    expect(ΔsanitizeScript(bypassSanitizationTrustScript('true'))).toEqual('true');
+    expect(() => ɵɵsanitizeScript('true')).toThrowError(ERROR);
+    expect(() => ɵɵsanitizeScript('true')).toThrowError(ERROR);
+    expect(() => ɵɵsanitizeScript(bypassSanitizationTrustHtml('true'))).toThrowError(ERROR);
+    expect(ɵɵsanitizeScript(bypassSanitizationTrustScript('true'))).toEqual('true');
   });
 
   it('should select correct sanitizer for URL props', () => {
@@ -83,7 +83,7 @@ describe('sanitization', () => {
     const schema = SECURITY_SCHEMA();
     const contextsByProp: Map<string, Set<number>> = new Map();
     const sanitizerNameByContext: Map<number, Function> = new Map([
-      [SecurityContext.URL, ΔsanitizeUrl], [SecurityContext.RESOURCE_URL, ΔsanitizeResourceUrl]
+      [SecurityContext.URL, ɵɵsanitizeUrl], [SecurityContext.RESOURCE_URL, ɵɵsanitizeResourceUrl]
     ]);
     Object.keys(schema).forEach(key => {
       const context = schema[key];
@@ -102,28 +102,29 @@ describe('sanitization', () => {
 
   it('should sanitize resourceUrls via sanitizeUrlOrResourceUrl', () => {
     const ERROR = 'unsafe value used in a resource URL context (see http://g.co/ng/security#xss)';
-    expect(() => ΔsanitizeUrlOrResourceUrl('http://server', 'iframe', 'src')).toThrowError(ERROR);
-    expect(() => ΔsanitizeUrlOrResourceUrl('javascript:true', 'iframe', 'src')).toThrowError(ERROR);
+    expect(() => ɵɵsanitizeUrlOrResourceUrl('http://server', 'iframe', 'src')).toThrowError(ERROR);
+    expect(() => ɵɵsanitizeUrlOrResourceUrl('javascript:true', 'iframe', 'src'))
+        .toThrowError(ERROR);
     expect(
-        () => ΔsanitizeUrlOrResourceUrl(
+        () => ɵɵsanitizeUrlOrResourceUrl(
             bypassSanitizationTrustHtml('javascript:true'), 'iframe', 'src'))
         .toThrowError(ERROR);
-    expect(ΔsanitizeUrlOrResourceUrl(
+    expect(ɵɵsanitizeUrlOrResourceUrl(
                bypassSanitizationTrustResourceUrl('javascript:true'), 'iframe', 'src'))
         .toEqual('javascript:true');
   });
 
   it('should sanitize urls via sanitizeUrlOrResourceUrl', () => {
-    expect(ΔsanitizeUrlOrResourceUrl('http://server', 'a', 'href')).toEqual('http://server');
-    expect(ΔsanitizeUrlOrResourceUrl(new Wrap('http://server'), 'a', 'href'))
+    expect(ɵɵsanitizeUrlOrResourceUrl('http://server', 'a', 'href')).toEqual('http://server');
+    expect(ɵɵsanitizeUrlOrResourceUrl(new Wrap('http://server'), 'a', 'href'))
         .toEqual('http://server');
-    expect(ΔsanitizeUrlOrResourceUrl('javascript:true', 'a', 'href'))
+    expect(ɵɵsanitizeUrlOrResourceUrl('javascript:true', 'a', 'href'))
         .toEqual('unsafe:javascript:true');
-    expect(ΔsanitizeUrlOrResourceUrl(new Wrap('javascript:true'), 'a', 'href'))
+    expect(ɵɵsanitizeUrlOrResourceUrl(new Wrap('javascript:true'), 'a', 'href'))
         .toEqual('unsafe:javascript:true');
-    expect(ΔsanitizeUrlOrResourceUrl(bypassSanitizationTrustHtml('javascript:true'), 'a', 'href'))
+    expect(ɵɵsanitizeUrlOrResourceUrl(bypassSanitizationTrustHtml('javascript:true'), 'a', 'href'))
         .toEqual('unsafe:javascript:true');
-    expect(ΔsanitizeUrlOrResourceUrl(bypassSanitizationTrustUrl('javascript:true'), 'a', 'href'))
+    expect(ɵɵsanitizeUrlOrResourceUrl(bypassSanitizationTrustUrl('javascript:true'), 'a', 'href'))
         .toEqual('javascript:true');
   });
 });
diff --git a/packages/core/test/strict_types/inheritance_spec.ts b/packages/core/test/strict_types/inheritance_spec.ts
index 39693adc84..b1b5261bd5 100644
--- a/packages/core/test/strict_types/inheritance_spec.ts
+++ b/packages/core/test/strict_types/inheritance_spec.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ΔComponentDefWithMeta, ΔPipeDefWithMeta as PipeDefWithMeta} from '@angular/core';
+import {ɵɵComponentDefWithMeta, ɵɵPipeDefWithMeta as PipeDefWithMeta} from '@angular/core';
 
 declare class SuperComponent {
-  static ngComponentDef: ΔComponentDefWithMeta<SuperComponent, '[super]', never, {}, {}, never>;
+  static ngComponentDef: ɵɵComponentDefWithMeta<SuperComponent, '[super]', never, {}, {}, never>;
 }
 
 declare class SubComponent extends SuperComponent {
@@ -18,7 +18,7 @@ declare class SubComponent extends SuperComponent {
   // would produce type errors when the "strictFunctionTypes" option is enabled.
   onlyInSubtype: string;
 
-  static ngComponentDef: ΔComponentDefWithMeta<SubComponent, '[sub]', never, {}, {}, never>;
+  static ngComponentDef: ɵɵComponentDefWithMeta<SubComponent, '[sub]', never, {}, {}, never>;
 }
 
 declare class SuperPipe { static ngPipeDef: PipeDefWithMeta<SuperPipe, 'super'>; }
diff --git a/packages/core/test/test_bed_spec.ts b/packages/core/test/test_bed_spec.ts
index a2b32bbd9c..fa546d6ac1 100644
--- a/packages/core/test/test_bed_spec.ts
+++ b/packages/core/test/test_bed_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, ErrorHandler, Inject, Injectable, InjectionToken, Input, NgModule, Optional, Pipe, ɵsetClassMetadata as setClassMetadata, ΔdefineComponent as defineComponent, Δtext as text} from '@angular/core';
+import {Component, Directive, ErrorHandler, Inject, Injectable, InjectionToken, Input, NgModule, Optional, Pipe, ɵsetClassMetadata as setClassMetadata, ɵɵdefineComponent as defineComponent, ɵɵtext as text} from '@angular/core';
 import {TestBed, getTestBed} from '@angular/core/testing/src/test_bed';
 import {By} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
diff --git a/packages/core/test/view/ng_module_spec.ts b/packages/core/test/view/ng_module_spec.ts
index 0f270b9cb2..ec81d5c0ed 100644
--- a/packages/core/test/view/ng_module_spec.ts
+++ b/packages/core/test/view/ng_module_spec.ts
@@ -10,7 +10,7 @@ import {NgModuleRef} from '@angular/core';
 import {InjectFlags, inject} from '@angular/core/src/di';
 import {Injector} from '@angular/core/src/di/injector';
 import {INJECTOR} from '@angular/core/src/di/injector_compatibility';
-import {ΔInjectableDef, ΔdefineInjectable} from '@angular/core/src/di/interface/defs';
+import {ɵɵInjectableDef, ɵɵdefineInjectable} from '@angular/core/src/di/interface/defs';
 import {NgModuleDefinition, NgModuleProviderDef, NodeFlags} from '@angular/core/src/view';
 import {moduleDef} from '@angular/core/src/view/ng_module';
 import {createNgModuleRef} from '@angular/core/src/view/refs';
@@ -27,14 +27,14 @@ class MyChildModule {}
 class NotMyModule {}
 
 class Bar {
-  static ngInjectableDef: ΔInjectableDef<Bar> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<Bar> = ɵɵdefineInjectable({
     factory: () => new Bar(),
     providedIn: MyModule,
   });
 }
 
 class Baz {
-  static ngInjectableDef: ΔInjectableDef<Baz> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<Baz> = ɵɵdefineInjectable({
     factory: () => new Baz(),
     providedIn: NotMyModule,
   });
@@ -43,7 +43,7 @@ class Baz {
 class HasNormalDep {
   constructor(public foo: Foo) {}
 
-  static ngInjectableDef: ΔInjectableDef<HasNormalDep> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<HasNormalDep> = ɵɵdefineInjectable({
     factory: () => new HasNormalDep(inject(Foo)),
     providedIn: MyModule,
   });
@@ -52,7 +52,7 @@ class HasNormalDep {
 class HasDefinedDep {
   constructor(public bar: Bar) {}
 
-  static ngInjectableDef: ΔInjectableDef<HasDefinedDep> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<HasDefinedDep> = ɵɵdefineInjectable({
     factory: () => new HasDefinedDep(inject(Bar)),
     providedIn: MyModule,
   });
@@ -61,14 +61,14 @@ class HasDefinedDep {
 class HasOptionalDep {
   constructor(public baz: Baz|null) {}
 
-  static ngInjectableDef: ΔInjectableDef<HasOptionalDep> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<HasOptionalDep> = ɵɵdefineInjectable({
     factory: () => new HasOptionalDep(inject(Baz, InjectFlags.Optional)),
     providedIn: MyModule,
   });
 }
 
 class ChildDep {
-  static ngInjectableDef: ΔInjectableDef<ChildDep> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<ChildDep> = ɵɵdefineInjectable({
     factory: () => new ChildDep(),
     providedIn: MyChildModule,
   });
@@ -76,7 +76,7 @@ class ChildDep {
 
 class FromChildWithOptionalDep {
   constructor(public baz: Baz|null) {}
-  static ngInjectableDef: ΔInjectableDef<FromChildWithOptionalDep> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<FromChildWithOptionalDep> = ɵɵdefineInjectable({
     factory: () => new FromChildWithOptionalDep(inject(Baz, InjectFlags.Default)),
     providedIn: MyChildModule,
   });
@@ -86,7 +86,7 @@ class FromChildWithSkipSelfDep {
   constructor(
       public skipSelfChildDep: ChildDep|null, public selfChildDep: ChildDep|null,
       public optionalSelfBar: Bar|null) {}
-  static ngInjectableDef: ΔInjectableDef<FromChildWithSkipSelfDep> = ΔdefineInjectable({
+  static ngInjectableDef: ɵɵInjectableDef<FromChildWithSkipSelfDep> = ɵɵdefineInjectable({
     factory: () => new FromChildWithSkipSelfDep(
                  inject(ChildDep, InjectFlags.SkipSelf|InjectFlags.Optional),
                  inject(ChildDep, InjectFlags.Self),
@@ -209,7 +209,7 @@ describe('NgModuleRef_ injector', () => {
 
       ngOnDestroy(): void { Service.destroyed++; }
 
-      static ngInjectableDef: ΔInjectableDef<Service> = ΔdefineInjectable({
+      static ngInjectableDef: ɵɵInjectableDef<Service> = ɵɵdefineInjectable({
         factory: () => new Service(),
         providedIn: 'root',
       });
diff --git a/packages/core/testing/src/r3_test_bed_compiler.ts b/packages/core/testing/src/r3_test_bed_compiler.ts
index c9153b4063..e18e7f81fa 100644
--- a/packages/core/testing/src/r3_test_bed_compiler.ts
+++ b/packages/core/testing/src/r3_test_bed_compiler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgZone, Injector, Pipe, PlatformRef, Provider, Type, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵNG_COMPONENT_DEF as NG_COMPONENT_DEF, ɵNG_DIRECTIVE_DEF as NG_DIRECTIVE_DEF, ɵNG_INJECTOR_DEF as NG_INJECTOR_DEF, ɵNG_MODULE_DEF as NG_MODULE_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ΔInjectableDef as InjectableDef, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵDirectiveDef as DirectiveDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵtransitiveScopesFor as transitiveScopesFor,} from '@angular/core';
+import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgZone, Injector, Pipe, PlatformRef, Provider, Type, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵNG_COMPONENT_DEF as NG_COMPONENT_DEF, ɵNG_DIRECTIVE_DEF as NG_DIRECTIVE_DEF, ɵNG_INJECTOR_DEF as NG_INJECTOR_DEF, ɵNG_MODULE_DEF as NG_MODULE_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ɵɵInjectableDef as InjectableDef, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵDirectiveDef as DirectiveDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵtransitiveScopesFor as transitiveScopesFor,} from '@angular/core';
 import {ResourceLoader} from '@angular/compiler';
 
 import {clearResolutionOfComponentResourcesQueue, restoreComponentResolutionQueue, resolveComponentResources, isComponentDefPendingResolution} from '../../src/metadata/resource_loading';
diff --git a/packages/core/testing/src/test_bed.ts b/packages/core/testing/src/test_bed.ts
index 880e1ae3da..77961d62bb 100644
--- a/packages/core/testing/src/test_bed.ts
+++ b/packages/core/testing/src/test_bed.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectFlags, InjectionToken, Injector, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, StaticProvider, Type, ɵAPP_ROOT as APP_ROOT, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearOverrides as clearOverrides, ɵgetInjectableDef as getInjectableDef, ɵivyEnabled as ivyEnabled, ɵoverrideComponentView as overrideComponentView, ɵoverrideProvider as overrideProvider, ɵstringify as stringify, ΔInjectableDef} from '@angular/core';
+import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectFlags, InjectionToken, Injector, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, StaticProvider, Type, ɵAPP_ROOT as APP_ROOT, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearOverrides as clearOverrides, ɵgetInjectableDef as getInjectableDef, ɵivyEnabled as ivyEnabled, ɵoverrideComponentView as overrideComponentView, ɵoverrideProvider as overrideProvider, ɵstringify as stringify, ɵɵInjectableDef} from '@angular/core';
 
 import {AsyncTestCompleter} from './async_test_completer';
 import {ComponentFixture} from './component_fixture';
@@ -559,7 +559,7 @@ export class TestBedViewEngine implements Injector, TestBed {
         deps?: any[],
       },
       deprecated = false): void {
-    let def: ΔInjectableDef<any>|null = null;
+    let def: ɵɵInjectableDef<any>|null = null;
     if (typeof token !== 'string' && (def = getInjectableDef(token)) && def.providedIn === 'root') {
       if (provider.useFactory) {
         this._rootProviderOverrides.push(
diff --git a/packages/platform-browser/src/browser/meta.ts b/packages/platform-browser/src/browser/meta.ts
index e32b984a46..eb8ad345d3 100644
--- a/packages/platform-browser/src/browser/meta.ts
+++ b/packages/platform-browser/src/browser/meta.ts
@@ -7,7 +7,7 @@
  */
 
 import {DOCUMENT} from '@angular/common';
-import {Inject, Injectable, Δinject} from '@angular/core';
+import {Inject, Injectable, ɵɵinject} from '@angular/core';
 
 import {DomAdapter, getDOM} from '../dom/dom_adapter';
 
@@ -34,7 +34,7 @@ export type MetaDefinition = {
  * Factory to create Meta service.
  */
 export function createMeta() {
-  return new Meta(Δinject(DOCUMENT));
+  return new Meta(ɵɵinject(DOCUMENT));
 }
 
 /**
diff --git a/packages/platform-browser/src/browser/title.ts b/packages/platform-browser/src/browser/title.ts
index a5f7b807fa..623f2f8ea8 100644
--- a/packages/platform-browser/src/browser/title.ts
+++ b/packages/platform-browser/src/browser/title.ts
@@ -7,7 +7,7 @@
  */
 
 import {DOCUMENT} from '@angular/common';
-import {Inject, Injectable, Δinject} from '@angular/core';
+import {Inject, Injectable, ɵɵinject} from '@angular/core';
 
 import {getDOM} from '../dom/dom_adapter';
 
@@ -15,7 +15,7 @@ import {getDOM} from '../dom/dom_adapter';
  * Factory to create Title service.
  */
 export function createTitle() {
-  return new Title(Δinject(DOCUMENT));
+  return new Title(ɵɵinject(DOCUMENT));
 }
 
 /**
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index dc664d6c6f..1a3c687730 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -266,7 +266,7 @@ export declare class DefaultIterableDiffer<V> implements IterableDiffer<V>, Iter
 }
 
 /** @deprecated */
-export declare const defineInjectable: typeof ΔdefineInjectable;
+export declare const defineInjectable: typeof ɵɵdefineInjectable;
 
 export declare function destroyPlatform(): void;
 
@@ -383,7 +383,7 @@ export interface HostListenerDecorator {
     new (eventName: string, args?: string[]): any;
 }
 
-export declare const inject: typeof Δinject;
+export declare const inject: typeof ɵɵinject;
 
 export interface Inject {
     token: any;
@@ -659,6 +659,386 @@ export interface OutputDecorator {
     new (bindingPropertyName?: string): any;
 }
 
+export declare function ɵɵallocHostVars(count: number): void;
+
+export interface ɵɵBaseDef<T> {
+    contentQueries: ContentQueriesFunction<T> | null;
+    /** @deprecated */ readonly declaredInputs: {
+        [P in keyof T]: string;
+    };
+    hostBindings: HostBindingsFunction<T> | null;
+    readonly inputs: {
+        [P in keyof T]: string;
+    };
+    readonly outputs: {
+        [P in keyof T]: string;
+    };
+    viewQuery: ViewQueriesFunction<T> | null;
+}
+
+export declare function ɵɵbind<T>(value: T): T | NO_CHANGE;
+
+export declare function ɵɵclassMap(classes: {
+    [styleName: string]: any;
+} | NO_CHANGE | string | null): void;
+
+export declare function ɵɵclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
+
+export declare type ɵɵComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = ComponentDef<T>;
+
+export declare function ɵɵcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+
+export declare function ɵɵcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+
+export declare function ɵɵcontainer(index: number): void;
+
+export declare function ɵɵcontainerRefreshEnd(): void;
+
+export declare function ɵɵcontainerRefreshStart(index: number): void;
+
+export declare function ɵɵcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
+
+export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
+
+export declare function ɵɵdefineBase<T>(baseDefinition: {
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    contentQueries?: ContentQueriesFunction<T> | null;
+    viewQuery?: ViewQueriesFunction<T> | null;
+    hostBindings?: HostBindingsFunction<T>;
+}): ɵɵBaseDef<T>;
+
+export declare function ɵɵdefineComponent<T>(componentDefinition: {
+    type: Type<T>;
+    selectors: CssSelectorList;
+    factory: FactoryFn<T>;
+    consts: number;
+    vars: number;
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    hostBindings?: HostBindingsFunction<T>;
+    contentQueries?: ContentQueriesFunction<T>;
+    exportAs?: string[];
+    template: ComponentTemplate<T>;
+    ngContentSelectors?: string[];
+    viewQuery?: ViewQueriesFunction<T> | null;
+    features?: ComponentDefFeature[];
+    encapsulation?: ViewEncapsulation;
+    data?: {
+        [kind: string]: any;
+    };
+    styles?: string[];
+    changeDetection?: ChangeDetectionStrategy;
+    directives?: DirectiveTypesOrFactory | null;
+    pipes?: PipeTypesOrFactory | null;
+    schemas?: SchemaMetadata[] | null;
+}): never;
+
+export declare const ɵɵdefineDirective: <T>(directiveDefinition: {
+    type: Type<T>;
+    selectors: (string | SelectorFlags)[][];
+    factory: FactoryFn<T>;
+    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
+    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
+    features?: DirectiveDefFeature[] | undefined;
+    hostBindings?: HostBindingsFunction<T> | undefined;
+    contentQueries?: ContentQueriesFunction<T> | undefined;
+    viewQuery?: ViewQueriesFunction<T> | null | undefined;
+    exportAs?: string[] | undefined;
+}) => never;
+
+export declare function ɵɵdefineInjectable<T>(opts: {
+    providedIn?: Type<any> | 'root' | 'any' | null;
+    factory: () => T;
+}): never;
+
+export declare function ɵɵdefineInjector(options: {
+    factory: () => any;
+    providers?: any[];
+    imports?: any[];
+}): never;
+
+export declare function ɵɵdefineNgModule<T>(def: {
+    type: T;
+    bootstrap?: Type<any>[] | (() => Type<any>[]);
+    declarations?: Type<any>[] | (() => Type<any>[]);
+    imports?: Type<any>[] | (() => Type<any>[]);
+    exports?: Type<any>[] | (() => Type<any>[]);
+    schemas?: SchemaMetadata[] | null;
+    id?: string | null;
+}): never;
+
+export declare function ɵɵdefinePipe<T>(pipeDef: {
+    name: string;
+    type: Type<T>;
+    factory: FactoryFn<T>;
+    pure?: boolean;
+}): never;
+
+export declare type ɵɵDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = DirectiveDef<T>;
+
+export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
+
+export declare function ɵɵdisableBindings(): void;
+
+export declare function ɵɵelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ɵɵelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
+
+export declare function ɵɵelementContainerEnd(): void;
+
+export declare function ɵɵelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ɵɵelementEnd(): void;
+
+export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
+
+export declare function ɵɵelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+
+export declare function ɵɵelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ɵɵembeddedViewEnd(): void;
+
+export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
+
+export declare function ɵɵenableBindings(): void;
+
+export declare function ɵɵgetCurrentView(): OpaqueViewState;
+
+export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
+
+export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
+
+export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
+
+export declare function ɵɵi18nApply(index: number): void;
+
+export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
+
+export declare function ɵɵi18nEnd(): void;
+
+export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
+
+/** @deprecated */
+export declare function ɵɵi18nLocalize(input: string, placeholders?: {
+    [key: string]: string;
+}): string;
+
+export declare function ɵɵi18nPostprocess(message: string, replacements?: {
+    [key: string]: (string | string[]);
+}): string;
+
+export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void;
+
+export declare function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
+
+export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
+
+export interface ɵɵInjectableDef<T> {
+    factory: () => T;
+    providedIn: InjectorType<any> | 'root' | 'any' | null;
+    value: T | undefined;
+}
+
+export declare function ɵɵinjectAttribute(attrNameToInject: string): string | null;
+
+export interface ɵɵInjectorDef<T> {
+    factory: () => T;
+    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
+    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
+}
+
+export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
+
+export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+
+export declare function ɵɵload<T>(index: number): T;
+
+export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
+
+export declare function ɵɵloadViewQuery<T>(): T;
+
+export declare function ɵɵnamespaceHTML(): void;
+
+export declare function ɵɵnamespaceMathML(): void;
+
+export declare function ɵɵnamespaceSVG(): void;
+
+export declare function ɵɵnextContext<T = any>(level?: number): T;
+
+export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
+
+export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
+
+export declare function ɵɵpipe(index: number, pipeName: string): any;
+
+export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
+
+export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
+
+export declare function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
+
+export declare function ɵɵpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
+
+export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
+
+export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
+
+export declare function ɵɵprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
+
+export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
+
+export declare function ɵɵproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
+
+export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
+
+export declare function ɵɵpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
+
+export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
+
+export declare function ɵɵreference<T>(index: number): T;
+
+export declare function ɵɵresolveBody(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: HTMLElement;
+};
+
+export declare function ɵɵresolveDocument(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: Document;
+};
+
+export declare function ɵɵresolveWindow(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: Window | null;
+};
+
+export declare function ɵɵrestoreView(viewToRestore: OpaqueViewState): void;
+
+export declare function ɵɵsanitizeHtml(unsafeHtml: any): string;
+
+export declare function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string;
+
+export declare function ɵɵsanitizeScript(unsafeScript: any): string;
+
+export declare function ɵɵsanitizeStyle(unsafeStyle: any): string;
+
+export declare function ɵɵsanitizeUrl(unsafeUrl: any): string;
+
+export declare function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any;
+
+export declare function ɵɵselect(index: number): void;
+
+export declare function ɵɵsetComponentScope(type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void;
+
+export declare function ɵɵsetNgModuleScope(type: any, scope: {
+    declarations?: Type<any>[] | (() => Type<any>[]);
+    imports?: Type<any>[] | (() => Type<any>[]);
+    exports?: Type<any>[] | (() => Type<any>[]);
+}): void;
+
+export declare function ɵɵstaticContentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): void;
+
+export declare function ɵɵstaticViewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): void;
+
+export declare function ɵɵstyleMap(styles: {
+    [styleName: string]: any;
+} | NO_CHANGE | null): void;
+
+export declare function ɵɵstyleProp(styleIndex: number, value: string | number | String | PlayerFactory | null, suffix?: string | null, forceOverride?: boolean): void;
+
+export declare function ɵɵstyling(classBindingNames?: string[] | null, styleBindingNames?: string[] | null, styleSanitizer?: StyleSanitizeFn | null): void;
+
+export declare function ɵɵstylingApply(): void;
+
+export declare function ɵɵtemplate(index: number, templateFn: ComponentTemplate<any> | null, consts: number, vars: number, tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null, localRefExtractor?: LocalRefExtractor): void;
+
+export declare function ɵɵtemplateRefExtractor(tNode: TNode, currentView: LView): ViewEngine_TemplateRef<{}> | null;
+
+export declare function ɵɵtext(index: number, value?: any): void;
+
+export declare function ɵɵtextBinding<T>(index: number, value: T | NO_CHANGE): void;
+
+export declare function ɵɵviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
+
 export declare const PACKAGE_ROOT_URL: InjectionToken<string>;
 
 export interface Pipe {
@@ -1051,383 +1431,3 @@ export interface WtfScopeFn {
 }
 
 export declare const wtfStartTimeRange: (rangeType: string, action: string) => any;
-
-export declare function ΔallocHostVars(count: number): void;
-
-export interface ΔBaseDef<T> {
-    contentQueries: ContentQueriesFunction<T> | null;
-    /** @deprecated */ readonly declaredInputs: {
-        [P in keyof T]: string;
-    };
-    hostBindings: HostBindingsFunction<T> | null;
-    readonly inputs: {
-        [P in keyof T]: string;
-    };
-    readonly outputs: {
-        [P in keyof T]: string;
-    };
-    viewQuery: ViewQueriesFunction<T> | null;
-}
-
-export declare function Δbind<T>(value: T): T | NO_CHANGE;
-
-export declare function ΔclassMap(classes: {
-    [styleName: string]: any;
-} | NO_CHANGE | string | null): void;
-
-export declare function ΔclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
-
-export declare type ΔComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = ComponentDef<T>;
-
-export declare function ΔcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
-
-export declare function ΔcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
-
-export declare function Δcontainer(index: number): void;
-
-export declare function ΔcontainerRefreshEnd(): void;
-
-export declare function ΔcontainerRefreshStart(index: number): void;
-
-export declare function ΔcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
-
-export declare const ΔdefaultStyleSanitizer: StyleSanitizeFn;
-
-export declare function ΔdefineBase<T>(baseDefinition: {
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    contentQueries?: ContentQueriesFunction<T> | null;
-    viewQuery?: ViewQueriesFunction<T> | null;
-    hostBindings?: HostBindingsFunction<T>;
-}): ΔBaseDef<T>;
-
-export declare function ΔdefineComponent<T>(componentDefinition: {
-    type: Type<T>;
-    selectors: CssSelectorList;
-    factory: FactoryFn<T>;
-    consts: number;
-    vars: number;
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    hostBindings?: HostBindingsFunction<T>;
-    contentQueries?: ContentQueriesFunction<T>;
-    exportAs?: string[];
-    template: ComponentTemplate<T>;
-    ngContentSelectors?: string[];
-    viewQuery?: ViewQueriesFunction<T> | null;
-    features?: ComponentDefFeature[];
-    encapsulation?: ViewEncapsulation;
-    data?: {
-        [kind: string]: any;
-    };
-    styles?: string[];
-    changeDetection?: ChangeDetectionStrategy;
-    directives?: DirectiveTypesOrFactory | null;
-    pipes?: PipeTypesOrFactory | null;
-    schemas?: SchemaMetadata[] | null;
-}): never;
-
-export declare const ΔdefineDirective: <T>(directiveDefinition: {
-    type: Type<T>;
-    selectors: (string | SelectorFlags)[][];
-    factory: FactoryFn<T>;
-    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
-    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
-    features?: DirectiveDefFeature[] | undefined;
-    hostBindings?: HostBindingsFunction<T> | undefined;
-    contentQueries?: ContentQueriesFunction<T> | undefined;
-    viewQuery?: ViewQueriesFunction<T> | null | undefined;
-    exportAs?: string[] | undefined;
-}) => never;
-
-export declare function ΔdefineInjectable<T>(opts: {
-    providedIn?: Type<any> | 'root' | 'any' | null;
-    factory: () => T;
-}): never;
-
-export declare function ΔdefineInjector(options: {
-    factory: () => any;
-    providers?: any[];
-    imports?: any[];
-}): never;
-
-export declare function ΔdefineNgModule<T>(def: {
-    type: T;
-    bootstrap?: Type<any>[] | (() => Type<any>[]);
-    declarations?: Type<any>[] | (() => Type<any>[]);
-    imports?: Type<any>[] | (() => Type<any>[]);
-    exports?: Type<any>[] | (() => Type<any>[]);
-    schemas?: SchemaMetadata[] | null;
-    id?: string | null;
-}): never;
-
-export declare function ΔdefinePipe<T>(pipeDef: {
-    name: string;
-    type: Type<T>;
-    factory: FactoryFn<T>;
-    pure?: boolean;
-}): never;
-
-export declare type ΔDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = DirectiveDef<T>;
-
-export declare function ΔdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function ΔdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
-
-export declare function ΔdisableBindings(): void;
-
-export declare function Δelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ΔelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
-
-export declare function ΔelementContainerEnd(): void;
-
-export declare function ΔelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ΔelementEnd(): void;
-
-export declare function ΔelementHostAttrs(attrs: TAttributes): void;
-
-export declare function ΔelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
-
-export declare function ΔelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ΔembeddedViewEnd(): void;
-
-export declare function ΔembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
-
-export declare function ΔenableBindings(): void;
-
-export declare function ΔgetCurrentView(): OpaqueViewState;
-
-export declare function ΔgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
-
-export declare function ΔgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
-
-export declare function Δi18n(index: number, message: string, subTemplateIndex?: number): void;
-
-export declare function Δi18nApply(index: number): void;
-
-export declare function Δi18nAttributes(index: number, values: string[]): void;
-
-export declare function Δi18nEnd(): void;
-
-export declare function Δi18nExp<T>(expression: T | NO_CHANGE): void;
-
-/** @deprecated */
-export declare function Δi18nLocalize(input: string, placeholders?: {
-    [key: string]: string;
-}): string;
-
-export declare function Δi18nPostprocess(message: string, replacements?: {
-    [key: string]: (string | string[]);
-}): string;
-
-export declare function Δi18nStart(index: number, message: string, subTemplateIndex?: number): void;
-
-export declare function ΔInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
-
-export declare function Δinject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function Δinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
-
-export interface ΔInjectableDef<T> {
-    factory: () => T;
-    providedIn: InjectorType<any> | 'root' | 'any' | null;
-    value: T | undefined;
-}
-
-export declare function ΔinjectAttribute(attrNameToInject: string): string | null;
-
-export interface ΔInjectorDef<T> {
-    factory: () => T;
-    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
-    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
-}
-
-export declare function Δinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
-
-export declare function Δinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
-
-export declare function Δinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
-
-export declare function Δinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
-
-export declare function Δinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
-
-export declare function Δinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
-
-export declare function Δinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
-
-export declare function Δinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
-
-export declare function ΔinterpolationV(values: any[]): string | NO_CHANGE;
-
-export declare function Δlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
-
-export declare function Δload<T>(index: number): T;
-
-export declare function ΔloadContentQuery<T>(): QueryList<T>;
-
-export declare function ΔloadViewQuery<T>(): T;
-
-export declare function ΔnamespaceHTML(): void;
-
-export declare function ΔnamespaceMathML(): void;
-
-export declare function ΔnamespaceSVG(): void;
-
-export declare function ΔnextContext<T = any>(level?: number): T;
-
-export declare type ΔNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
-
-export declare function ΔNgOnChangesFeature<T>(): DirectiveDefFeature;
-
-export declare function Δpipe(index: number, pipeName: string): any;
-
-export declare function ΔpipeBind1(index: number, slotOffset: number, v1: any): any;
-
-export declare function ΔpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
-
-export declare function ΔpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
-
-export declare function ΔpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
-
-export declare function ΔpipeBindV(index: number, slotOffset: number, values: any[]): any;
-
-export declare type ΔPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
-
-export declare function Δprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
-
-export declare function ΔprojectionDef(selectors?: CssSelectorList[]): void;
-
-export declare function Δproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ΔProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
-
-export declare function ΔpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
-
-export declare function ΔpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
-
-export declare function ΔpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
-
-export declare function ΔpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
-
-export declare function ΔpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
-
-export declare function ΔpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
-
-export declare function ΔpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
-
-export declare function ΔpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
-
-export declare function ΔpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
-
-export declare function ΔpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
-
-export declare function ΔqueryRefresh(queryList: QueryList<any>): boolean;
-
-export declare function Δreference<T>(index: number): T;
-
-export declare function ΔresolveBody(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: HTMLElement;
-};
-
-export declare function ΔresolveDocument(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: Document;
-};
-
-export declare function ΔresolveWindow(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: Window | null;
-};
-
-export declare function ΔrestoreView(viewToRestore: OpaqueViewState): void;
-
-export declare function ΔsanitizeHtml(unsafeHtml: any): string;
-
-export declare function ΔsanitizeResourceUrl(unsafeResourceUrl: any): string;
-
-export declare function ΔsanitizeScript(unsafeScript: any): string;
-
-export declare function ΔsanitizeStyle(unsafeStyle: any): string;
-
-export declare function ΔsanitizeUrl(unsafeUrl: any): string;
-
-export declare function ΔsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any;
-
-export declare function Δselect(index: number): void;
-
-export declare function ΔsetComponentScope(type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void;
-
-export declare function ΔsetNgModuleScope(type: any, scope: {
-    declarations?: Type<any>[] | (() => Type<any>[]);
-    imports?: Type<any>[] | (() => Type<any>[]);
-    exports?: Type<any>[] | (() => Type<any>[]);
-}): void;
-
-export declare function ΔstaticContentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): void;
-
-export declare function ΔstaticViewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): void;
-
-export declare function ΔstyleMap(styles: {
-    [styleName: string]: any;
-} | NO_CHANGE | null): void;
-
-export declare function ΔstyleProp(styleIndex: number, value: string | number | String | PlayerFactory | null, suffix?: string | null, forceOverride?: boolean): void;
-
-export declare function Δstyling(classBindingNames?: string[] | null, styleBindingNames?: string[] | null, styleSanitizer?: StyleSanitizeFn | null): void;
-
-export declare function ΔstylingApply(): void;
-
-export declare function Δtemplate(index: number, templateFn: ComponentTemplate<any> | null, consts: number, vars: number, tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null, localRefExtractor?: LocalRefExtractor): void;
-
-export declare function ΔtemplateRefExtractor(tNode: TNode, currentView: LView): ViewEngine_TemplateRef<{}> | null;
-
-export declare function Δtext(index: number, value?: any): void;
-
-export declare function ΔtextBinding<T>(index: number, value: T | NO_CHANGE): void;
-
-export declare function ΔviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
diff --git a/tools/ts-api-guardian/index.bzl b/tools/ts-api-guardian/index.bzl
index 71f35129b8..da378c2882 100644
--- a/tools/ts-api-guardian/index.bzl
+++ b/tools/ts-api-guardian/index.bzl
@@ -24,7 +24,7 @@ def ts_api_guardian_test(
         golden,
         actual,
         data = [],
-        strip_export_pattern = ["^__", "^ɵ"],
+        strip_export_pattern = ["^__", "^ɵ[^ɵ]"],
         allow_module_identifiers = COMMON_MODULE_IDENTIFIERS,
         use_angular_tag_rules = True,
         **kwargs):

From e688e02ee442658c754d813e84a9908baf874520 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 16 May 2019 15:15:43 -0700
Subject: [PATCH 115/275] fix(bazel): ng test should run specific
 ts_web_test_suite (#30526)

PR closes https://github.com/angular/angular/issues/30191

PR Close #30526
---
 packages/bazel/src/schematics/ng-add/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts
index 6bca362fe3..d38588b7c4 100755
--- a/packages/bazel/src/schematics/ng-add/index.ts
+++ b/packages/bazel/src/schematics/ng-add/index.ts
@@ -174,7 +174,10 @@ function updateAngularJsonToUseBazelBuilder(options: Schema): Rule {
       replacePropertyInAstObject(
           recorder, architect, 'test', {
             builder: '@angular/bazel:build',
-            options: {'bazelCommand': 'test', 'targetLabel': '//src/...'},
+            options: {
+              bazelCommand: 'test',
+              targetLabel: '//src:test',
+            },
           },
           indent);
     }

From e58e5ec6a6631f9d21d0dcbed78de695fb44bf94 Mon Sep 17 00:00:00 2001
From: "Fux, Etienne" <etienne.fux@zuehlke.com>
Date: Thu, 16 May 2019 10:21:58 +0200
Subject: [PATCH 116/275] docs: improve consistency of style guide example
 (#30504)

The text for entry Style 04-10 of the style guide talks about
FilterTextService however, the example folder structure has the inversed
filename.

PR Close #30504
---
 aio/content/guide/styleguide.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/styleguide.md b/aio/content/guide/styleguide.md
index da70b2cc20..e1fb6ef661 100644
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@@ -2468,11 +2468,11 @@ Here is a compliant folder and file structure:
           </div>
 
           <div class='file'>
-            text-filter.component.ts|spec.ts
+            filter-text.component.ts|spec.ts
           </div>
 
           <div class='file'>
-            text-filter.service.ts|spec.ts
+            filter-text.service.ts|spec.ts
           </div>
 
         </div>
@@ -3019,11 +3019,11 @@ Yet there is a real danger of that happening if the `SharedModule` provides a se
         </div>
 
         <div class='file'>
-          text-filter.component.ts|spec.ts
+          filter-text.component.ts|spec.ts
         </div>
 
         <div class='file'>
-          text-filter.service.ts|spec.ts
+          filter-text.service.ts|spec.ts
         </div>
 
       </div>

From c79bffaacb3c4e808ed16791eab7a6a4c8ec4696 Mon Sep 17 00:00:00 2001
From: janith <janithisipathana@gmail.com>
Date: Thu, 18 Apr 2019 13:09:56 +0530
Subject: [PATCH 117/275] docs: remove gender prefixes from examples (#29972)

PR Close #29972
---
 .../examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts    | 4 ++--
 .../examples/ajs-quick-reference/src/app/movie.service.ts   | 4 ++--
 aio/content/examples/animations/src/app/mock-heroes.ts      | 2 +-
 aio/content/examples/architecture/e2e/src/app.e2e-spec.ts   | 2 +-
 .../examples/architecture/src/app/backend.service.ts        | 2 +-
 .../examples/component-interaction/e2e/src/app.e2e-spec.ts  | 4 ++--
 aio/content/examples/component-interaction/src/app/hero.ts  | 2 +-
 .../component-interaction/src/app/name-parent.component.ts  | 4 ++--
 .../component-interaction/src/app/votetaker.component.ts    | 2 +-
 .../dependency-injection-in-action/e2e/src/app.e2e-spec.ts  | 6 +++---
 .../dependency-injection-in-action/src/app/hero.service.ts  | 2 +-
 .../src/app/storage.component.ts                            | 4 ++--
 .../examples/dependency-injection/e2e/src/app.e2e-spec.ts   | 2 +-
 .../dependency-injection/src/app/heroes/mock-heroes.ts      | 2 +-
 aio/content/examples/docs-style-guide/src/app/hero.ts       | 2 +-
 aio/content/examples/http/e2e/src/app.e2e-spec.ts           | 2 +-
 aio/content/examples/http/src/app/in-memory-data.service.ts | 2 +-
 aio/content/examples/ngcontainer/src/app/hero.ts            | 2 +-
 aio/content/examples/router/src/app/heroes/mock-heroes.ts   | 2 +-
 .../examples/structural-directives/e2e/src/app.e2e-spec.ts  | 4 ++--
 aio/content/examples/structural-directives/src/app/hero.ts  | 2 +-
 aio/content/examples/template-syntax/src/app/hero.ts        | 2 +-
 .../examples/testing/src/app/in-memory-data.service.ts      | 2 +-
 aio/content/examples/toh-pt2/src/app/mock-heroes.ts         | 2 +-
 aio/content/examples/toh-pt3/src/app/mock-heroes.ts         | 2 +-
 aio/content/examples/toh-pt4/src/app/mock-heroes.ts         | 2 +-
 aio/content/examples/toh-pt5/src/app/mock-heroes.ts         | 2 +-
 .../examples/toh-pt6/src/app/in-memory-data.service.ts      | 2 +-
 aio/content/examples/toh-pt6/src/app/mock-heroes.ts         | 2 +-
 .../examples/universal/src/app/in-memory-data.service.ts    | 2 +-
 aio/content/examples/universal/src/app/mock-heroes.ts       | 2 +-
 aio/content/tutorial/toh-pt5.md                             | 2 +-
 packages/compiler-cli/test/metadata/collector_spec.ts       | 4 ++--
 33 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts b/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts
index e27f56e68b..0eef85ffde 100644
--- a/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts
@@ -67,8 +67,8 @@ describe('AngularJS to Angular Quick Reference Tests', function () {
     testFavoriteHero('Magneta', 'No movie, sorry!');
   });
 
-  it('should display a movie for Mr. Nice', function () {
-    testFavoriteHero('Mr. Nice', 'Excellent choice!');
+  it('should display a movie for Dr Nice', function () {
+    testFavoriteHero('Dr Nice', 'Excellent choice!');
   });
 
   function testImagesAreDisplayed(isDisplayed: boolean) {
diff --git a/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts b/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
index 887774d570..f74e606544 100644
--- a/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
+++ b/aio/content/examples/ajs-quick-reference/src/app/movie.service.ts
@@ -18,12 +18,12 @@ export class MovieService {
         approvalRating: .97
       },
       {
-        hero: 'Mr. Nice',
+        hero: 'Dr Nice',
         imageurl: 'assets/images/villain.png',
         movieId: 2,
         mpaa: 'pg-13',
         releaseDate: '2015-12-18T00:00:00',
-        title: 'No More Mr. Nice Guy',
+        title: 'No More Dr Nice',
         price: 14.95,
         starRating: 4.6,
         approvalRating: .94
diff --git a/aio/content/examples/animations/src/app/mock-heroes.ts b/aio/content/examples/animations/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/animations/src/app/mock-heroes.ts
+++ b/aio/content/examples/animations/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts b/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts
index 8ad5c9ab74..6dbc6952b8 100644
--- a/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/architecture/e2e/src/app.e2e-spec.ts
@@ -31,7 +31,7 @@ describe('Architecture', () => {
 
 function heroTests() {
 
-  const targetHero: Hero = { id: 2, name: 'Mr. Nice' };
+  const targetHero: Hero = { id: 2, name: 'Dr Nice' };
 
   it('has the right number of heroes', () => {
     let page = getPageElts();
diff --git a/aio/content/examples/architecture/src/app/backend.service.ts b/aio/content/examples/architecture/src/app/backend.service.ts
index c05a8fcb8a..145be4cad5 100644
--- a/aio/content/examples/architecture/src/app/backend.service.ts
+++ b/aio/content/examples/architecture/src/app/backend.service.ts
@@ -5,7 +5,7 @@ import { Hero } from './hero';
 
 const HEROES = [
         new Hero('Windstorm', 'Weather mastery'),
-        new Hero('Mr. Nice', 'Killing them with kindness'),
+        new Hero('Dr Nice', 'Killing them with kindness'),
         new Hero('Magneta', 'Manipulates metallic objects')
       ];
 
diff --git a/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts b/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
index 7637a6affc..abc8ecf765 100644
--- a/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
@@ -13,7 +13,7 @@ describe('Component Communication Cookbook Tests', function () {
   describe('Parent-to-child communication', function() {
     // #docregion parent-to-child
     // ...
-    let _heroNames = ['Mr. IQ', 'Magneta', 'Bombasto'];
+    let _heroNames = ['Dr IQ', 'Magneta', 'Bombasto'];
     let _masterName = 'Master';
 
     it('should pass properties to children properly', function () {
@@ -36,7 +36,7 @@ describe('Component Communication Cookbook Tests', function () {
     // ...
     it('should display trimmed, non-empty names', function () {
       let _nonEmptyNameIndex = 0;
-      let _nonEmptyName = '"Mr. IQ"';
+      let _nonEmptyName = '"Dr IQ"';
       let parent = element.all(by.tagName('app-name-parent')).get(0);
       let hero = parent.all(by.tagName('app-name-child')).get(_nonEmptyNameIndex);
 
diff --git a/aio/content/examples/component-interaction/src/app/hero.ts b/aio/content/examples/component-interaction/src/app/hero.ts
index a7b70f48e8..3e80ad51c2 100644
--- a/aio/content/examples/component-interaction/src/app/hero.ts
+++ b/aio/content/examples/component-interaction/src/app/hero.ts
@@ -3,7 +3,7 @@ export class Hero {
 }
 
 export const HEROES = [
-  {name: 'Mr. IQ'},
+  {name: 'Dr IQ'},
   {name: 'Magneta'},
   {name: 'Bombasto'}
 ];
diff --git a/aio/content/examples/component-interaction/src/app/name-parent.component.ts b/aio/content/examples/component-interaction/src/app/name-parent.component.ts
index 2c8c23b781..747fbea166 100644
--- a/aio/content/examples/component-interaction/src/app/name-parent.component.ts
+++ b/aio/content/examples/component-interaction/src/app/name-parent.component.ts
@@ -9,7 +9,7 @@ import { Component } from '@angular/core';
   `
 })
 export class NameParentComponent {
-  // Displays 'Mr. IQ', '<no name set>', 'Bombasto'
-  names = ['Mr. IQ', '   ', '  Bombasto  '];
+  // Displays 'Dr IQ', '<no name set>', 'Bombasto'
+  names = ['Dr IQ', '   ', '  Bombasto  '];
 }
 // #enddocregion
diff --git a/aio/content/examples/component-interaction/src/app/votetaker.component.ts b/aio/content/examples/component-interaction/src/app/votetaker.component.ts
index d553af0d7b..7b3de1059b 100644
--- a/aio/content/examples/component-interaction/src/app/votetaker.component.ts
+++ b/aio/content/examples/component-interaction/src/app/votetaker.component.ts
@@ -15,7 +15,7 @@ import { Component }      from '@angular/core';
 export class VoteTakerComponent {
   agreed = 0;
   disagreed = 0;
-  voters = ['Mr. IQ', 'Ms. Universe', 'Bombasto'];
+  voters = ['Narco', 'Celeritas', 'Bombasto'];
 
   onVoted(agreed: boolean) {
     agreed ? this.agreed++ : this.disagreed++;
diff --git a/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts b/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts
index 00dd11868c..4d611f5698 100644
--- a/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts
@@ -23,8 +23,8 @@ describe('Dependency Injection Cookbook', function () {
       expect(sortedHeroes).toBeDefined();
     });
 
-    it('Mr. Nice should be in sorted heroes', function () {
-      let sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Mr. Nice" and position()=2]')).get(0);
+    it('Dr Nice should be in sorted heroes', function () {
+      let sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Dr Nice" and position()=2]')).get(0);
       expect(sortedHero).toBeDefined();
     });
 
@@ -60,7 +60,7 @@ describe('Dependency Injection Cookbook', function () {
 
     it('should render Hero-of-the-Month runner-ups', function () {
       let runnersUp =  element(by.id('rups1')).getText();
-      expect(runnersUp).toContain('RubberMan, Mr. Nice');
+      expect(runnersUp).toContain('RubberMan, Dr Nice');
     });
 
     it('should render DateLogger log entry in Hero-of-the-Month', function () {
diff --git a/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts b/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
index 44db98ee7a..369e2be532 100644
--- a/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts
@@ -11,7 +11,7 @@ export class HeroService {
   private heroes: Array<Hero> = [
     new Hero(1, 'RubberMan', 'Hero of many talents', '123-456-7899'),
     new Hero(2, 'Magma', 'Hero of all trades', '555-555-5555'),
-    new Hero(3, 'Mr. Nice', 'The name says it all', '111-222-3333')
+    new Hero(3, 'Dr Nice', 'The name says it all', '111-222-3333')
  ];
 
   getHeroById(id: number): Hero {
diff --git a/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts b/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts
index d0fb0ca54e..4dc074fd8f 100644
--- a/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/storage.component.ts
@@ -29,10 +29,10 @@ export class StorageComponent implements OnInit {
   }
 
   setSession() {
-    this.sessionStorageService.set('hero', 'Mr. Nice - Session');
+    this.sessionStorageService.set('hero', 'Dr Nice - Session');
   }
 
   setLocal() {
-    this.localStorageService.set('hero', 'Mr. Nice - Local');
+    this.localStorageService.set('hero', 'Dr Nice - Local');
   }
 }
diff --git a/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts b/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts
index 12fe6ae474..00bf3a9d0a 100644
--- a/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts
@@ -56,7 +56,7 @@ describe('Dependency Injection Tests', function () {
     });
 
     it('Hero displays as expected', function () {
-      expectedMsg = 'Mr. Nice';
+      expectedMsg = 'Dr Nice';
       expect(element(by.css('#hero')).getText()).toEqual(expectedMsg);
     });
 
diff --git a/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts b/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts
index a836faa1bd..61122b9fb2 100644
--- a/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, isSecret: false, name: 'Mr. Nice' },
+  { id: 11, isSecret: false, name: 'Dr Nice' },
   { id: 12, isSecret: false, name: 'Narco' },
   { id: 13, isSecret: false, name: 'Bombasto' },
   { id: 14, isSecret: false, name: 'Celeritas' },
diff --git a/aio/content/examples/docs-style-guide/src/app/hero.ts b/aio/content/examples/docs-style-guide/src/app/hero.ts
index fadbdbf9ed..e1fc2f4fa9 100644
--- a/aio/content/examples/docs-style-guide/src/app/hero.ts
+++ b/aio/content/examples/docs-style-guide/src/app/hero.ts
@@ -4,7 +4,7 @@ export class Hero {
 }
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' }
diff --git a/aio/content/examples/http/e2e/src/app.e2e-spec.ts b/aio/content/examples/http/e2e/src/app.e2e-spec.ts
index 9baf2cdc65..091e54acaa 100644
--- a/aio/content/examples/http/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/http/e2e/src/app.e2e-spec.ts
@@ -36,7 +36,7 @@ describe('Http Tests', function() {
   describe('Heroes', () => {
     it('retrieves the list of heroes at startup', () => {
       expect(page.heroesListItems.count()).toBe(4);
-      expect(page.heroesListItems.get(0).getText()).toContain('Mr. Nice');
+      expect(page.heroesListItems.get(0).getText()).toContain('Dr Nice');
       checkLogForMessage('GET "api/heroes"');
     });
 
diff --git a/aio/content/examples/http/src/app/in-memory-data.service.ts b/aio/content/examples/http/src/app/in-memory-data.service.ts
index 606e77f8f5..c74fb2626e 100644
--- a/aio/content/examples/http/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/http/src/app/in-memory-data.service.ts
@@ -3,7 +3,7 @@ import { InMemoryDbService } from 'angular-in-memory-web-api';
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/ngcontainer/src/app/hero.ts b/aio/content/examples/ngcontainer/src/app/hero.ts
index 28b435252d..8619853380 100644
--- a/aio/content/examples/ngcontainer/src/app/hero.ts
+++ b/aio/content/examples/ngcontainer/src/app/hero.ts
@@ -6,7 +6,7 @@ export class Hero {
 }
 
 export const heroes: Hero[] = [
-  { id: 1, name: 'Mr. Nice', emotion: 'happy' },
+  { id: 1, name: 'Dr Nice', emotion: 'happy' },
   { id: 2, name: 'Narco', emotion: 'sad' },
   { id: 3, name: 'Windstorm', emotion: 'confused' },
   { id: 4, name: 'Magneta' }
diff --git a/aio/content/examples/router/src/app/heroes/mock-heroes.ts b/aio/content/examples/router/src/app/heroes/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/router/src/app/heroes/mock-heroes.ts
+++ b/aio/content/examples/router/src/app/heroes/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts b/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts
index a877fb3223..9023c4ea89 100644
--- a/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/structural-directives/e2e/src/app.e2e-spec.ts
@@ -10,12 +10,12 @@ describe('Structural Directives', function () {
 
   it('first div should show hero name with *ngIf', function () {
     const allDivs = element.all(by.tagName('div'));
-    expect(allDivs.get(0).getText()).toEqual('Mr. Nice');
+    expect(allDivs.get(0).getText()).toEqual('Dr Nice');
   });
 
   it('first li should show hero name with *ngFor', function () {
     const allLis = element.all(by.tagName('li'));
-    expect(allLis.get(0).getText()).toEqual('Mr. Nice');
+    expect(allLis.get(0).getText()).toEqual('Dr Nice');
   });
 
   it('ngSwitch have two <happy-hero> instances', function () {
diff --git a/aio/content/examples/structural-directives/src/app/hero.ts b/aio/content/examples/structural-directives/src/app/hero.ts
index 89f0cbfdf8..4056351495 100644
--- a/aio/content/examples/structural-directives/src/app/hero.ts
+++ b/aio/content/examples/structural-directives/src/app/hero.ts
@@ -6,7 +6,7 @@ export class Hero {
 }
 
 export const heroes: Hero[] = [
-  { id: 1, name: 'Mr. Nice',  emotion: 'happy'},
+  { id: 1, name: 'Dr Nice',  emotion: 'happy'},
   { id: 2, name: 'Narco',     emotion: 'sad' },
   { id: 3, name: 'Windstorm', emotion: 'confused' },
   { id: 4, name: 'Magneta'}
diff --git a/aio/content/examples/template-syntax/src/app/hero.ts b/aio/content/examples/template-syntax/src/app/hero.ts
index f8cc3b16a6..612c1035cb 100644
--- a/aio/content/examples/template-syntax/src/app/hero.ts
+++ b/aio/content/examples/template-syntax/src/app/hero.ts
@@ -10,7 +10,7 @@ export class Hero {
       'http://www.imdb.com/title/tt0065832/',
       325
     ),
-    new Hero(1, 'Mr. Nice',  'happy'),
+    new Hero(1, 'Dr Nice',  'happy'),
     new Hero(2, 'Narco',     'sad' ),
     new Hero(3, 'Windstorm', 'confused' ),
     new Hero(4, 'Magneta')
diff --git a/aio/content/examples/testing/src/app/in-memory-data.service.ts b/aio/content/examples/testing/src/app/in-memory-data.service.ts
index 81f26b674a..d3827fcd2b 100644
--- a/aio/content/examples/testing/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/testing/src/app/in-memory-data.service.ts
@@ -9,7 +9,7 @@ const maxQuotes = Infinity; // 0;
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt2/src/app/mock-heroes.ts b/aio/content/examples/toh-pt2/src/app/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/toh-pt2/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt2/src/app/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt3/src/app/mock-heroes.ts b/aio/content/examples/toh-pt3/src/app/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/toh-pt3/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt3/src/app/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt4/src/app/mock-heroes.ts b/aio/content/examples/toh-pt4/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/toh-pt4/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt4/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt5/src/app/mock-heroes.ts b/aio/content/examples/toh-pt5/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/toh-pt5/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt5/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts b/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts
index c590be5d65..cb95d5eae5 100644
--- a/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts
@@ -9,7 +9,7 @@ import { Injectable } from '@angular/core';
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/toh-pt6/src/app/mock-heroes.ts b/aio/content/examples/toh-pt6/src/app/mock-heroes.ts
index 1771a7103b..cd3506f574 100644
--- a/aio/content/examples/toh-pt6/src/app/mock-heroes.ts
+++ b/aio/content/examples/toh-pt6/src/app/mock-heroes.ts
@@ -2,7 +2,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/universal/src/app/in-memory-data.service.ts b/aio/content/examples/universal/src/app/in-memory-data.service.ts
index ff1f190f83..b23507887e 100644
--- a/aio/content/examples/universal/src/app/in-memory-data.service.ts
+++ b/aio/content/examples/universal/src/app/in-memory-data.service.ts
@@ -3,7 +3,7 @@ import { InMemoryDbService } from 'angular-in-memory-web-api';
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
-      { id: 11, name: 'Mr. Nice' },
+      { id: 11, name: 'Dr Nice' },
       { id: 12, name: 'Narco' },
       { id: 13, name: 'Bombasto' },
       { id: 14, name: 'Celeritas' },
diff --git a/aio/content/examples/universal/src/app/mock-heroes.ts b/aio/content/examples/universal/src/app/mock-heroes.ts
index e84c2fd2b0..27ed1ffbff 100644
--- a/aio/content/examples/universal/src/app/mock-heroes.ts
+++ b/aio/content/examples/universal/src/app/mock-heroes.ts
@@ -1,7 +1,7 @@
 import { Hero } from './hero';
 
 export const HEROES: Hero[] = [
-  { id: 11, name: 'Mr. Nice' },
+  { id: 11, name: 'Dr Nice' },
   { id: 12, name: 'Narco' },
   { id: 13, name: 'Bombasto' },
   { id: 14, name: 'Celeritas' },
diff --git a/aio/content/tutorial/toh-pt5.md b/aio/content/tutorial/toh-pt5.md
index 4931ae01ef..cab0614f2d 100644
--- a/aio/content/tutorial/toh-pt5.md
+++ b/aio/content/tutorial/toh-pt5.md
@@ -475,7 +475,7 @@ The browser refreshes and the app is working again.
 You can click a hero in the dashboard or in the heroes list and navigate to that hero's detail view.
 
 If you paste `localhost:4200/detail/11` in the browser address bar,
-the router navigates to the detail view for the hero with `id: 11`,  "Mr. Nice".
+the router navigates to the detail view for the hero with `id: 11`,  "Dr Nice".
 
 {@a goback}
 
diff --git a/packages/compiler-cli/test/metadata/collector_spec.ts b/packages/compiler-cli/test/metadata/collector_spec.ts
index e48d686cf3..5e0b7cec2c 100644
--- a/packages/compiler-cli/test/metadata/collector_spec.ts
+++ b/packages/compiler-cli/test/metadata/collector_spec.ts
@@ -243,7 +243,7 @@ describe('Collector', () => {
       version: METADATA_VERSION,
       metadata: {
         HEROES: [
-          {'id': 11, 'name': 'Mr. Nice', '$quoted$': ['id', 'name']},
+          {'id': 11, 'name': 'Dr Nice', '$quoted$': ['id', 'name']},
           {'id': 12, 'name': 'Narco', '$quoted$': ['id', 'name']},
           {'id': 13, 'name': 'Bombasto', '$quoted$': ['id', 'name']},
           {'id': 14, 'name': 'Celeritas', '$quoted$': ['id', 'name']},
@@ -1221,7 +1221,7 @@ const FILES: Directory = {
       import {Hero as Hero} from './hero';
 
       export const HEROES: Hero[] = [
-          {"id": 11, "name": "Mr. Nice"},
+          {"id": 11, "name": "Dr Nice"},
           {"id": 12, "name": "Narco"},
           {"id": 13, "name": "Bombasto"},
           {"id": 14, "name": "Celeritas"},

From abe4433202a6f559c7617f0ac1333272b6f425c3 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 17 May 2019 12:45:15 -0700
Subject: [PATCH 118/275] test(ivy): add tests around directive attribute
 ghosting (#30544)

This battery of tests is to ensure the instructions we are generating have the same behavior in Ivy has they did in ViewEngine.

PR Close #30544
---
 .../core/test/acceptance/directive_spec.ts    | 243 ++++++++++++++++++
 1 file changed, 243 insertions(+)

diff --git a/packages/core/test/acceptance/directive_spec.ts b/packages/core/test/acceptance/directive_spec.ts
index 0fc8027586..4ff44eb326 100644
--- a/packages/core/test/acceptance/directive_spec.ts
+++ b/packages/core/test/acceptance/directive_spec.ts
@@ -253,4 +253,247 @@ describe('directives', () => {
 
   });
 
+  describe('attribute shadowing behaviors', () => {
+    /**
+     * To match ViewEngine, we need to ensure the following behaviors
+     */
+
+    @Directive({
+      selector: '[dir-with-title]',
+    })
+    class DirWithTitle {
+      @Input()
+      title = '';
+    }
+
+    it('should set both the div attribute and the directive input for `title="value"`', () => {
+      @Component({template: `<div dir-with-title title="a"></div>`})
+      class App {
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App, DirWithTitle],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const dirWithTitle =
+          fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+      const div = fixture.nativeElement.querySelector('div');
+      expect(dirWithTitle.title).toBe('a');
+      expect(div.getAttribute('title')).toBe('a');
+    });
+
+    it('should set the directive input only, shadowing the title property of the div, for `[title]="value"`',
+       () => {
+         @Component({template: `<div dir-with-title [title]="value"></div>`})
+         class App {
+           value = 'a';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         // We are checking the property here, not the attribute, because in the case of
+         // [key]="value" we are always setting the property of the instance, and actually setting
+         // the attribute is just a side-effect of the DOM implementation.
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.title).toBe('');
+       });
+
+    it('should allow setting directive `title` input with `[title]="value"` and a "attr.title" attribute with `attr.title="test"`',
+       () => {
+         @Component({template: `<div dir-with-title [title]="value" attr.title="test"></div>`})
+         class App {
+           value = 'a';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.getAttribute('attr.title')).toBe('test');
+         expect(div.title).toBe('');
+       });
+
+    it('should allow setting directive `title` input with `[title]="value1"` and attribute with `[attr.title]="value2"`',
+       () => {
+         @Component({template: `<div dir-with-title [title]="value1" [attr.title]="value2"></div>`})
+         class App {
+           value1 = 'a';
+           value2 = 'b';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.getAttribute('title')).toBe('b');
+       });
+
+    it('should allow setting directive `title` input with `[title]="value1"` and attribute with `attr.title="{{value2}}"`',
+       () => {
+         @Component(
+             {template: `<div dir-with-title [title]="value1" attr.title="{{value2}}"></div>`})
+         class App {
+           value1 = 'a';
+           value2 = 'b';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.getAttribute('title')).toBe('b');
+       });
+
+    it('should allow setting directive `title` input with `title="{{value}}"` and a "attr.title" attribute with `attr.title="test"`',
+       () => {
+         @Component({template: `<div dir-with-title title="{{value}}" attr.title="test"></div>`})
+         class App {
+           value = 'a';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.getAttribute('attr.title')).toBe('test');
+         expect(div.title).toBe('');
+       });
+
+    it('should allow setting directive `title` input with `title="{{value1}}"` and attribute with `[attr.title]="value2"`',
+       () => {
+         @Component(
+             {template: `<div dir-with-title title="{{value1}}" [attr.title]="value2"></div>`})
+         class App {
+           value1 = 'a';
+           value2 = 'b';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.getAttribute('title')).toBe('b');
+       });
+
+    it('should allow setting directive `title` input with `title="{{value1}}"` and attribute with `attr.title="{{value2}}"`',
+       () => {
+         @Component(
+             {template: `<div dir-with-title title="{{value1}}" attr.title="{{value2}}"></div>`})
+         class App {
+           value1 = 'a';
+           value2 = 'b';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.getAttribute('title')).toBe('b');
+       });
+
+    it('should set the directive input only, shadowing the title property on the div, for `title="{{value}}"`',
+       () => {
+         @Component({template: `<div dir-with-title title="{{value}}"></div>`})
+         class App {
+           value = 'a';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('a');
+         expect(div.title).toBe('');
+       });
+
+    it('should set the title attribute only, not directive input, for `attr.title="{{value}}"`',
+       () => {
+         @Component({template: `<div dir-with-title attr.title="{{value}}"></div>`})
+         class App {
+           value = 'a';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('');
+         expect(div.getAttribute('title')).toBe('a');
+       });
+
+    it('should set the title attribute only, not directive input, for `[attr.title]="value"`',
+       () => {
+         @Component({template: `<div dir-with-title [attr.title]="value"></div>`})
+         class App {
+           value = 'a';
+         }
+
+         TestBed.configureTestingModule({
+           declarations: [App, DirWithTitle],
+         });
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         const dirWithTitle =
+             fixture.debugElement.query(By.directive(DirWithTitle)).injector.get(DirWithTitle);
+         const div = fixture.nativeElement.querySelector('div');
+         expect(dirWithTitle.title).toBe('');
+         expect(div.getAttribute('title')).toBe('a');
+       });
+  });
 });

From e946594bf8d1c910c589bceeb6053ee3eba8bea6 Mon Sep 17 00:00:00 2001
From: Manohar Reddy Poreddy <manoharporeddy@outlook.com>
Date: Fri, 17 May 2019 11:12:46 +0530
Subject: [PATCH 119/275] docs: move instructions to see changes after the
 error is fixed in the tutorial (#30529)

docs: List only appears after the error is fixed

When the error happens, the list is not displayed too. Once the error is removed, the heroes list appears, so we can click and see the details.

PR Close #30529
---
 aio/content/tutorial/toh-pt2.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aio/content/tutorial/toh-pt2.md b/aio/content/tutorial/toh-pt2.md
index 571f14ba6e..6857609016 100644
--- a/aio/content/tutorial/toh-pt2.md
+++ b/aio/content/tutorial/toh-pt2.md
@@ -164,9 +164,6 @@ When the app starts, the `selectedHero` is `undefined` _by design_.
 
 Binding expressions in the template that refer to properties of `selectedHero` &mdash; expressions like `{{selectedHero.name}}` &mdash; _must fail_ because there is no selected hero.
 
-Now, click one of the list items.
-The app seems to be working again.
-The heroes appear in a list and details about the clicked hero appear at the bottom of the page.
 
 #### The fix - hide empty details with _*ngIf_
 
@@ -188,7 +185,10 @@ Don't forget the asterisk (*) in front of `ngIf`. It's a critical part of the sy
 
 After the browser refreshes, the list of names reappears.
 The details area is blank.
-Click a hero and its details appear.
+Click a hero in the list of heroes and its details appear.
+The app seems to be working again.
+The heroes appear in a list and details about the clicked hero appear at the bottom of the page.
+
 
 #### Why it works
 

From df1d3fbd7b1eb63c6e41d748ee9c197207ce30b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Wed, 15 May 2019 16:24:29 -0700
Subject: [PATCH 120/275] perf(ivy): minor cleanup; prevent sparse arrays
 (#30495)

PR Close #30495
---
 packages/core/src/render3/instructions/listener.ts | 3 ++-
 packages/core/src/render3/instructions/shared.ts   | 5 ++++-
 packages/core/src/render3/query.ts                 | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts
index ee61c22680..a9d50aae1f 100644
--- a/packages/core/src/render3/instructions/listener.ts
+++ b/packages/core/src/render3/instructions/listener.ts
@@ -9,6 +9,7 @@
 
 import {assertDataInRange} from '../../util/assert';
 import {isObservable} from '../../util/lang';
+import {EMPTY_OBJ} from '../empty';
 import {PropertyAliasValue, TNode, TNodeFlags, TNodeType} from '../interfaces/node';
 import {GlobalTargetResolver, RElement, Renderer3, isProceduralRenderer} from '../interfaces/renderer';
 import {CLEANUP, FLAGS, LView, LViewFlags, RENDERER, TVIEW} from '../interfaces/view';
@@ -115,7 +116,7 @@ function listenerInternal(
   // add native event listener - applicable to elements only
   if (tNode.type === TNodeType.Element) {
     const native = getNativeByTNode(tNode, lView) as RElement;
-    const resolved = eventTargetResolver ? eventTargetResolver(native) : {} as any;
+    const resolved = eventTargetResolver ? eventTargetResolver(native) : EMPTY_OBJ as any;
     const target = resolved.target || native;
     const renderer = loadRendererFn ? loadRendererFn(tNode, lView) : lView[RENDERER];
     const lCleanup = getCleanup(lView);
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 6d5f7797ea..869e16e88f 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -1322,7 +1322,10 @@ function setInputsFromAttrs<T>(
 function generateInitialInputs(
     directiveIndex: number, inputs: {[key: string]: string}, tNode: TNode): InitialInputData {
   const initialInputData: InitialInputData = tNode.initialInputs || (tNode.initialInputs = []);
-  initialInputData[directiveIndex] = null;
+  // Ensure that we don't create sparse arrays
+  for (let i = initialInputData.length; i <= directiveIndex; i++) {
+    initialInputData.push(null);
+  }
 
   const attrs = tNode.attrs !;
   let i = 0;
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 82d5572526..d8e07dab95 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -330,10 +330,9 @@ function add(
 
 function addMatch(query: LQuery<any>, matchingValue: any, insertBeforeViewMatches: boolean): void {
   // Views created in constructors may have their container values created too early. In this case,
-  // ensure template node results are spliced before container results. Otherwise, results inside
+  // ensure template node results are unshifted before container results. Otherwise, results inside
   // embedded views will appear before results on parent template nodes when flattened.
-  insertBeforeViewMatches ? query.values.splice(-1, 0, matchingValue) :
-                            query.values.push(matchingValue);
+  insertBeforeViewMatches ? query.values.unshift(matchingValue) : query.values.push(matchingValue);
   query.list.setDirty();
 }
 

From 0d97143965d30ec243f96b621ce4d1546bbfa431 Mon Sep 17 00:00:00 2001
From: Santosh Yadav <santosh.yadav198613@gmail.com>
Date: Sat, 11 May 2019 23:58:10 +0530
Subject: [PATCH 121/275] docs: correct typo in changelog (#30422)

Fixes #30420

PR Close #30422
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fee29c5706..9d3e7b1d55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -309,8 +309,8 @@ This release contains various API docs improvements.
 - `<tr>` would be wrapped in `<tbody>` if not inside `<tbody>`, `<tfoot>` or `<thead>`;
 - `<col>` would be wrapped in `<colgroup>` if not inside `<colgroup>`.
 
-This meachanism of automatic wrapping / auto-correcting was problematic for several reasons:
-- it is non-obvious and arbitrary (ex. there are more HTML elements that has rules for parent type);
+This mechanism of automatic wrapping / auto-correcting was problematic for several reasons:
+- it is non-obvious and arbitrary (ex. there are more HTML elements that have rules for parent type);
 - it is incorrect for cases where `<tr>` / `<col>` are at the root of a component's content, ex.:
 
 ```html

From 9e946c97159c81df7128cff613b33ea8c03daf9d Mon Sep 17 00:00:00 2001
From: Trotyl Yu <trotyl@qq.com>
Date: Tue, 21 May 2019 13:02:42 +0800
Subject: [PATCH 122/275] docs(changelog): remove docs-infra changes (#25833)

PR Close #25833
---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d3e7b1d55..62a58d745e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1051,7 +1051,6 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 
 * **bazel:** protractor rule should include *.e2e-spec.js ([#25701](https://github.com/angular/angular/issues/25701)) ([ed6b68b](https://github.com/angular/angular/commit/ed6b68b))
 * **core:** size regression with closure compiler ([#25531](https://github.com/angular/angular/issues/25531)) ([ebcf762](https://github.com/angular/angular/commit/ebcf762))
-* **docs-infra:** show "suggest edits" only for /guide and /tutorial dirs ([#24378](https://github.com/angular/angular/issues/24378)) ([66b7870](https://github.com/angular/angular/commit/66b7870))
 * **upgrade:** trigger `$destroy` event on upgraded component element ([#25357](https://github.com/angular/angular/issues/25357)) ([82e0676](https://github.com/angular/angular/commit/82e0676)), closes [#25334](https://github.com/angular/angular/issues/25334)
 * **router:** warn if navigation triggered outside Angular zone ([#24959](https://github.com/angular/angular/issues/24959)) ([23a96dc](https://github.com/angular/angular/commit/23a96dc)), closes [#15770](https://github.com/angular/angular/issues/15770) [#15946](https://github.com/angular/angular/issues/15946) [#24728](https://github.com/angular/angular/issues/24728)
 
@@ -1143,7 +1142,6 @@ Note: the 6.1.5 release on npm accidentally glitched-out midway, so we cut 6.1.6
 * **core:** Injector correctly honors the @Self flag ([#24520](https://github.com/angular/angular/issues/24520)) ([ccbda9d](https://github.com/angular/angular/commit/ccbda9d))
 * **core:** avoid eager providers re-initialization ([#23559](https://github.com/angular/angular/issues/23559)) ([0c6dc45](https://github.com/angular/angular/commit/0c6dc45))
 * **core:** call ngOnDestroy on all services that have it ([#23755](https://github.com/angular/angular/issues/23755)) ([fc03427](https://github.com/angular/angular/commit/fc03427)), closes [#22466](https://github.com/angular/angular/issues/22466) [#22240](https://github.com/angular/angular/issues/22240) [#14818](https://github.com/angular/angular/issues/14818)
-* **docs-infra:** fix table header layout in API pages ([#24919](https://github.com/angular/angular/issues/24919)) ([3cd9645](https://github.com/angular/angular/commit/3cd9645))
 * **elements:** always check to create strategy ([#23825](https://github.com/angular/angular/issues/23825)) ([b1cda36](https://github.com/angular/angular/commit/b1cda36))
 * **elements:** prevent closure renaming of platform properties ([#23843](https://github.com/angular/angular/issues/23843)) ([d4b8b24](https://github.com/angular/angular/commit/d4b8b24))
 * **forms:** properly handle special properties in FormGroup.get ([#22249](https://github.com/angular/angular/issues/22249)) ([9367e91](https://github.com/angular/angular/commit/9367e91)), closes [#17195](https://github.com/angular/angular/issues/17195)
@@ -1260,7 +1258,6 @@ For example:
 
 * **animations:** always render end-state styles for orphaned DOM nodes ([#24236](https://github.com/angular/angular/issues/24236)) ([0139173](https://github.com/angular/angular/commit/0139173))
 * **bazel:** Allow ng_module to depend on targets w no deps ([#24446](https://github.com/angular/angular/issues/24446)) ([ea3669e](https://github.com/angular/angular/commit/ea3669e))
-* **docs-infra:** use script nomodule to load IE polyfills, skip other polyfills ([#24317](https://github.com/angular/angular/issues/24317)) ([e876535](https://github.com/angular/angular/commit/e876535)), closes [#23647](https://github.com/angular/angular/issues/23647)
 * **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([d20877b](https://github.com/angular/angular/commit/d20877b)), closes [#10981](https://github.com/angular/angular/issues/10981)
 * **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([ea2987c](https://github.com/angular/angular/commit/ea2987c)), closes [#24095](https://github.com/angular/angular/issues/24095)
 

From e1af6e3c70bdfd76e0ddfb21f7bdf5560527a6bd Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Fri, 17 May 2019 14:31:48 -0500
Subject: [PATCH 123/275] docs: use dynamic import syntax in examples using
 lazy loading (#30563)

PR Close #30563
---
 .../lazy-loading-ngmodules/src/app/app-routing.module.ts  | 4 ++--
 .../examples/ngmodules/src/app/app-routing.module.ts      | 4 ++--
 .../examples/router/src/app/app-routing.module.5.ts       | 2 +-
 .../examples/router/src/app/app-routing.module.6.ts       | 4 ++--
 aio/content/examples/router/src/app/app-routing.module.ts | 4 ++--
 .../examples/testing/src/app/app-routing.module.ts        | 2 +-
 aio/content/guide/lazy-loading-ngmodules.md               | 2 +-
 aio/content/guide/router.md                               | 8 ++++----
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/app-routing.module.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/app-routing.module.ts
index 073bf73dd6..401aecbb1c 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/app-routing.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/app-routing.module.ts
@@ -8,11 +8,11 @@ import { Routes, RouterModule } from '@angular/router';
 const routes: Routes = [
   {
     path: 'customers',
-    loadChildren: './customers/customers.module#CustomersModule'
+    loadChildren: () => import('./customers/customers.module').then(mod => mod.CustomersModule)
   },
   {
     path: 'orders',
-    loadChildren: './orders/orders.module#OrdersModule'
+    loadChildren: () => import('./orders/orders.module').then(mod => mod.OrdersModule)
   },
   {
     path: '',
diff --git a/aio/content/examples/ngmodules/src/app/app-routing.module.ts b/aio/content/examples/ngmodules/src/app/app-routing.module.ts
index 2fea32093a..3ae0d3d346 100644
--- a/aio/content/examples/ngmodules/src/app/app-routing.module.ts
+++ b/aio/content/examples/ngmodules/src/app/app-routing.module.ts
@@ -3,8 +3,8 @@ import { Routes, RouterModule } from '@angular/router';
 
 export const routes: Routes = [
   { path: '', redirectTo: 'contact', pathMatch: 'full'},
-  { path: 'items', loadChildren: './items/items.module#ItemsModule' },
-  { path: 'customers', loadChildren: './customers/customers.module#CustomersModule' }
+  { path: 'items', loadChildren: () => import('./items/items.module').then(mod => mod.ItemsModule) },
+  { path: 'customers', loadChildren: () => import('./customers/customers.module').then(mod => mod.CustomersModule) }
 ];
 
 @NgModule({
diff --git a/aio/content/examples/router/src/app/app-routing.module.5.ts b/aio/content/examples/router/src/app/app-routing.module.5.ts
index a120771875..e99a6cb3c4 100644
--- a/aio/content/examples/router/src/app/app-routing.module.5.ts
+++ b/aio/content/examples/router/src/app/app-routing.module.5.ts
@@ -20,7 +20,7 @@ const appRoutes: Routes = [
 // #docregion admin, admin-1
   {
     path: 'admin',
-    loadChildren: './admin/admin.module#AdminModule',
+    loadChildren: () => import('./admin/admin.module').then(mod => mod.AdminModule),
 // #enddocregion admin-1
     canLoad: [AuthGuard]
 // #docregion admin-1
diff --git a/aio/content/examples/router/src/app/app-routing.module.6.ts b/aio/content/examples/router/src/app/app-routing.module.6.ts
index e1c81f2498..d060fad168 100644
--- a/aio/content/examples/router/src/app/app-routing.module.6.ts
+++ b/aio/content/examples/router/src/app/app-routing.module.6.ts
@@ -21,12 +21,12 @@ const appRoutes: Routes = [
   },
   {
     path: 'admin',
-    loadChildren: './admin/admin.module#AdminModule',
+    loadChildren: () => import('./admin/admin.module').then(mod => mod.AdminModule),
     canLoad: [AuthGuard]
   },
   {
     path: 'crisis-center',
-    loadChildren: './crisis-center/crisis-center.module#CrisisCenterModule'
+    loadChildren: () => import('./crisis-center/crisis-center.module').then(mod => mod.CrisisCenterModule)
   },
   { path: '',   redirectTo: '/heroes', pathMatch: 'full' },
   { path: '**', component: PageNotFoundComponent }
diff --git a/aio/content/examples/router/src/app/app-routing.module.ts b/aio/content/examples/router/src/app/app-routing.module.ts
index ffad588287..fc8bcb3b44 100644
--- a/aio/content/examples/router/src/app/app-routing.module.ts
+++ b/aio/content/examples/router/src/app/app-routing.module.ts
@@ -17,13 +17,13 @@ const appRoutes: Routes = [
   },
   {
     path: 'admin',
-    loadChildren: './admin/admin.module#AdminModule',
+    loadChildren: () => import('./admin/admin.module').then(mod => mod.AdminModule),
     canLoad: [AuthGuard]
   },
   // #docregion preload-v2
   {
     path: 'crisis-center',
-    loadChildren: './crisis-center/crisis-center.module#CrisisCenterModule',
+    loadChildren: () => import('./crisis-center/crisis-center.module').then(mod => mod.CrisisCenterModule),
     data: { preload: true }
   },
   // #enddocregion preload-v2
diff --git a/aio/content/examples/testing/src/app/app-routing.module.ts b/aio/content/examples/testing/src/app/app-routing.module.ts
index 7630c216f6..98c92a1f5a 100644
--- a/aio/content/examples/testing/src/app/app-routing.module.ts
+++ b/aio/content/examples/testing/src/app/app-routing.module.ts
@@ -8,7 +8,7 @@ import { AboutComponent } from './about/about.component';
     RouterModule.forRoot([
       { path: '', redirectTo: 'dashboard', pathMatch: 'full'},
       { path: 'about', component: AboutComponent },
-      { path: 'heroes', loadChildren: './hero/hero.module#HeroModule'}
+      { path: 'heroes', loadChildren: () => import('./hero/hero.module').then(mod => mod.HeroModule)}
     ])
   ],
   exports: [ RouterModule ] // re-export the module declarations
diff --git a/aio/content/guide/lazy-loading-ngmodules.md b/aio/content/guide/lazy-loading-ngmodules.md
index dc21eddba7..eee72d86f8 100644
--- a/aio/content/guide/lazy-loading-ngmodules.md
+++ b/aio/content/guide/lazy-loading-ngmodules.md
@@ -143,7 +143,7 @@ In `AppRoutingModule`, update the `routes` array with the following:
 </code-example>
 
 
-The import statements stay the same. The first two paths are the routes to the `CustomersModule` and the `OrdersModule` respectively. Notice that the lazy loading syntax uses `loadChildren` followed by a string that is the relative path to the module, a hash mark or `#`, and the module’s class name.
+The import statements stay the same. The first two paths are the routes to the `CustomersModule` and the `OrdersModule` respectively. Notice that the lazy loading syntax uses `loadChildren` followed by a function that uses the browser's built-in `import('...')` syntax for dynamic imports. The import path is the relative path to the module.
 
 ### Inside the feature module
 
diff --git a/aio/content/guide/router.md b/aio/content/guide/router.md
index 44f1d5452d..ab87bd36d8 100644
--- a/aio/content/guide/router.md
+++ b/aio/content/guide/router.md
@@ -3954,10 +3954,10 @@ Users will still visit `/admin` and the `AdminComponent` still serves as the *Ro
 
 Open the `AppRoutingModule` and add a new `admin` route to its `appRoutes` array.
 
-Give it a `loadChildren` property instead of a `children` property, set to the address of the `AdminModule`.
-The address is the `AdminModule` file location (relative to the app root),
-followed by a `#` separator, followed by the name of the exported module class, `AdminModule`.
-
+Give it a `loadChildren` property instead of a `children` property.
+The `loadChildren` property takes a function that returns a promise using the browser's built-in syntax for lazy loading code using dynamic imports `import('...')`.
+The path is the location of the `AdminModule` (relative to the app root).
+After the code is requested and loaded, the `Promise` resolves an object that contains the `NgModule`, in this case the `AdminModule`.
 
 <code-example path="router/src/app/app-routing.module.5.ts" region="admin-1" header="app-routing.module.ts (load children)">
 

From ebfbc04000cd2df9fee1595c08f2bc1c6f24217c Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 21 May 2019 17:49:37 +0300
Subject: [PATCH 124/275] ci(docs-infra): fix `test_docs_examples_ivy` job
 (#30593)

Context:
As part of the `test_docs_examples_ivy` job, we run 5 concurrent builds
on each VM (each for a different example/project). Additionally, all
example projects share the same `node_modules/` (via a symlink to
`aio/tools/examples/shared/node_modules/`), so all concurrent builds
operate on the same files.

Previously, we pre-ran ngcc with `--properties module` to process the
fesm5 bundles. Since we have switched to es2015 in 661a57d9e, we now
need the esm2015 bundles. As a result, the initial ngcc run is
redundant and ngcc runs again during each build (to process the fesm2015
bundles). Since there are 5 concurrent builds, we often end up with
multiple ngcc instances processing the same package and trying to write
to the same directories at the same time, causing a
`file already exists` error

This commit fixes it by pre-processing the esm2015 bundles, so there is
no need to re-run ngcc during each concurrent build.

Fixes #30577

PR Close #30593
---
 aio/tools/examples/example-boilerplate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/tools/examples/example-boilerplate.js b/aio/tools/examples/example-boilerplate.js
index 84f0892696..d126e16370 100644
--- a/aio/tools/examples/example-boilerplate.js
+++ b/aio/tools/examples/example-boilerplate.js
@@ -75,9 +75,9 @@ class ExampleBoilerPlate {
     }
 
     if (ivy) {
-      // We only need the "fesm5" bundles as the CLI webpack build does not need
+      // We only need the "es2015" bundles as the CLI webpack build does not need
       // any other formats for building and serving.
-      shelljs.exec(`yarn --cwd ${SHARED_PATH} ivy-ngcc --properties module`);
+      shelljs.exec(`yarn --cwd ${SHARED_PATH} ivy-ngcc --properties es2015`);
     }
 
     exampleFolders.forEach(exampleFolder => {

From a96976e88f2253b9484eaebabe74ec31999636dd Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Mon, 20 May 2019 16:08:16 -0700
Subject: [PATCH 125/275] fix(core): remove deprecated
 `TestBed.deprecatedOverrideProvider` API (#30576)

BREAKING CHANGE

In PR #19558, we fixed a bug in `TestBed.overrideProvider` where
eager providers were not being instantiated correctly. However,
it turned out that since this bug had been around for quite a bit,
many apps were relying on the broken behavior where the providers
would not be instantiated. To assist in the transition, the
`TestBed.deprecatedOverrideProvider` method was temporarily
introduced to mimic the old behavior so that apps would have a
longer time period to migrate their code.

2 years and 3 versions later, it is time to remove the temporary
method. This commit removes `TestBed.deprecatedOverrideProvider`
altogether. Any usages of `TestBed.deprecatedOverrideProvider`
should be replaced with `TestBed.overrideProvider`. This may mean
that providers that were not created before will now be instantiated,
which could mean that your tests need to provide more mocks or stubs
for the dependencies of the newly instantiated providers.

PR Close #30576
---
 aio/content/guide/deprecations.md             |  9 +---
 packages/core/testing/src/r3_test_bed.ts      | 43 -----------------
 packages/core/testing/src/test_bed.ts         | 48 -------------------
 packages/core/testing/src/test_bed_common.ts  | 16 -------
 .../test/testing_public_spec.ts               | 21 --------
 tools/public_api_guard/core/testing.d.ts      | 44 ++++-------------
 6 files changed, 12 insertions(+), 169 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index ab5bdc28ad..7ece547a6b 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -60,13 +60,6 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 | [`RootRenderer`](api/core/RootRenderer) | [`RendererFactory2`](api/core/RendererFactory2) | v4 | none |
 | [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32).
 
-#### @angular/core/testing
-
-| API | Replacement | Deprecation announced | Notes |
-| --- | ----------- | --------------------- | ----- |
-| [`TestBed.deprecatedOverrideProvider()`](api/core/testing/TestBed#deprecatedoverrideprovider) | [`TestBed.overrideProvider()`] (api/core/testing/TestBed#overrideprovider) | v7 | none |
-| [`TestBedStatic.deprecatedOverrideProvider()`](api/core/testing/TestBedStatic#deprecatedoverrideprovider) | [`TestBedStatic.overrideProvider()`](api/core/testing/TestBedStatic#overrideprovider) | v5 | none |
-
 
 #### @angular/forms
 
@@ -253,6 +246,8 @@ The following APIs have been removed starting with version 8.0.0:
 | [`@angular/http`](https://v7.angular.io/api/http) | All exports | [`@angular/common/http`](https://v7.angular.io/api/common/http) | See [below](#http). |
 [`@angular/http/testing`](https://v7.angular.io/api/http/testing) | All exports | [`@angular/common/http/testing`](https://v7.angular.io/api/common/http/testing) | See [below](#http). |
 | `@angular/platform-browser` | [`DOCUMENT`](https://v7.angular.io/api/platform-browser/DOCUMENT) | [`DOCUMENT` in `@angular/common`](https://v7.angular.io/api/common/DOCUMENT) | Updating to version 8 with [`ng update`](cli/update) changes this automatically.  |
+| `@angular/core/testing` | [`TestBed.deprecatedOverrideProvider()`](https://v7.angular.io/api/core/testing/TestBed#deprecatedoverrideprovider) | [`TestBed.overrideProvider()`] (api/core/testing/TestBed#overrideprovider) | none |
+| `@angular/core/testing` | [`TestBedStatic.deprecatedOverrideProvider()`](https://v7.angular.io/api/core/testing/TestBedStatic#deprecatedoverrideprovider) | [`TestBedStatic.overrideProvider()`](api/core/testing/TestBedStatic#overrideprovider) | none |
 
 
 
diff --git a/packages/core/testing/src/r3_test_bed.ts b/packages/core/testing/src/r3_test_bed.ts
index 38f8e50abc..c14143aa36 100644
--- a/packages/core/testing/src/r3_test_bed.ts
+++ b/packages/core/testing/src/r3_test_bed.ts
@@ -150,25 +150,6 @@ export class TestBedRender3 implements Injector, TestBed {
     return TestBedRender3 as any as TestBedStatic;
   }
 
-  /**
-   * Overwrites all providers for the given token with the given provider definition.
-   *
-   * @deprecated as it makes all NgModules lazy. Introduced only for migrating off of it.
-   */
-  static deprecatedOverrideProvider(token: any, provider: {
-    useFactory: Function,
-    deps: any[],
-  }): void;
-  static deprecatedOverrideProvider(token: any, provider: {useValue: any;}): void;
-  static deprecatedOverrideProvider(token: any, provider: {
-    useFactory?: Function,
-    useValue?: any,
-    deps?: any[],
-  }): TestBedStatic {
-    _getTestBedRender3().deprecatedOverrideProvider(token, provider as any);
-    return TestBedRender3 as any as TestBedStatic;
-  }
-
   static get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): any;
   /**
    * @deprecated from v8.0.0 use Type<T> or InjectionToken<T>
@@ -317,30 +298,6 @@ export class TestBedRender3 implements Injector, TestBed {
     this.compiler.overrideProvider(token, provider);
   }
 
-  /**
-   * Overwrites all providers for the given token with the given provider definition.
-   *
-   * @deprecated as it makes all NgModules lazy. Introduced only for migrating off of it.
-   */
-  deprecatedOverrideProvider(token: any, provider: {
-    useFactory: Function,
-    deps: any[],
-  }): void;
-  deprecatedOverrideProvider(token: any, provider: {useValue: any;}): void;
-  deprecatedOverrideProvider(
-      token: any, provider: {useFactory?: Function, useValue?: any, deps?: any[]}): void {
-    // HACK: This is NOT the correct implementation for deprecatedOverrideProvider.
-    // To implement it in a backward compatible way, we would need to record some state
-    // so we know to prevent eager instantiation of NgModules. However, we don't plan
-    // to implement this at all since the API is deprecated and scheduled for removal
-    // in V8. This hack is here temporarily for Ivy testing until we transition apps
-    // inside Google to the overrideProvider API. At that point, we will be able to
-    // remove this method entirely. In the meantime, we can use overrideProvider to
-    // test apps with Ivy that don't care about eager instantiation. This fixes 85%
-    // of cases in our blueprint.
-    this.overrideProvider(token, provider as any);
-  }
-
   createComponent<T>(type: Type<T>): ComponentFixture<T> {
     const testComponentRenderer: TestComponentRenderer = this.get(TestComponentRenderer);
     const rootElId = `root-ng-internal-isolated-${_nextRootElementId++}`;
diff --git a/packages/core/testing/src/test_bed.ts b/packages/core/testing/src/test_bed.ts
index 77961d62bb..f1653b4b6e 100644
--- a/packages/core/testing/src/test_bed.ts
+++ b/packages/core/testing/src/test_bed.ts
@@ -83,20 +83,6 @@ export interface TestBed {
   overrideProvider(token: any, provider: {useFactory?: Function, useValue?: any, deps?: any[]}):
       void;
 
-  /**
-   * Overwrites all providers for the given token with the given provider definition.
-   *
-   * @deprecated as it makes all NgModules lazy. Introduced only for migrating off of it.
-   */
-  deprecatedOverrideProvider(token: any, provider: {
-    useFactory: Function,
-    deps: any[],
-  }): void;
-  deprecatedOverrideProvider(token: any, provider: {useValue: any;}): void;
-  deprecatedOverrideProvider(
-      token: any, provider: {useFactory?: Function, useValue?: any, deps?: any[]}): void;
-
-
   overrideTemplateUsingTestingModule(component: Type<any>, template: string): void;
 
   createComponent<T>(component: Type<T>): ComponentFixture<T>;
@@ -224,25 +210,6 @@ export class TestBedViewEngine implements Injector, TestBed {
     return TestBedViewEngine as any as TestBedStatic;
   }
 
-  /**
-   * Overwrites all providers for the given token with the given provider definition.
-   *
-   * @deprecated as it makes all NgModules lazy. Introduced only for migrating off of it.
-   */
-  static deprecatedOverrideProvider(token: any, provider: {
-    useFactory: Function,
-    deps: any[],
-  }): void;
-  static deprecatedOverrideProvider(token: any, provider: {useValue: any;}): void;
-  static deprecatedOverrideProvider(token: any, provider: {
-    useFactory?: Function,
-    useValue?: any,
-    deps?: any[],
-  }): TestBedStatic {
-    _getTestBedViewEngine().deprecatedOverrideProvider(token, provider as any);
-    return TestBedViewEngine as any as TestBedStatic;
-  }
-
   static get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): any;
   /**
    * @deprecated from v8.0.0 use Type<T> or InjectionToken<T>
@@ -537,21 +504,6 @@ export class TestBedViewEngine implements Injector, TestBed {
     this.overrideProviderImpl(token, provider);
   }
 
-  /**
-   * Overwrites all providers for the given token with the given provider definition.
-   *
-   * @deprecated as it makes all NgModules lazy. Introduced only for migrating off of it.
-   */
-  deprecatedOverrideProvider(token: any, provider: {
-    useFactory: Function,
-    deps: any[],
-  }): void;
-  deprecatedOverrideProvider(token: any, provider: {useValue: any;}): void;
-  deprecatedOverrideProvider(
-      token: any, provider: {useFactory?: Function, useValue?: any, deps?: any[]}): void {
-    this.overrideProviderImpl(token, provider, /* deprecated */ true);
-  }
-
   private overrideProviderImpl(
       token: any, provider: {
         useFactory?: Function,
diff --git a/packages/core/testing/src/test_bed_common.ts b/packages/core/testing/src/test_bed_common.ts
index 822cc15f9e..9977194ef1 100644
--- a/packages/core/testing/src/test_bed_common.ts
+++ b/packages/core/testing/src/test_bed_common.ts
@@ -114,22 +114,6 @@ export interface TestBedStatic {
     deps?: any[],
   }): TestBedStatic;
 
-  /**
-   * Overwrites all providers for the given token with the given provider definition.
-   *
-   * @deprecated as it makes all NgModules lazy. Introduced only for migrating off of it.
-   */
-  deprecatedOverrideProvider(token: any, provider: {
-    useFactory: Function,
-    deps: any[],
-  }): void;
-  deprecatedOverrideProvider(token: any, provider: {useValue: any;}): void;
-  deprecatedOverrideProvider(token: any, provider: {
-    useFactory?: Function,
-    useValue?: any,
-    deps?: any[],
-  }): TestBedStatic;
-
   get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): any;
   /**
    * @deprecated from v8.0.0 use Type<T> or InjectionToken<T>
diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts
index 1b6de179ec..a641b8ae6e 100644
--- a/packages/platform-browser/test/testing_public_spec.ts
+++ b/packages/platform-browser/test/testing_public_spec.ts
@@ -494,27 +494,6 @@ class CompWithUrlTemplate {
             expect(someModule).toBeAnInstanceOf(SomeModule);
           });
 
-          obsoleteInIvy(`deprecated method, won't be reimplemented for Render3`)
-              .it('should keep imported NgModules lazy with deprecatedOverrideProvider', () => {
-                let someModule: SomeModule|undefined;
-
-                @NgModule()
-                class SomeModule {
-                  constructor() { someModule = this; }
-                }
-
-                TestBed.configureTestingModule({
-                  providers: [
-                    {provide: 'a', useValue: 'aValue'},
-                  ],
-                  imports: [SomeModule]
-                });
-                TestBed.deprecatedOverrideProvider('a', {useValue: 'mockValue'});
-
-                expect(TestBed.get('a')).toBe('mockValue');
-                expect(someModule).toBeUndefined();
-              });
-
           describe('injecting eager providers into an eager overwritten provider', () => {
             @NgModule({
               providers: [
diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts
index 6cf7bd65dd..5c10def5a9 100644
--- a/tools/public_api_guard/core/testing.d.ts
+++ b/tools/public_api_guard/core/testing.d.ts
@@ -57,18 +57,6 @@ export interface TestBed {
     }): void;
     configureTestingModule(moduleDef: TestModuleMetadata): void;
     createComponent<T>(component: Type<T>): ComponentFixture<T>;
-    deprecatedOverrideProvider(token: any, provider: {
-        useFactory?: Function;
-        useValue?: any;
-        deps?: any[];
-    }): void;
-    deprecatedOverrideProvider(token: any, provider: {
-        useValue: any;
-    }): void;
-    /** @deprecated */ deprecatedOverrideProvider(token: any, provider: {
-        useFactory: Function;
-        deps: any[];
-    }): void;
     execute(tokens: any[], fn: Function, context?: any): any;
     get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): any;
     /** @deprecated */ get(token: any, notFoundValue?: any): any;
@@ -78,16 +66,16 @@ export interface TestBed {
     overrideModule(ngModule: Type<any>, override: MetadataOverride<NgModule>): void;
     overridePipe(pipe: Type<any>, override: MetadataOverride<Pipe>): void;
     overrideProvider(token: any, provider: {
-        useFactory?: Function;
-        useValue?: any;
-        deps?: any[];
+        useFactory: Function;
+        deps: any[];
     }): void;
     overrideProvider(token: any, provider: {
         useValue: any;
     }): void;
     overrideProvider(token: any, provider: {
-        useFactory: Function;
-        deps: any[];
+        useFactory?: Function;
+        useValue?: any;
+        deps?: any[];
     }): void;
     overrideTemplateUsingTestingModule(component: Type<any>, template: string): void;
     resetTestEnvironment(): void;
@@ -105,25 +93,17 @@ export interface TestBedStatic {
     }): TestBedStatic;
     configureTestingModule(moduleDef: TestModuleMetadata): TestBedStatic;
     createComponent<T>(component: Type<T>): ComponentFixture<T>;
-    deprecatedOverrideProvider(token: any, provider: {
-        useFactory?: Function;
-        useValue?: any;
-        deps?: any[];
-    }): TestBedStatic;
-    deprecatedOverrideProvider(token: any, provider: {
-        useValue: any;
-    }): void;
-    /** @deprecated */ deprecatedOverrideProvider(token: any, provider: {
-        useFactory: Function;
-        deps: any[];
-    }): void;
-    /** @deprecated */ get(token: any, notFoundValue?: any): any;
     get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): any;
+    /** @deprecated */ get(token: any, notFoundValue?: any): any;
     initTestEnvironment(ngModule: Type<any> | Type<any>[], platform: PlatformRef, aotSummaries?: () => any[]): TestBed;
     overrideComponent(component: Type<any>, override: MetadataOverride<Component>): TestBedStatic;
     overrideDirective(directive: Type<any>, override: MetadataOverride<Directive>): TestBedStatic;
     overrideModule(ngModule: Type<any>, override: MetadataOverride<NgModule>): TestBedStatic;
     overridePipe(pipe: Type<any>, override: MetadataOverride<Pipe>): TestBedStatic;
+    overrideProvider(token: any, provider: {
+        useFactory: Function;
+        deps: any[];
+    }): TestBedStatic;
     overrideProvider(token: any, provider: {
         useValue: any;
     }): TestBedStatic;
@@ -132,10 +112,6 @@ export interface TestBedStatic {
         useValue?: any;
         deps?: any[];
     }): TestBedStatic;
-    overrideProvider(token: any, provider: {
-        useFactory: Function;
-        deps: any[];
-    }): TestBedStatic;
     overrideTemplate(component: Type<any>, template: string): TestBedStatic;
     overrideTemplateUsingTestingModule(component: Type<any>, template: string): TestBedStatic;
     resetTestEnvironment(): void;

From c9f5f3d8028707a87ae8d03e2eac7d30fd1cf02f Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Fri, 17 May 2019 10:28:33 -0500
Subject: [PATCH 126/275] docs: add section to upgrade guide on lazy loading
 AngularJS (#30541)

PR Close #30541
---
 .github/CODEOWNERS                            |  1 +
 .../upgrade-lazy-load-ajs/example-config.json |  0
 .../app/angular-js/angular-js.component.ts    | 14 ++++
 .../src/app/angularjs-app/index.ts            | 29 ++++++++
 .../src/app/app-routing.module.ts             | 31 +++++++++
 .../src/app/app.component.css                 |  0
 .../src/app/app.component.html                |  9 +++
 .../src/app/app.component.ts                  |  8 +++
 .../src/app/app.module.ts                     | 25 +++++++
 .../src/app/app404/app404.component.css       |  0
 .../src/app/app404/app404.component.html      |  3 +
 .../src/app/app404/app404.component.ts        | 15 +++++
 .../src/app/home/home.component.css           |  0
 .../src/app/home/home.component.html          |  3 +
 .../src/app/home/home.component.ts            | 15 +++++
 .../src/app/lazy-loader.service.ts            | 23 +++++++
 .../upgrade-lazy-load-ajs/src/index.html      | 14 ++++
 .../upgrade-lazy-load-ajs/src/main.ts         | 12 ++++
 .../upgrade-lazy-load-ajs/zipper.json         |  7 ++
 aio/content/guide/upgrade.md                  | 66 +++++++++++++++++++
 20 files changed, 275 insertions(+)
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/example-config.json
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/angular-js/angular-js.component.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app-routing.module.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.css
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.html
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app.module.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.css
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.html
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.css
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.html
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/app/lazy-loader.service.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/index.html
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/src/main.ts
 create mode 100644 aio/content/examples/upgrade-lazy-load-ajs/zipper.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b274f730b9..05112c88c4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -661,6 +661,7 @@
 /packages/common/upgrade/**                                     @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /packages/examples/upgrade/**                                   @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/upgrade.md                                   @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/upgrade-lazy-load-ajs/**                  @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/upgrade-module/**                         @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/images/guide/upgrade/**                            @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/upgrade-phonecat-1-typescript/**          @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/example-config.json b/aio/content/examples/upgrade-lazy-load-ajs/example-config.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/angular-js/angular-js.component.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/angular-js/angular-js.component.ts
new file mode 100644
index 0000000000..bc5d22c0f0
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/angular-js/angular-js.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit, ElementRef } from '@angular/core';
+import { LazyLoaderService } from '../lazy-loader.service';
+
+@Component({
+  selector: 'app-angular-js',
+  template: '<div ng-view></div>'
+})
+export class AngularJSComponent implements OnInit {
+  constructor(private lazyLoader: LazyLoaderService, private elRef: ElementRef) {}
+
+  ngOnInit() {
+    this.lazyLoader.load(this.elRef.nativeElement);
+  }
+}
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts
new file mode 100644
index 0000000000..4d43a7fa09
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts
@@ -0,0 +1,29 @@
+import * as angular from 'angular';
+import 'angular-route';
+
+const appName = 'myApp';
+
+angular.module(appName, [
+  'ngRoute'
+])
+.config(['$routeProvider', '$locationProvider',
+  function config($routeProvider, $locationProvider) {
+    $locationProvider.html5Mode(true);
+
+    $routeProvider.
+      when('/users', {
+        template: `
+          <p>
+            Users Page
+          </p>
+        `
+      }).
+      otherwise({
+        template: ''
+      });
+  }]
+);
+
+export function bootstrap(el: HTMLElement) {
+  return angular.bootstrap(el,  [appName]);
+}
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app-routing.module.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app-routing.module.ts
new file mode 100644
index 0000000000..5cc7055597
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app-routing.module.ts
@@ -0,0 +1,31 @@
+// #docplaster
+// #docregion
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule, UrlSegment } from '@angular/router';
+import { AngularJSComponent } from './angular-js/angular-js.component';
+import { HomeComponent } from './home/home.component';
+import { App404Component } from './app404/app404.component';
+
+// Match any URL that starts with `users`
+// #docregion matcher
+export function isAngularJSUrl(url: UrlSegment[]) {
+  return url.length > 0 && url[0].path.startsWith('users') ? ({consumed: url}) : null;
+}
+// #enddocregion matcher
+
+export const routes: Routes = [
+  // Routes rendered by Angular
+  { path: '', component: HomeComponent },
+
+  // AngularJS routes
+  { matcher: isAngularJSUrl, component: AngularJSComponent },
+
+  // Catch-all route
+  { path: '**', component: App404Component }
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.css b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.html b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.html
new file mode 100644
index 0000000000..51c9edae12
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.html
@@ -0,0 +1,9 @@
+Lazy Loading AngularJS
+
+<nav>
+  <a routerLink="/">Home</a>
+  <a routerLink="/users">Users</a>
+  <a routerLink="/notfound">404 Page</a>
+</nav>
+
+<router-outlet></router-outlet>
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.ts
new file mode 100644
index 0000000000..400d937a2f
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
+})
+export class AppComponent { }
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.module.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.module.ts
new file mode 100644
index 0000000000..4e199e90bf
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app.module.ts
@@ -0,0 +1,25 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+import { AngularJSComponent } from './angular-js/angular-js.component';
+import { HomeComponent } from './home/home.component';
+import { App404Component } from './app404/app404.component';
+
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    AngularJSComponent,
+    HomeComponent,
+    App404Component
+  ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.css b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.html b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.html
new file mode 100644
index 0000000000..27e1f55db9
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.html
@@ -0,0 +1,3 @@
+<p>
+  Angular 404
+</p>
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.ts
new file mode 100644
index 0000000000..9adfed8166
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/app404/app404.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-app404',
+  templateUrl: './app404.component.html',
+  styleUrls: ['./app404.component.css']
+})
+export class App404Component implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.css b/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.html b/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.html
new file mode 100644
index 0000000000..a2bf06c9de
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.html
@@ -0,0 +1,3 @@
+<p>
+  Angular Home
+</p>
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.ts
new file mode 100644
index 0000000000..33fd77077e
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/home/home.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-home',
+  templateUrl: './home.component.html',
+  styleUrls: ['./home.component.css']
+})
+export class HomeComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/lazy-loader.service.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/lazy-loader.service.ts
new file mode 100644
index 0000000000..50c8492fb9
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/lazy-loader.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LazyLoaderService {
+  bootstrapped = false;
+
+  load(el: HTMLElement): void {
+    if (this.bootstrapped) {
+      return;
+    }
+
+    import('./angularjs-app').then(app => {
+      try {
+        app.bootstrap(el);
+        this.bootstrapped = true;
+      } catch (e) {
+        console.error(e);
+      }
+    });
+  }
+}
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/index.html b/aio/content/examples/upgrade-lazy-load-ajs/src/index.html
new file mode 100644
index 0000000000..53a90fd4e6
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>AngularJS Hybrid</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/main.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/main.ts
new file mode 100644
index 0000000000..c7b673cf44
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/main.ts
@@ -0,0 +1,12 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/zipper.json b/aio/content/examples/upgrade-lazy-load-ajs/zipper.json
new file mode 100644
index 0000000000..f86b7903a7
--- /dev/null
+++ b/aio/content/examples/upgrade-lazy-load-ajs/zipper.json
@@ -0,0 +1,7 @@
+{
+  "files": [
+    "!**/*.d.ts",
+    "!**/*.js",
+    "!**/*.[1,2].*"
+  ]
+}
diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index 24b074556d..c98254cbd7 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -838,6 +838,72 @@ After this, the service is injectable anywhere in AngularJS code:
 <code-example path="upgrade-module/src/app/a-to-ajs-providers/hero-detail.component.ts" header="hero-detail.component.ts">
 </code-example>
 
+## Lazy Loading AngularJS
+
+When building applications, you want to ensure that only the required resources are loaded when necessary. Whether that be loading of assets or code, making sure everything that can be deferred until needed keeps your application running efficiently. This is especially true when running different frameworks in the same application. 
+
+[Lazy loading](guide/glossary#lazy-loading) is a technique that defers the loading of required assets and code resources until they are actually used. This reduces startup time and increases efficiency, especially when running different frameworks in the same application.
+
+When migrating large applications from AngularJS to Angular using a hybrid approach, you want to migrate some of the most commonly used features first, and only use the less commonly used features if needed. Doing so helps you ensure that the application is still providing a seamless experience for your users while you are migrating.
+
+In most environments where both Angular and AngularJS are used to render the application, both frameworks are loaded in the initial bundle being sent to the client. This results in both increased bundle size and possible reduced performance. 
+
+Overall application performance is affected in cases where the user stays on Angular-rendered pages because the AngularJS framework and application are still loaded and running, even if they are never accessed. 
+
+You can take steps to mitigate both bundle size and performance issues. By isolating your AngularJS app to a separate bundle, you can take advantage of [lazy loading](guide/glossary#lazy-loading) to load, bootstrap, and render the AngularJS application only when needed. This strategy reduces your initial bundle size, defers any potential impact from loading both frameworks until absolutely necessary, and keeps your application running as efficiently as possible.
+
+The steps below show you how to do the following:
+
+* Setup a callback function for your AngularJS bundle.
+* Create a service that lazy loads and bootstraps your AngularJS app.
+* Create a routable component for AngularJS content
+* Create a custom `matcher` function for AngularJS-specific URLs and configure the Angular `Router` with the custom matcher for AngularJS routes.
+
+### Create a service to lazy load AngularJS
+
+As of Angular version 8, lazy loading code can be accomplished simply by using the dynamic import syntax `import('...')`. In your application, you create a new service that uses dynamic imports to lazy load AngularJS.
+
+<code-example path="upgrade-lazy-load-ajs/src/app/lazy-loader.service.ts" header="src/app/lazy-loader.service.ts">
+</code-example>
+
+The service uses the `import()` method to load your bundled AngularJS application lazily. This decreases the initial bundle size of your application as you're not loading code your user doesn't need yet. You also need to provide a way to _bootstrap_ the application manually after it has been loaded. AngularJS provides a way to manually bootstrap an application using the [angular.bootstrap()](https://docs.angularjs.org/api/ng/function/angular.bootstrap) method with a provided HTML element. Your AngularJS app should also expose a `bootstrap` method that bootstraps the AngularJS app.
+
+<code-example path="upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts" header="angularjs-app">
+</code-example>
+
+Your AngularJS application is configured with only the routes it needs to render content. The remaining routes in your application are handled by the Angular Router. The exposed `bootstrap` method is called in your Angular app to bootstrap the AngularJS application after the bundle is loaded.
+
+<div class="alert is-important">
+
+**Note:** After AngularJS is loaded and bootstrapped, listeners such as those wired up in your route configuration will continue to listen for route changes. To ensure listeners are shut down when AngularJS isn't being displayed, configure an `otherwise` option with the [$routeProvider](https://docs.angularjs.org/api/ngRoute/provider/$routeProvider) that renders an empty template. This assumes all other routes will be handled by Angular.
+
+</div>
+
+### Create a component to render AngularJS content
+
+In your Angular application, you need a component as a placeholder for your AngularJS content. This component uses the service you create to load and bootstrap your AngularJS app after the component is initialized.
+
+<code-example path="upgrade-lazy-load-ajs/src/app/angular-js/angular-js.component.ts" header="src/app/angular-js/angular-js.component.ts">
+</code-example>
+
+When the Angular Router matches a route that uses AngularJS, the `AngularJSComponent` is rendered, and the content is rendered within the AngularJS [`ng-view`](https://docs.angularjs.org/api/ngRoute/directive/ngView) directive. 
+
+### Configure a custom route matcher for AngularJS routes
+
+To configure the Angular Router, you must define a route for AngularJS URLs. To match those URLs, you add a route configuration that uses the `matcher` property. The `matcher` allows you to use custom pattern matching for URL paths. The Angular Router tries to match on more specific routes such as static and variable routes first. When it doesn't find a match, it then looks at custom matchers defined in your route configuration. If the custom matchers don't match a route, it then goes to catch-all routes, such as a 404 page.
+
+The following example defines a custom matcher function for AngularJS routes.
+
+<code-example path="upgrade-lazy-load-ajs/src/app/app-routing.module.ts" header="src/app/app-routing.module.ts" region="matcher">
+</code-example>
+
+The following code adds a route object to your routing configuration using the `matcher` property and custom matcher, and the `component` property with `AngularJSComponent`.
+
+<code-example path="upgrade-lazy-load-ajs/src/app/app-routing.module.ts" header="src/app/app-routing.module.ts">
+</code-example>
+
+When your application matches a route that needs AngularJS, the AngularJS app is loaded and bootstrapped, the AngularJS routes match the necessary URL to render their content, and your application continues to run with both AngularJS and Angular frameworks.
+
 ## Using the Unified Angular Location Service
 
 In AngularJS, the [$location service](https://docs.angularjs.org/api/ng/service/$location) handles all routing configuration and navigation, encoding and decoding of URLS, redirects, and interactions with browser APIs. Angular uses its own underlying `Location` service for all of these tasks. 

From f3c69e7f6b263e7ae5fa05c45a61e345dc47aaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Tue, 14 May 2019 15:55:46 -0700
Subject: [PATCH 127/275] refactor(ivy): rewrite flatten function to be more
 memory efficient (#30468)

The `flatten` function used `concat` and `slice` which created a lot of intermediary
object allocations. Because `flatten` is used from query any benchmark which
used query would exhibit high minor GC counts.

PR Close #30468
---
 integration/_payload-limits.json              |  4 +--
 .../side-effects/snapshots/core/esm2015.js    | 22 ++++++-------
 packages/core/src/render3/jit/module.ts       | 15 +++++----
 packages/core/src/util/array_utils.ts         | 31 +++++++++----------
 4 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
index 9d62c9f0fa..9957587800 100644
--- a/integration/_payload-limits.json
+++ b/integration/_payload-limits.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1497,
-        "main": 166739,
+        "main": 166799,
         "polyfills": 43626
       }
     }
@@ -34,4 +34,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/integration/side-effects/snapshots/core/esm2015.js b/integration/side-effects/snapshots/core/esm2015.js
index 458c867642..7e58a587f5 100644
--- a/integration/side-effects/snapshots/core/esm2015.js
+++ b/integration/side-effects/snapshots/core/esm2015.js
@@ -30,20 +30,16 @@ function getSymbolIterator() {
 
 if ("undefined" === typeof ngI18nClosureMode) _global["ngI18nClosureMode"] = "undefined" !== typeof goog && "function" === typeof goog.getMsg;
 
-function flatten(list, mapFn) {
-    const result = [];
-    let i = 0;
-    while (i < list.length) {
-        const item = list[i];
-        if (Array.isArray(item)) if (item.length > 0) {
-            list = item.concat(list.slice(i + 1));
-            i = 0;
-        } else i++; else {
-            result.push(mapFn ? mapFn(item) : item);
-            i++;
-        }
+function flatten(list, dst) {
+    if (void 0 === dst) dst = list;
+    for (let i = 0; i < list.length; i++) {
+        let item = list[i];
+        if (Array.isArray(item)) {
+            if (dst === list) dst = list.slice(0, i);
+            flatten(item, dst);
+        } else if (dst !== list) dst.push(item);
     }
-    return result;
+    return dst;
 }
 
 class EventEmitter extends Subject {
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 4d35a0ec89..fe41493869 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -108,11 +108,13 @@ export function compileNgModuleDefs(moduleType: NgModuleType, ngModule: NgModule
         ngModuleDef = getCompilerFacade().compileNgModule(
             angularCoreEnv, `ng:///${moduleType.name}/ngModuleDef.js`, {
               type: moduleType,
-              bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY, resolveForwardRef),
+              bootstrap: flatten(ngModule.bootstrap || EMPTY_ARRAY).map(resolveForwardRef),
               declarations: declarations.map(resolveForwardRef),
-              imports: flatten(ngModule.imports || EMPTY_ARRAY, resolveForwardRef)
+              imports: flatten(ngModule.imports || EMPTY_ARRAY)
+                           .map(resolveForwardRef)
                            .map(expandModuleWithProviders),
-              exports: flatten(ngModule.exports || EMPTY_ARRAY, resolveForwardRef)
+              exports: flatten(ngModule.exports || EMPTY_ARRAY)
+                           .map(resolveForwardRef)
                            .map(expandModuleWithProviders),
               emitInline: true,
               schemas: ngModule.schemas ? flatten(ngModule.schemas) : null,
@@ -156,12 +158,12 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
   const errors: string[] = [];
   const declarations = maybeUnwrapFn(ngModuleDef.declarations);
   const imports = maybeUnwrapFn(ngModuleDef.imports);
-  flatten(imports, unwrapModuleWithProvidersImports).forEach(verifySemanticsOfNgModuleDef);
+  flatten(imports).map(unwrapModuleWithProvidersImports).forEach(verifySemanticsOfNgModuleDef);
   const exports = maybeUnwrapFn(ngModuleDef.exports);
   declarations.forEach(verifyDeclarationsHaveDefinitions);
   const combinedDeclarations: Type<any>[] = [
     ...declarations.map(resolveForwardRef),  //
-    ...flatten(imports.map(computeCombinedExports), resolveForwardRef),
+    ...flatten(imports.map(computeCombinedExports)).map(resolveForwardRef),
   ];
   exports.forEach(verifyExportsAreDeclaredOrReExported);
   declarations.forEach(verifyDeclarationIsUnique);
@@ -170,7 +172,8 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
   const ngModule = getAnnotation<NgModule>(moduleType, 'NgModule');
   if (ngModule) {
     ngModule.imports &&
-        flatten(ngModule.imports, unwrapModuleWithProvidersImports)
+        flatten(ngModule.imports)
+            .map(unwrapModuleWithProvidersImports)
             .forEach(verifySemanticsOfNgModuleDef);
     ngModule.bootstrap && ngModule.bootstrap.forEach(verifyCorrectBootstrapType);
     ngModule.bootstrap && ngModule.bootstrap.forEach(verifyComponentIsPartOfNgModule);
diff --git a/packages/core/src/util/array_utils.ts b/packages/core/src/util/array_utils.ts
index aac3dba3d8..ab846bbf7b 100644
--- a/packages/core/src/util/array_utils.ts
+++ b/packages/core/src/util/array_utils.ts
@@ -19,24 +19,23 @@ export function addAllToArray(items: any[], arr: any[]) {
 }
 
 /**
- * Flattens an array in non-recursive way. Input arrays are not modified.
+ * Flattens an array.
  */
-export function flatten(list: any[], mapFn?: (value: any) => any): any[] {
-  const result: any[] = [];
-  let i = 0;
-  while (i < list.length) {
-    const item = list[i];
+export function flatten(list: any[], dst?: any[]): any[] {
+  if (dst === undefined) dst = list;
+  for (let i = 0; i < list.length; i++) {
+    let item = list[i];
     if (Array.isArray(item)) {
-      if (item.length > 0) {
-        list = item.concat(list.slice(i + 1));
-        i = 0;
-      } else {
-        i++;
+      // we need to inline it.
+      if (dst === list) {
+        // Our assumption that the list was already flat was wrong and
+        // we need to clone flat since we need to write to it.
+        dst = list.slice(0, i);
       }
-    } else {
-      result.push(mapFn ? mapFn(item) : item);
-      i++;
+      flatten(item, dst);
+    } else if (dst !== list) {
+      dst.push(item);
     }
   }
-  return result;
-}
+  return dst;
+}
\ No newline at end of file

From a50c1bb7bc75ca6e59cbd6f9f960bff9f94d1aaf Mon Sep 17 00:00:00 2001
From: Stewart Rand <stewartrand@gmail.com>
Date: Tue, 14 May 2019 14:17:35 -0300
Subject: [PATCH 128/275] docs: fix spelling of 'its' (#30455)

PR Close #30455
---
 aio/content/guide/dependency-injection.md | 50 +++++++++++------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/aio/content/guide/dependency-injection.md b/aio/content/guide/dependency-injection.md
index 2fc4a9fdd0..ac9467dbf8 100644
--- a/aio/content/guide/dependency-injection.md
+++ b/aio/content/guide/dependency-injection.md
@@ -1,11 +1,11 @@
-# Dependency Injection in Angular 
+# Dependency Injection in Angular
 
 Dependency injection (DI), is an important application design pattern.
-Angular has its own DI framework, which is typically 
+Angular has its own DI framework, which is typically
 used in the design of Angular applications to increase their efficiency and modularity.
 
 Dependencies are services or objects that a class needs to perform its function.
-DI is a coding pattern in which a class asks for dependencies from external sources rather than creating them itself. 
+DI is a coding pattern in which a class asks for dependencies from external sources rather than creating them itself.
 
 In Angular, the DI framework provides declared dependencies to a class when that class is instantiated. This guide explains how DI works in Angular, and how you use it to make your apps flexible, efficient, and robust, as well as testable and maintainable.
 
@@ -57,7 +57,7 @@ The DI framework lets you supply data to a component from an injectable _service
 Having multiple classes in the same file can be confusing. We generally recommend that you define components and services in separate files.
 
 If you do combine a component and service in the same file,
-it is important to define the service first, and then the component. If you define the component before the service, you get a run-time null reference error. 
+it is important to define the service first, and then the component. If you define the component before the service, you get a run-time null reference error.
 
 It is possible to define the component first with the help of the `forwardRef()` method as explained in this [blog post](http://blog.thoughtram.io/angular/2015/09/03/forward-references-in-angular-2.html).
 
@@ -92,25 +92,25 @@ The `@Injectable()` is an essential ingredient in every Angular service definiti
 
 The class we have created provides a service. The `@Injectable()` decorator marks it as a service
 that can be injected, but Angular can't actually inject it anywhere until you configure
-an Angular [dependency injector](guide/glossary#injector) with a [provider](guide/glossary#provider) of that service. 
+an Angular [dependency injector](guide/glossary#injector) with a [provider](guide/glossary#provider) of that service.
 
-The injector is responsible for creating service instances and injecting them into classes like `HeroListComponent`.  
+The injector is responsible for creating service instances and injecting them into classes like `HeroListComponent`.
 You rarely create an Angular injector yourself. Angular creates injectors for you as it executes the app, starting with the _root injector_ that it creates during the [bootstrap process](guide/bootstrapping).
 
-A provider tells an injector _how to create the service_. 
-You must configure an injector with a provider before that injector can create a service (or provide any other kind of dependency). 
+A provider tells an injector _how to create the service_.
+You must configure an injector with a provider before that injector can create a service (or provide any other kind of dependency).
 
 A provider can be the service class itself, so that the injector can use `new` to create an instance.
-You might also define more than one class to provide the same service in different ways, 
+You might also define more than one class to provide the same service in different ways,
 and configure different injectors with different providers.
 
 <div class="alert is-helpful">
 
 Injectors are inherited, which means that if a given injector can't resolve a dependency,
-it asks the parent injector to resolve it.  
-A component can get services from its own injector, 
-from the injectors of its component ancestors, 
-from the injector of its parent NgModule, or from the `root` injector. 
+it asks the parent injector to resolve it.
+A component can get services from its own injector,
+from the injectors of its component ancestors,
+from the injector of its parent NgModule, or from the `root` injector.
 
 * Learn more about the [different kinds of providers](guide/dependency-injection-providers).
 
@@ -124,7 +124,7 @@ You can configure injectors with providers at different levels of your app, by s
 
 * In the `@NgModule()` decorator for an NgModule.
 
-* In the `@Component()` decorator for a component. 
+* In the `@Component()` decorator for a component.
 
 The `@Injectable()` decorator has the `providedIn` metadata option, where you can specify the provider of the decorated service class with the `root` injector, or with the injector for a specific NgModule.
 
@@ -138,12 +138,12 @@ Learn more about [where to configure providers](guide/hierarchical-dependency-in
 
 </div>
 
-{@a injector-config} 
+{@a injector-config}
 {@a bootstrap}
 
 ## Injecting services
 
-In order for `HeroListComponent` to get heroes from `HeroService`, it needs to ask for `HeroService` to be injected, rather than creating it's own `HeroService` instance with `new`.
+In order for `HeroListComponent` to get heroes from `HeroService`, it needs to ask for `HeroService` to be injected, rather than creating its own `HeroService` instance with `new`.
 
 You can tell Angular to inject a dependency in a component's constructor by specifying a **constructor parameter with the dependency type**. Here's the `HeroListComponent` constructor, asking for the `HeroService` to be injected.
 
@@ -170,15 +170,15 @@ If you decided to provide `HeroService` in `AppModule`, `HeroListComponent` woul
 
 ### Injector hierarchy and service instances
 
-Services are singletons _within the scope of an injector_. That is, there is at most one instance of a service in a given injector. 
+Services are singletons _within the scope of an injector_. That is, there is at most one instance of a service in a given injector.
 
 There is only one root injector for an app. Providing `UserService` at the `root` or `AppModule` level means it is registered with the root injector. There is just one `UserService` instance in the entire app and every class that injects `UserService` gets this service instance _unless_ you configure another provider with a _child injector_.
 
-Angular DI has a [hierarchical injection system](guide/hierarchical-dependency-injection), which means that nested injectors can create their own service instances. 
+Angular DI has a [hierarchical injection system](guide/hierarchical-dependency-injection), which means that nested injectors can create their own service instances.
 Angular regularly creates nested injectors. Whenever Angular creates a new instance of a component that has `providers` specified in `@Component()`, it also creates a new _child injector_ for that instance.
-Similarly, when a new NgModule is lazy-loaded at run time, Angular can create an injector for it with its own providers. 
+Similarly, when a new NgModule is lazy-loaded at run time, Angular can create an injector for it with its own providers.
 
-Child modules and component injectors are independent of each other, and create their own separate instances of the provided services. When Angular destroys an NgModule or component instance, it also destroys that injector and that injector's service instances. 
+Child modules and component injectors are independent of each other, and create their own separate instances of the provided services. When Angular destroys an NgModule or component instance, it also destroys that injector and that injector's service instances.
 
 Thanks to [injector inheritance](guide/hierarchical-dependency-injection),
 you can still inject application-wide services into these components.
@@ -207,7 +207,7 @@ Learn more in the [Testing](guide/testing) guide.
 
 {@a service-needs-service}
 
-## Services that need other services 
+## Services that need other services
 
 Services can have their own dependencies. `HeroService` is very simple and doesn't have any dependencies of its own. Suppose, however, that you want it to report its activities through a logging service. You can apply the same *constructor injection* pattern,
 adding a constructor that takes a `Logger` parameter.
@@ -233,14 +233,14 @@ The constructor asks for an injected instance of `Logger` and stores it in a pri
 Notice that the `Logger` service also has the `@Injectable()` decorator, even though it might not need its own dependencies. In fact, the `@Injectable()` decorator is **required  for all services**.
 
 When Angular creates a class whose constructor has parameters, it looks for type and injection metadata about those parameters so that it can inject the correct service.
-If Angular can't find that parameter information, it throws an error. 
+If Angular can't find that parameter information, it throws an error.
 Angular can only find the parameter information _if the class has a decorator of some kind_.
 The `@Injectable()` decorator is the standard decorator for service classes.
 
 <div class="alert is-helpful">
 
  The decorator requirement is imposed by TypeScript. TypeScript normally discards parameter type information when it [transpiles](guide/glossary#transpile) the code to JavaScript. TypeScript preserves this information if the class has a decorator and the `emitDecoratorMetadata` compiler option is set `true` in TypeScript's `tsconfig.json` configuration file. The CLI configures `tsconfig.json` with `emitDecoratorMetadata: true`.
- 
+
  This means you're responsible for putting `@Injectable()` on your service classes.
 
 </div>
@@ -269,7 +269,7 @@ Angular knows to inject the service associated with that `HeroService` class tok
 <code-example path="dependency-injection/src/app/heroes/hero-list.component.ts" region="ctor-signature" header="src/app/heroes/hero-list.component.ts">
 </code-example>
 
-Many dependency values are provided by classes, but not all. The expanded *provide* object lets you associate different kinds of providers with a DI token. 
+Many dependency values are provided by classes, but not all. The expanded *provide* object lets you associate different kinds of providers with a DI token.
 
 * Learn more about [different kinds of providers](guide/dependency-injection-providers).
 
@@ -280,7 +280,7 @@ Many dependency values are provided by classes, but not all. The expanded *provi
 `HeroService` *requires* a logger, but what if it could get by without
 one?
 
-When a component or service declares a dependency, the class constructor takes that dependency as a parameter. 
+When a component or service declares a dependency, the class constructor takes that dependency as a parameter.
 You can tell Angular that the dependency is optional by annotating the
 constructor parameter with `@Optional()`.
 

From 8c00fced1c8ba26b31dd7bcf06bb3a33806b5ed4 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 18 May 2019 00:20:46 +0300
Subject: [PATCH 129/275] docs: add info about who adds/removes labels in
 `TRIAGE_AND_LABELS.md` (#30171)

PR Close #30171
---
 docs/TRIAGE_AND_LABELS.md | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md
index b5a307110a..86f626c661 100644
--- a/docs/TRIAGE_AND_LABELS.md
+++ b/docs/TRIAGE_AND_LABELS.md
@@ -120,17 +120,27 @@ Triaging PRs is the same as triaging issues, except that the labels `frequency:
 
 PRs also have additional label categories that should be used to signal their state.
 
-Every triaged PR must have a `pr_action` label assigned to it:
+Every triaged PR must have a `PR action` label assigned to it:
 
-* `PR action: cleanup` - more work is needed from the author.
-* `PR action: discuss` - discussion is needed, to be led by the author.
-* `PR action: merge` - the PR author is ready for the changes to be merged by the caretaker as soon as the PR is green (or merge-assistance label is applied and caretaker has deemed it acceptable manually). In other words, this label indicates to "auto submit when ready".
+* `PR action: discuss`: Discussion is needed, to be led by the author.
+  * _**Who adds it:** Typically the PR author._
+  * _**Who removes it:** Whoever added it._
+* `PR action: cleanup`: More work is needed from the author.
+  * _**Who adds it:** The reviewer requesting changes to the PR._
+  * _**Who removes it:** Either the author (after implementing the requested changes) or the reviewer (after confirming the requested changes have been implemented)._
+* `PR action: merge`: The PR author is ready for the changes to be merged by the caretaker as soon as the PR is green (or merge-assistance label is applied and caretaker has deemed it acceptable manually). In other words, this label indicates to "auto submit when ready".
+  * _**Who adds it:** Typically the PR author._
+  * _**Who removes it:** Whoever added it._
 
 
 In addition, PRs can have the following states:
 
-* `PR state: WIP` - PR is experimental or rapidly changing. Not ready for review or triage.
-* `PR state: blocked` - PR is blocked on an issue or other PR. Not ready for review or triage or merge.
+* `PR state: WIP`: PR is experimental or rapidly changing. Not ready for review or triage.
+  * _**Who adds it:** The PR author._
+  * _**Who removes it:** Whoever added it._
+* `PR state: blocked`: PR is blocked on an issue or other PR. Not ready for merge.
+  * _**Who adds it:** Any team member._
+  * _**Who removes it:** Any team member._
 
 When a PR is ready for review, a review should be requested using the Reviewers interface in Github.
 
@@ -167,14 +177,23 @@ Only the `PR action: merge` label means that the PR is ready for merging.
 ## Special Labels
 
 ### `cla: yes`, `cla: no`
+* _**Who adds it:** @googlebot, or a Googler manually overriding the status in case the bot got it wrong._
+* _**Who removes it:** @googlebot._
+
 Managed by googlebot.
 Indicates whether a PR has a CLA on file for its author(s).
 Only issues with `cla:yes` should be merged into master.
 
 ### `aio: preview`
+* _**Who adds it:** Any team member. (Typically the author or a reviewer.)_
+* _**Who removes it:** Any team member. (Typically, whoever added it.)_
+
 Applying this label to a PR makes the angular.io preview available regardless of the author. [More info](../aio/aio-builds-setup/docs/overview--security-model.md)
 
 ### `PR action: merge-assistance`
+* _**Who adds it:** Any team member._
+* _**Who removes it:** Any team member._
+
 This label can be added to let the caretaker know that the PR needs special attention.
 There should always be a comment added to the PR to explain why the caretaker's assistance is needed.
 The comment should be formatted like this: `merge-assistance: <explain what kind of assistance you need, and if not obvious why>`

From 53a0b26348f4f85b77dbebdf473c3f98960dfeb9 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 18 May 2019 00:20:47 +0300
Subject: [PATCH 130/275] docs: document the `PR action: review` label in
 `TRIAGE_AND_LABELS.md` (#30171)

PR Close #30171
---
 docs/TRIAGE_AND_LABELS.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md
index 86f626c661..beea97c569 100644
--- a/docs/TRIAGE_AND_LABELS.md
+++ b/docs/TRIAGE_AND_LABELS.md
@@ -125,6 +125,9 @@ Every triaged PR must have a `PR action` label assigned to it:
 * `PR action: discuss`: Discussion is needed, to be led by the author.
   * _**Who adds it:** Typically the PR author._
   * _**Who removes it:** Whoever added it._
+* `PR action: review` (optional): One or more reviews are pending. The label is optional, since the review status can be derived from GitHub's Reviewers interface.
+  * _**Who adds it:** Any team member. The caretaker can use it to differentiate PRs pending review from merge-ready PRs._
+  * _**Who removes it:** Whoever added it or the reviewer adding the last missing review._
 * `PR action: cleanup`: More work is needed from the author.
   * _**Who adds it:** The reviewer requesting changes to the PR._
   * _**Who removes it:** Either the author (after implementing the requested changes) or the reviewer (after confirming the requested changes have been implemented)._

From 697046c2b2edb902103f9ce2ef42208832627e56 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sat, 18 May 2019 00:20:47 +0300
Subject: [PATCH 131/275] docs: document the `PR action: rerun CI at HEAD`
 label in `TRIAGE_AND_LABELS.md` (#30171)

Related to #29098.

PR Close #30171
---
 docs/TRIAGE_AND_LABELS.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md
index beea97c569..4622f788eb 100644
--- a/docs/TRIAGE_AND_LABELS.md
+++ b/docs/TRIAGE_AND_LABELS.md
@@ -202,3 +202,9 @@ There should always be a comment added to the PR to explain why the caretaker's
 The comment should be formatted like this: `merge-assistance: <explain what kind of assistance you need, and if not obvious why>`
 
 For example, the PR owner might not be a Googler and needs help to run g3sync; or one of the checks is failing due to external causes and the PR should still be merged.
+
+### `PR action: rerun CI at HEAD`
+* _**Who adds it:** Any team member._
+* _**Who removes it:** The Angular Bot, once it triggers the CI rerun._
+
+This label can be added to instruct the Angular Bot to rerun the CI jobs for the PR at latest HEAD of the branch it targets.

From 0d52a27f41d8ea86f2b42e4d1f33eec3fce7ffe0 Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Mon, 20 May 2019 12:54:26 -0500
Subject: [PATCH 132/275] docs(common): update API docs for unified location
 service for upgrading (#30567)

PR Close #30567
---
 packages/common/upgrade/src/location_shim.ts  | 102 +++++++++---------
 .../upgrade/src/location_upgrade_module.ts    |  22 +++-
 packages/common/upgrade/src/params.ts         |  63 ++++++++++-
 3 files changed, 130 insertions(+), 57 deletions(-)

diff --git a/packages/common/upgrade/src/location_shim.ts b/packages/common/upgrade/src/location_shim.ts
index 6a81891e94..b9e7cda766 100644
--- a/packages/common/upgrade/src/location_shim.ts
+++ b/packages/common/upgrade/src/location_shim.ts
@@ -22,7 +22,10 @@ const DEFAULT_PORTS: {[key: string]: number} = {
 };
 
 /**
- * Docs TBD.
+ * Location service that provides a drop-in replacement for the $location service
+ * provided in AngularJS.
+ *
+ * @see [Using the Angular Unified Location Service](guide/upgrade#using-the-unified-angular-location-service)
  *
  * @publicApi
  */
@@ -321,12 +324,17 @@ export class $locationShim {
   }
 
   /**
-   * Register URL change listeners. This API can be used to catch updates performed by the
-   * AngularJS framework. These changes are a subset of the `$locationChangeStart/Success` events
-   * as those events fire when AngularJS updates it's internally referenced version of the browser
-   * URL. It's possible for `$locationChange` events to happen, but for the browser URL
+   * Registers listeners for URL changes. This API is used to catch updates performed by the
+   * AngularJS framework. These changes are a subset of the `$locationChangeStart` and
+   * `$locationChangeSuccess` events which fire when AngularJS updates its internally-referenced
+   * version of the browser URL.
+   *
+   * It's possible for `$locationChange` events to happen, but for the browser URL
    * (window.location) to remain unchanged. This `onChange` callback will fire only when AngularJS
    * actually updates the browser URL (window.location).
+   *
+   * @param fn The callback function that is triggered for the listener when the URL changes.
+   * @param err The callback function that is triggered when an error occurs.
    */
   onChange(
       fn: (url: string, state: unknown, oldUrl: string, oldState: unknown) => void,
@@ -346,6 +354,11 @@ export class $locationShim {
     });
   }
 
+  /**
+   * Parses the provided URL, and sets the current URL to the parsed result.
+   *
+   * @param url The URL string.
+   */
   $$parse(url: string) {
     let pathUrl: string|undefined;
     if (url.startsWith('/')) {
@@ -366,6 +379,12 @@ export class $locationShim {
     this.composeUrls();
   }
 
+  /**
+   * Parses the provided URL and its relative URL.
+   *
+   * @param url The full URL string.
+   * @param relHref A URL string relative to the full URL string.
+   */
   $$parseLinkUrl(url: string, relHref?: string|null): boolean {
     // When relHref is passed, it should be a hash and is handled separately
     if (relHref && relHref[0] === '#') {
@@ -413,9 +432,8 @@ export class $locationShim {
   }
 
   /**
-   * This method is getter only.
-   *
-   * Return full URL representation with all segments encoded according to rules specified in
+   * Retrieves the full URL representation with all segments encoded according to
+   * rules specified in
    * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
    *
    *
@@ -428,12 +446,8 @@ export class $locationShim {
   absUrl(): string { return this.$$absUrl; }
 
   /**
-   * This method is getter / setter.
-   *
-   * Return URL (e.g. `/path?a=b#hash`) when called without any parameter.
-   *
-   * Change path, search and hash, when called with parameter and return `$location`.
-   *
+   * Retrieves the current URL, or sets a new URL. When setting a URL,
+   * changes the path, search, and hash, and returns a reference to its own instance.
    *
    * ```js
    * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
@@ -463,10 +477,7 @@ export class $locationShim {
   }
 
   /**
-   * This method is getter only.
-   *
-   * Return protocol of current URL.
-   *
+   * Retrieves the protocol of the current URL.
    *
    * ```js
    * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
@@ -477,11 +488,9 @@ export class $locationShim {
   protocol(): string { return this.$$protocol; }
 
   /**
-   * This method is getter only.
+   * Retrieves the protocol of the current URL.
    *
-   * Return host of current URL.
-   *
-   * Note: compared to the non-AngularJS version `location.host` which returns `hostname:port`, this
+   * In contrast to the non-AngularJS version `location.host` which returns `hostname:port`, this
    * returns the `hostname` portion only.
    *
    *
@@ -500,10 +509,7 @@ export class $locationShim {
   host(): string { return this.$$host; }
 
   /**
-   * This method is getter only.
-   *
-   * Return port of current URL.
-   *
+   * Retrieves the port of the current URL.
    *
    * ```js
    * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
@@ -514,16 +520,12 @@ export class $locationShim {
   port(): number|null { return this.$$port; }
 
   /**
-   * This method is getter / setter.
+   * Retrieves the path of the current URL, or changes the path and returns a reference to its own
+   * instance.
    *
-   * Return path of current URL when called without any parameter.
-   *
-   * Change path when called with parameter and return `$location`.
-   *
-   * Note: Path should always begin with forward slash (/), this method will add the forward slash
+   * Paths should always begin with forward slash (/). This method adds the forward slash
    * if it is missing.
    *
-   *
    * ```js
    * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
    * let path = $location.path();
@@ -548,11 +550,8 @@ export class $locationShim {
   }
 
   /**
-   * This method is getter / setter.
-   *
-   * Return search part (as object) of current URL when called without any parameter.
-   *
-   * Change search part when called with parameter and return `$location`.
+   * Retrieves a map of the search parameters of the current URL, or changes a search 
+   * part and returns a reference to its own instance.
    *
    *
    * ```js
@@ -585,8 +584,7 @@ export class $locationShim {
    * If `paramValue` is `true`, the property specified via the first argument will be added with no
    * value nor trailing equal sign.
    *
-   * @return {Object} If called with no arguments returns the parsed `search` object. If called with
-   * one or more arguments returns `$location` object itself.
+   * @return {Object} The parsed `search` object of the current URL, or the changed `search` object.
    */
   search(): {[key: string]: unknown};
   search(search: string|number|{[key: string]: unknown}): this;
@@ -633,12 +631,8 @@ export class $locationShim {
   }
 
   /**
-   * This method is getter / setter.
-   *
-   * Returns the hash fragment when called without any parameters.
-   *
-   * Changes the hash fragment when called with a parameter and returns `$location`.
-   *
+   * Retrieves the current hash fragment, or changes the hash fragment and returns a reference to
+   * its own instance.
    *
    * ```js
    * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue
@@ -660,7 +654,7 @@ export class $locationShim {
   }
 
   /**
-   * If called, all changes to $location during the current `$digest` will replace the current
+   * Changes to `$location` during the current `$digest` will replace the current
    * history record, instead of adding a new one.
    */
   replace(): this {
@@ -669,15 +663,13 @@ export class $locationShim {
   }
 
   /**
-   * This method is getter / setter.
-   *
-   * Return the history state object when called without any parameter.
+   * Retrieves the history state object when called without any parameter.
    *
    * Change the history state object when called with one parameter and return `$location`.
    * The state object is later passed to `pushState` or `replaceState`.
    *
-   * NOTE: This method is supported only in HTML5 mode and only in browsers supporting
-   * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support
+   * This method is supported only in HTML5 mode and only in browsers supporting
+   * the HTML5 History API methods such as `pushState` and `replaceState`. If you need to support
    * older browsers (like IE9 or Android < 4.0), don't use this method.
    *
    */
@@ -694,7 +686,8 @@ export class $locationShim {
 }
 
 /**
- * Docs TBD.
+ * The factory function used to create an instance of the `$locationShim` in Angular,
+ * and provides an API-compatiable `$locationProvider` for AngularJS.
  *
  * @publicApi
  */
@@ -704,6 +697,9 @@ export class $locationShimProvider {
       private platformLocation: PlatformLocation, private urlCodec: UrlCodec,
       private locationStrategy: LocationStrategy) {}
 
+  /**
+   * Factory method that returns an instance of the $locationShim
+   */
   $get() {
     return new $locationShim(
         this.ngUpgrade.$injector, this.location, this.platformLocation, this.urlCodec,
diff --git a/packages/common/upgrade/src/location_upgrade_module.ts b/packages/common/upgrade/src/location_upgrade_module.ts
index 4cd9ee35b4..720dd986a0 100644
--- a/packages/common/upgrade/src/location_upgrade_module.ts
+++ b/packages/common/upgrade/src/location_upgrade_module.ts
@@ -20,15 +20,31 @@ import {AngularJSUrlCodec, UrlCodec} from './params';
  * @publicApi
  */
 export interface LocationUpgradeConfig {
+  /**
+   * Configures whether the location upgrade module should use the `HashLocationStrategy`
+   * or the `PathLocationStrategy`
+   */
   useHash?: boolean;
+  /**
+   * Configures the hash prefix used in the URL when using the `HashLocationStrategy`
+   */
   hashPrefix?: string;
+  /**
+   * Configures the URL codec for encoding and decoding URLs. Default is the `AngularJSCodec`
+   */
   urlCodec?: typeof UrlCodec;
+  /**
+   * Configures the base href when used in server-side rendered applications
+   */
   serverBaseHref?: string;
+  /**
+   * Configures the base href when used in client-side rendered applications
+   */
   appBaseHref?: string;
 }
 
 /**
- * Is used in DI to configure the location upgrade package.
+ * A provider token used to configure the location upgrade module.
  *
  * @publicApi
  */
@@ -38,7 +54,9 @@ export const LOCATION_UPGRADE_CONFIGURATION =
 const APP_BASE_HREF_RESOLVED = new InjectionToken<string>('APP_BASE_HREF_RESOLVED');
 
 /**
- * Module used for configuring Angular's LocationUpgradeService.
+ * `NgModule` used for providing and configuring Angular's Unified Location Service for upgrading.
+ * 
+ * @see [Using the Unified Angular Location Service](guide/upgrade#using-the-unified-angular-location-service)
  *
  * @publicApi
  */
diff --git a/packages/common/upgrade/src/params.ts b/packages/common/upgrade/src/params.ts
index 612e15310a..025c2edcaa 100644
--- a/packages/common/upgrade/src/params.ts
+++ b/packages/common/upgrade/src/params.ts
@@ -12,21 +12,80 @@
  * @publicApi
  **/
 export abstract class UrlCodec {
+  /**
+   * Encodes the path from the provided string
+   *
+   * @param path The path string
+   */
   abstract encodePath(path: string): string;
+
+  /**
+   * Decodes the path from the provided string
+   *
+   * @param path The path string
+   */
   abstract decodePath(path: string): string;
 
+  /**
+   * Encodes the search string from the provided string or object
+   *
+   * @param path The path string or object
+   */
   abstract encodeSearch(search: string|{[k: string]: unknown}): string;
+
+  /**
+   * Decodes the search objects from the provided string
+   *
+   * @param path The path string
+   */
   abstract decodeSearch(search: string): {[k: string]: unknown};
 
+  /**
+   * Encodes the hash from the provided string
+   *
+   * @param path The hash string
+   */
   abstract encodeHash(hash: string): string;
+
+  /**
+   * Decodes the hash from the provided string
+   *
+   * @param path The hash string
+   */
   abstract decodeHash(hash: string): string;
 
+  /**
+   * Normalizes the URL from the provided string
+   *
+   * @param path The URL string
+   */
   abstract normalize(href: string): string;
+
+
+  /**
+   * Normalizes the URL from the provided string, search, hash, and base URL parameters
+   *
+   * @param path The URL path
+   * @param search The search object
+   * @param hash The has string
+   * @param baseUrl The base URL for the URL
+   */
   abstract normalize(path: string, search: {[k: string]: unknown}, hash: string, baseUrl?: string):
       string;
 
+  /**
+   * Checks whether the two strings are equal
+   * @param valA First string for comparison
+   * @param valB Second string for comparison
+   */
   abstract areEqual(valA: string, valB: string): boolean;
 
+  /**
+   * Parses the URL string based on the base URL
+   *
+   * @param url The full URL string
+   * @param base The base for the URL
+   */
   abstract parse(url: string, base?: string): {
     href: string,
     protocol: string,
@@ -40,8 +99,8 @@ export abstract class UrlCodec {
 }
 
 /**
- * A `AngularJSUrlCodec` that uses logic from AngularJS to serialize and parse URLs
- * and URL parameters
+ * A `UrlCodec` that uses logic from AngularJS to serialize and parse URLs
+ * and URL parameters.
  *
  * @publicApi
  */

From 6debe9dfb9a2babec05b8fadd7e312de87ae9c4b Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Mon, 20 May 2019 12:54:40 -0500
Subject: [PATCH 133/275] docs(docs-infra): add common/upgrade to authors
 package for API docs (#30567)

This fixes an issue where the common/upgrade packge isn't included
on page reload when changes are made to the common/upgrade package

PR Close #30567
---
 aio/tools/transforms/authors-package/api-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/tools/transforms/authors-package/api-package.js b/aio/tools/transforms/authors-package/api-package.js
index d079d126c7..aff578cf67 100644
--- a/aio/tools/transforms/authors-package/api-package.js
+++ b/aio/tools/transforms/authors-package/api-package.js
@@ -11,7 +11,7 @@ const { API_SOURCE_PATH } = require('../config');
 
 const packageMap = {
   animations: ['animations/index.ts', 'animations/browser/index.ts', 'animations/browser/testing/index.ts'],
-  common: ['common/index.ts', 'common/testing/index.ts', 'common/http/index.ts', 'common/http/testing/index.ts'],
+  common: ['common/index.ts', 'common/testing/index.ts', 'common/upgrade/index.ts', 'common/http/index.ts', 'common/http/testing/index.ts'],
   core: ['core/index.ts', 'core/testing/index.ts'],
   elements: ['elements/index.ts'],
   forms: ['forms/index.ts'],

From f6bf8928f208c0363588c09d38c0025a5b3f76d0 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Thu, 16 May 2019 17:39:07 +0200
Subject: [PATCH 134/275] fix(core): temporarily remove @deprecated jsdoc tag
 for a TextBed.get overload (#30514)

PR #29290 introduced a new `TestBed.get` signature and deprecated the existing one.
This raises a lot of TSLint deprecation warnings in projects using a strict TS config (see #29905 for context), so we are temporarily removing the `@deprecated` annotation in favor of a plain text warning until we properly fix it.

Refs #29905
Fixes FW-1336

PR Close #30514
---
 packages/core/testing/src/test_bed.ts    | 8 +++++++-
 tools/public_api_guard/core/testing.d.ts | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/core/testing/src/test_bed.ts b/packages/core/testing/src/test_bed.ts
index f1653b4b6e..6fe51195c9 100644
--- a/packages/core/testing/src/test_bed.ts
+++ b/packages/core/testing/src/test_bed.ts
@@ -57,8 +57,14 @@ export interface TestBed {
   compileComponents(): Promise<any>;
 
   get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): any;
+
+  // TODO: switch back to official deprecation marker once TSLint issue is resolved
+  // https://github.com/palantir/tslint/issues/4522
   /**
-   * @deprecated from v8.0.0 use Type<T> or InjectionToken<T>
+   * deprecated from v8.0.0 use Type<T> or InjectionToken<T>
+   * This does not use the deprecated jsdoc tag on purpose
+   * because it renders all overloads as deprecated in TSLint
+   * due to https://github.com/palantir/tslint/issues/4522.
    */
   get(token: any, notFoundValue?: any): any;
 
diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts
index 5c10def5a9..11e0cb85b5 100644
--- a/tools/public_api_guard/core/testing.d.ts
+++ b/tools/public_api_guard/core/testing.d.ts
@@ -59,7 +59,7 @@ export interface TestBed {
     createComponent<T>(component: Type<T>): ComponentFixture<T>;
     execute(tokens: any[], fn: Function, context?: any): any;
     get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): any;
-    /** @deprecated */ get(token: any, notFoundValue?: any): any;
+    get(token: any, notFoundValue?: any): any;
     initTestEnvironment(ngModule: Type<any> | Type<any>[], platform: PlatformRef, aotSummaries?: () => any[]): void;
     overrideComponent(component: Type<any>, override: MetadataOverride<Component>): void;
     overrideDirective(directive: Type<any>, override: MetadataOverride<Directive>): void;

From 7c0667d2158663a4335eb93b2950bd228dc5a2aa Mon Sep 17 00:00:00 2001
From: Sander Vanneste <sandervanneste12@hotmail.com>
Date: Sat, 18 May 2019 22:59:29 +0200
Subject: [PATCH 135/275] docs: delete double dashes on ng command in testing
 guide (#30551)

Closes #30550

PR Close #30551
---
 aio/content/guide/testing.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index d0ef1a99f3..b62d61417e 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -218,8 +218,8 @@ exports.config = config;
 Now you can run the following commands to use the `--no-sandbox` flag:
 
 <code-example language="sh" class="code-shell">
-  ng test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
-  ng e2e -- --protractor-config=e2e/protractor-ci.conf.js
+  ng test --no-watch --no-progress --browsers=ChromeHeadlessCI
+  ng e2e --protractor-config=e2e/protractor-ci.conf.js
 </code-example>
 
 <div class="alert is-helpful">

From 514ebf402acf7cffa542ffd59adc9873f6e9262f Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 21 May 2019 11:28:36 +0200
Subject: [PATCH 136/275] refactor(ivy): avoid calling other instructions from
 the loadViewQuery instruction (#30587)

PR Close #30587
---
 packages/core/src/render3/query.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index d8e07dab95..a3f2a3550e 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -18,7 +18,7 @@ import {assertDataInRange, assertDefined, assertEqual} from '../util/assert';
 import {assertPreviousIsParent} from './assert';
 import {getNodeInjectable, locateDirectiveOrProvider} from './di';
 import {NG_ELEMENT_ID} from './fields';
-import {store, ɵɵload} from './instructions/all';
+import {store} from './instructions/all';
 import {storeCleanupWithContext} from './instructions/shared';
 import {unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
 import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
@@ -26,6 +26,7 @@ import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType, u
 import {LQueries, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
 import {CONTENT_QUERIES, HEADER_OFFSET, LView, QUERIES, TVIEW} from './interfaces/view';
 import {getCurrentQueryIndex, getIsParent, getLView, isCreationMode, setCurrentQueryIndex} from './state';
+import {loadInternal} from './util/view_utils';
 import {createElementRef, createTemplateRef} from './view_engine_compatibility';
 
 const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4;
@@ -456,7 +457,7 @@ export function ɵɵviewQuery<T>(
 export function ɵɵloadViewQuery<T>(): T {
   const index = getCurrentQueryIndex();
   setCurrentQueryIndex(index + 1);
-  return ɵɵload<T>(index - HEADER_OFFSET);
+  return loadInternal<T>(getLView(), index - HEADER_OFFSET);
 }
 
 /**

From 2fe6f350cb25a59997f2ce633fd5849a9652b9fa Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 21 May 2019 11:36:22 +0200
Subject: [PATCH 137/275] refactor(ivy): avoid repeated read of LView from
 global state (#30587)

PR Close #30587
---
 packages/core/src/render3/query.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index a3f2a3550e..dd918278b3 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -368,11 +368,10 @@ type QueryList_<T> = QueryList<T>& {_valuesTree: any[], _static: boolean};
  * @param read What to save in the query
  * @returns QueryList<T>
  */
-export function query<T>(
+function query<T>(
     // TODO: "read" should be an AbstractType (FW-486)
-    predicate: Type<any>| string[], descend: boolean, read: any): QueryList<T> {
+    lView: LView, predicate: Type<any>| string[], descend: boolean, read: any): QueryList<T> {
   ngDevMode && assertPreviousIsParent(getIsParent());
-  const lView = getLView();
   const queryList = new QueryList<T>() as QueryList_<T>;
   const queries = lView[QUERIES] || (lView[QUERIES] = new LQueries_(null, null, null));
   queryList._valuesTree = [];
@@ -443,7 +442,7 @@ export function ɵɵviewQuery<T>(
     tView.expandoStartIndex++;
   }
   const index = getCurrentQueryIndex();
-  const viewQuery: QueryList<T> = query<T>(predicate, descend, read);
+  const viewQuery: QueryList<T> = query<T>(lView, predicate, descend, read);
   store(index - HEADER_OFFSET, viewQuery);
   setCurrentQueryIndex(index + 1);
   return viewQuery;
@@ -478,7 +477,7 @@ export function ɵɵcontentQuery<T>(
     read: any): QueryList<T> {
   const lView = getLView();
   const tView = lView[TVIEW];
-  const contentQuery: QueryList<T> = query<T>(predicate, descend, read);
+  const contentQuery: QueryList<T> = query<T>(lView, predicate, descend, read);
   (lView[CONTENT_QUERIES] || (lView[CONTENT_QUERIES] = [])).push(contentQuery);
   if (tView.firstTemplatePass) {
     const tViewContentQueries = tView.contentQueries || (tView.contentQueries = []);

From b613f90146cbdd030ce31bb1da8ce1b2b77f1a76 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 21 May 2019 12:04:17 +0200
Subject: [PATCH 138/275] refactor(ivy): avoid calling query instructions from
 static query instructions (#30587)

PR Close #30587
---
 packages/core/src/render3/query.ts | 49 ++++++++++++++++++------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index dd918278b3..1b2daecea4 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -24,7 +24,7 @@ import {unusedValueExportToPlacateAjd as unused1} from './interfaces/definition'
 import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
 import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
 import {LQueries, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
-import {CONTENT_QUERIES, HEADER_OFFSET, LView, QUERIES, TVIEW} from './interfaces/view';
+import {CONTENT_QUERIES, HEADER_OFFSET, LView, QUERIES, TVIEW, TView} from './interfaces/view';
 import {getCurrentQueryIndex, getIsParent, getLView, isCreationMode, setCurrentQueryIndex} from './state';
 import {loadInternal} from './util/view_utils';
 import {createElementRef, createTemplateRef} from './view_engine_compatibility';
@@ -370,12 +370,13 @@ type QueryList_<T> = QueryList<T>& {_valuesTree: any[], _static: boolean};
  */
 function query<T>(
     // TODO: "read" should be an AbstractType (FW-486)
-    lView: LView, predicate: Type<any>| string[], descend: boolean, read: any): QueryList<T> {
+    lView: LView, predicate: Type<any>| string[], descend: boolean, read: any,
+    isStatic: boolean): QueryList<T> {
   ngDevMode && assertPreviousIsParent(getIsParent());
   const queryList = new QueryList<T>() as QueryList_<T>;
   const queries = lView[QUERIES] || (lView[QUERIES] = new LQueries_(null, null, null));
   queryList._valuesTree = [];
-  queryList._static = false;
+  queryList._static = isStatic;
   queries.track(queryList, predicate, descend, read);
   storeCleanupWithContext(lView, queryList, queryList.destroy);
   return queryList;
@@ -415,12 +416,10 @@ export function ɵɵqueryRefresh(queryList: QueryList<any>): boolean {
 export function ɵɵstaticViewQuery<T>(
     // TODO(FW-486): "read" should be an AbstractType
     predicate: Type<any>| string[], descend: boolean, read: any): void {
-  const queryList = ɵɵviewQuery(predicate, descend, read) as QueryList_<T>;
-  const tView = getLView()[TVIEW];
-  queryList._static = true;
-  if (!tView.staticViewQueries) {
-    tView.staticViewQueries = true;
-  }
+  const lView = getLView();
+  const tView = lView[TVIEW];
+  viewQueryInternal(lView, tView, predicate, descend, read, true);
+  tView.staticViewQueries = true;
 }
 
 /**
@@ -438,14 +437,20 @@ export function ɵɵviewQuery<T>(
     predicate: Type<any>| string[], descend: boolean, read: any): QueryList<T> {
   const lView = getLView();
   const tView = lView[TVIEW];
+  return viewQueryInternal(lView, tView, predicate, descend, read, false);
+}
+
+function viewQueryInternal<T>(
+    lView: LView, tView: TView, predicate: Type<any>| string[], descend: boolean, read: any,
+    isStatic: boolean): QueryList<T> {
   if (tView.firstTemplatePass) {
     tView.expandoStartIndex++;
   }
   const index = getCurrentQueryIndex();
-  const viewQuery: QueryList<T> = query<T>(lView, predicate, descend, read);
-  store(index - HEADER_OFFSET, viewQuery);
+  const queryList: QueryList<T> = query<T>(lView, predicate, descend, read, isStatic);
+  store(index - HEADER_OFFSET, queryList);
   setCurrentQueryIndex(index + 1);
-  return viewQuery;
+  return queryList;
 }
 
 /**
@@ -477,7 +482,15 @@ export function ɵɵcontentQuery<T>(
     read: any): QueryList<T> {
   const lView = getLView();
   const tView = lView[TVIEW];
-  const contentQuery: QueryList<T> = query<T>(lView, predicate, descend, read);
+  return contentQueryInternal(lView, tView, directiveIndex, predicate, descend, read, false);
+}
+
+function contentQueryInternal<T>(
+    lView: LView, tView: TView, directiveIndex: number, predicate: Type<any>| string[],
+    descend: boolean,
+    // TODO(FW-486): "read" should be an AbstractType
+    read: any, isStatic: boolean): QueryList<T> {
+  const contentQuery: QueryList<T> = query<T>(lView, predicate, descend, read, isStatic);
   (lView[CONTENT_QUERIES] || (lView[CONTENT_QUERIES] = [])).push(contentQuery);
   if (tView.firstTemplatePass) {
     const tViewContentQueries = tView.contentQueries || (tView.contentQueries = []);
@@ -506,12 +519,10 @@ export function ɵɵstaticContentQuery<T>(
     directiveIndex: number, predicate: Type<any>| string[], descend: boolean,
     // TODO(FW-486): "read" should be an AbstractType
     read: any): void {
-  const queryList = ɵɵcontentQuery(directiveIndex, predicate, descend, read) as QueryList_<T>;
-  const tView = getLView()[TVIEW];
-  queryList._static = true;
-  if (!tView.staticContentQueries) {
-    tView.staticContentQueries = true;
-  }
+  const lView = getLView();
+  const tView = lView[TVIEW];
+  contentQueryInternal(lView, tView, directiveIndex, predicate, descend, read, true);
+  tView.staticContentQueries = true;
 }
 
 /**

From 66f269c077590365aa920cba8f0c48844f663695 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Tue, 21 May 2019 12:15:38 +0200
Subject: [PATCH 139/275] refactor(ivy): rename query-related functions for
 clarity (#30587)

PR Close #30587
---
 packages/core/src/render3/query.ts       | 16 +++++++++-------
 packages/core/test/render3/query_spec.ts |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 1b2daecea4..e768e40f7c 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -97,9 +97,9 @@ export class LQueries_ implements LQueries {
   track<T>(queryList: QueryList<T>, predicate: Type<T>|string[], descend?: boolean, read?: Type<T>):
       void {
     if (descend) {
-      this.deep = createQuery(this.deep, queryList, predicate, read != null ? read : null);
+      this.deep = createLQuery(this.deep, queryList, predicate, read != null ? read : null);
     } else {
-      this.shallow = createQuery(this.shallow, queryList, predicate, read != null ? read : null);
+      this.shallow = createLQuery(this.shallow, queryList, predicate, read != null ? read : null);
     }
   }
 
@@ -346,7 +346,7 @@ function createPredicate<T>(predicate: Type<T>| string[], read: Type<T>| null):
   };
 }
 
-function createQuery<T>(
+function createLQuery<T>(
     previous: LQuery<any>| null, queryList: QueryList<T>, predicate: Type<T>| string[],
     read: Type<T>| null): LQuery<T> {
   return {
@@ -361,14 +361,14 @@ function createQuery<T>(
 type QueryList_<T> = QueryList<T>& {_valuesTree: any[], _static: boolean};
 
 /**
- * Creates and returns a QueryList.
+ * Creates a QueryList and stores it in LView's collection of active queries (LQueries).
  *
  * @param predicate The type for which the query will search
  * @param descend Whether or not to descend into children
  * @param read What to save in the query
  * @returns QueryList<T>
  */
-function query<T>(
+function createQueryListInLView<T>(
     // TODO: "read" should be an AbstractType (FW-486)
     lView: LView, predicate: Type<any>| string[], descend: boolean, read: any,
     isStatic: boolean): QueryList<T> {
@@ -447,7 +447,8 @@ function viewQueryInternal<T>(
     tView.expandoStartIndex++;
   }
   const index = getCurrentQueryIndex();
-  const queryList: QueryList<T> = query<T>(lView, predicate, descend, read, isStatic);
+  const queryList: QueryList<T> =
+      createQueryListInLView<T>(lView, predicate, descend, read, isStatic);
   store(index - HEADER_OFFSET, queryList);
   setCurrentQueryIndex(index + 1);
   return queryList;
@@ -490,7 +491,8 @@ function contentQueryInternal<T>(
     descend: boolean,
     // TODO(FW-486): "read" should be an AbstractType
     read: any, isStatic: boolean): QueryList<T> {
-  const contentQuery: QueryList<T> = query<T>(lView, predicate, descend, read, isStatic);
+  const contentQuery: QueryList<T> =
+      createQueryListInLView<T>(lView, predicate, descend, read, isStatic);
   (lView[CONTENT_QUERIES] || (lView[CONTENT_QUERIES] = [])).push(contentQuery);
   if (tView.firstTemplatePass) {
     const tViewContentQueries = tView.contentQueries || (tView.contentQueries = []);
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index bc54502ab9..935bca6a50 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -12,7 +12,7 @@ import {EventEmitter} from '../..';
 import {AttributeMarker, detectChanges, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
 import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵload, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
-import {query, ɵɵcontentQuery, ɵɵloadContentQuery, ɵɵloadViewQuery, ɵɵqueryRefresh, ɵɵviewQuery} from '../../src/render3/query';
+import {ɵɵcontentQuery, ɵɵloadContentQuery, ɵɵloadViewQuery, ɵɵqueryRefresh, ɵɵviewQuery} from '../../src/render3/query';
 import {getLView} from '../../src/render3/state';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
 import {ɵɵtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';

From 0f5da82cfdfd60344e7765c5874702399aaaca10 Mon Sep 17 00:00:00 2001
From: jenniferfell <jenniferfell.sf@gmail.com>
Date: Mon, 6 May 2019 14:39:58 -0600
Subject: [PATCH 140/275] docs: deprecations summary fix api heading level,
 remove inject, add index by version (#30400)

PR Close #30400
---
 aio/content/guide/deprecations.md | 83 +++++++++++++++++++++++++------
 1 file changed, 69 insertions(+), 14 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index 7ece547a6b..b7537e0878 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -18,6 +18,48 @@ For step-by-step instructions on how to update to the latest Angular release, us
 </div>
 
 
+## Index
+
+To help you future-proof your apps, the following table lists all deprecated APIs and features, organized by the release in which they are candidates for removal. Each item is linked to the section later in this guide that describes the deprecation reason and replacement options.
+
+<!--
+deprecation -> removal cheat sheet
+v4 - v7
+v5 - v8
+v6 - v9
+v7 - v10
+v8 - v11
+-->
+
+
+| Area | API or Feature | May be removed in |
+| ---- | -------------- | ----------------- |
+| `@angular/common` | [Pipes using Intl API](#i18n-pipes) | <!--v8--> v9 |
+| `@angular/common` | [`ReflectiveInjector`](#reflectiveinjector) | <!--v8--> v9 |
+| `@angular/core` | [`CollectionChangeRecord`](#core) | <!--v7--> v9 |
+| `@angular/core` | [`DefaultIterableDiffer`](#core) | <!--v7--> v9 |
+| `@angular/core` | [`ReflectiveKey`](#core) | <!--v8--> v9 |
+| `@angular/core` | [`RenderComponentType`](#core) | <!--v7--> v9 |
+| `@angular/core` | [`Renderer`](#core) | <!--v7--> v9 |
+| `@angular/core` | [`RootRenderer`](#core) | <!--v7--> v9 |
+| `@angular/core` | [`ViewEncapsulation.Native`](#core) | v9 |
+| `@angular/forms` | [`ngForm` element selector](#ngform) | v9 |
+| `@angular/forms` | [`NgFormSelectorWarning`](#forms) | v9 |
+| `@angular/forms` | [`ngModel` with reactive forms](#ngmodel-reactive) | v9 |
+| `@angular/router` | [`preserveQueryParams`](#router) | <!--v7--> v9 |
+| `@angular/upgrade` | [`@angular/upgrade`](#upgrade) | <!--v8--> v9 |
+| `@angular/upgrade` | [`getAngularLib`](#upgrade-static) | <!--v8--> v9 |
+| `@angular/upgrade` | [`setAngularLib`](#upgrade-static) | <!--v8--> v9 |
+| template syntax | [`/deep/`, `>>>`, and `::ng-deep`](#deep-component-style-selector) | <!--v7--> v9 |
+| template syntax | [`<template`>](#template-tag) | <!--v7--> v9 |
+| service worker | [`versionedFiles` setting](#sw-versionedfiles)| v9 |
+| polyfills | [reflect-metadata](#reflect-metadata) | <!--v8--> v9 |
+| `@angular/core` | [`defineInjectable`](#core) | v11 |
+| `@angular/router` | [`loadChildren` string syntax](#loadChildren) | v11 |
+| `@angular/router` | [`ActivatedRoute` params and `queryParams` properties](#activatedroute-props) | unspecified |
+
+
+
 
 ## Deprecated APIs
 
@@ -32,8 +74,8 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 
 
-
-#### @angular/common
+{@a common}
+### @angular/common
 
 
 | API | Replacement | Deprecation announced | Notes |
@@ -45,14 +87,14 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
  | [`DeprecatedPercentPipe`](api/common/DeprecatedPercentPipe) | [`PercentPipe`](api/common/PercentPipe) | v5 | See [Pipes](#i18n-pipes) |
 
 
-#### @angular/core
+{@a core}
+### @angular/core
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
 | [`CollectionChangeRecord`](api/core/CollectionChangeRecord) | [`IterableChangeRecord`](api/core/IterableChangeRecord) | v4 | none |
 | [`DefaultIterableDiffer`](api/core/DefaultIterableDiffer) | n/a | v4 | Not part of public API. |
 | [`defineInjectable`](api/core/defineInjectable) | `ɵɵdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
-| [`inject`](api/core/inject) | `ɵɵinject` | v8 | Used only in generated code. No source code should depend on this API. |
 | [`ReflectiveInjector`](api/core/ReflectiveInjector) | [`Injector.create`](api/core/Injector#create)  | v5 | See [`ReflectiveInjector`](#reflectiveinjector) |
 | [`ReflectiveKey`](api/core/ReflectiveKey) | none | v5 | none |
 | [`RenderComponentType`](api/core/RenderComponentType) | [`RendererType2`](api/core/RendererType2) and  [`Renderer2`](api/core/Renderer2) | v4 | none |
@@ -61,28 +103,30 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 | [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32).
 
 
-#### @angular/forms
+{@a forms}
+### @angular/forms
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
 | [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) | n/a | v6 | See [ngForm](#ngform). |
 
-
-#### @angular/router
+{@a router}
+### @angular/router
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
 | [`preserveQueryParams`](api/router/NavigationExtras#preserveQueryParams) | [`queryParamsHandling`](api/router/NavigationExtras#queryParamsHandling) | v4 | none |
 
 
-#### @angular/upgrade
+{@a upgrade}
+### @angular/upgrade
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
 | [All entry points](api/upgrade) | [`@angular/upgrade/static`](api/upgrade/static) | v5 | See [Upgrading from AngularJS](guide/upgrade). |
 
-
-#### @angular/upgrade/static
+{@a upgrade-static}
+### @angular/upgrade/static
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
@@ -98,10 +142,10 @@ This section lists all of the currently-deprecated features, which includes temp
 
 
 
-{@a component-styles}
-### Component styles
+{@a deep-component-style-selector}
+### `/deep/`, `>>>` and `:ng-deep` component style selectors
 
-The shadow-piercing descendant combinator is deprecated and support is being removed from major browsers and tools. As such, in v4 we deprecated support in Angular for all 3 of `/deep/`, `>>>` and `::ng-deep`. Until removal, `::ng-deep` is preferred for broader compatibility with the tools.
+The shadow-dom-piercing descendant combinator is deprecated and support is being [removed from major browsers and tools](https://developers.google.com/web/updates/2017/10/remove-shadow-piercing). As such, in v4 we deprecated support in Angular for all 3 of `/deep/`, `>>>` and `::ng-deep`. Until removal, `::ng-deep` is preferred for broader compatibility with the tools.
 
 For more information, see [/deep/, >>>, and ::ng-deep](guide/component-styles#deprecated-deep--and-ng-deep "Component Styles guide, Deprecated deep and ngdeep")
  in the Component Styles guide.
@@ -182,7 +226,7 @@ In version 4.3, Angular introduced new number, date, and currency pipes that inc
 In version 5.0.0, Angular updated its standard pipes to use the CLRD implementation.
 At that time, Angular also added [`DeprecatedI18NPipesModule`](api/common/DeprecatedI18NPipesModule) and related APIs to provide limited-time access to the old behavior. If you need to use these `Deprecated*` pipes, see [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md#i18n-pipes) and the [Date Formats mappings](https://docs.google.com/spreadsheets/d/12iygt-_cakNP1VO7MV9g4lq9NsxVWG4tSfc98HpHb0k/edit#gid=0 "Date Formats Google sheet").
 
-Reminder: If you use these `Deprecated*` pipes, you should migrate to the current APIs listed above as soon as possible. These deprecated APIs are candidates for removal in the next major release.
+Reminder: If you use these `Deprecated*` pipes, you should migrate to the current APIs listed above as soon as possible. These deprecated APIs are candidates for removal in version 9.
 
 
 {@a loadChildren}
@@ -236,6 +280,17 @@ const routes: Routes = [{
 For more information see the [Router guide](guide/router#activated-route).
 
 
+{@a reflect-metadata}
+### Dependency on a reflect-metadata polyfill in JIT mode
+Angular applications, and specifically applications that relied on the JIT compiler, used to require a polyfill for the [reflect-metadata](https://github.com/rbuckton/reflect-metadata) APIs.
+
+The need for this polyfill was removed in Angular version 8.0 ([see #14473](https://github.com/angular/angular-cli/pull/14473)), rendering the presence of the poylfill in most Angular applications unnecessary. Because the polyfill can be depended on by 3rd-party libraries, instead of removing it from all Angular projects, we are deprecating the requirement for this polyfill as of version 8.0. This should give library authors and application developers sufficient time to evaluate if they need the polyfill, and perform any refactoring necessary to remove the dependency on it.
+
+In typical Angular project, the polyfill is not used in production builds, so deprecating it (rather than removing it)  doesn't have impact on the production applications. The goal behind this removal is overall simplification of the build setup and decrease in the number of external dependencies.
+
+We expect to remove the polyfill from most if not all CLI projects via an `ng upgrade` migration from version 8 to 9.
+
+
 {@a removed}
 ## Removed APIs
 

From 87a2366eeba64530e8a4293b773b56575b1a42e7 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Tue, 21 May 2019 17:07:19 -0700
Subject: [PATCH 141/275] build: update base SHA for rebase on merge-pr script

---
 scripts/github/merge-pr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/github/merge-pr b/scripts/github/merge-pr
index 1bd4ba756c..4ad7a09aa1 100755
--- a/scripts/github/merge-pr
+++ b/scripts/github/merge-pr
@@ -131,8 +131,8 @@ CHERRY_PICK_PR="git cherry-pick merge_pr_base..merge_pr"
 #
 # This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging
 # of non-approved or otherwise bad changes.
-REQUIRED_BASE_SHA_MASTER="3fba6eff79a9b50909199eaa4ebf754c1c4adba6" # pullapprove => CODEOWNERS migration
-REQUIRED_BASE_SHA_PATCH="e3853e842ea5c10fafbc310a76a4a7f47ed8c65e"  # pullapprove => CODEOWNERS migration
+REQUIRED_BASE_SHA_MASTER="a03a9236f2aed5d00012d25f032aa43a046d91da" # pullapprove => CODEOWNERS migration
+REQUIRED_BASE_SHA_PATCH="a03a9236f2aed5d00012d25f032aa43a046d91da"  # pullapprove => CODEOWNERS migration
 if [[ $MERGE_MASTER == 1 ]]; then
   REQUIRED_BASE_SHA="$REQUIRED_BASE_SHA_MASTER"
 # check patch only if patch-only PR

From f1ea78ba095ecede6b1fb0235a6c308885cba823 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 17 May 2019 09:56:54 +0000
Subject: [PATCH 142/275] build(docs-infra): upgrade cli command docs sources
 to f960a8e4a (#30530)

Updating [angular#master](https://github.com/angular/angular/tree/master) from [cli-builds#master](https://github.com/angular/cli-builds/tree/master).

##
Relevant changes in [commit range](https://github.com/angular/cli-builds/compare/73d875a70...f960a8e4a):

**Modified**
- help/update.json

##

PR Close #30530
---
 aio/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/package.json b/aio/package.json
index 0428297960..e8c9588be1 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -19,7 +19,7 @@
     "build-local": "yarn ~~build",
     "prebuild-with-ivy": "yarn setup-local && node scripts/switch-to-ivy",
     "build-with-ivy": "yarn ~~build",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 73d875a70",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js f960a8e4a",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",

From f74e0fd8251802107094886d76a0971d478d6be8 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 21 May 2019 10:36:52 +0200
Subject: [PATCH 143/275] refactor(core): migrations should parse cli workspace
 config as json5 (#30582)

Currently we try to parse CLI workspace configurations gracefully by
using the native `JSON.parse()` method. This means that the CLI workspace
configuration needs to follow the strict JSON specification because otherwise
the migrations would not be able to find TypeScript configurations in the CLI
project where JSON5 workspace configurations are supported.

In order to handle such workspace configurations, we leverage the JSON
parsing logicfrom the `@angular-devkit/core` which is also used by the CLI.

PR Close #30582
---
 .../test/project_tsconfig_paths_spec.ts       | 20 +++++++++++++++++++
 .../utils/project_tsconfig_paths.ts           |  8 +++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/packages/core/schematics/test/project_tsconfig_paths_spec.ts b/packages/core/schematics/test/project_tsconfig_paths_spec.ts
index 0091ce0070..0ebf15276d 100644
--- a/packages/core/schematics/test/project_tsconfig_paths_spec.ts
+++ b/packages/core/schematics/test/project_tsconfig_paths_spec.ts
@@ -25,6 +25,26 @@ describe('project tsconfig paths', () => {
     expect(getProjectTsConfigPaths(testTree).buildPaths).toEqual(['my-custom-config.json']);
   });
 
+  it('should be able to read workspace configuration which is using JSON5 features', () => {
+    testTree.create('/my-build-config.json', '');
+    testTree.create('/angular.json', `{
+      // Comments, unquoted properties or trailing commas are only supported in JSON5.
+      projects: {
+        with_tests: {
+          targets: {
+            build: {
+              options: {
+                tsConfig: './my-build-config.json',
+              }
+            }
+          }
+        }
+      },
+    }`);
+
+    expect(getProjectTsConfigPaths(testTree).buildPaths).toEqual(['my-build-config.json']);
+  });
+
   it('should detect test tsconfig path inside of angular.json file', () => {
     testTree.create('/my-test-config.json', '');
     testTree.create('/angular.json', JSON.stringify({
diff --git a/packages/core/schematics/utils/project_tsconfig_paths.ts b/packages/core/schematics/utils/project_tsconfig_paths.ts
index 05d46ae1cc..6690974fb0 100644
--- a/packages/core/schematics/utils/project_tsconfig_paths.ts
+++ b/packages/core/schematics/utils/project_tsconfig_paths.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {normalize} from '@angular-devkit/core';
+import {JsonParseMode, normalize, parseJson} from '@angular-devkit/core';
 import {Tree} from '@angular-devkit/schematics';
 import {WorkspaceProject} from '@schematics/angular/utility/workspace-models';
 
@@ -78,8 +78,10 @@ function getWorkspaceConfigGracefully(tree: Tree): any {
   }
 
   try {
-    return JSON.parse(configBuffer.toString());
-  } catch {
+    // Parse the workspace file as JSON5 which is also supported for CLI
+    // workspace configurations.
+    return parseJson(configBuffer.toString(), JsonParseMode.Json5);
+  } catch (e) {
     return null;
   }
 }

From ae91f45b277bb1d3347535fd69baad30ef69f16b Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 21 May 2019 11:41:49 -0700
Subject: [PATCH 144/275] docs: update file structure and workspace config for
 v8 (#30595)

PR Close #30595
---
 aio/content/guide/file-structure.md   | 29 +++++++++++++++------------
 aio/content/guide/workspace-config.md |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/aio/content/guide/file-structure.md b/aio/content/guide/file-structure.md
index 31ea551900..402e165ce0 100644
--- a/aio/content/guide/file-structure.md
+++ b/aio/content/guide/file-structure.md
@@ -5,15 +5,15 @@ You develop applications in the context of an Angular [workspace](guide/glossary
 The Angular CLI `ng new` command creates a workspace.
 
 <code-example language="bash" linenums="false">
-ng new &lt;project_name&gt;
+ng new &lt;my-project&gt;
 </code-example>
 
-When you run this command, the CLI installs the necessary Angular npm packages and other dependencies in a new workspace, with a root folder named *project_name*.
-The workspace root folder contains workspace configuration files and a README file with generated descriptive text that you can customize.
+When you run this command, the CLI installs the necessary Angular npm packages and other dependencies in a new workspace, with a root-level application named *my-project*.
+The workspace root folder contains various support and configuration files, and a README file with generated descriptive text that you can customize.
 
-By default, `ng new` also creates an initial skeleton application, along with its end-to-end tests.
+By default, `ng new` creates an initial skeleton application at the root level of the workspace, along with its end-to-end tests.
 The skeleton is for a simple Welcome application that is ready to run and easy to modify.
-This *root application* has the same name as the workspace, and the source files reside in the `src/` subfolder of the workspace.
+The root-level application has the same name as the workspace, and the source files reside in the `src/` subfolder of the workspace.
 
 This default behavior is suitable for a typical "multi-repo" development style where each application resides in its own workspace.
 Beginners and intermediate users are encouraged to use `ng new` to create a separate workspace for each application.
@@ -28,27 +28,29 @@ See [Setting up for a multi-project workspace](#multiple-projects) below.
 ## Workspace configuration files
 
 All projects within a workspace share a [CLI configuration context](guide/workspace-config).
-The top level of the workspace contains workspace-wide configuration files.
+The top level of the workspace contains workspace-wide configuration files, configuration files for the root-level application, and subfolders for the root-level application source and test files.
 
 | WORKSPACE CONFIG FILES    | PURPOSE |
 | :--------------------- | :------------------------------------------|
-| `node_modules/`        | Provides [npm packages](guide/npm-packages) to the entire workspace. Workspace-wide `node_modules` dependencies are visible to all projects. |
 | `.editorconfig`        | Configuration for code editors. See [EditorConfig](https://editorconfig.org/). |
 | `.gitignore`           | Specifies intentionally untracked files that [Git](https://git-scm.com/) should ignore. |
+| `README.md`            | Introductory documentation for the root app. |
 | `angular.json`         | CLI configuration defaults for all projects in the workspace, including configuration options for build, serve, and test tools that the CLI uses, such as [TSLint](https://palantir.github.io/tslint/), [Karma](https://karma-runner.github.io/), and [Protractor](http://www.protractortest.org/). For details, see [Angular Workspace Configuration](guide/workspace-config). |
 | `package.json`          | Configures [npm package dependencies](guide/npm-packages) that are available to all projects in the workspace. See [npm documentation](https://docs.npmjs.com/files/package.json) for the specific format and contents of this file. |
 | `package-lock.json`     | Provides version information for all packages installed into `node_modules` by the npm client. See [npm documentation](https://docs.npmjs.com/files/package-lock.json) for details. If you use the yarn client, this file will be [yarn.lock](https://yarnpkg.com/lang/en/docs/yarn-lock/) instead. |
-| `README.md`             | Introductory documentation for the root app. |
+| `src/`                  | Source files for the root-level application project. |
+| `node_modules/`         | Provides [npm packages](guide/npm-packages) to the entire workspace. Workspace-wide `node_modules` dependencies are visible to all projects. |
 | `tsconfig.json`         | Default [TypeScript](https://www.typescriptlang.org/) configuration for projects in the workspace. |
 | `tslint.json`           | Default [TSLint](https://palantir.github.io/tslint/) configuration for projects in the workspace. |
 
+
 ## Application project files
 
-By default, the CLI command `ng new my-app` creates a workspace folder named "my-app" and generates a new application skeleton for a root application at the top level of the workspace.
+By default, the CLI command `ng new my-app` creates a workspace folder named "my-app" and generates a new application skeleton in a `src/` folder at the top level of the workspace.
 A newly generated application contains source files for a root module, with a root component and template.
 
 When the workspace file structure is in place, you can use the `ng generate` command on the command line to add functionality and data to the application.
-This initial starter application is the *default app* for CLI commands (unless you change the default after creating [additional apps](#multiple-projects)).
+This initial root-level application is the *default app* for CLI commands (unless you change the default after creating [additional apps](#multiple-projects)).
 
 <div class="alert is-helpful">
 
@@ -105,10 +107,11 @@ Project-specific [TypeScript](https://www.typescriptlang.org/) configuration fil
 
 ### End-to-end test files
 
-An `e2e/` subfolder contains source files for a set of end-to-end tests that correspond to an application, along with test-specific configuration files.
+An `e2e/` folder at the top level contains source files for a set of end-to-end tests that correspond to the root-level application, along with test-specific configuration files.
+
+For a multi-project workspace, application-specific end-to-end tests are in the project root, under `projects/project-name/e2e/`.
 
 <code-example language="none" linenums="false">
-my-app/
   e2e/
      src/                 (end-to-end tests for my-app)
         app.e2e-spec.ts
@@ -126,7 +129,7 @@ A multi-project workspace is suitable for an enterprise that uses a single repos
 ### Setting up for a multi-project workspace
 
 If you intend to have multiple projects in a workspace, you can skip the initial application generation when you create the workspace, and give the workspace a unique name.
-The following command creates a workspace with all of the workspace-wide configuration files, but no root application.
+The following command creates a workspace with all of the workspace-wide configuration files, but no root-level application.
 
 <code-example language="bash" linenums="false">
 ng new my-workspace --createApplication="false"
diff --git a/aio/content/guide/workspace-config.md b/aio/content/guide/workspace-config.md
index ed312f2275..a5dbf58769 100644
--- a/aio/content/guide/workspace-config.md
+++ b/aio/content/guide/workspace-config.md
@@ -44,7 +44,7 @@ When you create a library project with `ng generate library`, the library projec
 The following top-level configuration properties are available for each project, under `projects:<project_name>`.
 
 <code-example format="." language="json" linenums="false">
-    "my-v7-app": {
+    "my-app": {
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",

From 3c548189b16074948802649031197789d686037c Mon Sep 17 00:00:00 2001
From: jenniferfell <jenniferfell.sf@gmail.com>
Date: Tue, 21 May 2019 15:58:06 -0600
Subject: [PATCH 145/275] docs: update node and typescript versions mentioned
 in docs (#30601)

PR Close #30601
---
 aio/content/guide/setup-local.md        |  2 +-
 aio/content/guide/visual-studio-2015.md | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/aio/content/guide/setup-local.md b/aio/content/guide/setup-local.md
index 81fe83feb0..bb494c6d77 100644
--- a/aio/content/guide/setup-local.md
+++ b/aio/content/guide/setup-local.md
@@ -23,7 +23,7 @@ Before you begin, make sure your development environment includes `Node.js®` an
 {@a nodejs}
 ### Node.js
 
-Angular requires `Node.js` version 8.x or 10.x.
+Angular requires `Node.js` version 10.9.0 or later.
 
 * To check your version, run `node -v` in a terminal/console window.
 
diff --git a/aio/content/guide/visual-studio-2015.md b/aio/content/guide/visual-studio-2015.md
index e09aea2d84..a6aa3ceb9d 100644
--- a/aio/content/guide/visual-studio-2015.md
+++ b/aio/content/guide/visual-studio-2015.md
@@ -96,16 +96,15 @@ find them in either location, it will use its own versions of the tools.
 
 
 
-While Visual Studio Update 3 ships with TypeScript support out of the box, it currently doesn’t ship with TypeScript 3.1, 
-which you need to develop Angular applications.
+While Visual Studio Update 3 ships with TypeScript support out of the box, it currently doesn’t ship with more recent versions of TypeScript, which you need to develop Angular applications.
 
-To install TypeScript 3.1:
+To install the latest version of TypeScript:
 
- * Download and install [TypeScript 3.1 for Visual Studio 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48593),
+ * Download and install the latest [TypeScript for Visual Studio 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48593),
 
- * OR install it with npm: `npm install -g typescript@3.1`.
+ * OR install it with npm: `npm install -g typescript@latest`.
 
-You can find out more about TypeScript 3.1 support in Visual Studio **[here](https://blogs.msdn.microsoft.com/typescript/announcing-typescript-3-1/)**.
+You can find out more about TypeScript support in Visual Studio **[here](https://blogs.msdn.microsoft.com/typescript/announcing-typescript-3-1/)**.
 
 At this point, Visual Studio is ready. It’s a good idea to close Visual Studio and 
 restart it to make sure everything is clean.

From 2cd529439410dda6a918d02ddf37dbfa20e0702f Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 17 Apr 2019 11:29:45 -0700
Subject: [PATCH 146/275] docs: add new cli builder api guide (#29964)

PR Close #29964
---
 aio/content/guide/cli-builder.md | 595 +++++++++++++++++++++++++++++++
 aio/content/navigation.json      |   5 +
 2 files changed, 600 insertions(+)
 create mode 100644 aio/content/guide/cli-builder.md

diff --git a/aio/content/guide/cli-builder.md b/aio/content/guide/cli-builder.md
new file mode 100644
index 0000000000..d78cfa4720
--- /dev/null
+++ b/aio/content/guide/cli-builder.md
@@ -0,0 +1,595 @@
+# Angular CLI Builders
+
+A number of Angular CLI commands run a complex process on your code, such as linting, building, or testing.
+The commands use an internal tool called Architect to run *CLI builders*, which apply another tool to accomplish the desired task.
+
+With Angular version 8, the CLI Builder API is stable and available to developers who want to customize the Angular CLI by adding or modifying commands. For example, you could supply a builder to perform an entirely new task, or to change which third-party tool is used by an existing command.
+
+This document explains how CLI builders integrate with the workspace configuration file, and shows how you can create your own builder.
+
+<div class="alert is-helpful">
+
+   You can find the code from the examples used here in [this GitHub repository](https://github.com/mgechev/cli-builders-demo).
+
+</div>
+
+## CLI builders
+
+The internal Architect tool delegates work to handler functions called [*builders*](guide/glossary#builder).
+A builder handler function receives two arguments; a set of input `options` (a JSON object), and a `context` (a `BuilderContext` object).
+
+The separation of concerns here is the same as with [schematics](guide/glossary#schematic), which are used for other CLI commands that touch your code (such as `ng generate`).
+
+* Options are given by the CLI user, context is provided by and provides access to the CLI Builder API, and the developer provides the behavior.
+
+* The `BuilderContext` object provides access to the scheduling method, `BuilderContext.scheduleTarget()`. The scheduler executes the builder handler function with a given [target configuration](guide/glossary#target).
+
+The builder handler function can be synchronous (return a value) or asynchronous (return a Promise), or it can watch and return multiple values (return an Observable).
+The return value or values must always be of type `BuilderOutput`.
+This object contains a Boolean `success` field and an optional `error` field that can contain an error message.
+
+Angular provides some builders that are used by the CLI for commands such as `ng build`, `ng test`, and `ng lint`.
+Default target configurations for these and other built-in CLI builders can be found (and customized) in the "architect" section of the [workspace configuration file](guide/workspace-config), `angular.json`.
+You can also extend and customize Angular by creating your own builders, which you can run  using the [`ng run` CLI command](cli/run).
+
+### Builder project structure
+
+A builder resides in a "project" folder that is similar in structure to an Angular workspace, with global configuration files at the top level, and more specific configuration in a source folder with the code files that define the behavior.
+For example, your `myBuilder` folder could contain the following files.
+
+| FILES    | PURPOSE |
+| :----------------------- | :------------------------------------------|
+| `src/my-builder.ts`      | Main source file for the builder definition. |
+| `src/my-builder.spec.ts` | Source file for tests. |
+| `src/schema.json`        | Definition of builder input options. |
+| `builders.json`          | Testing configuration. |
+| `package.json`           | Dependencies. See https://docs.npmjs.com/files/package.json. |
+| `tsconfig.json`          | [TypeScript configuration](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html). |
+
+You can publish the builder to `npm` (see [Publishing your Library](https://angular.io/guide/creating-libraries#publishing-your-library)). If you publish it as `@example/my-builder`, you can install it using the following command.
+
+<code-example language="sh">
+
+npm install @example/my-builder
+
+</code-example>
+
+## Creating a builder
+
+As an example, let’s create a builder that executes a shell command.
+To create a builder, use the `createBuilder()` CLI Builder function, and return a `BuilderOutput` object.
+
+```
+
+import { BuilderOutput, createBuilder } from '@angular-devkit/architect';
+
+export default createBuilder(_commandBuilder);
+
+function _commandBuilder(
+  options: JsonObject,
+  context: BuilderContext,
+  ): Promise<BuilderOutput> {
+  ...
+}
+
+```
+
+Now let’s add some logic to it.
+The following code retrieves the command and arguments from the user options, spawns the new process, and waits for the process to finish.
+If the process is successful (returns a code of 0), it resolves the return value.
+
+```
+import { BuilderOutput, createBuilder } from '@angular-devkit/architect';
+import * as childProcess from 'child_process';
+
+export default createBuilder(_commandBuilder);
+
+function _commandBuilder(
+  options: JsonObject,
+  context: BuilderContext,
+): Promise<BuilderOutput> {
+  const child = childProcess.spawn(options.command, options.args);
+  return new Promise<BuilderOutput>(resolve => {
+    child.on('close', code => {
+      resolve({success: code === 0});
+    });
+  });
+}
+```
+
+### Handling output
+
+By default, the `spawn()` method outputs everything to the process standard output and error.
+To make it easier to test and debug, we can forward the output to the CLI Builder logger instead.
+This also allows the builder itself to be executed in a separate process, even if the standard output and error are deactivated (as in an [Electron app](https://electronjs.org/)).
+
+We can retrieve a Logger instance from the context.
+
+```
+import { BuilderOutput, createBuilder, BuilderContext } from '@angular-devkit/architect';
+import * as childProcess from 'child_process';
+
+export default createBuilder(_commandBuilder);
+
+function _commandBuilder(
+  options: JsonObject,
+  context: BuilderContext,
+): Promise<BuilderOutput> {
+  const child = childProcess.spawn(options.command, options.args, {stdio: 'pipe'});
+  child.stdout.on('data', (data) => {
+    context.logger.info(data.toString());
+  });
+  child.stderr.on('data', (data) => {
+    context.logger.error(data.toString());
+  });
+
+  return new Promise<BuilderOutput>(resolve => {
+    child.on('close', code => {
+      resolve({success: code === 0});
+    });
+  });
+}
+
+```
+
+### Progress and status reporting
+
+The CLI Builder API includes progress and status reporting tools, which can provide hints for certain functions and interfaces.
+
+To report progress, use the `BuilderContext.reportProgress()` method, which takes a current value, (optional) total, and status string as arguments.
+The total can be any number; for example, if you know how many files you have to process, the total could be the number of files, and current should be the number processed so far.
+The status string is unmodified unless you pass in a new string value.
+
+You can see an [example](https://github.com/angular/angular-cli/blob/ba21c855c0c8b778005df01d4851b5a2176edc6f/packages/angular_devkit/build_angular/src/tslint/index.ts#L107) of how the `tslint` builder reports progress.
+
+In our example, the shell command either finishes or is still executing, so there’s no need for a progress report, but we can report status so that a parent builder that called our builder would know what’s going on.
+Use the `BuilderContext.reportStatus()` method to generate a status string of any length.
+(Note that there’s no guarantee that a long string will be shown entirely; it could be cut to fit the  UI that displays it.)
+Pass an empty string to remove the status.
+
+```
+import { BuilderOutput, createBuilder, BuilderContext } from '@angular-devkit/architect';
+import * as childProcess from 'child_process';
+
+export default createBuilder(_commandBuilder);
+
+function _commandBuilder(
+  options: JsonObject,
+  context: BuilderContext,
+): Promise<BuilderOutput> {
+  context.reportStatus(`Executing "${options.command}"...`);
+  const child = childProcess.spawn(options.command, options.args, {stdio: 'pipe'});
+
+  child.stdout.on('data', (data) => {
+    context.logger.info(data.toString());
+  });
+  child.stderr.on('data', (data) => {
+    context.logger.error(data.toString());
+  });
+
+  return new Promise<BuilderOutput>(resolve => {
+    context.reportStatus(`Done.`);
+    child.on('close', code => {
+      resolve({success: code === 0});
+    });
+  });
+}
+```
+
+## Builder input
+
+You can invoke a builder indirectly through a CLI command, or directly with the Angular CLI `ng run` command.
+In either case, you must provide required inputs, but can allow other inputs to default to values that are pre-configured for a specific [*target*](guide/glossary#target), provide a pre-defined, named override configuration, and provide further override option values on the command line.
+
+### Input validation
+
+You define builder inputs in a JSON schema associated with that builder.
+The Architect tool collects the resolved input values into an `options` object, and validates their types against the schema before passing them to the builder function.
+(The Schematics library does the same kind of validation of user input).
+
+For our example builder, we expect the `options` value to be a `JsonObject` with two keys: a `command` that is a string, and an `args` array of string values.
+
+We can provide the following schema for type validation of these values.
+
+<code-example format="." language="json" linenums="false">
+
+{
+  "$schema": "http://json-schema.org/schema",
+  "type": "object",
+  "properties": {
+    "command": {
+      "type": "string"
+    },
+    "args": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  }
+}
+
+</code-example>
+
+<div class="alert is-helpful">
+
+This is a very simple example, but the use of a schema for validation can be very powerful.
+For more information, see the [JSON schemas website](http://json-schema.org/).
+
+</div>
+
+To link our builder implementation with its schema and name, we need to create a *builder definition* file, which we can point to in `package.json`.
+
+Create a file named `builders.json` file that looks like this.
+
+<code-example format="." language="json" linenums="false">
+
+{
+  "builders": {
+    "command": {
+      "implementation": "./command",
+      "schema": "./command/schema.json",
+      "description": "Runs any command line in the operating system."
+    }
+  }
+}
+
+</code-example>
+
+In the `package.json` file, add a `builders` key that tells the Architect tool where to find our builder definition file.
+
+<code-example format="." language="json" linenums="false">
+
+{
+  "name": "@example/command-runner",
+  "version": "1.0.0",
+  "description": "Builder for Command Runner",
+  "builders": "builders.json",
+  "devDependencies": {
+    "@angular-devkit/architect": "^1.0.0"
+  }
+}
+
+</code-example>
+
+The official name of our builder is now ` @example/command-runner:command`.
+The first part  of this is the package name (resolved using node resolution), and the second part is the builder name (resolved using the `builder.json` file).
+
+Using one of our `options` is very straightforward, we did this in the previous section when we accessed `options.command`.
+
+<code-example format="." language="typescript" linenums="false">
+    context.reportStatus(`Executing "${options.command}"...`);
+    const child = childProcess.spawn(options.command, options.args, { stdio: 'pipe' });
+
+</code-example>
+
+### Target configuration
+
+A builder must have a defined target that associates it with a specific input configuration and [project](guide/glossary#project).
+
+Targets are defined in the `angular.json` [workspace configuration file](guide/workspace-config).
+A target specifies the builder to use, its default options configuration, and named alternative configurations.
+The Architect tool uses the target definition to resolve input options for a given run.
+
+The  `angular.json` file has a section for each project, and the "architect" section of each project configures targets for builders used by CLI commands such as 'build', 'test', and 'lint'.
+By default, for example, the `build` command runs the builder  `@angular-devkit/build-angular:browser` to perform the build task, and passes in default option values as specified for the `build` target in `angular.json`.
+
+<code-example format="." language="json" linenums="false">
+{
+  "myApp": {
+    ...
+    "architect": {
+        "build": {
+             "builder": "@angular-devkit/build-angular:browser",
+             "options": {
+            "outputPath": "dist/myApp",
+            "index": "src/index.html",
+        ...
+   },
+          "configurations": {
+            "production": {
+                 "fileReplacements": [
+                    {
+                         "replace": "src/environments/environment.ts",
+                         "with": "src/environments/environment.prod.ts"
+                    }
+                 ],
+               "optimization": true,
+               "outputHashing": "all",
+      ...
+            }
+             }
+        },
+       ...
+
+</code-example>
+
+The command passes the builder the set of default options specified in the "options" section.
+If you pass the `--configuration=production` flag, it uses the override values specified in the `production` alternative configuration.
+You can specify further option overrides individually on the command line.
+You might also add more alternative configurations to the `build` target, to define other environments such as `stage` or `qa`.
+
+#### Target strings
+
+The  generic `ng run` CLI command takes as its first argument a target string of the form *project:target[:configuration]*.
+
+* *project*: The name of the Angular CLI project that the target is associated with.
+
+* *target*: A named builder configuration from the `architect` section of the `angular.json` file.
+
+* *configuration*: (optional) The name of a specific configuration override for the given target, as defined in the `angular.json` file.
+
+If your builder calls another builder, it may need to read a passed target string.
+You can parse this string into an object by using the `targetFromTargetString()` utility function from `@angular-devkit/architect`.
+
+## Schedule and run
+
+Architect runs builders asynchronously.
+To invoke a builder, you schedule a task to be run when all configuration resolution is complete.
+
+The builder function is not executed until the scheduler returns a `BuilderRun` control object.
+The CLI typically schedules tasks by calling the `BuilderContext.scheduleTarget()` function, and then resolves input options using the target definition in the `angular.json` file.
+
+Architect resolves input options for a given target by taking the default options object, then overwriting values from the configuration used (if any), then further overwriting values from the overrides object passed to `BuilderContext.scheduleTarget()`.
+For the Angular CLI, the overrides object is built from command line arguments.
+
+Architect validates the resulting options values against the schema of the builder.
+If inputs are valid, Architect creates the context and executes the builder.
+
+For more information see [Workspace Configuration](guide/workspace-config).
+
+<div class="alert is-helpful">
+
+   You can also invoke a builder directly from another builder or test by calling `BuilderContext.scheduleBuilder()`.
+   You pass an `options` object directly to the method, and those option values are validated against the schema of the builder without further adjustment.
+
+   Only the  `BuilderContext.scheduleTarget()` method resolves the configuration and overrides through the `angular.json` file.
+
+</div>
+
+### Default architect configuration
+
+Let’s create a simple `angular.json` file that puts target configurations into context.
+
+We can publish the builder to npm (see [Publishing your Library](https://angular.io/guide/creating-libraries#publishing-your-library)), and install it using the following command:
+
+<code-example language="sh">
+
+npm install @example/command-runner
+
+</code-example>
+
+If we create a new project with `ng new builder-test`, the generated `angular.json` file looks something like this, with only default builder configurations.
+
+<code-example format="." language="json" linenums="false">
+
+{
+  // ...
+  "projects": {
+    // ...
+    "builder-test": {
+      // ...
+      "architect": {
+        // ...
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            // ... more options...
+            "outputPath": "dist/builder-test",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json"
+          },
+          "configurations": {
+            "production": {
+              // ... more options...
+              "optimization": true,
+              "aot": true,
+              "buildOptimizer": true
+            }
+          }
+        }
+      }
+    }
+  }
+  // ...
+}
+
+</code-example>
+
+### Adding a target
+
+Let's add a new target that will run our builder to execute a particular command.
+This target will tell the builder to run `touch` on a file, in order to update its modified date.
+
+We need to update the `angular.json` file to add a target for this builder to the "architect" section of our new project.
+
+* We'll add a new target section to the "architect" object for our project.
+
+* The target named "touch" uses our builder, which we published to `@example/command-runner`. (See [Publishing your Library](https://angular.io/guide/creating-libraries#publishing-your-library))
+
+* The options object provides default values for the two inputs that we defined; `command`, which is the Unix command to execute, and `args`, an array that contains the file to operate on.
+
+* The configurations key is optional, we'll leave it out for now.
+
+<code-example format="." language="json" linenums="false">
+
+{
+  "projects": {
+    "builder-test": {
+      "architect": {
+        "builder-test": {
+          "touch": {
+            "builder": "@example/command-runner:command",
+            "options": {
+              "command": "touch",
+              "args": [
+                "src/main.ts"
+              ]
+            }
+          }
+        },
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/builder-test",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json"
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "aot": true,
+              "buildOptimizer": true
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+</code-example>
+
+### Running the builder
+
+To run our builder with the new target's default configuration, use the following CLI command in a Linux shell.
+
+<code-example language="sh">
+
+   ng run builder-test:touch
+
+</code-example>
+
+This will run the `touch` command on the `src/main.ts` file.
+
+You can use command-line arguments to override the configured defaults.
+For example, to run with a different `command` value, use the following CLI command.
+
+<code-example language="sh">
+
+ng run builder-test:touch --command=ls
+
+</code-example>
+
+This will call the `ls` command instead of the `touch` command.
+Because we did not override the *args* option, it will list information about the `src/main.ts` file (the default value provided for the target).
+
+## Testing a builder
+
+Use integration testing for your builder, so that you can use the Architect scheduler to create a context, as in this [example](https://github.com/mgechev/cli-builders-demo).
+
+* In the builder source directory, we have created a new test file `index.spec.ts`. The code creates new instances of `JsonSchemaRegistry` (for schema validation), `TestingArchitectHost` (an in-memory implementation of `ArchitectHost`), and `Architect`.
+
+* We've added a `builders.json` file next to the builder's [`package.json` file](https://github.com/mgechev/cli-builders-demo/blob/master/command-builder/builders.json), and modified the package file to point to it.
+
+Here’s an example of a test that runs the command builder.
+The test uses the builder to run the `ls` command, then validates that it ran successfully and listed the proper files.
+
+<code-example format="." language="typescript" linenums="false">
+
+import { Architect, ArchitectHost } from '@angular-devkit/architect';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing';
+// Our builder forwards the STDOUT of the command to the logger.
+import { logging, schema } from '@angular-devkit/core';
+
+describe('Command Runner Builder', () => {
+  let architect: Architect;
+  let architectHost: ArchitectHost;
+
+  beforeEach(async () => {
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+    // TestingArchitectHost() takes workspace and current directories.
+    // Since we don't use those, both are the same in this case.
+    architectHost = new TestingArchitectHost(__dirname, __dirname);
+    architect = new Architect(architectHost, registry);
+
+    // This will either take a Node package name, or a path to the directory
+    // for the package.json file.
+    await architectHost.addBuilderFromPackage('..');
+  });
+
+  // This might not work in Windows.
+  it('can run ls', async () => {
+    // Create a logger that keeps an array of all messages that were logged.
+    const logger = new logging.Logger('');
+    const logs = [];
+    logger.subscribe(ev => logs.push(ev.message));
+
+    // A "run" can have multiple outputs, and contains progress information.
+    const run = await architect.scheduleBuilder('@example/command-runner:command', {
+      command: 'ls',
+      args: [__dirname],
+    }, { logger });  // We pass the logger for checking later.
+
+    // The "result" member (of type BuilderOutput) is the next output.
+    const output = await run.result;
+
+    // Stop the builder from running. This stops Architect from keeping
+    // the builder-associated states in memory, since builders keep waiting
+    // to be scheduled.
+    await run.stop();
+
+    // Expect that it succeeded.
+    expect(output.success).toBe(true);
+
+    // Expect that this file was listed. It should be since we're running
+    // `ls $__dirname`.
+    expect(logs).toContain('index.spec.ts');
+  });
+});
+
+</code-example>
+
+<div class="alert is-helpful">
+
+   When running this test in your repo, you need the [`ts-node`](https://github.com/TypeStrong/ts-node) package. You can avoid this by renaming `index.spec.ts` to `index.spec.js`.
+
+</div>
+
+### Watch mode
+
+Architect expects builders to run once (by default) and return.
+This behavior is not entirely compatible with a builder that watches for changes (like Webpack, for example).
+Architect can support watch mode, but there are some things to look out for.
+
+* To be used with watch mode, a builder handler function should return an Observable. Architect subscribes to the Observable until it completes and might reuse it if the builder is scheduled again with the same arguments.
+
+* The builder should always emit a `BuilderOutput` object after each execution. Once it’s been executed, it can enter a watch mode, to be triggered by an external event. If an event triggers it to restart, the builder should execute the `BuilderContext.reportRunning()` function to tell Architect that it is running again. This prevents Architect from stopping the builder if another run is scheduled.
+
+When your builder calls `BuilderRun.stop()` to exit watch mode, Architect unsubscribes from the builder’s Observable and calls the builder’s teardown logic to clean up.
+(This behavior also allows for long running builds to be stopped and cleaned up.)
+
+In general, if your builder is watching an external event, you should separate your run into three phases.
+
+1. **Running**
+   For example, webpack compiles. This ends when webpack finishes and your builder emits a `BuilderOutput` object.
+
+1. **Watching**
+   Between two runs, watch an external event stream. For example, webpack watches the file system for any changes. This ends when webpack restarts building, and `BuilderContext.reportRunning()` is called. This goes back to step 1.
+
+1. **Completion**
+   Either the task is fully completed (for example, webpack was supposed to run a number of times), or the builder run was stopped (using `BuilderRun.stop()`). Your teardown logic is executed, and Architect unsubscribes from your builder’s Observable.
+
+## Summary
+
+The CLI Builder API provides a new way of changing the behavior of the Angular CLI by using builders to execute custom logic.
+
+* Builders can be synchronous or asynchronous, execute once or watch for external events, and can schedule other builders or targets.
+
+* Builders have option defaults specified in the `angular.json` configuration file, which can be overwritten by an alternate configuration for the target, and further overwritten by command line flags.
+
+* We recommend that you use integration tests to test Architect builders. You can use unit tests to validate the logic that the builder executes.
+
+* If your builder returns an Observable, it should clean up in the teardown logic of that Observable.
\ No newline at end of file
diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index ba97ed64cf..c3b9c14f2a 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -560,6 +560,11 @@
             }
           ]
         },
+        {
+          "url": "guide/cli-builder",
+          "title": "CLI Builders",
+          "tooltip": "Using builders to customize Angular CLI."
+        },
         {
           "url": "guide/ivy",
           "title": "Angular Ivy",

From 3125376ec1274002bb1f39e02fda53a6b67a5a71 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Tue, 21 May 2019 15:06:22 -0700
Subject: [PATCH 147/275] fix(bazel): allow ts_library interop with list-typed
 inputs (#30600)

_compile_action should take a list since we compute it within one node in the build graph
This needs to be cleaned up since Bazel is getting stricter with
disallowing iteration over depsets

PR Close #30600
---
 packages/bazel/src/ng_module.bzl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index 3504c16be4..d0183c9b47 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -489,6 +489,14 @@ def _compile_action(ctx, inputs, outputs, dts_bundles_out, messages_out, tsconfi
     # Give the Angular compiler all the user-listed assets
     file_inputs = list(ctx.files.assets)
 
+    if (type(inputs) == type([])):
+        file_inputs.extend(inputs)
+    else:
+        # inputs ought to be a list, but allow depset as well
+        # so that this can change independently of rules_typescript
+        # TODO(alexeagle): remove this case after update (July 2019)
+        file_inputs.extend(inputs.to_list())
+
     if hasattr(ctx.attr, "node_modules"):
         file_inputs.extend(_filter_ts_inputs(ctx.files.node_modules))
 
@@ -508,7 +516,7 @@ def _compile_action(ctx, inputs, outputs, dts_bundles_out, messages_out, tsconfi
     # Collect the inputs and summary files from our deps
     action_inputs = depset(
         file_inputs,
-        transitive = [inputs] + [
+        transitive = [
             dep.collect_summaries_aspect_result
             for dep in ctx.attr.deps
             if hasattr(dep, "collect_summaries_aspect_result")

From 70fd4300f4af262f33942df4bcfcec933c76c8ed Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 21 May 2019 21:59:53 +0200
Subject: [PATCH 148/275] test(compiler-cli): compliance tests not always
 reporting test failure (#30597)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently the `@angular/compiler-cli` compliance tests sometimes do
not throw an exception if the expected output does not match the
generated JavaScript output. This can happen for the following cases:

1. Expected code includes character that is not part of known alphabet
    (e.g. `Δ` is still used in a new compliance test after rebasing a PR)
2. Expected code asserts that a string literal matches a string with
    escaped quotes. e.g. expects `const $var$ = "\"quoted\"";`)

PR Close #30597
---
 .../test/compliance/mock_compile.ts           | 18 ++++++++----
 .../test/compliance/mock_compiler_spec.ts     | 28 +++++++++++++++++++
 .../compliance/r3_view_compiler_i18n_spec.ts  |  8 +++---
 .../r3_view_compiler_providers_spec.ts        | 16 +++++++++--
 4 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/mock_compile.ts b/packages/compiler-cli/test/compliance/mock_compile.ts
index ec39a099c8..332f1d9e59 100644
--- a/packages/compiler-cli/test/compliance/mock_compile.ts
+++ b/packages/compiler-cli/test/compliance/mock_compile.ts
@@ -17,12 +17,12 @@ import {NgtscProgram} from '../../src/ngtsc/program';
 const IDENTIFIER = /[A-Za-z_$ɵ][A-Za-z0-9_$]*/;
 const OPERATOR =
     /!|\?|%|\*|\/|\^|&&?|\|\|?|\(|\)|\{|\}|\[|\]|:|;|<=?|>=?|={1,3}|!==?|=>|\+\+?|--?|@|,|\.|\.\.\./;
-const STRING = /'[^']*'|"[^"]*"|`[\s\S]*?`/;
+const STRING = /'(\\'|[^'])*'|"(\\"|[^"])*"|`(\\`[\s\S])*?`/;
 const NUMBER = /\d+/;
 
 const ELLIPSIS = '…';
 const TOKEN = new RegExp(
-    `\\s*((${IDENTIFIER.source})|(${OPERATOR.source})|(${STRING.source})|${NUMBER.source}|${ELLIPSIS})`,
+    `\\s*((${IDENTIFIER.source})|(${OPERATOR.source})|(${STRING.source})|${NUMBER.source}|${ELLIPSIS})\\s*`,
     'y');
 
 type Piece = string | RegExp;
@@ -35,10 +35,11 @@ function tokenize(text: string): Piece[] {
   TOKEN.lastIndex = 0;
 
   let match: RegExpMatchArray|null;
+  let tokenizedTextEnd = 0;
   const pieces: Piece[] = [];
 
   while ((match = TOKEN.exec(text)) !== null) {
-    const token = match[1];
+    const [fullMatch, token] = match;
     if (token === 'IDENT') {
       pieces.push(IDENTIFIER);
     } else if (token === ELLIPSIS) {
@@ -46,12 +47,17 @@ function tokenize(text: string): Piece[] {
     } else {
       pieces.push(token);
     }
+    tokenizedTextEnd += fullMatch.length;
   }
 
-  if (pieces.length === 0 || TOKEN.lastIndex !== 0) {
-    const from = TOKEN.lastIndex;
+  if (pieces.length === 0 || tokenizedTextEnd < text.length) {
+    // The new token that could not be found is located after the
+    // last tokenized character.
+    const from = tokenizedTextEnd;
     const to = from + ERROR_CONTEXT_WIDTH;
-    throw Error(`Invalid test, no token found for '${text.substr(from, to)}...'`);
+    throw Error(
+        `Invalid test, no token found for "${text[tokenizedTextEnd]}" ` +
+        `(context = '${text.substr(from, to)}...'`);
   }
 
   return pieces;
diff --git a/packages/compiler-cli/test/compliance/mock_compiler_spec.ts b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
index 94d69b2780..a1422aa4cc 100644
--- a/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/mock_compiler_spec.ts
@@ -82,6 +82,34 @@ describe('mock_compiler', () => {
           result.source, 'name   \n\n   .  \n    length',
           'name length expression not found (whitespace)');
     });
+
+    it('should throw if the expected output contains unknown characters', () => {
+      const files = {
+        app: {
+          'test.ts': `ɵsayHello();`,
+        }
+      };
+
+      const result = compile(files, angularFiles);
+
+      expect(() => {
+        expectEmit(result.source, `ΔsayHello();`, 'Output does not match.');
+      }).toThrowError(/Invalid test, no token found for "Δ"/);
+    });
+
+    it('should be able to properly handle string literals with escaped quote', () => {
+      const files = {
+        app: {
+          'test.ts': String.raw `const identifier = "\"quoted\"";`,
+        }
+      };
+
+      const result = compile(files, angularFiles);
+
+      expect(() => {
+        expectEmit(result.source, String.raw `const $a$ = "\"quoted\"";`, 'Output does not match.');
+      }).not.toThrow();
+    });
   });
 
   it('should be able to skip untested regions (… and // ...)', () => {
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index bc5e396424..5d65f8d700 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -2692,7 +2692,7 @@ describe('i18n support in the view compiler', () => {
               "startItalicText": "\uFFFD#4\uFFFD",
               "closeItalicText": "\uFFFD/#4\uFFFD",
               "closeTagDiv": "\uFFFD/#3\uFFFD",
-              "icu": I18N_APP_SPEC_TS_1
+              "icu": $I18N_1$
             });
             $I18N_0$ = $MSG_EXTERNAL_5791551881115084301$$APP_SPEC_TS_0$;
         }
@@ -2704,7 +2704,7 @@ describe('i18n support in the view compiler', () => {
               "startItalicText": "\uFFFD#4\uFFFD",
               "closeItalicText": "\uFFFD/#4\uFFFD",
               "closeTagDiv": "\uFFFD/#3\uFFFD",
-              "icu": I18N_APP_SPEC_TS_1
+              "icu": $I18N_1$
             });
         }
         …
@@ -2715,14 +2715,14 @@ describe('i18n support in the view compiler', () => {
             $r3$.ɵɵelementStart(0, "div");
             $r3$.ɵɵi18nStart(1, $I18N_0$);
             $r3$.ɵɵelement(2, "b");
-            $r3$.ɵɵelementStart(3, "div");
-            $r3$.ɵɵstyling($_c2$);
+            $r3$.ɵɵelementStart(3, "div", $_c2$);
             $r3$.ɵɵelement(4, "i");
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
+            $r3$.ɵɵselect(1);
             $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.gender));
             $r3$.ɵɵi18nApply(1);
           }
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
index 0a0eaed14e..e46ac76c9c 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_providers_spec.ts
@@ -144,9 +144,19 @@ describe('compiler compliance: providers', () => {
         result.source, `
     export class MyComponent {
     }
-    MyComponent.ngComponentDef = i0.ɵdefineComponent({ type: MyComponent, selectors: [["my-component"]], factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); }, consts: 1, vars: 0, template: function MyComponent_Template(rf, ctx) { if (rf & 1) {
-            i0.ɵelement(0, "div");
-        } } });`,
+    MyComponent.ngComponentDef = i0.ɵɵdefineComponent({
+      type: MyComponent,
+      selectors: [["my-component"]],
+      factory: function MyComponent_Factory(t) { return new (t || MyComponent)(); },
+      consts: 1,
+      vars: 0,
+      template: function MyComponent_Template(rf, ctx) {
+        if (rf & 1) {
+          i0.ɵɵelement(0, "div");
+        }
+      },
+      encapsulation: 2
+    });`,
         'Incorrect features');
   });
 });

From 02523debe533c6d0562db19838e9c177e9f827f6 Mon Sep 17 00:00:00 2001
From: Andrew Kushnir <akushnir@google.com>
Date: Mon, 20 May 2019 14:40:44 -0700
Subject: [PATCH 149/275] fix(ivy): handle pipes in i18n attributes properly
 (#30573)

Prior to this change we processed binding expression (including bindings with pipes) in i18n attributes before we generate update instruction. As a result, slot offsets for pipeBind instructions were calculated incorrectly. Now we perform binding expression processing when we generate "update block" instructions, so offsets are calculated correctly.

PR Close #30573
---
 .../test/compliance/r3_view_compiler_i18n_spec.ts      | 10 +++++-----
 packages/compiler/src/render3/view/template.ts         |  5 +++--
 packages/core/test/acceptance/i18n_spec.ts             |  8 ++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index 5d65f8d700..0951d62d62 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -470,7 +470,7 @@ describe('i18n support in the view compiler', () => {
           }
           if (rf & 2) {
             $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 6, ctx.valueA)));
             $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
             $r3$.ɵɵi18nApply(2);
             $r3$.ɵɵselect(3);
@@ -520,7 +520,7 @@ describe('i18n support in the view compiler', () => {
           }
           if (rf & 2) {
             $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 1, ctx.valueA)));
             $r3$.ɵɵi18nApply(2);
           }
         }
@@ -567,7 +567,7 @@ describe('i18n support in the view compiler', () => {
           if (rf & 2) {
             const $outer_r1$ = ctx.$implicit;
             $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 0, $outer_r1$)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 1, $outer_r1$)));
             $r3$.ɵɵi18nApply(3);
           }
         }
@@ -699,7 +699,7 @@ describe('i18n support in the view compiler', () => {
           }
           if (rf & 2) {
             $r3$.ɵɵselect(0);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 0, ctx.valueA)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(1, 6, ctx.valueA)));
             $r3$.ɵɵi18nExp($r3$.ɵɵbind(ctx.valueB));
             $r3$.ɵɵi18nApply(2);
             $r3$.ɵɵselect(3);
@@ -754,7 +754,7 @@ describe('i18n support in the view compiler', () => {
           if (rf & 2) {
             const $outer_r1$ = ctx.$implicit;
             $r3$.ɵɵselect(1);
-            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 0, $outer_r1$)));
+            $r3$.ɵɵi18nExp($r3$.ɵɵbind($r3$.ɵɵpipeBind1(2, 1, $outer_r1$)));
             $r3$.ɵɵi18nApply(3);
           }
         }
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 758ceb66ea..32d990934b 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -643,8 +643,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
               i18nAttrArgs.push(o.literal(attr.name), this.i18nTranslate(message, params));
               converted.expressions.forEach(expression => {
                 hasBindings = true;
-                const binding = this.convertExpressionBinding(implicit, expression);
-                this.updateInstruction(elementIndex, element.sourceSpan, R3.i18nExp, [binding]);
+                this.updateInstruction(
+                    elementIndex, element.sourceSpan, R3.i18nExp,
+                    () => [this.convertExpressionBinding(implicit, expression)]);
               });
             }
           }
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index f63ed86800..647d86c5ec 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -570,6 +570,14 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       expect(fixture.nativeElement.innerHTML).toEqual(`<div title="bonjour John"></div>`);
     });
 
+    it('with pipes', () => {
+      ɵi18nConfigureLocalize(
+          {translations: {'hello {$interpolation}': 'bonjour {$interpolation}'}});
+      const fixture = initWithTemplate(
+          AppComp, `<div i18n i18n-title title="hello {{name | uppercase}}"></div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div title="bonjour ANGULAR"></div>`);
+    });
+
     it('multiple attributes', () => {
       ɵi18nConfigureLocalize(
           {translations: {'hello {$interpolation}': 'bonjour {$interpolation}'}});

From 76391f899923f8a838e71b17c0343701879ef8a0 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 1 May 2019 14:58:59 +0100
Subject: [PATCH 150/275] fix(ivy): use `ReflectionHost` in
 `AbsoluteModuleStrategy` (#30200)

The AbsoluteModuleStrategy in ngtsc assumed that the source code is
formatted as TypeScript with regards to module exports.

In ngcc this is not always the case, so this commit changes
`AbsoluteModuleStrategy` so that it relies upon a `ReflectionHost`  to
compute the exports of a module.

PR Close #30200
---
 .../ngcc/src/analysis/decoration_analyzer.ts  |  3 +-
 .../src/ngtsc/imports/src/emitter.ts          | 37 +++++--------------
 packages/compiler-cli/src/ngtsc/program.ts    |  3 +-
 .../typecheck/test/type_constructor_spec.ts   |  8 ++--
 4 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts
index 1a24bfab42..602f8d4829 100644
--- a/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts
@@ -70,7 +70,8 @@ export class DecorationAnalyzer {
   fullMetaReader = new CompoundMetadataReader([this.metaRegistry, this.dtsMetaReader]);
   refEmitter = new ReferenceEmitter([
     new LocalIdentifierStrategy(),
-    new AbsoluteModuleStrategy(this.program, this.typeChecker, this.options, this.host),
+    new AbsoluteModuleStrategy(
+        this.program, this.typeChecker, this.options, this.host, this.reflectionHost),
     // TODO(alxhub): there's no reason why ngcc needs the "logical file system" logic here, as ngcc
     // projects only ever have one rootDir. Instead, ngcc should just switch its emitted import
     // based on whether a bestGuessOwningModule is present in the Reference.
diff --git a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
index fcfb24edcd..3131558ee8 100644
--- a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
+++ b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
@@ -11,11 +11,13 @@ import {ExternalReference} from '@angular/compiler/src/compiler';
 import * as ts from 'typescript';
 
 import {LogicalFileSystem, LogicalProjectPath} from '../../path';
+import {ReflectionHost} from '../../reflection';
 import {getSourceFile, isDeclaration, nodeNameForError, resolveModuleName} from '../../util/src/typescript';
 
 import {findExportedNameOfNode} from './find_export';
 import {ImportMode, Reference} from './references';
 
+
 /**
  * A host which supports an operation to convert a file name into a module name.
  *
@@ -115,8 +117,9 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
   private moduleExportsCache = new Map<string, Map<ts.Declaration, string>|null>();
 
   constructor(
-      private program: ts.Program, private checker: ts.TypeChecker,
-      private options: ts.CompilerOptions, private host: ts.CompilerHost) {}
+      protected program: ts.Program, protected checker: ts.TypeChecker,
+      protected options: ts.CompilerOptions, protected host: ts.CompilerHost,
+      private reflectionHost: ReflectionHost) {}
 
   emit(ref: Reference<ts.Node>, context: ts.SourceFile, importMode: ImportMode): Expression|null {
     if (ref.bestGuessOwningModule === null) {
@@ -159,7 +162,7 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
     return this.moduleExportsCache.get(moduleName) !;
   }
 
-  private enumerateExportsOfModule(specifier: string, fromFile: string):
+  protected enumerateExportsOfModule(specifier: string, fromFile: string):
       Map<ts.Declaration, string>|null {
     // First, resolve the module specifier to its entry point, and get the ts.Symbol for it.
     const resolvedModule = resolveModuleName(specifier, fromFile, this.options, this.host);
@@ -172,34 +175,12 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
       return null;
     }
 
-    const entryPointSymbol = this.checker.getSymbolAtLocation(entryPointFile);
-    if (entryPointSymbol === undefined) {
+    const exports = this.reflectionHost.getExportsOfModule(entryPointFile);
+    if (exports === null) {
       return null;
     }
-
-    // Next, build a Map of all the ts.Declarations exported via the specifier and their exported
-    // names.
     const exportMap = new Map<ts.Declaration, string>();
-
-    const exports = this.checker.getExportsOfModule(entryPointSymbol);
-    for (const expSymbol of exports) {
-      // Resolve export symbols to their actual declarations.
-      const declSymbol = expSymbol.flags & ts.SymbolFlags.Alias ?
-          this.checker.getAliasedSymbol(expSymbol) :
-          expSymbol;
-
-      // At this point the valueDeclaration of the symbol should be defined.
-      const decl = declSymbol.valueDeclaration;
-      if (decl === undefined) {
-        continue;
-      }
-
-      // Prefer importing the symbol via its declared name, but take any export of it otherwise.
-      if (declSymbol.name === expSymbol.name || !exportMap.has(decl)) {
-        exportMap.set(decl, expSymbol.name);
-      }
-    }
-
+    exports.forEach((declaration, name) => { exportMap.set(declaration.node, name); });
     return exportMap;
   }
 }
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index c3ab8ca2de..e16a415fbd 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -438,7 +438,8 @@ export class NgtscProgram implements api.Program {
         // First, try to use local identifiers if available.
         new LocalIdentifierStrategy(),
         // Next, attempt to use an absolute import.
-        new AbsoluteModuleStrategy(this.tsProgram, checker, this.options, this.host),
+        new AbsoluteModuleStrategy(
+            this.tsProgram, checker, this.options, this.host, this.reflector),
         // Finally, check if the reference is being written into a file within the project's logical
         // file system, and use a relative import if so. If this fails, ReferenceEmitter will throw
         // an error.
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts
index 695b5dac10..c08b50c3e8 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts
@@ -10,7 +10,7 @@ import * as ts from 'typescript';
 
 import {AbsoluteModuleStrategy, LocalIdentifierStrategy, LogicalProjectStrategy, Reference, ReferenceEmitter} from '../../imports';
 import {AbsoluteFsPath, LogicalFileSystem} from '../../path';
-import {isNamedClassDeclaration} from '../../reflection';
+import {TypeScriptReflectionHost, isNamedClassDeclaration} from '../../reflection';
 import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
 import {getRootDirs} from '../../util/src/typescript';
 import {TypeCheckingConfig} from '../src/api';
@@ -54,7 +54,8 @@ TestClass.ngTypeCtor({value: 'test'});
       const logicalFs = new LogicalFileSystem(getRootDirs(host, options));
       const emitter = new ReferenceEmitter([
         new LocalIdentifierStrategy(),
-        new AbsoluteModuleStrategy(program, checker, options, host),
+        new AbsoluteModuleStrategy(
+            program, checker, options, host, new TypeScriptReflectionHost(checker)),
         new LogicalProjectStrategy(checker, logicalFs),
       ]);
       const ctx = new TypeCheckContext(
@@ -84,7 +85,8 @@ TestClass.ngTypeCtor({value: 'test'});
       const logicalFs = new LogicalFileSystem(getRootDirs(host, options));
       const emitter = new ReferenceEmitter([
         new LocalIdentifierStrategy(),
-        new AbsoluteModuleStrategy(program, checker, options, host),
+        new AbsoluteModuleStrategy(
+            program, checker, options, host, new TypeScriptReflectionHost(checker)),
         new LogicalProjectStrategy(checker, logicalFs),
       ]);
       const ctx = new TypeCheckContext(

From 620cd5c1483d791b80f7bcd88e9d7a4702b136b2 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 29 Apr 2019 09:54:30 +0100
Subject: [PATCH 151/275] feat(ivy): ngcc - implement `CommonJsReflectionHost`
 (#30200)

PR Close #30200
---
 .../ngcc/src/host/commonjs_host.ts            |  186 ++
 .../ngcc/test/host/commonjs_host_spec.ts      | 1766 +++++++++++++++++
 2 files changed, 1952 insertions(+)
 create mode 100644 packages/compiler-cli/ngcc/src/host/commonjs_host.ts
 create mode 100644 packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts

diff --git a/packages/compiler-cli/ngcc/src/host/commonjs_host.ts b/packages/compiler-cli/ngcc/src/host/commonjs_host.ts
new file mode 100644
index 0000000000..979f6604ea
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/host/commonjs_host.ts
@@ -0,0 +1,186 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+import {Declaration, Import} from '../../../src/ngtsc/reflection';
+import {Logger} from '../logging/logger';
+import {BundleProgram} from '../packages/bundle_program';
+import {Esm5ReflectionHost} from './esm5_host';
+
+export class CommonJsReflectionHost extends Esm5ReflectionHost {
+  protected commonJsExports = new Map<ts.SourceFile, Map<string, Declaration>|null>();
+  constructor(
+      logger: Logger, isCore: boolean, protected program: ts.Program,
+      protected compilerHost: ts.CompilerHost, dts?: BundleProgram|null) {
+    super(logger, isCore, program.getTypeChecker(), dts);
+  }
+
+  getImportOfIdentifier(id: ts.Identifier): Import|null {
+    const requireCall = this.findCommonJsImport(id);
+    if (requireCall === null) {
+      return null;
+    }
+    return {from: requireCall.arguments[0].text, name: id.text};
+  }
+
+  getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null {
+    return this.getCommonJsImportedDeclaration(id) || super.getDeclarationOfIdentifier(id);
+  }
+
+  getExportsOfModule(module: ts.Node): Map<string, Declaration>|null {
+    return super.getExportsOfModule(module) || this.getCommonJsExports(module.getSourceFile());
+  }
+
+  getCommonJsExports(sourceFile: ts.SourceFile): Map<string, Declaration>|null {
+    if (!this.commonJsExports.has(sourceFile)) {
+      const moduleExports = this.computeExportsOfCommonJsModule(sourceFile);
+      this.commonJsExports.set(sourceFile, moduleExports);
+    }
+    return this.commonJsExports.get(sourceFile) !;
+  }
+
+  private computeExportsOfCommonJsModule(sourceFile: ts.SourceFile): Map<string, Declaration> {
+    const moduleMap = new Map<string, Declaration>();
+    for (const statement of this.getModuleStatements(sourceFile)) {
+      if (isCommonJsExportStatement(statement)) {
+        const exportDeclaration = this.extractCommonJsExportDeclaration(statement);
+        if (exportDeclaration !== null) {
+          moduleMap.set(exportDeclaration.name, exportDeclaration.declaration);
+        }
+      } else if (isReexportStatement(statement)) {
+        const reexports = this.extractCommonJsReexports(statement, sourceFile);
+        for (const reexport of reexports) {
+          moduleMap.set(reexport.name, reexport.declaration);
+        }
+      }
+    }
+    return moduleMap;
+  }
+
+  private extractCommonJsExportDeclaration(statement: CommonJsExportStatement):
+      CommonJsExportDeclaration|null {
+    const exportExpression = statement.expression.right;
+    const declaration = this.getDeclarationOfExpression(exportExpression);
+    if (declaration === null) {
+      return null;
+    }
+    const name = statement.expression.left.name.text;
+    return {name, declaration};
+  }
+
+  private extractCommonJsReexports(statement: ReexportStatement, containingFile: ts.SourceFile):
+      CommonJsExportDeclaration[] {
+    const reexports: CommonJsExportDeclaration[] = [];
+    const requireCall = statement.expression.arguments[0];
+    const importPath = requireCall.arguments[0].text;
+    const importedFile = this.resolveModuleName(importPath, containingFile);
+    if (importedFile !== undefined) {
+      const viaModule = stripExtension(importedFile.fileName);
+      const importedExports = this.getExportsOfModule(importedFile);
+      if (importedExports !== null) {
+        importedExports.forEach(
+            (decl, name) => reexports.push({name, declaration: {node: decl.node, viaModule}}));
+      }
+    }
+    return reexports;
+  }
+
+  private findCommonJsImport(id: ts.Identifier): RequireCall|null {
+    // Is `id` a namespaced property access, e.g. `Directive` in `core.Directive`?
+    // If so capture the symbol of the namespace, e.g. `core`.
+    const nsIdentifier = findNamespaceOfIdentifier(id);
+    const nsSymbol = nsIdentifier && this.checker.getSymbolAtLocation(nsIdentifier) || null;
+    const nsDeclaration = nsSymbol && nsSymbol.valueDeclaration;
+    const initializer =
+        nsDeclaration && ts.isVariableDeclaration(nsDeclaration) && nsDeclaration.initializer ||
+        null;
+    return initializer && isRequireCall(initializer) ? initializer : null;
+  }
+
+  private getCommonJsImportedDeclaration(id: ts.Identifier): Declaration|null {
+    const importInfo = this.getImportOfIdentifier(id);
+    if (importInfo === null) {
+      return null;
+    }
+
+    const importedFile = this.resolveModuleName(importInfo.from, id.getSourceFile());
+    if (importedFile === undefined) {
+      return null;
+    }
+
+    return {node: importedFile, viaModule: importInfo.from};
+  }
+
+  private resolveModuleName(moduleName: string, containingFile: ts.SourceFile): ts.SourceFile
+      |undefined {
+    if (this.compilerHost.resolveModuleNames) {
+      const moduleInfo =
+          this.compilerHost.resolveModuleNames([moduleName], containingFile.fileName)[0];
+      return moduleInfo && this.program.getSourceFile(moduleInfo.resolvedFileName);
+    } else {
+      const moduleInfo = ts.resolveModuleName(
+          moduleName, containingFile.fileName, this.program.getCompilerOptions(),
+          this.compilerHost);
+      return moduleInfo.resolvedModule &&
+          this.program.getSourceFile(moduleInfo.resolvedModule.resolvedFileName);
+    }
+  }
+}
+
+type CommonJsExportStatement = ts.ExpressionStatement & {
+  expression:
+      ts.BinaryExpression & {left: ts.PropertyAccessExpression & {expression: ts.Identifier}}
+};
+export function isCommonJsExportStatement(s: ts.Statement): s is CommonJsExportStatement {
+  return ts.isExpressionStatement(s) && ts.isBinaryExpression(s.expression) &&
+      ts.isPropertyAccessExpression(s.expression.left) &&
+      ts.isIdentifier(s.expression.left.expression) &&
+      s.expression.left.expression.text === 'exports';
+}
+
+interface CommonJsExportDeclaration {
+  name: string;
+  declaration: Declaration;
+}
+
+export type RequireCall = ts.CallExpression & {arguments: [ts.StringLiteral]};
+export function isRequireCall(node: ts.Node): node is RequireCall {
+  return ts.isCallExpression(node) && ts.isIdentifier(node.expression) &&
+      node.expression.text === 'require' && node.arguments.length === 1 &&
+      ts.isStringLiteral(node.arguments[0]);
+}
+
+/**
+ * If the identifier `id` is the RHS of a property access of the form `namespace.id`
+ * and `namespace` is an identifer then return `namespace`, otherwise `null`.
+ * @param id The identifier whose namespace we want to find.
+ */
+function findNamespaceOfIdentifier(id: ts.Identifier): ts.Identifier|null {
+  return id.parent && ts.isPropertyAccessExpression(id.parent) &&
+          ts.isIdentifier(id.parent.expression) ?
+      id.parent.expression :
+      null;
+}
+
+export function stripParentheses(node: ts.Node): ts.Node {
+  return ts.isParenthesizedExpression(node) ? node.expression : node;
+}
+
+type ReexportStatement = ts.ExpressionStatement & {expression: {arguments: [RequireCall]}};
+function isReexportStatement(statement: ts.Statement): statement is ReexportStatement {
+  return ts.isExpressionStatement(statement) && ts.isCallExpression(statement.expression) &&
+      ts.isIdentifier(statement.expression.expression) &&
+      statement.expression.expression.text === '__export' &&
+      statement.expression.arguments.length === 1 &&
+      isRequireCall(statement.expression.arguments[0]);
+}
+
+function stripExtension(fileName: string): string {
+  return fileName.replace(/\..+$/, '');
+}
diff --git a/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts b/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts
new file mode 100644
index 0000000000..9d02cba996
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts
@@ -0,0 +1,1766 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+
+import {ClassMemberKind, CtorParameter, Import, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
+import {CommonJsReflectionHost} from '../../src/host/commonjs_host';
+import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
+import {getIifeBody} from '../../src/host/esm5_host';
+import {MockLogger} from '../helpers/mock_logger';
+import {getDeclaration, makeTestBundleProgram} from '../helpers/utils';
+
+import {expectTypeValueReferencesForParameters} from './util';
+
+const SOME_DIRECTIVE_FILE = {
+  name: '/some_directive.cjs.js',
+  contents: `
+var core = require('@angular/core');
+
+var INJECTED_TOKEN = new InjectionToken('injected');
+var ViewContainerRef = {};
+var TemplateRef = {};
+
+var SomeDirective = (function() {
+  function SomeDirective(_viewContainer, _template, injected) {
+    this.instanceProperty = 'instance';
+  }
+  SomeDirective.prototype = {
+    instanceMethod: function() {},
+  };
+  SomeDirective.staticMethod = function() {};
+  SomeDirective.staticProperty = 'static';
+  SomeDirective.decorators = [
+    { type: core.Directive, args: [{ selector: '[someDirective]' },] }
+  ];
+  SomeDirective.ctorParameters = function() { return [
+    { type: ViewContainerRef, },
+    { type: TemplateRef, },
+    { type: undefined, decorators: [{ type: core.Inject, args: [INJECTED_TOKEN,] },] },
+  ]; };
+  SomeDirective.propDecorators = {
+    "input1": [{ type: core.Input },],
+    "input2": [{ type: core.Input },],
+  };
+  return SomeDirective;
+}());
+exports.SomeDirective = SomeDirective;
+`
+};
+
+const SIMPLE_ES2015_CLASS_FILE = {
+  name: '/simple_es2015_class.d.ts',
+  contents: `
+    export class EmptyClass {}
+  `,
+};
+
+const SIMPLE_CLASS_FILE = {
+  name: '/simple_class.js',
+  contents: `
+var EmptyClass = (function() {
+  function EmptyClass() {
+  }
+  return EmptyClass;
+}());
+var NoDecoratorConstructorClass = (function() {
+  function NoDecoratorConstructorClass(foo) {
+  }
+  return NoDecoratorConstructorClass;
+}());
+exports.EmptyClass = EmptyClass;
+exports.NoDecoratorConstructorClass = NoDecoratorConstructorClass;
+`,
+};
+
+const FOO_FUNCTION_FILE = {
+  name: '/foo_function.js',
+  contents: `
+var core = require('@angular/core');
+function foo() {}
+foo.decorators = [
+  { type: core.Directive, args: [{ selector: '[ignored]' },] }
+];
+exports.foo = foo;
+`,
+};
+
+const INVALID_DECORATORS_FILE = {
+  name: '/invalid_decorators.js',
+  contents: `
+var core = require('@angular/core');
+var NotArrayLiteral = (function() {
+  function NotArrayLiteral() {
+  }
+  NotArrayLiteral.decorators = () => [
+    { type: core.Directive, args: [{ selector: '[ignored]' },] },
+  ];
+  return NotArrayLiteral;
+}());
+
+var NotObjectLiteral = (function() {
+  function NotObjectLiteral() {
+  }
+  NotObjectLiteral.decorators = [
+    "This is not an object literal",
+    { type: core.Directive },
+  ];
+  return NotObjectLiteral;
+}());
+
+var NoTypeProperty = (function() {
+  function NoTypeProperty() {
+  }
+  NoTypeProperty.decorators = [
+    { notType: core.Directive },
+    { type: core.Directive },
+  ];
+  return NoTypeProperty;
+}());
+
+var NotIdentifier = (function() {
+  function NotIdentifier() {
+  }
+  NotIdentifier.decorators = [
+    { type: 'StringsLiteralsAreNotIdentifiers' },
+    { type: core.Directive },
+  ];
+  return NotIdentifier;
+}());
+`,
+};
+
+const INVALID_DECORATOR_ARGS_FILE = {
+  name: '/invalid_decorator_args.js',
+  contents: `
+var core = require('@angular/core');
+var NoArgsProperty = (function() {
+  function NoArgsProperty() {
+  }
+  NoArgsProperty.decorators = [
+    { type: core.Directive },
+  ];
+  return NoArgsProperty;
+}());
+
+var args = [{ selector: '[ignored]' },];
+var NoPropertyAssignment = (function() {
+  function NoPropertyAssignment() {
+  }
+  NoPropertyAssignment.decorators = [
+    { type: core.Directive, args },
+  ];
+  return NoPropertyAssignment;
+}());
+
+var NotArrayLiteral = (function() {
+  function NotArrayLiteral() {
+  }
+  NotArrayLiteral.decorators = [
+    { type: core.Directive, args: () => [{ selector: '[ignored]' },] },
+  ];
+  return NotArrayLiteral;
+}());
+`,
+};
+
+const INVALID_PROP_DECORATORS_FILE = {
+  name: '/invalid_prop_decorators.js',
+  contents: `
+var core = require('@angular/core');
+var NotObjectLiteral = (function() {
+  function NotObjectLiteral() {
+  }
+  NotObjectLiteral.propDecorators = () => ({
+    "prop": [{ type: core.Directive },]
+  });
+  return NotObjectLiteral;
+}());
+
+var NotObjectLiteralProp = (function() {
+  function NotObjectLiteralProp() {
+  }
+  NotObjectLiteralProp.propDecorators = {
+    "prop": [
+      "This is not an object literal",
+      { type: core.Directive },
+    ]
+  };
+  return NotObjectLiteralProp;
+}());
+
+var NoTypeProperty = (function() {
+  function NoTypeProperty() {
+  }
+  NoTypeProperty.propDecorators = {
+    "prop": [
+      { notType: core.Directive },
+      { type: core.Directive },
+    ]
+  };
+  return NoTypeProperty;
+}());
+
+var NotIdentifier = (function() {
+  function NotIdentifier() {
+  }
+  NotIdentifier.propDecorators = {
+    "prop": [
+      { type: 'StringsLiteralsAreNotIdentifiers' },
+      { type: core.Directive },
+    ]
+  };
+  return NotIdentifier;
+}());
+`,
+};
+
+const INVALID_PROP_DECORATOR_ARGS_FILE = {
+  name: '/invalid_prop_decorator_args.js',
+  contents: `
+var core = require('@angular/core');
+var NoArgsProperty = (function() {
+  function NoArgsProperty() {
+  }
+  NoArgsProperty.propDecorators = {
+    "prop": [{ type: core.Input },]
+  };
+  return NoArgsProperty;
+}());
+
+var args = [{ selector: '[ignored]' },];
+var NoPropertyAssignment = (function() {
+  function NoPropertyAssignment() {
+  }
+  NoPropertyAssignment.propDecorators = {
+    "prop": [{ type: core.Input, args },]
+  };
+  return NoPropertyAssignment;
+}());
+
+var NotArrayLiteral = (function() {
+  function NotArrayLiteral() {
+  }
+  NotArrayLiteral.propDecorators = {
+    "prop": [{ type: core.Input, args: () => [{ selector: '[ignored]' },] },],
+  };
+  return NotArrayLiteral;
+}());
+`,
+};
+
+const INVALID_CTOR_DECORATORS_FILE = {
+  name: '/invalid_ctor_decorators.js',
+  contents: `
+var core = require('@angular/core');
+var NoParameters = (function() {
+  function NoParameters() {}
+  return NoParameters;
+}());
+
+var ArrowFunction = (function() {
+  function ArrowFunction(arg1) {
+  }
+  ArrowFunction.ctorParameters = () => [
+    { type: 'ParamType', decorators: [{ type: core.Inject },] }
+  ];
+  return ArrowFunction;
+}());
+
+var NotArrayLiteral = (function() {
+  function NotArrayLiteral(arg1) {
+  }
+  NotArrayLiteral.ctorParameters = function() { return 'StringsAreNotArrayLiterals'; };
+  return NotArrayLiteral;
+}());
+
+var NotObjectLiteral = (function() {
+  function NotObjectLiteral(arg1, arg2) {
+  }
+  NotObjectLiteral.ctorParameters = function() { return [
+    "This is not an object literal",
+    { type: 'ParamType', decorators: [{ type: core.Inject },] },
+  ]; };
+  return NotObjectLiteral;
+}());
+
+var NoTypeProperty = (function() {
+  function NoTypeProperty(arg1, arg2) {
+  }
+  NoTypeProperty.ctorParameters = function() { return [
+    {
+      type: 'ParamType',
+      decorators: [
+        { notType: core.Inject },
+        { type: core.Inject },
+      ]
+    },
+  ]; };
+  return NoTypeProperty;
+}());
+
+var NotIdentifier = (function() {
+  function NotIdentifier(arg1, arg2) {
+  }
+  NotIdentifier.ctorParameters = function() { return [
+    {
+      type: 'ParamType',
+      decorators: [
+        { type: 'StringsLiteralsAreNotIdentifiers' },
+        { type: core.Inject },
+      ]
+    },
+  ]; };
+  return NotIdentifier;
+}());
+`,
+};
+
+const INVALID_CTOR_DECORATOR_ARGS_FILE = {
+  name: '/invalid_ctor_decorator_args.js',
+  contents: `
+var core = require('@angular/core');
+var NoArgsProperty = (function() {
+  function NoArgsProperty(arg1) {
+  }
+  NoArgsProperty.ctorParameters = function() { return [
+    { type: 'ParamType', decorators: [{ type: core.Inject },] },
+  ]; };
+  return NoArgsProperty;
+}());
+
+var args = [{ selector: '[ignored]' },];
+var NoPropertyAssignment = (function() {
+  function NoPropertyAssignment(arg1) {
+  }
+  NoPropertyAssignment.ctorParameters = function() { return [
+    { type: 'ParamType', decorators: [{ type: core.Inject, args },] },
+  ]; };
+  return NoPropertyAssignment;
+}());
+
+var NotArrayLiteral = (function() {
+  function NotArrayLiteral(arg1) {
+  }
+  NotArrayLiteral.ctorParameters = function() { return [
+    { type: 'ParamType', decorators: [{ type: core.Inject, args: () => [{ selector: '[ignored]' },] },] },
+  ]; };
+  return NotArrayLiteral;
+}());
+`,
+};
+
+const IMPORTS_FILES = [
+  {
+    name: '/file_a.js',
+    contents: `
+var a = 'a';
+exports.a = a;
+`,
+  },
+  {
+    name: '/file_b.js',
+    contents: `
+var file_a = require('./file_a');
+var b = file_a.a;
+var c = 'c';
+var d = c;
+`,
+  },
+  {
+    name: '/file_c.js',
+    contents: `
+var file_a = require('./file_a');
+var c = file_a.a;
+`,
+  },
+];
+
+const EXPORTS_FILES = [
+  {
+    name: '/a_module.js',
+    contents: `
+var a = 'a';
+exports.a = a;
+`,
+  },
+  {
+    name: '/b_module.js',
+    contents: `
+var core = require('@angular/core');
+var a_module = require('/a_module');
+var b = a_module.a;
+var e = 'e';
+var SomeClass = (function() {
+  function SomeClass() {}
+  return SomeClass;
+}());
+
+exports.Directive = core.Directive;
+exports.a = a_module.a;
+exports.b = b;
+exports.c = a_module.a;
+exports.d = b;
+exports.e = e;
+exports.DirectiveX = core.Directive;
+exports.SomeClass = SomeClass;
+`,
+  },
+  {
+    name: '/xtra_module.js',
+    contents: `
+var xtra1 = 'xtra1';
+var xtra2 = 'xtra2';
+exports.xtra1 = xtra1;
+exports.xtra2 = xtra2;
+`,
+  },
+  {
+    name: '/wildcard_reexports.js',
+    contents: `
+    function __export(m) {
+      for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    __export(require("./b_module"));
+    __export(require("./xtra_module"));
+    `
+  },
+];
+
+const FUNCTION_BODY_FILE = {
+  name: '/function_body.js',
+  contents: `
+function foo(x) {
+  return x;
+}
+function bar(x, y) {
+  if (y === void 0) { y = 42; }
+  return x + y;
+}
+function complex() {
+  var x = 42;
+  return 42;
+}
+function baz(x) {
+  var y;
+  if (x === void 0) { y = 42; }
+  return y;
+}
+var y;
+function qux(x) {
+  if (x === void 0) { y = 42; }
+  return y;
+}
+function moo() {
+  var x;
+  if (x === void 0) { x = 42; }
+  return x;
+}
+var x;
+function juu() {
+  if (x === void 0) { x = 42; }
+  return x;
+}
+`
+};
+
+const DECORATED_FILES = [
+  {
+    name: '/primary.js',
+    contents: `
+var core = require('@angular/core');
+var secondary = require('./secondary');
+var A = (function() {
+  function A() {}
+  A.decorators = [
+    { type: core.Directive, args: [{ selector: '[a]' }] }
+  ];
+  return A;
+}());
+  var B = (function() {
+  function B() {}
+  B.decorators = [
+    { type: core.Directive, args: [{ selector: '[b]' }] }
+  ];
+  return B;
+}());
+  function x() {}
+  function y() {}
+  var C = (function() {
+  function C() {}
+  return C;
+});
+exports.A = A;
+exports.x = x;
+exports.C = C;
+`
+  },
+  {
+    name: '/secondary.js',
+    contents: `
+var core = require('@angular/core');
+var D = (function() {
+  function D() {}
+  D.decorators = [
+    { type: core.Directive, args: [{ selector: '[d]' }] }
+  ];
+  return D;
+}());
+exports.D = D;
+    `
+  }
+];
+
+const TYPINGS_SRC_FILES = [
+  {
+    name: '/src/index.js',
+    contents: `
+var internal = require('./internal');
+var class1 = require('./class1');
+var class2 = require('./class2');
+function __export(m) {
+  for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+var InternalClass = internal.InternalClass;
+__export(class1);
+__export(class2);
+`
+  },
+  {
+    name: '/src/class1.js',
+    contents: `
+var Class1 = (function() {
+  function Class1() {}
+  return Class1;
+}());
+var MissingClass1 = (function() {
+  function MissingClass1() {}
+  return MissingClass1;
+}());
+exports.Class1 = Class1;
+exports.MissingClass1 = MissingClass1;
+`
+  },
+  {
+    name: '/src/class2.js',
+    contents: `
+var Class2 = (function() {
+  function Class2() {}
+  return Class2;
+}());
+exports.Class2 = Class2;
+`
+  },
+  {name: '/src/func1.js', contents: 'function mooFn() {} export {mooFn}'}, {
+    name: '/src/internal.js',
+    contents: `
+var InternalClass = (function() {
+  function InternalClass() {}
+  return InternalClass;
+}());
+var Class2 = (function() {
+  function Class2() {}
+  return Class2;
+}());
+exports.InternalClass =InternalClass;
+exports.Class2 = Class2;
+`
+  },
+  {
+    name: '/src/missing-class.js',
+    contents: `
+var MissingClass2 = (function() {
+  function MissingClass2() {}
+  return MissingClass2;
+}());
+exports. MissingClass2 = MissingClass2;
+`
+  },
+  {
+    name: '/src/flat-file.js',
+    contents: `
+var Class1 = (function() {
+  function Class1() {}
+  return Class1;
+}());
+var MissingClass1 = (function() {
+  function MissingClass1() {}
+  return MissingClass1;
+}());
+var MissingClass2 = (function() {
+  function MissingClass2() {}
+  return MissingClass2;
+}());
+var Class3 = (function() {
+  function Class3() {}
+  return Class3;
+}());
+exports.Class1 = Class1;
+exports.xClass3 = Class3;
+exports.MissingClass1 = MissingClass1;
+exports.MissingClass2 = MissingClass2;
+`
+  }
+];
+
+const TYPINGS_DTS_FILES = [
+  {
+    name: '/typings/index.d.ts',
+    contents:
+        `import {InternalClass} from './internal'; export * from './class1'; export * from './class2';`
+  },
+  {
+    name: '/typings/class1.d.ts',
+    contents: `export declare class Class1 {}\nexport declare class OtherClass {}`
+  },
+  {
+    name: '/typings/class2.d.ts',
+    contents:
+        `export declare class Class2 {}\nexport declare interface SomeInterface {}\nexport {Class3 as xClass3} from './class3';`
+  },
+  {name: '/typings/func1.d.ts', contents: 'export declare function mooFn(): void;'},
+  {
+    name: '/typings/internal.d.ts',
+    contents: `export declare class InternalClass {}\nexport declare class Class2 {}`
+  },
+  {name: '/typings/class3.d.ts', contents: `export declare class Class3 {}`},
+];
+
+const MODULE_WITH_PROVIDERS_PROGRAM = [
+  {
+    name: '/src/functions.js',
+    contents: `
+var mod = require('./module');
+var SomeService = (function() {
+  function SomeService() {}
+  return SomeService;
+}());
+
+var InternalModule = (function() {
+  function InternalModule() {}
+  return InternalModule;
+}());
+
+function aNumber() { return 42; }
+function aString() { return 'foo'; }
+function emptyObject() { return {}; }
+function ngModuleIdentifier() { return { ngModule: InternalModule }; }
+function ngModuleWithEmptyProviders() { return { ngModule: InternalModule, providers: [] }; }
+function ngModuleWithProviders() { return { ngModule: InternalModule, providers: [SomeService] }; }
+function onlyProviders() { return { providers: [SomeService] }; }
+function ngModuleNumber() { return { ngModule: 42 }; }
+function ngModuleString() { return { ngModule: 'foo' }; }
+function ngModuleObject() { return { ngModule: { foo: 42 } }; }
+function externalNgModule() { return { ngModule: mod.ExternalModule }; }
+// NOTE: We do not include the "namespaced" export tests in CommonJS as all CommonJS exports are already namespaced.
+// function namespacedExternalNgModule() { return { ngModule: mod.ExternalModule }; }
+
+exports.aNumber = aNumber;
+exports.aString = aString;
+exports.emptyObject = emptyObject;
+exports.ngModuleIdentifier = ngModuleIdentifier;
+exports.ngModuleWithEmptyProviders = ngModuleWithEmptyProviders;
+exports.ngModuleWithProviders = ngModuleWithProviders;
+exports.onlyProviders = onlyProviders;
+exports.ngModuleNumber = ngModuleNumber;
+exports.ngModuleString = ngModuleString;
+exports.ngModuleObject = ngModuleObject;
+exports.externalNgModule = externalNgModule;
+exports.SomeService = SomeService;
+exports.InternalModule = InternalModule;
+`
+  },
+  {
+    name: '/src/methods.js',
+    contents: `
+var mod = require('./module');
+var SomeService = (function() {
+  function SomeService() {}
+  return SomeService;
+}());
+
+var InternalModule = (function() {
+  function InternalModule() {}
+  InternalModule.prototype = {
+    instanceNgModuleIdentifier: function() { return { ngModule: InternalModule }; },
+    instanceNgModuleWithEmptyProviders: function() { return { ngModule: InternalModule, providers: [] }; },
+    instanceNgModuleWithProviders: function() { return { ngModule: InternalModule, providers: [SomeService] }; },
+    instanceExternalNgModule: function() { return { ngModule: mod.ExternalModule }; },
+  };
+  InternalModule.aNumber = function() { return 42; };
+  InternalModule.aString = function() { return 'foo'; };
+  InternalModule.emptyObject = function() { return {}; };
+  InternalModule.ngModuleIdentifier = function() { return { ngModule: InternalModule }; };
+  InternalModule.ngModuleWithEmptyProviders = function() { return { ngModule: InternalModule, providers: [] }; };
+  InternalModule.ngModuleWithProviders = function() { return { ngModule: InternalModule, providers: [SomeService] }; };
+  InternalModule.onlyProviders = function() { return { providers: [SomeService] }; };
+  InternalModule.ngModuleNumber = function() { return { ngModule: 42 }; };
+  InternalModule.ngModuleString = function() { return { ngModule: 'foo' }; };
+  InternalModule.ngModuleObject = function() { return { ngModule: { foo: 42 } }; };
+  InternalModule.externalNgModule = function() { return { ngModule: mod.ExternalModule }; };
+  return InternalModule;
+}());
+
+exports.SomeService = SomeService;
+exports.InternalModule = InternalModule;
+`
+  },
+  {
+    name: '/src/aliased_class.js',
+    contents: `
+var AliasedModule = (function() {
+  function AliasedModule() {}
+  AliasedModule_1 = AliasedModule;
+  AliasedModule.forRoot = function() { return { ngModule: AliasedModule_1 }; };
+  var AliasedModule_1;
+  return AliasedModule;
+}());
+exports.AliasedModule = AliasedModule;
+`
+  },
+  {
+    name: '/src/module.js',
+    contents: `
+var ExternalModule = (function() {
+  function ExternalModule() {}
+  return ExternalModule;
+}());
+exports.ExternalModule = ExternalModule;
+`
+  },
+];
+
+
+describe('CommonJsReflectionHost', () => {
+
+  describe('getDecoratorsOfDeclaration()', () => {
+    it('should find the decorators on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators).toBeDefined();
+      expect(decorators.length).toEqual(1);
+
+      const decorator = decorators[0];
+      expect(decorator.name).toEqual('Directive');
+      expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
+      expect(decorator.args !.map(arg => arg.getText())).toEqual([
+        '{ selector: \'[someDirective]\' }',
+      ]);
+    });
+
+    it('should return null if the symbol is not a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const functionNode =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(functionNode);
+      expect(decorators).toBe(null);
+    });
+
+    it('should return null if there are no decorators', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode);
+      expect(decorators).toBe(null);
+    });
+
+    it('should ignore `decorators` if it is not an array literal', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NotArrayLiteral', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode);
+      expect(decorators).toEqual([]);
+    });
+
+    it('should ignore decorator elements that are not object literals', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NotObjectLiteral', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore decorator elements that have no `type` property', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NoTypeProperty', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore decorator elements whose `type` value is not an identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_DECORATORS_FILE.name, 'NotIdentifier', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should use `getImportOfIdentifier()` to retrieve import info', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'};
+      const spy = spyOn(host, 'getImportOfIdentifier').and.returnValue(mockImportInfo);
+
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toEqual(1);
+      expect(decorators[0].import).toBe(mockImportInfo);
+
+      const typeIdentifier = spy.calls.mostRecent().args[0] as ts.Identifier;
+      expect(typeIdentifier.text).toBe('Directive');
+    });
+
+    describe('(returned decorators `args`)', () => {
+      it('should be an empty array if decorator has no `args` property', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+            isNamedVariableDeclaration);
+        const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Directive');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if decorator\'s `args` has no property assignment', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+            isNamedVariableDeclaration);
+        const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Directive');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if `args` property value is not an array literal', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+            isNamedVariableDeclaration);
+        const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Directive');
+        expect(decorators[0].args).toEqual([]);
+      });
+    });
+  });
+
+  describe('getMembersOfClass()', () => {
+    it('should find decorated members on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const input1 = members.find(member => member.name === 'input1') !;
+      expect(input1.kind).toEqual(ClassMemberKind.Property);
+      expect(input1.isStatic).toEqual(false);
+      expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
+
+      const input2 = members.find(member => member.name === 'input2') !;
+      expect(input2.kind).toEqual(ClassMemberKind.Property);
+      expect(input2.isStatic).toEqual(false);
+      expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
+    });
+
+    it('should find non decorated properties on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const instanceProperty = members.find(member => member.name === 'instanceProperty') !;
+      expect(instanceProperty.kind).toEqual(ClassMemberKind.Property);
+      expect(instanceProperty.isStatic).toEqual(false);
+      expect(ts.isBinaryExpression(instanceProperty.implementation !)).toEqual(true);
+      expect(instanceProperty.value !.getText()).toEqual(`'instance'`);
+    });
+
+    it('should find static methods on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const staticMethod = members.find(member => member.name === 'staticMethod') !;
+      expect(staticMethod.kind).toEqual(ClassMemberKind.Method);
+      expect(staticMethod.isStatic).toEqual(true);
+      expect(ts.isFunctionExpression(staticMethod.implementation !)).toEqual(true);
+    });
+
+    it('should find static properties on a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      const staticProperty = members.find(member => member.name === 'staticProperty') !;
+      expect(staticProperty.kind).toEqual(ClassMemberKind.Property);
+      expect(staticProperty.isStatic).toEqual(true);
+      expect(ts.isPropertyAccessExpression(staticProperty.implementation !)).toEqual(true);
+      expect(staticProperty.value !.getText()).toEqual(`'static'`);
+    });
+
+    it('should throw if the symbol is not a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const functionNode =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      expect(() => {
+        host.getMembersOfClass(functionNode);
+      }).toThrowError(`Attempted to get members of a non-class: "function foo() {}"`);
+    });
+
+    it('should return an empty array if there are no prop decorators', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+
+      expect(members).toEqual([]);
+    });
+
+    it('should not process decorated properties in `propDecorators` if it is not an object literal',
+       () => {
+         const {program, host: compilerHost} =
+             makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+         const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+         const classNode = getDeclaration(
+             program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteral',
+             isNamedVariableDeclaration);
+         const members = host.getMembersOfClass(classNode);
+
+         expect(members.map(member => member.name)).not.toContain('prop');
+       });
+
+    it('should ignore prop decorator elements that are not object literals', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteralProp',
+          isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+      const prop = members.find(m => m.name === 'prop') !;
+      const decorators = prop.decorators !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore prop decorator elements that have no `type` property', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_PROP_DECORATORS_FILE.name, 'NoTypeProperty', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+      const prop = members.find(m => m.name === 'prop') !;
+      const decorators = prop.decorators !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should ignore prop decorator elements whose `type` value is not an identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_PROP_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_PROP_DECORATORS_FILE.name, 'NotIdentifier', isNamedVariableDeclaration);
+      const members = host.getMembersOfClass(classNode);
+      const prop = members.find(m => m.name === 'prop') !;
+      const decorators = prop.decorators !;
+
+      expect(decorators.length).toBe(1);
+      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+    });
+
+    it('should use `getImportOfIdentifier()` to retrieve import info', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const mockImportInfo = { name: 'mock', from: '@angular/core' } as Import;
+      const spy = spyOn(host, 'getImportOfIdentifier').and.returnValue(mockImportInfo);
+
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const decorators = host.getDecoratorsOfDeclaration(classNode) !;
+
+      expect(decorators.length).toEqual(1);
+      expect(decorators[0].import).toBe(mockImportInfo);
+
+      const typeIdentifier = spy.calls.mostRecent().args[0] as ts.Identifier;
+      expect(typeIdentifier.text).toBe('Directive');
+    });
+
+    describe('(returned prop decorators `args`)', () => {
+      it('should be an empty array if prop decorator has no `args` property', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_PROP_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+            isNamedVariableDeclaration);
+        const members = host.getMembersOfClass(classNode);
+        const prop = members.find(m => m.name === 'prop') !;
+        const decorators = prop.decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Input');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if prop decorator\'s `args` has no property assignment', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_PROP_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+            isNamedVariableDeclaration);
+        const members = host.getMembersOfClass(classNode);
+        const prop = members.find(m => m.name === 'prop') !;
+        const decorators = prop.decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Input');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if `args` property value is not an array literal', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_PROP_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+            isNamedVariableDeclaration);
+        const members = host.getMembersOfClass(classNode);
+        const prop = members.find(m => m.name === 'prop') !;
+        const decorators = prop.decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Input');
+        expect(decorators[0].args).toEqual([]);
+      });
+    });
+  });
+
+  describe('getConstructorParameters', () => {
+    it('should find the decorated constructor parameters', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters).toBeDefined();
+      expect(parameters !.map(parameter => parameter.name)).toEqual([
+        '_viewContainer', '_template', 'injected'
+      ]);
+      expectTypeValueReferencesForParameters(parameters !, [
+        'ViewContainerRef',
+        'TemplateRef',
+        null,
+      ]);
+    });
+
+    it('should throw if the symbol is not a class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const functionNode =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      expect(() => { host.getConstructorParameters(functionNode); })
+          .toThrowError(
+              'Attempted to get constructor parameters of a non-class: "function foo() {}"');
+    });
+
+    // In ES5 there is no such thing as a constructor-less class
+    // it('should return `null` if there is no constructor', () => { });
+
+    it('should return an array even if there are no decorators', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SIMPLE_CLASS_FILE.name, 'NoDecoratorConstructorClass',
+          isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters).toEqual(jasmine.any(Array));
+      expect(parameters !.length).toEqual(1);
+      expect(parameters ![0].name).toEqual('foo');
+      expect(parameters ![0].decorators).toBe(null);
+    });
+
+    it('should return an empty array if there are no constructor parameters', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_CTOR_DECORATORS_FILE.name, 'NoParameters', isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters).toEqual([]);
+    });
+
+    // In ES5 there are no arrow functions
+    // it('should ignore `ctorParameters` if it is an arrow function', () => { });
+
+    it('should ignore `ctorParameters` if it does not return an array literal', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, INVALID_CTOR_DECORATORS_FILE.name, 'NotArrayLiteral',
+          isNamedVariableDeclaration);
+      const parameters = host.getConstructorParameters(classNode);
+
+      expect(parameters !.length).toBe(1);
+      expect(parameters ![0]).toEqual(jasmine.objectContaining<CtorParameter>({
+        name: 'arg1',
+        decorators: null,
+      }));
+    });
+
+    describe('(returned parameters `decorators`)', () => {
+      it('should ignore param decorator elements that are not object literals', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATORS_FILE.name, 'NotObjectLiteral',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+
+        expect(parameters !.length).toBe(2);
+        expect(parameters ![0]).toEqual(jasmine.objectContaining<CtorParameter>({
+          name: 'arg1',
+          decorators: null,
+        }));
+        expect(parameters ![1]).toEqual(jasmine.objectContaining<CtorParameter>({
+          name: 'arg2',
+          decorators: jasmine.any(Array) as any
+        }));
+      });
+
+      it('should ignore param decorator elements that have no `type` property', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATORS_FILE.name, 'NoTypeProperty',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+      });
+
+      it('should ignore param decorator elements whose `type` value is not an identifier', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([INVALID_CTOR_DECORATORS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATORS_FILE.name, 'NotIdentifier',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+      });
+
+      it('should use `getImportOfIdentifier()` to retrieve import info', () => {
+        const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+        const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'};
+        const spy = spyOn(CommonJsReflectionHost.prototype, 'getImportOfIdentifier')
+                        .and.returnValue(mockImportInfo);
+
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![2].decorators !;
+
+        expect(decorators.length).toEqual(1);
+        expect(decorators[0].import).toBe(mockImportInfo);
+
+        const typeIdentifier = spy.calls.mostRecent().args[0] as ts.Identifier;
+        expect(typeIdentifier.text).toBe('Inject');
+      });
+    });
+
+    describe('(returned parameters `decorators.args`)', () => {
+      it('should be an empty array if param decorator has no `args` property', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        expect(parameters !.length).toBe(1);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Inject');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if param decorator\'s `args` has no property assignment', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Inject');
+        expect(decorators[0].args).toEqual([]);
+      });
+
+      it('should be an empty array if `args` property value is not an array literal', () => {
+        const {program, host: compilerHost} =
+            makeTestBundleProgram([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+        const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+        const classNode = getDeclaration(
+            program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+            isNamedVariableDeclaration);
+        const parameters = host.getConstructorParameters(classNode);
+        const decorators = parameters ![0].decorators !;
+
+        expect(decorators.length).toBe(1);
+        expect(decorators[0].name).toBe('Inject');
+        expect(decorators[0].args).toEqual([]);
+      });
+    });
+  });
+
+  describe('getDefinitionOfFunction()', () => {
+    it('should return an object describing the function declaration passed as an argument', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FUNCTION_BODY_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+
+      const fooNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'foo', isNamedFunctionDeclaration) !;
+      const fooDef = host.getDefinitionOfFunction(fooNode);
+      expect(fooDef.node).toBe(fooNode);
+      expect(fooDef.body !.length).toEqual(1);
+      expect(fooDef.body ![0].getText()).toEqual(`return x;`);
+      expect(fooDef.parameters.length).toEqual(1);
+      expect(fooDef.parameters[0].name).toEqual('x');
+      expect(fooDef.parameters[0].initializer).toBe(null);
+
+      const barNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'bar', isNamedFunctionDeclaration) !;
+      const barDef = host.getDefinitionOfFunction(barNode);
+      expect(barDef.node).toBe(barNode);
+      expect(barDef.body !.length).toEqual(1);
+      expect(ts.isReturnStatement(barDef.body ![0])).toBeTruthy();
+      expect(barDef.body ![0].getText()).toEqual(`return x + y;`);
+      expect(barDef.parameters.length).toEqual(2);
+      expect(barDef.parameters[0].name).toEqual('x');
+      expect(fooDef.parameters[0].initializer).toBe(null);
+      expect(barDef.parameters[1].name).toEqual('y');
+      expect(barDef.parameters[1].initializer !.getText()).toEqual('42');
+
+      const bazNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'baz', isNamedFunctionDeclaration) !;
+      const bazDef = host.getDefinitionOfFunction(bazNode);
+      expect(bazDef.node).toBe(bazNode);
+      expect(bazDef.body !.length).toEqual(3);
+      expect(bazDef.parameters.length).toEqual(1);
+      expect(bazDef.parameters[0].name).toEqual('x');
+      expect(bazDef.parameters[0].initializer).toBe(null);
+
+      const quxNode =
+          getDeclaration(program, FUNCTION_BODY_FILE.name, 'qux', isNamedFunctionDeclaration) !;
+      const quxDef = host.getDefinitionOfFunction(quxNode);
+      expect(quxDef.node).toBe(quxNode);
+      expect(quxDef.body !.length).toEqual(2);
+      expect(quxDef.parameters.length).toEqual(1);
+      expect(quxDef.parameters[0].name).toEqual('x');
+      expect(quxDef.parameters[0].initializer).toBe(null);
+    });
+  });
+
+  describe('getImportOfIdentifier', () => {
+    it('should find the import of an identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(IMPORTS_FILES);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const variableNode = getDeclaration(program, '/file_b.js', 'b', isNamedVariableDeclaration);
+      const identifier =
+          (variableNode.initializer && ts.isPropertyAccessExpression(variableNode.initializer)) ?
+          variableNode.initializer.name :
+          null;
+
+      expect(identifier).not.toBe(null);
+      const importOfIdent = host.getImportOfIdentifier(identifier !);
+      expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
+    });
+
+    it('should return null if the identifier was not imported', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(IMPORTS_FILES);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const variableNode = getDeclaration(program, '/file_b.js', 'd', isNamedVariableDeclaration);
+      const importOfIdent = host.getImportOfIdentifier(variableNode.initializer as ts.Identifier);
+
+      expect(importOfIdent).toBeNull();
+    });
+
+    it('should handle factory functions not wrapped in parentheses', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(IMPORTS_FILES);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const variableNode = getDeclaration(program, '/file_c.js', 'c', isNamedVariableDeclaration);
+      const identifier =
+          (variableNode.initializer && ts.isPropertyAccessExpression(variableNode.initializer)) ?
+          variableNode.initializer.name :
+          null;
+
+      expect(identifier).not.toBe(null);
+      const importOfIdent = host.getImportOfIdentifier(identifier !);
+      expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
+    });
+  });
+
+  describe('getDeclarationOfIdentifier', () => {
+    it('should return the declaration of a locally defined identifier', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const ctrDecorators = host.getConstructorParameters(classNode) !;
+      const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference !as{
+                                             local: true,
+                                             expression: ts.Identifier,
+                                             defaultImportStatement: null,
+                                           }).expression;
+
+      const expectedDeclarationNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'ViewContainerRef', isNamedVariableDeclaration);
+      const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfViewContainerRef);
+      expect(actualDeclaration).not.toBe(null);
+      expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
+      expect(actualDeclaration !.viaModule).toBe(null);
+    });
+
+    it('should return the source-file of an import namespace', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SOME_DIRECTIVE_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(
+          program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
+      const classDecorators = host.getDecoratorsOfDeclaration(classNode) !;
+      const identifierOfDirective = (((classDecorators[0].node as ts.ObjectLiteralExpression)
+                                          .properties[0] as ts.PropertyAssignment)
+                                         .initializer as ts.PropertyAccessExpression)
+                                        .expression as ts.Identifier;
+
+      const expectedDeclarationNode =
+          program.getSourceFile('node_modules/@angular/core/index.d.ts') !;
+      const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective);
+      expect(actualDeclaration).not.toBe(null);
+      expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
+      expect(actualDeclaration !.viaModule).toBe('@angular/core');
+    });
+  });
+
+  describe('getExportsOfModule()', () => {
+    it('should return a map of all the exports from a given module', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(EXPORTS_FILES);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const file = program.getSourceFile('/b_module.js') !;
+      const exportDeclarations = host.getExportsOfModule(file);
+      expect(exportDeclarations).not.toBe(null);
+      expect(Array.from(exportDeclarations !.entries())
+                 .map(entry => [entry[0], entry[1].node.getText(), entry[1].viaModule]))
+          .toEqual([
+            ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
+            ['a', `a = 'a'`, '/a_module'],
+            ['b', `b = a_module.a`, null],
+            ['c', `a = 'a'`, '/a_module'],
+            ['d', `b = a_module.a`, null],
+            ['e', `e = 'e'`, null],
+            ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
+            [
+              'SomeClass',
+              `SomeClass = (function() {\n  function SomeClass() {}\n  return SomeClass;\n}())`,
+              null
+            ],
+          ]);
+    });
+
+    it('should handle wildcard re-exports of other modules', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(EXPORTS_FILES);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const file = program.getSourceFile('/wildcard_reexports.js') !;
+      const exportDeclarations = host.getExportsOfModule(file);
+      expect(exportDeclarations).not.toBe(null);
+      expect(Array.from(exportDeclarations !.entries())
+                 .map(entry => [entry[0], entry[1].node.getText(), entry[1].viaModule]))
+          .toEqual([
+            ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, '/b_module'],
+            ['a', `a = 'a'`, '/b_module'],
+            ['b', `b = a_module.a`, '/b_module'],
+            ['c', `a = 'a'`, '/b_module'],
+            ['d', `b = a_module.a`, '/b_module'],
+            ['e', `e = 'e'`, '/b_module'],
+            ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, '/b_module'],
+            [
+              'SomeClass',
+              `SomeClass = (function() {\n  function SomeClass() {}\n  return SomeClass;\n}())`,
+              '/b_module'
+            ],
+            ['xtra1', `xtra1 = 'xtra1'`, '/xtra_module'],
+            ['xtra2', `xtra2 = 'xtra2'`, '/xtra_module'],
+          ]);
+    });
+  });
+
+  describe('getClassSymbol()', () => {
+    it('should return the class symbol for an ES2015 class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_ES2015_CLASS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const node = getDeclaration(
+          program, SIMPLE_ES2015_CLASS_FILE.name, 'EmptyClass', isNamedClassDeclaration);
+      const classSymbol = host.getClassSymbol(node);
+
+      expect(classSymbol).toBeDefined();
+      expect(classSymbol !.valueDeclaration).toBe(node);
+    });
+
+    it('should return the class symbol for an ES5 class (outer variable declaration)', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const node =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const classSymbol = host.getClassSymbol(node);
+
+      expect(classSymbol).toBeDefined();
+      expect(classSymbol !.valueDeclaration).toBe(node);
+    });
+
+    it('should return the class symbol for an ES5 class (inner function declaration)', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const outerNode =
+          getDeclaration(program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+      const innerNode = getIifeBody(outerNode) !.statements.find(isNamedFunctionDeclaration) !;
+      const classSymbol = host.getClassSymbol(innerNode);
+
+      expect(classSymbol).toBeDefined();
+      expect(classSymbol !.valueDeclaration).toBe(outerNode);
+    });
+
+    it('should return the same class symbol (of the outer declaration) for outer and inner declarations',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+         const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+         const outerNode = getDeclaration(
+             program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
+         const innerNode = getIifeBody(outerNode) !.statements.find(isNamedFunctionDeclaration) !;
+
+         expect(host.getClassSymbol(innerNode)).toBe(host.getClassSymbol(outerNode));
+       });
+
+    it('should return undefined if node is not an ES5 class', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram([FOO_FUNCTION_FILE]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const node =
+          getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+      const classSymbol = host.getClassSymbol(node);
+
+      expect(classSymbol).toBeUndefined();
+    });
+  });
+
+  describe('isClass()', () => {
+    let host: CommonJsReflectionHost;
+    let mockNode: ts.Node;
+    let getClassDeclarationSpy: jasmine.Spy;
+    let superGetClassDeclarationSpy: jasmine.Spy;
+
+    beforeEach(() => {
+      const {program, host: compilerHost} = makeTestBundleProgram([SIMPLE_CLASS_FILE]);
+      host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      mockNode = {} as any;
+
+      getClassDeclarationSpy = spyOn(CommonJsReflectionHost.prototype, 'getClassDeclaration');
+      superGetClassDeclarationSpy = spyOn(Esm2015ReflectionHost.prototype, 'getClassDeclaration');
+    });
+
+    it('should return true if superclass returns true', () => {
+      superGetClassDeclarationSpy.and.returnValue(true);
+      getClassDeclarationSpy.and.callThrough();
+
+      expect(host.isClass(mockNode)).toBe(true);
+      expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+      expect(superGetClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+    });
+
+    it('should return true if it can find a declaration for the class', () => {
+      getClassDeclarationSpy.and.returnValue(true);
+
+      expect(host.isClass(mockNode)).toBe(true);
+      expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+    });
+
+    it('should return false if it cannot find a declaration for the class', () => {
+      getClassDeclarationSpy.and.returnValue(false);
+
+      expect(host.isClass(mockNode)).toBe(false);
+      expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
+    });
+  });
+
+  describe('hasBaseClass()', () => {
+    function hasBaseClass(source: string) {
+      const file = {
+        name: '/synthesized_constructors.js',
+        contents: source,
+      };
+
+      const {program, host: compilerHost} = makeTestBundleProgram([file]);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const classNode = getDeclaration(program, file.name, 'TestClass', isNamedVariableDeclaration);
+      return host.hasBaseClass(classNode);
+    }
+
+    it('should consider an IIFE with _super parameter as having a base class', () => {
+      const result = hasBaseClass(`
+        var TestClass = /** @class */ (function (_super) {
+          __extends(TestClass, _super);
+          function TestClass() {}
+          return TestClass;
+        }(null));`);
+      expect(result).toBe(true);
+    });
+
+    it('should consider an IIFE with a unique name generated for the _super parameter as having a base class',
+       () => {
+         const result = hasBaseClass(`
+        var TestClass = /** @class */ (function (_super_1) {
+          __extends(TestClass, _super_1);
+          function TestClass() {}
+          return TestClass;
+        }(null));`);
+         expect(result).toBe(true);
+       });
+
+    it('should not consider an IIFE without parameter as having a base class', () => {
+      const result = hasBaseClass(`
+        var TestClass = /** @class */ (function () {
+          __extends(TestClass, _super);
+          function TestClass() {}
+          return TestClass;
+        }(null));`);
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('findDecoratedClasses()', () => {
+    it('should return an array of all decorated classes in the given source file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(DECORATED_FILES);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const primary = program.getSourceFile(DECORATED_FILES[0].name) !;
+
+      const primaryDecoratedClasses = host.findDecoratedClasses(primary);
+      expect(primaryDecoratedClasses.length).toEqual(2);
+      const classA = primaryDecoratedClasses.find(c => c.name === 'A') !;
+      expect(classA.decorators.map(decorator => decorator.name)).toEqual(['Directive']);
+      // Note that `B` is not exported from `primary.js`
+      const classB = primaryDecoratedClasses.find(c => c.name === 'B') !;
+      expect(classB.decorators.map(decorator => decorator.name)).toEqual(['Directive']);
+
+      const secondary = program.getSourceFile(DECORATED_FILES[1].name) !;
+      const secondaryDecoratedClasses = host.findDecoratedClasses(secondary);
+      expect(secondaryDecoratedClasses.length).toEqual(1);
+      // Note that `D` is exported from `secondary.js` but not exported from `primary.js`
+      const classD = secondaryDecoratedClasses.find(c => c.name === 'D') !;
+      expect(classD.name).toEqual('D');
+      expect(classD.decorators.map(decorator => decorator.name)).toEqual(['Directive']);
+    });
+  });
+
+  describe('getDtsDeclarationsOfClass()', () => {
+    it('should find the dts declaration that has the same relative path to the source file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const class1 = getDeclaration(program, '/src/class1.js', 'Class1', ts.isVariableDeclaration);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      const dtsDeclaration = host.getDtsDeclaration(class1);
+      expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class1.d.ts');
+    });
+
+    it('should find the dts declaration for exported functions', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dtsProgram = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const mooFn = getDeclaration(program, '/src/func1.js', 'mooFn', ts.isFunctionDeclaration);
+      const host =
+          new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dtsProgram);
+
+      const dtsDeclaration = host.getDtsDeclaration(mooFn);
+      expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/func1.d.ts');
+    });
+
+    it('should return null if there is no matching class in the matching dts file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const missingClass =
+          getDeclaration(program, '/src/class1.js', 'MissingClass1', ts.isVariableDeclaration);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      expect(host.getDtsDeclaration(missingClass)).toBe(null);
+    });
+
+    it('should return null if there is no matching dts file', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const missingClass = getDeclaration(
+          program, '/src/missing-class.js', 'MissingClass2', ts.isVariableDeclaration);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      expect(host.getDtsDeclaration(missingClass)).toBe(null);
+    });
+
+    it('should find the dts file that contains a matching class declaration, even if the source files do not match',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+         const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+         const class1 =
+             getDeclaration(program, '/src/flat-file.js', 'Class1', ts.isVariableDeclaration);
+         const host =
+             new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+         const dtsDeclaration = host.getDtsDeclaration(class1);
+         expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class1.d.ts');
+       });
+
+    it('should find aliased exports', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+      const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+      const class3 =
+          getDeclaration(program, '/src/flat-file.js', 'Class3', ts.isVariableDeclaration);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+      const dtsDeclaration = host.getDtsDeclaration(class3);
+      expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class3.d.ts');
+    });
+
+    it('should find the dts file that contains a matching class declaration, even if the class is not publicly exported',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+         const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+         const internalClass =
+             getDeclaration(program, '/src/internal.js', 'InternalClass', ts.isVariableDeclaration);
+         const host =
+             new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+         const dtsDeclaration = host.getDtsDeclaration(internalClass);
+         expect(dtsDeclaration !.getSourceFile().fileName).toEqual('/typings/internal.d.ts');
+       });
+
+    it('should prefer the publicly exported class if there are multiple classes with the same name',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(TYPINGS_SRC_FILES);
+         const dts = makeTestBundleProgram(TYPINGS_DTS_FILES);
+         const class2 =
+             getDeclaration(program, '/src/class2.js', 'Class2', ts.isVariableDeclaration);
+         const internalClass2 =
+             getDeclaration(program, '/src/internal.js', 'Class2', ts.isVariableDeclaration);
+         const host =
+             new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
+
+         const class2DtsDeclaration = host.getDtsDeclaration(class2);
+         expect(class2DtsDeclaration !.getSourceFile().fileName).toEqual('/typings/class2.d.ts');
+
+         const internalClass2DtsDeclaration = host.getDtsDeclaration(internalClass2);
+         expect(internalClass2DtsDeclaration !.getSourceFile().fileName)
+             .toEqual('/typings/class2.d.ts');
+       });
+  });
+
+  describe('getModuleWithProvidersFunctions', () => {
+    it('should find every exported function that returns an object that looks like a ModuleWithProviders object',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(MODULE_WITH_PROVIDERS_PROGRAM);
+         const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+         const file = program.getSourceFile('/src/functions.js') !;
+         const fns = host.getModuleWithProvidersFunctions(file);
+         expect(fns.map(fn => [fn.declaration.name !.getText(), fn.ngModule.node.name.text]))
+             .toEqual([
+               ['ngModuleIdentifier', 'InternalModule'],
+               ['ngModuleWithEmptyProviders', 'InternalModule'],
+               ['ngModuleWithProviders', 'InternalModule'],
+               ['externalNgModule', 'ExternalModule'],
+             ]);
+       });
+
+    it('should find every static method on exported classes that return an object that looks like a ModuleWithProviders object',
+       () => {
+         const {program, host: compilerHost} = makeTestBundleProgram(MODULE_WITH_PROVIDERS_PROGRAM);
+         const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+         const file = program.getSourceFile('/src/methods.js') !;
+         const fn = host.getModuleWithProvidersFunctions(file);
+         expect(fn.map(fn => [fn.declaration.getText(), fn.ngModule.node.name.text])).toEqual([
+           [
+             'function() { return { ngModule: InternalModule }; }',
+             'InternalModule',
+           ],
+           [
+             'function() { return { ngModule: InternalModule, providers: [] }; }',
+             'InternalModule',
+           ],
+           [
+             'function() { return { ngModule: InternalModule, providers: [SomeService] }; }',
+             'InternalModule',
+           ],
+           [
+             'function() { return { ngModule: mod.ExternalModule }; }',
+             'ExternalModule',
+           ],
+         ]);
+       });
+
+    // https://github.com/angular/angular/issues/29078
+    it('should resolve aliased module references to their original declaration', () => {
+      const {program, host: compilerHost} = makeTestBundleProgram(MODULE_WITH_PROVIDERS_PROGRAM);
+      const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
+      const file = program.getSourceFile('/src/aliased_class.js') !;
+      const fn = host.getModuleWithProvidersFunctions(file);
+      expect(fn.map(fn => [fn.declaration.getText(), fn.ngModule.node.name.text])).toEqual([
+        ['function() { return { ngModule: AliasedModule_1 }; }', 'AliasedModule'],
+      ]);
+    });
+  });
+});

From 1bdec3ed6a2dee25530d8957104fa49a0fb5e94b Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 17 May 2019 20:35:16 +0100
Subject: [PATCH 152/275] feat(ivy): ngcc - implement CommonJsDependencyHost
 (#30200)

PR Close #30200
---
 .../dependencies/commonjs_dependency_host.ts  | 107 ++++++++++
 .../ngcc/src/dependencies/dependency_host.ts  |   6 +-
 .../src/dependencies/esm_dependency_host.ts   |   6 +-
 .../src/dependencies/umd_dependency_host.ts   |   6 +-
 .../commonjs_dependency_host_spec.ts          | 185 ++++++++++++++++++
 .../dependencies/esm_dependency_host_spec.ts  |   4 +-
 .../dependencies/umd_dependency_host_spec.ts  |   4 +-
 7 files changed, 305 insertions(+), 13 deletions(-)
 create mode 100644 packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts
 create mode 100644 packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts

diff --git a/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts
new file mode 100644
index 0000000000..352844d282
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts
@@ -0,0 +1,107 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
+import {FileSystem} from '../file_system/file_system';
+import {isRequireCall} from '../host/commonjs_host';
+
+import {DependencyHost, DependencyInfo} from './dependency_host';
+import {ModuleResolver, ResolvedDeepImport, ResolvedRelativeModule} from './module_resolver';
+
+/**
+ * Helper functions for computing dependencies.
+ */
+export class CommonJsDependencyHost implements DependencyHost {
+  constructor(private fs: FileSystem, private moduleResolver: ModuleResolver) {}
+
+  /**
+   * Find all the dependencies for the entry-point at the given path.
+   *
+   * @param entryPointPath The absolute path to the JavaScript file that represents an entry-point.
+   * @returns Information about the dependencies of the entry-point, including those that were
+   * missing or deep imports into other entry-points.
+   */
+  findDependencies(entryPointPath: AbsoluteFsPath): DependencyInfo {
+    const dependencies = new Set<AbsoluteFsPath>();
+    const missing = new Set<AbsoluteFsPath|PathSegment>();
+    const deepImports = new Set<AbsoluteFsPath>();
+    const alreadySeen = new Set<AbsoluteFsPath>();
+    this.recursivelyFindDependencies(
+        entryPointPath, dependencies, missing, deepImports, alreadySeen);
+    return {dependencies, missing, deepImports};
+  }
+
+  /**
+   * Compute the dependencies of the given file.
+   *
+   * @param file An absolute path to the file whose dependencies we want to get.
+   * @param dependencies A set that will have the absolute paths of resolved entry points added to
+   * it.
+   * @param missing A set that will have the dependencies that could not be found added to it.
+   * @param deepImports A set that will have the import paths that exist but cannot be mapped to
+   * entry-points, i.e. deep-imports.
+   * @param alreadySeen A set that is used to track internal dependencies to prevent getting stuck
+   * in a
+   * circular dependency loop.
+   */
+  private recursivelyFindDependencies(
+      file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>, missing: Set<string>,
+      deepImports: Set<AbsoluteFsPath>, alreadySeen: Set<AbsoluteFsPath>): void {
+    const fromContents = this.fs.readFile(file);
+    if (!this.hasRequireCalls(fromContents)) {
+      // Avoid parsing the source file as there are no require calls.
+      return;
+    }
+
+    // Parse the source into a TypeScript AST and then walk it looking for imports and re-exports.
+    const sf =
+        ts.createSourceFile(file, fromContents, ts.ScriptTarget.ES2015, false, ts.ScriptKind.JS);
+
+    for (const statement of sf.statements) {
+      const declarations =
+          ts.isVariableStatement(statement) ? statement.declarationList.declarations : [];
+      for (const declaration of declarations) {
+        if (declaration.initializer && isRequireCall(declaration.initializer)) {
+          const importPath = declaration.initializer.arguments[0].text;
+          const resolvedModule = this.moduleResolver.resolveModuleImport(importPath, file);
+          if (resolvedModule) {
+            if (resolvedModule instanceof ResolvedRelativeModule) {
+              const internalDependency = resolvedModule.modulePath;
+              if (!alreadySeen.has(internalDependency)) {
+                alreadySeen.add(internalDependency);
+                this.recursivelyFindDependencies(
+                    internalDependency, dependencies, missing, deepImports, alreadySeen);
+              }
+            } else {
+              if (resolvedModule instanceof ResolvedDeepImport) {
+                deepImports.add(resolvedModule.importPath);
+              } else {
+                dependencies.add(resolvedModule.entryPointPath);
+              }
+            }
+          } else {
+            missing.add(importPath);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Check whether a source file needs to be parsed for imports.
+   * This is a performance short-circuit, which saves us from creating
+   * a TypeScript AST unnecessarily.
+   *
+   * @param source The content of the source file to check.
+   *
+   * @returns false if there are definitely no require calls
+   * in this file, true otherwise.
+   */
+  hasRequireCalls(source: string): boolean { return /require\(['"]/.test(source); }
+}
diff --git a/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts
index b2210eb39c..c2a6924c6f 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
 
 export interface DependencyHost {
   findDependencies(entryPointPath: AbsoluteFsPath): DependencyInfo;
@@ -14,6 +14,6 @@ export interface DependencyHost {
 
 export interface DependencyInfo {
   dependencies: Set<AbsoluteFsPath>;
-  missing: Set<string>;
-  deepImports: Set<string>;
+  missing: Set<AbsoluteFsPath|PathSegment>;
+  deepImports: Set<AbsoluteFsPath>;
 }
diff --git a/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts
index 33c7630698..0b164fac20 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts
@@ -7,7 +7,7 @@
  */
 import * as ts from 'typescript';
 
-import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
 import {FileSystem} from '../file_system/file_system';
 import {DependencyHost, DependencyInfo} from './dependency_host';
 import {ModuleResolver, ResolvedDeepImport, ResolvedRelativeModule} from './module_resolver';
@@ -28,8 +28,8 @@ export class EsmDependencyHost implements DependencyHost {
    */
   findDependencies(entryPointPath: AbsoluteFsPath): DependencyInfo {
     const dependencies = new Set<AbsoluteFsPath>();
-    const missing = new Set<string>();
-    const deepImports = new Set<string>();
+    const missing = new Set<AbsoluteFsPath|PathSegment>();
+    const deepImports = new Set<AbsoluteFsPath>();
     const alreadySeen = new Set<AbsoluteFsPath>();
     this.recursivelyFindDependencies(
         entryPointPath, dependencies, missing, deepImports, alreadySeen);
diff --git a/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts
index f8ad0ae9d6..d00790a494 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts
@@ -7,7 +7,7 @@
  */
 import * as ts from 'typescript';
 
-import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
 import {FileSystem} from '../file_system/file_system';
 import {getImportsOfUmdModule, parseStatementForUmdModule} from '../host/umd_host';
 
@@ -31,8 +31,8 @@ export class UmdDependencyHost implements DependencyHost {
    */
   findDependencies(entryPointPath: AbsoluteFsPath): DependencyInfo {
     const dependencies = new Set<AbsoluteFsPath>();
-    const missing = new Set<string>();
-    const deepImports = new Set<string>();
+    const missing = new Set<AbsoluteFsPath|PathSegment>();
+    const deepImports = new Set<AbsoluteFsPath>();
     const alreadySeen = new Set<AbsoluteFsPath>();
     this.recursivelyFindDependencies(
         entryPointPath, dependencies, missing, deepImports, alreadySeen);
diff --git a/packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts
new file mode 100644
index 0000000000..951fec0ef6
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts
@@ -0,0 +1,185 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
+import {CommonJsDependencyHost} from '../../src/dependencies/commonjs_dependency_host';
+import {ModuleResolver} from '../../src/dependencies/module_resolver';
+import {MockFileSystem} from '../helpers/mock_file_system';
+
+const _ = AbsoluteFsPath.from;
+
+describe('CommonJsDependencyHost', () => {
+  let host: CommonJsDependencyHost;
+  beforeEach(() => {
+    const fs = createMockFileSystem();
+    host = new CommonJsDependencyHost(fs, new ModuleResolver(fs));
+  });
+
+  describe('getDependencies()', () => {
+    it('should not generate a TS AST if the source does not contain any require calls', () => {
+      spyOn(ts, 'createSourceFile');
+      host.findDependencies(_('/no/imports/or/re-exports/index.js'));
+      expect(ts.createSourceFile).not.toHaveBeenCalled();
+    });
+
+    it('should resolve all the external imports of the source file', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/imports/index.js'));
+      expect(dependencies.size).toBe(2);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+    });
+
+    it('should resolve all the external re-exports of the source file', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/re-exports/index.js'));
+      expect(dependencies.size).toBe(2);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+    });
+
+    it('should capture missing external imports', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/imports-missing/index.js'));
+
+      expect(dependencies.size).toBe(1);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(missing.size).toBe(1);
+      expect(missing.has(PathSegment.fromFsPath('missing'))).toBe(true);
+      expect(deepImports.size).toBe(0);
+    });
+
+    it('should not register deep imports as missing', () => {
+      // This scenario verifies the behavior of the dependency analysis when an external import
+      // is found that does not map to an entry-point but still exists on disk, i.e. a deep import.
+      // Such deep imports are captured for diagnostics purposes.
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/external/deep-import/index.js'));
+
+      expect(dependencies.size).toBe(0);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(1);
+      expect(deepImports.has(_('/node_modules/lib_1/deep/import'))).toBe(true);
+    });
+
+    it('should recurse into internal dependencies', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/internal/outer/index.js'));
+
+      expect(dependencies.size).toBe(1);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+    });
+
+    it('should handle circular internal dependencies', () => {
+      const {dependencies, missing, deepImports} =
+          host.findDependencies(_('/internal/circular_a/index.js'));
+      expect(dependencies.size).toBe(2);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1/sub_1'))).toBe(true);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+    });
+
+    it('should support `paths` alias mappings when resolving modules', () => {
+      const fs = createMockFileSystem();
+      host = new CommonJsDependencyHost(fs, new ModuleResolver(fs, {
+                                          baseUrl: '/dist',
+                                          paths: {
+                                            '@app/*': ['*'],
+                                            '@lib/*/test': ['lib/*/test'],
+                                          }
+                                        }));
+      const {dependencies, missing, deepImports} = host.findDependencies(_('/path-alias/index.js'));
+      expect(dependencies.size).toBe(4);
+      expect(dependencies.has(_('/dist/components'))).toBe(true);
+      expect(dependencies.has(_('/dist/shared'))).toBe(true);
+      expect(dependencies.has(_('/dist/lib/shared/test'))).toBe(true);
+      expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
+      expect(missing.size).toBe(0);
+      expect(deepImports.size).toBe(0);
+    });
+  });
+
+  function createMockFileSystem() {
+    return new MockFileSystem({
+      '/no/imports/or/re-exports/index.js': '// some text but no import-like statements',
+      '/no/imports/or/re-exports/package.json': '{"esm2015": "./index.js"}',
+      '/no/imports/or/re-exports/index.metadata.json': 'MOCK METADATA',
+      '/external/imports/index.js': commonJs(['lib_1', 'lib_1/sub_1']),
+      '/external/imports/package.json': '{"esm2015": "./index.js"}',
+      '/external/imports/index.metadata.json': 'MOCK METADATA',
+      '/external/re-exports/index.js':
+          commonJs(['lib_1', 'lib_1/sub_1'], ['lib_1.X', 'lib_1sub_1.Y']),
+      '/external/re-exports/package.json': '{"esm2015": "./index.js"}',
+      '/external/re-exports/index.metadata.json': 'MOCK METADATA',
+      '/external/imports-missing/index.js': commonJs(['lib_1', 'missing']),
+      '/external/imports-missing/package.json': '{"esm2015": "./index.js"}',
+      '/external/imports-missing/index.metadata.json': 'MOCK METADATA',
+      '/external/deep-import/index.js': commonJs(['lib_1/deep/import']),
+      '/external/deep-import/package.json': '{"esm2015": "./index.js"}',
+      '/external/deep-import/index.metadata.json': 'MOCK METADATA',
+      '/internal/outer/index.js': commonJs(['../inner']),
+      '/internal/outer/package.json': '{"esm2015": "./index.js"}',
+      '/internal/outer/index.metadata.json': 'MOCK METADATA',
+      '/internal/inner/index.js': commonJs(['lib_1/sub_1'], ['X']),
+      '/internal/circular_a/index.js': commonJs(['../circular_b', 'lib_1/sub_1'], ['Y']),
+      '/internal/circular_b/index.js': commonJs(['../circular_a', 'lib_1'], ['X']),
+      '/internal/circular_a/package.json': '{"esm2015": "./index.js"}',
+      '/internal/circular_a/index.metadata.json': 'MOCK METADATA',
+      '/re-directed/index.js': commonJs(['lib_1/sub_2']),
+      '/re-directed/package.json': '{"esm2015": "./index.js"}',
+      '/re-directed/index.metadata.json': 'MOCK METADATA',
+      '/path-alias/index.js':
+          commonJs(['@app/components', '@app/shared', '@lib/shared/test', 'lib_1']),
+      '/path-alias/package.json': '{"esm2015": "./index.js"}',
+      '/path-alias/index.metadata.json': 'MOCK METADATA',
+      '/node_modules/lib_1/index.d.ts': 'export declare class X {}',
+      '/node_modules/lib_1/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/node_modules/lib_1/index.metadata.json': 'MOCK METADATA',
+      '/node_modules/lib_1/deep/import/index.js': 'export class DeepImport {}',
+      '/node_modules/lib_1/sub_1/index.d.ts': 'export declare class Y {}',
+      '/node_modules/lib_1/sub_1/package.json':
+          '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/node_modules/lib_1/sub_1/index.metadata.json': 'MOCK METADATA',
+      '/node_modules/lib_1/sub_2.d.ts': `export * from './sub_2/sub_2';`,
+      '/node_modules/lib_1/sub_2/sub_2.d.ts': `export declare class Z {}';`,
+      '/node_modules/lib_1/sub_2/package.json':
+          '{"esm2015": "./sub_2.js", "typings": "./sub_2.d.ts"}',
+      '/node_modules/lib_1/sub_2/sub_2.metadata.json': 'MOCK METADATA',
+      '/dist/components/index.d.ts': `export declare class MyComponent {};`,
+      '/dist/components/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/dist/components/index.metadata.json': 'MOCK METADATA',
+      '/dist/shared/index.d.ts': `import {X} from 'lib_1';\nexport declare class Service {}`,
+      '/dist/shared/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/dist/shared/index.metadata.json': 'MOCK METADATA',
+      '/dist/lib/shared/test/index.d.ts': `export class TestHelper {}`,
+      '/dist/lib/shared/test/package.json': '{"esm2015": "./index.js", "typings": "./index.d.ts"}',
+      '/dist/lib/shared/test/index.metadata.json': 'MOCK METADATA',
+    });
+  }
+});
+
+function commonJs(importPaths: string[], exportNames: string[] = []) {
+  const commonJsRequires =
+      importPaths
+          .map(
+              p =>
+                  `var ${p.replace('@angular/', '').replace(/\.?\.?\//g, '').replace(/@/,'')} = require('${p}');`)
+          .join('\n');
+  const exportStatements =
+      exportNames.map(e => `  exports.${e.replace(/.+\./, '')} = ${e};`).join('\n');
+  return `${commonJsRequires}
+${exportStatements}`;
+}
diff --git a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
index 69ec54d5a5..6298ba3f2c 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts
@@ -7,7 +7,7 @@
  */
 import * as ts from 'typescript';
 
-import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
 import {EsmDependencyHost} from '../../src/dependencies/esm_dependency_host';
 import {ModuleResolver} from '../../src/dependencies/module_resolver';
 import {MockFileSystem} from '../helpers/mock_file_system';
@@ -56,7 +56,7 @@ describe('EsmDependencyHost', () => {
       expect(dependencies.size).toBe(1);
       expect(dependencies.has(_('/node_modules/lib-1'))).toBe(true);
       expect(missing.size).toBe(1);
-      expect(missing.has('missing')).toBe(true);
+      expect(missing.has(PathSegment.fromFsPath('missing'))).toBe(true);
       expect(deepImports.size).toBe(0);
     });
 
diff --git a/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
index 5f348c4566..521af669b8 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts
@@ -7,7 +7,7 @@
  */
 import * as ts from 'typescript';
 
-import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {AbsoluteFsPath, PathSegment} from '../../../src/ngtsc/path';
 import {ModuleResolver} from '../../src/dependencies/module_resolver';
 import {UmdDependencyHost} from '../../src/dependencies/umd_dependency_host';
 import {MockFileSystem} from '../helpers/mock_file_system';
@@ -55,7 +55,7 @@ describe('UmdDependencyHost', () => {
       expect(dependencies.size).toBe(1);
       expect(dependencies.has(_('/node_modules/lib_1'))).toBe(true);
       expect(missing.size).toBe(1);
-      expect(missing.has('missing')).toBe(true);
+      expect(missing.has(PathSegment.fromFsPath('missing'))).toBe(true);
       expect(deepImports.size).toBe(0);
     });
 

From c7a998706763c387f661e0b09eef26b8ebac03e8 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 29 Apr 2019 18:17:36 +0100
Subject: [PATCH 153/275] feat(ivy): ngcc - implement
 CommonJsRenderingFormatter (#30200)

PR Close #30200
---
 .../ngcc/src/packages/entry_point.ts          |   2 +-
 .../rendering/commonjs_rendering_formatter.ts |  70 +++
 .../commonjs_rendering_formatter_spec.ts      | 440 ++++++++++++++++++
 3 files changed, 511 insertions(+), 1 deletion(-)
 create mode 100644 packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts
 create mode 100644 packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts

diff --git a/packages/compiler-cli/ngcc/src/packages/entry_point.ts b/packages/compiler-cli/ngcc/src/packages/entry_point.ts
index 8a8c8bd9bc..dcf72cb22a 100644
--- a/packages/compiler-cli/ngcc/src/packages/entry_point.ts
+++ b/packages/compiler-cli/ngcc/src/packages/entry_point.ts
@@ -12,7 +12,7 @@ import {Logger} from '../logging/logger';
 /**
  * The possible values for the format of an entry-point.
  */
-export type EntryPointFormat = 'esm5' | 'esm2015' | 'umd';
+export type EntryPointFormat = 'esm5' | 'esm2015' | 'umd' | 'commonjs';
 
 /**
  * An object containing information about an entry-point, including paths
diff --git a/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts
new file mode 100644
index 0000000000..5b3010bdd3
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts
@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {dirname, relative} from 'canonical-path';
+import * as ts from 'typescript';
+import MagicString from 'magic-string';
+import {Import, ImportManager} from '../../../src/ngtsc/translator';
+import {ExportInfo} from '../analysis/private_declarations_analyzer';
+import {isRequireCall} from '../host/commonjs_host';
+import {NgccReflectionHost} from '../host/ngcc_host';
+import {Esm5RenderingFormatter} from './esm5_rendering_formatter';
+import {stripExtension} from './utils';
+
+/**
+ * A RenderingFormatter that works with CommonJS files, instead of `import` and `export` statements
+ * the module is an IIFE with a factory function call with dependencies, which are defined in a
+ * wrapper function for AMD, CommonJS and global module formats.
+ */
+export class CommonJsRenderingFormatter extends Esm5RenderingFormatter {
+  constructor(protected commonJsHost: NgccReflectionHost, isCore: boolean) {
+    super(commonJsHost, isCore);
+  }
+
+  /**
+   *  Add the imports below any in situ imports as `require` calls.
+   */
+  addImports(output: MagicString, imports: Import[], file: ts.SourceFile): void {
+    const insertionPoint = this.findEndOfImports(file);
+    const renderedImports =
+        imports.map(i => `var ${i.qualifier} = require('${i.specifier}');\n`).join('');
+    output.appendLeft(insertionPoint, renderedImports);
+  }
+
+  /**
+   * Add the exports to the bottom of the file.
+   */
+  addExports(
+      output: MagicString, entryPointBasePath: string, exports: ExportInfo[],
+      importManager: ImportManager, file: ts.SourceFile): void {
+    exports.forEach(e => {
+      const basePath = stripExtension(e.from);
+      const relativePath = './' + relative(dirname(entryPointBasePath), basePath);
+      const namedImport = entryPointBasePath !== basePath ?
+          importManager.generateNamedImport(relativePath, e.identifier) :
+          {symbol: e.identifier, moduleImport: null};
+      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport}.` : '';
+      const exportStr = `\nexports.${e.identifier} = ${importNamespace}${namedImport.symbol};`;
+      output.append(exportStr);
+    });
+  }
+
+  protected findEndOfImports(sf: ts.SourceFile): number {
+    for (const statement of sf.statements) {
+      if (ts.isExpressionStatement(statement) && isRequireCall(statement.expression)) {
+        continue;
+      }
+      const declarations = ts.isVariableStatement(statement) ?
+          Array.from(statement.declarationList.declarations) :
+          [];
+      if (declarations.some(d => !d.initializer || !isRequireCall(d.initializer))) {
+        return statement.getStart();
+      }
+    }
+    return 0;
+  }
+}
diff --git a/packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts b/packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts
new file mode 100644
index 0000000000..6199050edb
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts
@@ -0,0 +1,440 @@
+/**
+ * @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 MagicString from 'magic-string';
+import * as ts from 'typescript';
+import {NoopImportRewriter} from '../../../src/ngtsc/imports';
+import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {ImportManager} from '../../../src/ngtsc/translator';
+import {DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
+import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
+import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
+import {CommonJsReflectionHost} from '../../src/host/commonjs_host';
+import {CommonJsRenderingFormatter} from '../../src/rendering/commonjs_rendering_formatter';
+import {makeTestEntryPointBundle, getDeclaration, createFileSystemFromProgramFiles} from '../helpers/utils';
+import {MockFileSystem} from '../helpers/mock_file_system';
+import {MockLogger} from '../helpers/mock_logger';
+
+const _ = AbsoluteFsPath.fromUnchecked;
+
+function setup(file: {name: AbsoluteFsPath, contents: string}) {
+  const fs = new MockFileSystem(createFileSystemFromProgramFiles([file]));
+  const logger = new MockLogger();
+  const bundle = makeTestEntryPointBundle('module', 'commonjs', false, [file]);
+  const typeChecker = bundle.src.program.getTypeChecker();
+  const host = new CommonJsReflectionHost(logger, false, bundle.src.program, bundle.src.host);
+  const referencesRegistry = new NgccReferencesRegistry(host);
+  const decorationAnalyses =
+      new DecorationAnalyzer(
+          fs, bundle.src.program, bundle.src.options, bundle.src.host, typeChecker, host,
+          referencesRegistry, [AbsoluteFsPath.fromUnchecked('/')], false)
+          .analyzeProgram();
+  const switchMarkerAnalyses = new SwitchMarkerAnalyzer(host).analyzeProgram(bundle.src.program);
+  const renderer = new CommonJsRenderingFormatter(host, false);
+  const importManager = new ImportManager(new NoopImportRewriter(), 'i');
+  return {
+    host,
+    program: bundle.src.program,
+    sourceFile: bundle.src.file, renderer, decorationAnalyses, switchMarkerAnalyses, importManager
+  };
+}
+
+const PROGRAM = {
+  name: _('/some/file.js'),
+  contents: `
+/* A copyright notice */
+require('some-side-effect');
+var core = require('@angular/core');
+var A = (function() {
+  function A() {}
+  A.decorators = [
+    { type: core.Directive, args: [{ selector: '[a]' }] },
+    { type: OtherA }
+  ];
+  A.prototype.ngDoCheck = function() {
+    //
+  };
+  return A;
+}());
+
+var B = (function() {
+  function B() {}
+  B.decorators = [
+    { type: OtherB },
+    { type: core.Directive, args: [{ selector: '[b]' }] }
+  ];
+  return B;
+}());
+
+var C = (function() {
+  function C() {}
+  C.decorators = [
+    { type: core.Directive, args: [{ selector: '[c]' }] },
+  ];
+  return C;
+}());
+
+function NoIife() {}
+
+var BadIife = (function() {
+  function BadIife() {}
+  BadIife.decorators = [
+    { type: core.Directive, args: [{ selector: '[c]' }] },
+  ];
+}());
+
+var compileNgModuleFactory = compileNgModuleFactory__PRE_R3__;
+var badlyFormattedVariable = __PRE_R3__badlyFormattedVariable;
+function compileNgModuleFactory__PRE_R3__(injector, options, moduleType) {
+  var compilerFactory = injector.get(CompilerFactory);
+  var compiler = compilerFactory.createCompiler([options]);
+  return compiler.compileModuleAsync(moduleType);
+}
+
+function compileNgModuleFactory__POST_R3__(injector, options, moduleType) {
+  ngDevMode && assertNgModuleType(moduleType);
+  return Promise.resolve(new R3NgModuleFactory(moduleType));
+}
+// Some other content
+exports.A = A;
+exports.B = B;
+exports.C = C;
+exports.NoIife = NoIife;
+exports.BadIife = BadIife;`
+};
+
+const PROGRAM_DECORATE_HELPER = {
+  name: _('/some/file.js'),
+  contents: `
+var tslib_1 = require("tslib");
+/* A copyright notice */
+var core = require('@angular/core');
+var OtherA = function () { return function (node) { }; };
+var OtherB = function () { return function (node) { }; };
+var A = /** @class */ (function () {
+    function A() {
+    }
+    A = tslib_1.__decorate([
+        core.Directive({ selector: '[a]' }),
+        OtherA()
+    ], A);
+    return A;
+}());
+exports.A = A;
+var B = /** @class */ (function () {
+    function B() {
+    }
+    B = tslib_1.__decorate([
+        OtherB(),
+        core.Directive({ selector: '[b]' })
+    ], B);
+    return B;
+}());
+exports.B = B;
+var C = /** @class */ (function () {
+    function C() {
+    }
+    C = tslib_1.__decorate([
+        core.Directive({ selector: '[c]' })
+    ], C);
+    return C;
+}());
+exports.C = C;
+var D = /** @class */ (function () {
+    function D() {
+    }
+    D_1 = D;
+    var D_1;
+    D = D_1 = tslib_1.__decorate([
+        core.Directive({ selector: '[d]', providers: [D_1] })
+    ], D);
+    return D;
+}());
+exports.D = D;
+// Some other content`
+};
+
+describe('CommonJsRenderingFormatter', () => {
+
+  describe('addImports', () => {
+    it('should insert the given imports after existing imports of the source file', () => {
+      const {renderer, sourceFile} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addImports(
+          output,
+          [
+            {specifier: '@angular/core', qualifier: 'i0'},
+            {specifier: '@angular/common', qualifier: 'i1'}
+          ],
+          sourceFile);
+      expect(output.toString()).toContain(`/* A copyright notice */
+require('some-side-effect');
+var core = require('@angular/core');
+var i0 = require('@angular/core');
+var i1 = require('@angular/common');`);
+    });
+  });
+
+  describe('addExports', () => {
+    it('should insert the given exports at the end of the source file', () => {
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), dtsFrom: _('/some/a.d.ts'), identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), dtsFrom: _('/some/foo/b.d.ts'), identifier: 'ComponentB'},
+            {from: PROGRAM.name, dtsFrom: PROGRAM.name, identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
+      expect(output.toString()).toContain(`
+// Some other content
+exports.A = A;
+exports.B = B;
+exports.C = C;
+exports.NoIife = NoIife;
+exports.BadIife = BadIife;
+exports.ComponentA1 = i0.ComponentA1;
+exports.ComponentA2 = i0.ComponentA2;
+exports.ComponentB = i1.ComponentB;
+exports.TopLevelComponent = TopLevelComponent;`);
+    });
+
+    it('should not insert alias exports in js output', () => {
+      const {importManager, renderer, sourceFile} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addExports(
+          output, _(PROGRAM.name.replace(/\.js$/, '')),
+          [
+            {from: _('/some/a.js'), alias: _('eComponentA1'), identifier: 'ComponentA1'},
+            {from: _('/some/a.js'), alias: _('eComponentA2'), identifier: 'ComponentA2'},
+            {from: _('/some/foo/b.js'), alias: _('eComponentB'), identifier: 'ComponentB'},
+            {from: PROGRAM.name, alias: 'eTopLevelComponent', identifier: 'TopLevelComponent'},
+          ],
+          importManager, sourceFile);
+      const outputString = output.toString();
+      expect(outputString).not.toContain(`{eComponentA1 as ComponentA1}`);
+      expect(outputString).not.toContain(`{eComponentB as ComponentB}`);
+      expect(outputString).not.toContain(`{eTopLevelComponent as TopLevelComponent}`);
+    });
+  });
+
+  describe('addConstants', () => {
+    it('should insert the given constants after imports in the source file', () => {
+      const {renderer, program} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addConstants(output, 'var x = 3;', file);
+      expect(output.toString()).toContain(`
+var core = require('@angular/core');
+
+var x = 3;
+var A = (function() {`);
+    });
+
+    it('should insert constants after inserted imports', () => {
+      const {renderer, program} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.addConstants(output, 'var x = 3;', file);
+      renderer.addImports(output, [{specifier: '@angular/core', qualifier: 'i0'}], file);
+      expect(output.toString()).toContain(`
+var core = require('@angular/core');
+var i0 = require('@angular/core');
+
+var x = 3;
+var A = (function() {`);
+    });
+  });
+
+  describe('rewriteSwitchableDeclarations', () => {
+    it('should switch marked declaration initializers', () => {
+      const {renderer, program, sourceFile, switchMarkerAnalyses} = setup(PROGRAM);
+      const file = program.getSourceFile('some/file.js');
+      if (file === undefined) {
+        throw new Error(`Could not find source file`);
+      }
+      const output = new MagicString(PROGRAM.contents);
+      renderer.rewriteSwitchableDeclarations(
+          output, file, switchMarkerAnalyses.get(sourceFile) !.declarations);
+      expect(output.toString())
+          .not.toContain(`var compileNgModuleFactory = compileNgModuleFactory__PRE_R3__;`);
+      expect(output.toString())
+          .toContain(`var badlyFormattedVariable = __PRE_R3__badlyFormattedVariable;`);
+      expect(output.toString())
+          .toContain(`var compileNgModuleFactory = compileNgModuleFactory__POST_R3__;`);
+      expect(output.toString())
+          .toContain(`function compileNgModuleFactory__PRE_R3__(injector, options, moduleType) {`);
+      expect(output.toString())
+          .toContain(`function compileNgModuleFactory__POST_R3__(injector, options, moduleType) {`);
+    });
+  });
+
+  describe('addDefinitions', () => {
+    it('should insert the definitions directly before the return statement of the class IIFE',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+         const output = new MagicString(PROGRAM.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+         renderer.addDefinitions(output, compiledClass, 'SOME DEFINITION TEXT');
+         expect(output.toString()).toContain(`
+  A.prototype.ngDoCheck = function() {
+    //
+  };
+SOME DEFINITION TEXT
+  return A;
+`);
+       });
+
+    it('should error if the compiledClass is not valid', () => {
+      const {renderer, sourceFile, program} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+
+      const noIifeDeclaration =
+          getDeclaration(program, sourceFile.fileName, 'NoIife', ts.isFunctionDeclaration);
+      const mockNoIifeClass: any = {declaration: noIifeDeclaration, name: _('NoIife')};
+      expect(() => renderer.addDefinitions(output, mockNoIifeClass, 'SOME DEFINITION TEXT'))
+          .toThrowError(
+              'Compiled class declaration is not inside an IIFE: NoIife in /some/file.js');
+
+      const badIifeDeclaration =
+          getDeclaration(program, sourceFile.fileName, 'BadIife', ts.isVariableDeclaration);
+      const mockBadIifeClass: any = {declaration: badIifeDeclaration, name: _('BadIife')};
+      expect(() => renderer.addDefinitions(output, mockBadIifeClass, 'SOME DEFINITION TEXT'))
+          .toThrowError(
+              'Compiled class wrapper IIFE does not have a return statement: BadIife in /some/file.js');
+    });
+  });
+
+
+  describe('removeDecorators', () => {
+
+    it('should delete the decorator (and following comma) that was matched in the analysis', () => {
+      const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+      const output = new MagicString(PROGRAM.contents);
+      const compiledClass =
+          decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+      const decorator = compiledClass.decorators[0];
+      const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+      decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+      renderer.removeDecorators(output, decoratorsToRemove);
+      expect(output.toString())
+          .not.toContain(`{ type: core.Directive, args: [{ selector: '[a]' }] },`);
+      expect(output.toString()).toContain(`{ type: OtherA }`);
+      expect(output.toString()).toContain(`{ type: core.Directive, args: [{ selector: '[b]' }] }`);
+      expect(output.toString()).toContain(`{ type: OtherB }`);
+      expect(output.toString()).toContain(`{ type: core.Directive, args: [{ selector: '[c]' }] }`);
+    });
+
+
+    it('should delete the decorator (but cope with no trailing comma) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+         const output = new MagicString(PROGRAM.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'B') !;
+         const decorator = compiledClass.decorators[0];
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[a]' }] },`);
+         expect(output.toString()).toContain(`{ type: OtherA }`);
+         expect(output.toString())
+             .not.toContain(`{ type: core.Directive, args: [{ selector: '[b]' }] }`);
+         expect(output.toString()).toContain(`{ type: OtherB }`);
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[c]' }] }`);
+       });
+
+
+    it('should delete the decorator (and its container if there are not other decorators left) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM);
+         const output = new MagicString(PROGRAM.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'C') !;
+         const decorator = compiledClass.decorators[0];
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         renderer.addDefinitions(output, compiledClass, 'SOME DEFINITION TEXT');
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[a]' }] },`);
+         expect(output.toString()).toContain(`{ type: OtherA }`);
+         expect(output.toString())
+             .toContain(`{ type: core.Directive, args: [{ selector: '[b]' }] }`);
+         expect(output.toString()).toContain(`{ type: OtherB }`);
+         expect(output.toString()).toContain(`function C() {}\nSOME DEFINITION TEXT\n  return C;`);
+         expect(output.toString()).not.toContain(`C.decorators`);
+       });
+
+  });
+
+  describe('[__decorate declarations]', () => {
+    it('should delete the decorator (and following comma) that was matched in the analysis', () => {
+      const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+      const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
+      const compiledClass =
+          decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'A') !;
+      const decorator = compiledClass.decorators.find(d => d.name === 'Directive') !;
+      const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+      decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+      renderer.removeDecorators(output, decoratorsToRemove);
+      expect(output.toString()).not.toContain(`Directive({ selector: '[a]' }),`);
+      expect(output.toString()).toContain(`OtherA()`);
+      expect(output.toString()).toContain(`Directive({ selector: '[b]' })`);
+      expect(output.toString()).toContain(`OtherB()`);
+      expect(output.toString()).toContain(`Directive({ selector: '[c]' })`);
+    });
+
+    it('should delete the decorator (but cope with no trailing comma) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+         const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'B') !;
+         const decorator = compiledClass.decorators.find(d => d.name === 'Directive') !;
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         expect(output.toString()).toContain(`Directive({ selector: '[a]' }),`);
+         expect(output.toString()).toContain(`OtherA()`);
+         expect(output.toString()).not.toContain(`Directive({ selector: '[b]' })`);
+         expect(output.toString()).toContain(`OtherB()`);
+         expect(output.toString()).toContain(`Directive({ selector: '[c]' })`);
+       });
+
+
+    it('should delete the decorator (and its container if there are no other decorators left) that was matched in the analysis',
+       () => {
+         const {renderer, decorationAnalyses, sourceFile} = setup(PROGRAM_DECORATE_HELPER);
+         const output = new MagicString(PROGRAM_DECORATE_HELPER.contents);
+         const compiledClass =
+             decorationAnalyses.get(sourceFile) !.compiledClasses.find(c => c.name === 'C') !;
+         const decorator = compiledClass.decorators.find(d => d.name === 'Directive') !;
+         const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+         decoratorsToRemove.set(decorator.node.parent !, [decorator.node]);
+         renderer.removeDecorators(output, decoratorsToRemove);
+         expect(output.toString()).toContain(`Directive({ selector: '[a]' }),`);
+         expect(output.toString()).toContain(`OtherA()`);
+         expect(output.toString()).toContain(`Directive({ selector: '[b]' })`);
+         expect(output.toString()).toContain(`OtherB()`);
+         expect(output.toString()).not.toContain(`Directive({ selector: '[c]' })`);
+         expect(output.toString()).not.toContain(`C = tslib_1.__decorate([`);
+         expect(output.toString()).toContain(`function C() {\n    }\n    return C;`);
+       });
+  });
+});

From e20b92ba3783afc725d359489062f366e1354a89 Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Mon, 29 Apr 2019 18:51:52 +0100
Subject: [PATCH 154/275] feat(ivy): ngcc - turn on CommonJS support (#30200)

PR Close #30200
---
 .../src/dependencies/dependency_resolver.ts   | 30 ++++++++++---------
 packages/compiler-cli/ngcc/src/main.ts        | 14 ++++++---
 .../ngcc/src/packages/entry_point.ts          | 15 ++++++++--
 .../ngcc/src/packages/transformer.ts          |  7 +++++
 .../dependencies/dependency_resolver_spec.ts  |  7 +++--
 .../test/packages/entry_point_finder_spec.ts  |  2 +-
 6 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts b/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
index d4338b5d7e..092d1f65b8 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/dependency_resolver.ts
@@ -8,6 +8,7 @@
 
 import {DepGraph} from 'dependency-graph';
 import {AbsoluteFsPath} from '../../../src/ngtsc/path';
+import {FileSystem} from '../file_system/file_system';
 import {Logger} from '../logging/logger';
 import {EntryPoint, EntryPointFormat, EntryPointJsonProperty, getEntryPointFormat} from '../packages/entry_point';
 import {DependencyHost} from './dependency_host';
@@ -65,7 +66,8 @@ export interface SortedEntryPointsInfo extends DependencyDiagnostics { entryPoin
  */
 export class DependencyResolver {
   constructor(
-      private logger: Logger, private hosts: Partial<Record<EntryPointFormat, DependencyHost>>) {}
+      private fs: FileSystem, private logger: Logger,
+      private hosts: Partial<Record<EntryPointFormat, DependencyHost>>) {}
   /**
    * Sort the array of entry points so that the dependant entry points always come later than
    * their dependencies in the array.
@@ -115,7 +117,7 @@ export class DependencyResolver {
 
     // Now add the dependencies between them
     angularEntryPoints.forEach(entryPoint => {
-      const formatInfo = getEntryPointFormatInfo(entryPoint);
+      const formatInfo = this.getEntryPointFormatInfo(entryPoint);
       const host = this.hosts[formatInfo.format];
       if (!host) {
         throw new Error(
@@ -164,22 +166,22 @@ export class DependencyResolver {
       });
     }
   }
-}
 
-function getEntryPointFormatInfo(entryPoint: EntryPoint):
-    {format: EntryPointFormat, path: AbsoluteFsPath} {
-  const properties = Object.keys(entryPoint.packageJson);
-  for (let i = 0; i < properties.length; i++) {
-    const property = properties[i] as EntryPointJsonProperty;
-    const format = getEntryPointFormat(property);
+  private getEntryPointFormatInfo(entryPoint: EntryPoint):
+      {format: EntryPointFormat, path: AbsoluteFsPath} {
+    const properties = Object.keys(entryPoint.packageJson);
+    for (let i = 0; i < properties.length; i++) {
+      const property = properties[i] as EntryPointJsonProperty;
+      const format = getEntryPointFormat(this.fs, entryPoint, property);
 
-    if (format === 'esm2015' || format === 'esm5' || format === 'umd') {
-      const formatPath = entryPoint.packageJson[property] !;
-      return {format, path: AbsoluteFsPath.resolve(entryPoint.path, formatPath)};
+      if (format === 'esm2015' || format === 'esm5' || format === 'umd' || format === 'commonjs') {
+        const formatPath = entryPoint.packageJson[property] !;
+        return {format, path: AbsoluteFsPath.resolve(entryPoint.path, formatPath)};
+      }
     }
+    throw new Error(
+        `There is no appropriate source code format in '${entryPoint.path}' entry-point.`);
   }
-  throw new Error(
-      `There is no appropriate source code format in '${entryPoint.path}' entry-point.`);
 }
 
 interface DependencyGraph extends DependencyDiagnostics {
diff --git a/packages/compiler-cli/ngcc/src/main.ts b/packages/compiler-cli/ngcc/src/main.ts
index bf98e04b1c..ec03384e23 100644
--- a/packages/compiler-cli/ngcc/src/main.ts
+++ b/packages/compiler-cli/ngcc/src/main.ts
@@ -7,6 +7,7 @@
  */
 import {AbsoluteFsPath} from '../../src/ngtsc/path';
 
+import {CommonJsDependencyHost} from './dependencies/commonjs_dependency_host';
 import {DependencyResolver} from './dependencies/dependency_resolver';
 import {EsmDependencyHost} from './dependencies/esm_dependency_host';
 import {ModuleResolver} from './dependencies/module_resolver';
@@ -64,7 +65,7 @@ export interface NgccOptions {
   pathMappings?: PathMappings;
 }
 
-const SUPPORTED_FORMATS: EntryPointFormat[] = ['esm5', 'esm2015', 'umd'];
+const SUPPORTED_FORMATS: EntryPointFormat[] = ['esm5', 'esm2015', 'umd', 'commonjs'];
 
 /**
  * This is the main entry-point into ngcc (aNGular Compatibility Compiler).
@@ -83,8 +84,13 @@ export function mainNgcc(
   const moduleResolver = new ModuleResolver(fs, pathMappings);
   const esmDependencyHost = new EsmDependencyHost(fs, moduleResolver);
   const umdDependencyHost = new UmdDependencyHost(fs, moduleResolver);
-  const resolver = new DependencyResolver(
-      logger, {esm5: esmDependencyHost, esm2015: esmDependencyHost, umd: umdDependencyHost});
+  const commonJsDependencyHost = new CommonJsDependencyHost(fs, moduleResolver);
+  const resolver = new DependencyResolver(fs, logger, {
+    esm5: esmDependencyHost,
+    esm2015: esmDependencyHost,
+    umd: umdDependencyHost,
+    commonjs: commonJsDependencyHost
+  });
   const finder = new EntryPointFinder(fs, logger, resolver);
   const fileWriter = getFileWriter(fs, createNewEntryPointFormats);
 
@@ -127,7 +133,7 @@ export function mainNgcc(
     for (let i = 0; i < propertiesToConsider.length; i++) {
       const property = propertiesToConsider[i] as EntryPointJsonProperty;
       const formatPath = entryPointPackageJson[property];
-      const format = getEntryPointFormat(property);
+      const format = getEntryPointFormat(fs, entryPoint, property);
 
       // No format then this property is not supposed to be compiled.
       if (!formatPath || !format || SUPPORTED_FORMATS.indexOf(format) === -1) continue;
diff --git a/packages/compiler-cli/ngcc/src/packages/entry_point.ts b/packages/compiler-cli/ngcc/src/packages/entry_point.ts
index dcf72cb22a..d0e485fb8d 100644
--- a/packages/compiler-cli/ngcc/src/packages/entry_point.ts
+++ b/packages/compiler-cli/ngcc/src/packages/entry_point.ts
@@ -5,8 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import * as ts from 'typescript';
 import {AbsoluteFsPath} from '../../../src/ngtsc/path';
 import {FileSystem} from '../file_system/file_system';
+import {parseStatementForUmdModule} from '../host/umd_host';
 import {Logger} from '../logging/logger';
 
 /**
@@ -107,7 +109,8 @@ export function getEntryPointInfo(
  * @param property The property to convert to a format.
  * @returns An entry-point format or `undefined` if none match the given property.
  */
-export function getEntryPointFormat(property: string): EntryPointFormat|undefined {
+export function getEntryPointFormat(
+    fs: FileSystem, entryPoint: EntryPoint, property: string): EntryPointFormat|undefined {
   switch (property) {
     case 'fesm2015':
       return 'esm2015';
@@ -120,7 +123,8 @@ export function getEntryPointFormat(property: string): EntryPointFormat|undefine
     case 'esm5':
       return 'esm5';
     case 'main':
-      return 'umd';
+      const pathToMain = AbsoluteFsPath.join(entryPoint.path, entryPoint.packageJson['main'] !);
+      return isUmdModule(fs, pathToMain) ? 'umd' : 'commonjs';
     case 'module':
       return 'esm5';
     default:
@@ -143,3 +147,10 @@ function loadEntryPointPackage(
     return null;
   }
 }
+
+function isUmdModule(fs: FileSystem, sourceFilePath: AbsoluteFsPath): boolean {
+  const sourceFile =
+      ts.createSourceFile(sourceFilePath, fs.readFile(sourceFilePath), ts.ScriptTarget.ES5);
+  return sourceFile.statements.length > 0 &&
+      parseStatementForUmdModule(sourceFile.statements[0]) !== null;
+}
diff --git a/packages/compiler-cli/ngcc/src/packages/transformer.ts b/packages/compiler-cli/ngcc/src/packages/transformer.ts
index 4b87430c40..25a972f223 100644
--- a/packages/compiler-cli/ngcc/src/packages/transformer.ts
+++ b/packages/compiler-cli/ngcc/src/packages/transformer.ts
@@ -13,11 +13,13 @@ import {NgccReferencesRegistry} from '../analysis/ngcc_references_registry';
 import {ExportInfo, PrivateDeclarationsAnalyzer} from '../analysis/private_declarations_analyzer';
 import {SwitchMarkerAnalyses, SwitchMarkerAnalyzer} from '../analysis/switch_marker_analyzer';
 import {FileSystem} from '../file_system/file_system';
+import {CommonJsReflectionHost} from '../host/commonjs_host';
 import {Esm2015ReflectionHost} from '../host/esm2015_host';
 import {Esm5ReflectionHost} from '../host/esm5_host';
 import {NgccReflectionHost} from '../host/ngcc_host';
 import {UmdReflectionHost} from '../host/umd_host';
 import {Logger} from '../logging/logger';
+import {CommonJsRenderingFormatter} from '../rendering/commonjs_rendering_formatter';
 import {DtsRenderer} from '../rendering/dts_renderer';
 import {Esm5RenderingFormatter} from '../rendering/esm5_rendering_formatter';
 import {EsmRenderingFormatter} from '../rendering/esm_rendering_formatter';
@@ -97,6 +99,9 @@ export class Transformer {
       case 'umd':
         return new UmdReflectionHost(
             this.logger, isCore, bundle.src.program, bundle.src.host, bundle.dts);
+      case 'commonjs':
+        return new CommonJsReflectionHost(
+            this.logger, isCore, bundle.src.program, bundle.src.host, bundle.dts);
       default:
         throw new Error(`Reflection host for "${bundle.format}" not yet implemented.`);
     }
@@ -114,6 +119,8 @@ export class Transformer {
           throw new Error('UmdRenderer requires a UmdReflectionHost');
         }
         return new UmdRenderingFormatter(host, isCore);
+      case 'commonjs':
+        return new CommonJsRenderingFormatter(host, isCore);
       default:
         throw new Error(`Renderer for "${bundle.format}" not yet implemented.`);
     }
diff --git a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
index 1faf99947d..733e9ccccf 100644
--- a/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
+++ b/packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts
@@ -25,7 +25,7 @@ describe('DependencyResolver', () => {
     fs = new MockFileSystem();
     moduleResolver = new ModuleResolver(fs);
     host = new EsmDependencyHost(fs, moduleResolver);
-    resolver = new DependencyResolver(new MockLogger(), {esm5: host, esm2015: host});
+    resolver = new DependencyResolver(fs, new MockLogger(), {esm5: host, esm2015: host});
   });
   describe('sortEntryPointsByDependency()', () => {
     const first = {
@@ -117,7 +117,7 @@ describe('DependencyResolver', () => {
     });
 
     it('should error if there is no appropriate DependencyHost for the given formats', () => {
-      resolver = new DependencyResolver(new MockLogger(), {esm2015: host});
+      resolver = new DependencyResolver(fs, new MockLogger(), {esm2015: host});
       expect(() => resolver.sortEntryPointsByDependency([first]))
           .toThrowError(
               `Could not find a suitable format for computing dependencies of entry-point: '${first.path}'.`);
@@ -152,7 +152,8 @@ describe('DependencyResolver', () => {
     it('should use the appropriate DependencyHost for each entry-point', () => {
       const esm5Host = new EsmDependencyHost(fs, moduleResolver);
       const esm2015Host = new EsmDependencyHost(fs, moduleResolver);
-      resolver = new DependencyResolver(new MockLogger(), {esm5: esm5Host, esm2015: esm2015Host});
+      resolver =
+          new DependencyResolver(fs, new MockLogger(), {esm5: esm5Host, esm2015: esm2015Host});
       spyOn(esm5Host, 'findDependencies').and.callFake(createFakeComputeDependencies(dependencies));
       spyOn(esm2015Host, 'findDependencies')
           .and.callFake(createFakeComputeDependencies(dependencies));
diff --git a/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts b/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts
index 4669e206c3..5f7dc3ae74 100644
--- a/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts
+++ b/packages/compiler-cli/ngcc/test/packages/entry_point_finder_spec.ts
@@ -23,7 +23,7 @@ describe('findEntryPoints()', () => {
   beforeEach(() => {
     const fs = createMockFileSystem();
     resolver = new DependencyResolver(
-        new MockLogger(), {esm2015: new EsmDependencyHost(fs, new ModuleResolver(fs))});
+        fs, new MockLogger(), {esm2015: new EsmDependencyHost(fs, new ModuleResolver(fs))});
     spyOn(resolver, 'sortEntryPointsByDependency').and.callFake((entryPoints: EntryPoint[]) => {
       return {entryPoints, ignoredEntryPoints: [], ignoredDependencies: []};
     });

From fa6cbb3ffe2e8de635901421a0411cbefd826c99 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 22 May 2019 13:21:46 +0200
Subject: [PATCH 155/275] fix(ivy): ng-container with ViewContainerRef creates
 two comments (#30611)

With Ivy, injecting a `ViewContainerRef` for a `<ng-container>` element
results in two comments generated in the DOM. One comment as host
element for the `ElementContainer` and one for the generated `LContainer`
which is needed for the created `ViewContainerRef`.

This is problematic as developers expect the same anchor element for
the `LContainer` and the `ElementContainer` in order to be able to move
the host element of `<ng-container>` without leaving the actual
`LContainer` anchor element at the original location.

This worked differently in View Engine and various applications might
depend on the behavior where the `ViewContainerRef` shares the anchor
comment node with the host comment node of the `<ng-container>`. For
example `CdkTable` from `@angular/cdk` moves around the host element of
a `<ng-container>` and also expects embedded views to be inserted next
to the moved `<ng-container>` host element.

See: https://github.com/angular/components/blob/f8be5329f8d94128ece5dfe3e8e998fe4077d44d/src/cdk/table/table.ts#L999-L1016

Resolves FW-1341

PR Close #30611
---
 .../src/render3/view_engine_compatibility.ts  | 15 +++--
 packages/core/test/acceptance/i18n_spec.ts    |  4 +-
 .../acceptance/view_container_ref_spec.ts     | 57 ++++++++++++++++++-
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/render3/view_engine_compatibility.ts b/packages/core/src/render3/view_engine_compatibility.ts
index cacee5f0cc..d6fde0e553 100644
--- a/packages/core/src/render3/view_engine_compatibility.ts
+++ b/packages/core/src/render3/view_engine_compatibility.ts
@@ -19,7 +19,7 @@ import {assertDefined, assertGreaterThan, assertLessThan} from '../util/assert';
 
 import {NodeInjector, getParentInjectorLocation} from './di';
 import {addToViewTree, createEmbeddedViewAndNode, createLContainer, renderEmbeddedTemplate} from './instructions/shared';
-import {ACTIVE_INDEX, CONTAINER_HEADER_OFFSET, LContainer, NATIVE} from './interfaces/container';
+import {ACTIVE_INDEX, CONTAINER_HEADER_OFFSET, LContainer} from './interfaces/container';
 import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType, TViewNode} from './interfaces/node';
 import {RComment, RElement, isProceduralRenderer} from './interfaces/renderer';
 import {CONTEXT, LView, QUERIES, RENDERER, TView, T_HOST} from './interfaces/view';
@@ -29,7 +29,7 @@ import {getParentInjectorTNode} from './node_util';
 import {getLView, getPreviousOrParentTNode} from './state';
 import {getParentInjectorView, hasParentInjector} from './util/injector_utils';
 import {findComponentView} from './util/view_traversal_utils';
-import {getComponentViewByIndex, getNativeByTNode, isComponent, isLContainer, isRootView, viewAttachedToContainer} from './util/view_utils';
+import {getComponentViewByIndex, getNativeByTNode, isComponent, isLContainer, isRootView, unwrapRNode, viewAttachedToContainer} from './util/view_utils';
 import {ViewRef} from './view_ref';
 
 
@@ -313,8 +313,15 @@ export function createContainerRef(
     lContainer = slotValue;
     lContainer[ACTIVE_INDEX] = -1;
   } else {
-    const commentNode = hostView[RENDERER].createComment(ngDevMode ? 'container' : '');
-    ngDevMode && ngDevMode.rendererCreateComment++;
+    let commentNode: RComment;
+    // If the host is an element container, the native host element is guaranteed to be a
+    // comment and we can reuse that comment as anchor element for the new LContainer.
+    if (hostTNode.type === TNodeType.ElementContainer) {
+      commentNode = unwrapRNode(slotValue) as RComment;
+    } else {
+      ngDevMode && ngDevMode.rendererCreateComment++;
+      commentNode = hostView[RENDERER].createComment(ngDevMode ? 'container' : '');
+    }
 
     // A container can be created on the root (topmost / bootstrapped) component and in this case we
     // can't use LTree to insert container's marker node (both parent of a comment node and the
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index 647d86c5ec..9679058eb2 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -937,14 +937,14 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       fixture.detectChanges();
       expect(q.query.length).toEqual(1);
       expect(toHtml(fixture.nativeElement))
-          .toEqual(`<div-query><!--ng-container-->Contenu<!--container--></div-query>`);
+          .toEqual(`<div-query>Contenu<!--ng-container--></div-query>`);
 
       // Disable ng-if
       fixture.componentInstance.visible = false;
       fixture.detectChanges();
       expect(q.query.length).toEqual(0);
       expect(toHtml(fixture.nativeElement))
-          .toEqual(`<div-query><!--ng-container-->Contenu<!--container--></div-query>`);
+          .toEqual(`<div-query>Contenu<!--ng-container--></div-query>`);
     });
   });
 });
diff --git a/packages/core/test/acceptance/view_container_ref_spec.ts b/packages/core/test/acceptance/view_container_ref_spec.ts
index 98048b7546..ca428508b4 100644
--- a/packages/core/test/acceptance/view_container_ref_spec.ts
+++ b/packages/core/test/acceptance/view_container_ref_spec.ts
@@ -61,6 +61,59 @@ describe('ViewContainerRef', () => {
          expect(fixture.componentInstance.foo).toBeAnInstanceOf(TemplateRef);
        });
 
+    it('should use comment node of host ng-container as insertion marker', () => {
+      @Component({template: 'hello'})
+      class HelloComp {
+      }
+
+      @NgModule({entryComponents: [HelloComp], declarations: [HelloComp]})
+      class HelloCompModule {
+      }
+
+      @Component({
+        template: `
+          <ng-container vcref></ng-container>
+        `
+      })
+      class TestComp {
+        @ViewChild(VCRefDirective, {static: true}) vcRefDir !: VCRefDirective;
+      }
+
+      TestBed.configureTestingModule(
+          {declarations: [TestComp, VCRefDirective], imports: [HelloCompModule]});
+      const fixture = TestBed.createComponent(TestComp);
+      const {vcref, cfr, elementRef} = fixture.componentInstance.vcRefDir;
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML)
+          .toMatch(/<!--(ng-container)?-->/, 'Expected only one comment node to be generated.');
+
+      const testParent = document.createElement('div');
+      testParent.appendChild(elementRef.nativeElement);
+
+      expect(testParent.textContent).toBe('');
+      expect(testParent.childNodes.length).toBe(1);
+      expect(testParent.childNodes[0].nodeType).toBe(Node.COMMENT_NODE);
+
+      // Add a test component to the view container ref to ensure that
+      // the "ng-container" comment was used as marker for the insertion.
+      vcref.createComponent(cfr.resolveComponentFactory(HelloComp));
+      fixture.detectChanges();
+
+      expect(testParent.textContent).toBe('hello');
+      expect(testParent.childNodes.length).toBe(2);
+
+      // With Ivy, views are inserted before the container comment marker.
+      if (ivyEnabled) {
+        expect(testParent.childNodes[0].nodeType).toBe(Node.ELEMENT_NODE);
+        expect(testParent.childNodes[0].textContent).toBe('hello');
+        expect(testParent.childNodes[1].nodeType).toBe(Node.COMMENT_NODE);
+      } else {
+        expect(testParent.childNodes[0].nodeType).toBe(Node.COMMENT_NODE);
+        expect(testParent.childNodes[1].nodeType).toBe(Node.ELEMENT_NODE);
+        expect(testParent.childNodes[1].textContent).toBe('hello');
+      }
+    });
   });
 
   describe('insert', () => {
@@ -1668,7 +1721,9 @@ class VCRefDirective {
 
   // Injecting the ViewContainerRef to create a dynamic container in which
   // embedded views will be created
-  constructor(public vcref: ViewContainerRef, public cfr: ComponentFactoryResolver) {}
+  constructor(
+      public vcref: ViewContainerRef, public cfr: ComponentFactoryResolver,
+      public elementRef: ElementRef) {}
 
   createView(s: string, index?: number): EmbeddedViewRef<any> {
     if (!this.tplRef) {

From 86c46908d442c28defb3f7b351edb2c14a1f07ae Mon Sep 17 00:00:00 2001
From: Andrew Kushnir <akushnir@google.com>
Date: Tue, 21 May 2019 16:54:10 -0700
Subject: [PATCH 156/275] fix(ivy): R3TestBed doesn't allow template overrides
 with an empty string (#30602)

Prior to this change a component was considered unresolved (i.e. having dynamic resources that should be loaded, like external template or stylesheets) even if template override was provided as an empty string (for example, via TestBed.overrideTemplateUsingTestingModule call). This commit fixes the condition that previously treated empty string as an absent template value.

PR Close #30602
---
 packages/core/src/metadata/resource_loading.ts | 2 +-
 packages/core/test/test_bed_spec.ts            | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/metadata/resource_loading.ts b/packages/core/src/metadata/resource_loading.ts
index ce4d7be738..c9ae16a81b 100644
--- a/packages/core/src/metadata/resource_loading.ts
+++ b/packages/core/src/metadata/resource_loading.ts
@@ -103,7 +103,7 @@ export function isComponentDefPendingResolution(type: Type<any>): boolean {
 
 export function componentNeedsResolution(component: Component): boolean {
   return !!(
-      (component.templateUrl && !component.template) ||
+      (component.templateUrl && !component.hasOwnProperty('template')) ||
       component.styleUrls && component.styleUrls.length);
 }
 export function clearResolutionOfComponentResourcesQueue(): Map<Type<any>, Component> {
diff --git a/packages/core/test/test_bed_spec.ts b/packages/core/test/test_bed_spec.ts
index fa546d6ac1..56dfc65ea0 100644
--- a/packages/core/test/test_bed_spec.ts
+++ b/packages/core/test/test_bed_spec.ts
@@ -423,6 +423,14 @@ describe('TestBed', () => {
           const fixture = TestBed.createComponent(SomeComponent);
           expect(fixture.nativeElement.innerHTML).toBe('Template override');
         });
+
+        it('should have an ability to override template with empty string', () => {
+          const SomeComponent = getAOTCompiledComponent();
+          TestBed.configureTestingModule({declarations: [SomeComponent]});
+          TestBed.overrideTemplateUsingTestingModule(SomeComponent, '');
+          const fixture = TestBed.createComponent(SomeComponent);
+          expect(fixture.nativeElement.innerHTML).toBe('');
+        });
       });
 
   onlyInIvy('patched ng defs should be removed after resetting TestingModule')

From d4e6263453a66b4190ac61606b9ffa175cfe7cca Mon Sep 17 00:00:00 2001
From: Stephen Fluin <stephen.fluin@gmail.com>
Date: Tue, 21 May 2019 11:24:24 -0700
Subject: [PATCH 157/275] docs: update simple stackblitz deployment
 instructions (#30465)

PR Close #30465
---
 aio/content/start/deployment.md | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/aio/content/start/deployment.md b/aio/content/start/deployment.md
index e5fa6e971a..2eed50a886 100644
--- a/aio/content/start/deployment.md
+++ b/aio/content/start/deployment.md
@@ -13,20 +13,18 @@ Whether you came here directly from [Your First App](start "Getting Started: You
 
 
 
-## Deploying from StackBlitz
+## Share your application
 
-StackBlitz allows you to publish your Angular app directly to Firebase from your project. The steps below outline how to deploy it quickly without setting up your own hosting environment.
+StackBlitz projects are public by default, allowing you to share your Angular app via the project URL. Keep in mind that this is a great way to share ideas and prototypes, but it is not intended for production hosting.
 
-1. In your StackBlitz project, in the left menu bar, click the `Firebase` icon.
-1. If you don’t have a `Firebase` account, visit the [Firebase](https://firebase.google.com/ "Firebase web site") to sign up for a free hosting account.
-1. Click the `Sign into Google` button and follow the prompts to give `StackBlitz` access your `Firebase` projects
-1. Select the `project` where you wish to deploy your application.
-1. Click the `Deploy` button to deploy your application.
-1. After the deployment completes, click the `Open live site` link to view your app live.
+1. In your StackBlitz project, make sure you have forked or saved your project.
+1. In the preview pane, you should see a URL that looks like `https://<Project ID>.stackblitz.io`.
+1. Share this URL with a friend or colleague.
+1. Users that visit your URL will see a development server start up, and then your application will load.
 
 ## Building locally
 
-To build your application locally, you will need to download the source code from your StackBlitz project. Click the `Download Project` icon in the left menu across from `Project` to download your files.
+To build your application locally or for production, you will need to download the source code from your StackBlitz project. Click the `Download Project` icon in the left menu across from `Project` to download your files.
 
 Once you have the source code downloaded and unzipped, use the [Angular Console](https://angularconsole.com "Angular Console web site") to serve the application, or you install Node and have the Angular CLI installed.
 
@@ -76,7 +74,7 @@ Learn more about development and distribution of your application in the [Buildi
 
 ## Join our community
 
-You are now an Angular developer! [Share this moment](https://twitter.com/intent/tweet?url=https://next.angular.io/start&text=I%20just%20finished%20the%20Angular%20Getting%20Started%20Tutorial "Angular on Twitter"), tell us what you thought of this Getting Started, or submit [suggestions for future editions](https://github.com/angular/angular/issues/new/choose "Angular GitHub repository new issue form"). 
+You are now an Angular developer! [Share this moment](https://twitter.com/intent/tweet?url=https://angular.io/start&text=I%20just%20finished%20the%20Angular%20Getting%20Started%20Tutorial "Angular on Twitter"), tell us what you thought of this Getting Started, or submit [suggestions for future editions](https://github.com/angular/angular/issues/new/choose "Angular GitHub repository new issue form"). 
 
 Angular offers many more capabilities, and you now have a foundation that empowers you to build an application and explore those other capabilities:
 

From 10f48278c237b7be27617e46f0dccd374db4b096 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 15 May 2019 16:41:29 -0700
Subject: [PATCH 158/275] test(ivy): add attribute interpolation test (#30503)

PR Close #30503
---
 .../core/test/acceptance/attributes_spec.ts   | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/packages/core/test/acceptance/attributes_spec.ts b/packages/core/test/acceptance/attributes_spec.ts
index d8946033a0..1773227951 100644
--- a/packages/core/test/acceptance/attributes_spec.ts
+++ b/packages/core/test/acceptance/attributes_spec.ts
@@ -98,3 +98,54 @@ describe('attribute binding', () => {
     expect(a.href.indexOf('unsafe:')).toBe(-1);
   });
 });
+
+describe('attribute interpolation', () => {
+  it('should handle all varieties of interpolation', () => {
+    @Component({
+      template: `
+        <div attr.title="a{{a}}b{{b}}c{{c}}d{{d}}e{{e}}f{{f}}g{{g}}h{{h}}i{{i}}j"></div>
+        <div attr.title="a{{a}}b{{b}}c{{c}}d{{d}}e{{e}}f{{f}}g{{g}}h{{h}}i"></div>
+        <div attr.title="a{{a}}b{{b}}c{{c}}d{{d}}e{{e}}f{{f}}g{{g}}h"></div>
+        <div attr.title="a{{a}}b{{b}}c{{c}}d{{d}}e{{e}}f{{f}}g"></div>
+        <div attr.title="a{{a}}b{{b}}c{{c}}d{{d}}e{{e}}f"></div>
+        <div attr.title="a{{a}}b{{b}}c{{c}}d{{d}}e"></div>
+        <div attr.title="a{{a}}b{{b}}c{{c}}d"></div>
+        <div attr.title="a{{a}}b{{b}}c"></div>
+        <div attr.title="a{{a}}b"></div>
+        <div attr.title="{{a}}"></div>
+      `
+    })
+    class App {
+      a = 1;
+      b = 2;
+      c = 3;
+      d = 4;
+      e = 5;
+      f = 6;
+      g = 7;
+      h = 8;
+      i = 9;
+    }
+
+    TestBed.configureTestingModule({
+      declarations: [App],
+    });
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    const divs = fixture.debugElement.queryAll(By.css('div[title]'));
+
+    expect(divs.map(el => el.nativeElement.getAttribute('title'))).toEqual([
+      'a1b2c3d4e5f6g7h8i9j',
+      'a1b2c3d4e5f6g7h8i',
+      'a1b2c3d4e5f6g7h',
+      'a1b2c3d4e5f6g',
+      'a1b2c3d4e5f',
+      'a1b2c3d4e',
+      'a1b2c3d',
+      'a1b2c',
+      'a1b',
+      '1',
+    ]);
+  });
+});

From 38d7acee4d0da2d1b8ff54c9dcdd2586831bc90d Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 15 May 2019 19:20:02 -0700
Subject: [PATCH 159/275] =?UTF-8?q?refactor(ivy):=20add=20new=20=C9=B5?=
 =?UTF-8?q?=C9=B5attribute=20instruction=20(#30503)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- adds the ɵɵattribute instruction
- adds compilation handling for Δattribute instruction
- updates tests

PR Close #30503
---
 .../r3_view_compiler_styling_spec.ts          |    8 +-
 .../compiler/src/render3/r3_identifiers.ts    |    2 +
 .../compiler/src/render3/view/template.ts     |   29 +-
 .../core/src/core_render3_private_export.ts   |    1 +
 packages/core/src/render3/index.ts            |    2 +
 packages/core/src/render3/instructions/all.ts |    1 +
 .../src/render3/instructions/attribute.ts     |   31 +
 .../core/src/render3/instructions/element.ts  |    2 +-
 packages/core/src/render3/jit/environment.ts  |    1 +
 tools/public_api_guard/core/core.d.ts         | 1214 ++++++++---------
 10 files changed, 657 insertions(+), 634 deletions(-)
 create mode 100644 packages/core/src/render3/instructions/attribute.ts

diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index 250cb6bf56..29691ad60f 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -547,7 +547,7 @@ describe('compiler compliance: styling', () => {
                   $r3$.ɵɵstyleProp(0, $ctx$.myWidth);
                   $r3$.ɵɵstyleProp(1, $ctx$.myHeight);
                   $r3$.ɵɵstylingApply();
-                  $r3$.ɵɵelementAttribute(0, "style", $r3$.ɵɵbind("border-width: 10px"), $r3$.ɵɵsanitizeStyle);
+                  $r3$.ɵɵattribute("style", "border-width: 10px", $r3$.ɵɵsanitizeStyle);
                 }
               },
               encapsulation: 2
@@ -772,7 +772,7 @@ describe('compiler compliance: styling', () => {
                   $r3$.ɵɵclassProp(0, $ctx$.yesToApple);
                   $r3$.ɵɵclassProp(1, $ctx$.yesToOrange);
                   $r3$.ɵɵstylingApply();
-                  $r3$.ɵɵelementAttribute(0, "class", $r3$.ɵɵbind("banana"));
+                  $r3$.ɵɵattribute("class", "banana");
                 }
               },
               encapsulation: 2
@@ -822,8 +822,8 @@ describe('compiler compliance: styling', () => {
                 }
                 if (rf & 2) {
                   $r3$.ɵɵselect(0);
-                  $r3$.ɵɵelementAttribute(0, "class", $r3$.ɵɵbind("round"));
-                  $r3$.ɵɵelementAttribute(0, "style", $r3$.ɵɵbind("height:100px"), $r3$.ɵɵsanitizeStyle);
+                  $r3$.ɵɵattribute("class", "round");
+                  $r3$.ɵɵattribute("style", "height:100px", $r3$.ɵɵsanitizeStyle);
                 }
               },
               encapsulation: 2
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index af400aa98c..05de920cd9 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -41,6 +41,8 @@ export class Identifiers {
 
   static elementAttribute: o.ExternalReference = {name: 'ɵɵelementAttribute', moduleName: CORE};
 
+  static attribute: o.ExternalReference = {name: 'ɵɵattribute', moduleName: CORE};
+
   static classProp: o.ExternalReference = {name: 'ɵɵclassProp', moduleName: CORE};
 
   static elementContainerStart:
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 32d990934b..c141d350bc 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -753,6 +753,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
           if (inputType === BindingType.Property) {
             if (value instanceof Interpolation) {
+              // prop="{{value}}" and friends
               this.updateInstruction(
                   elementIndex, input.sourceSpan, getPropertyInterpolationExpression(value),
                   () =>
@@ -761,23 +762,33 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
                        ...params]);
 
             } else {
-              // Bound, un-interpolated properties
+              // [prop]="value"
               this.updateInstruction(elementIndex, input.sourceSpan, R3.property, () => {
                 return [
                   o.literal(attrName), this.convertPropertyBinding(implicit, value, true), ...params
                 ];
               });
             }
-          } else {
-            let instruction: any;
-
-            if (inputType === BindingType.Class) {
-              instruction = R3.classProp;
+          } else if (inputType === BindingType.Attribute) {
+            if (value instanceof Interpolation) {
+              // attr.name="{{value}}" and friends
+              this.updateInstruction(elementIndex, input.sourceSpan, R3.elementAttribute, () => {
+                return [
+                  o.literal(elementIndex), o.literal(attrName),
+                  this.convertPropertyBinding(implicit, value), ...params
+                ];
+              });
             } else {
-              instruction = R3.elementAttribute;
+              // [attr.name]="value"
+              this.updateInstruction(elementIndex, input.sourceSpan, R3.attribute, () => {
+                return [
+                  o.literal(attrName), this.convertPropertyBinding(implicit, value, true), ...params
+                ];
+              });
             }
-
-            this.updateInstruction(elementIndex, input.sourceSpan, instruction, () => {
+          } else {
+            // class prop
+            this.updateInstruction(elementIndex, input.sourceSpan, R3.classProp, () => {
               return [
                 o.literal(elementIndex), o.literal(attrName),
                 this.convertPropertyBinding(implicit, value), ...params
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index f2b48983e4..96cfb3bd9b 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -8,6 +8,7 @@
 
 // clang-format off
 export {
+  ɵɵattribute,
   ɵɵdefineBase,
   ɵɵdefineComponent,
   ɵɵdefineDirective,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 34c39ec47f..b0ffe6aa71 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -21,7 +21,9 @@ export {
   markDirty,
   store,
   tick,
+
   ɵɵallocHostVars,
+  ɵɵattribute,
   ɵɵbind,
   ɵɵclassMap,
   ɵɵclassProp,
diff --git a/packages/core/src/render3/instructions/all.ts b/packages/core/src/render3/instructions/all.ts
index faee257e01..22017700fd 100644
--- a/packages/core/src/render3/instructions/all.ts
+++ b/packages/core/src/render3/instructions/all.ts
@@ -26,6 +26,7 @@
  * Jira Issue = FW-1184
  */
 export * from './alloc_host_vars';
+export * from './attribute';
 export * from './change_detection';
 export * from './container';
 export * from './storage';
diff --git a/packages/core/src/render3/instructions/attribute.ts b/packages/core/src/render3/instructions/attribute.ts
new file mode 100644
index 0000000000..478a1c2e4a
--- /dev/null
+++ b/packages/core/src/render3/instructions/attribute.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 {SanitizerFn} from '../interfaces/sanitization';
+import {getSelectedIndex} from '../state';
+
+import {ΔelementAttribute} from './element';
+import {Δbind} from './property';
+
+/**
+ * Updates the value of or removes a bound attribute on an Element.
+ *
+ * Used in the case of `[attr.title]="value"`
+ *
+ * @param name name The name of the attribute.
+ * @param value value The attribute is removed when value is `null` or `undefined`.
+ *                  Otherwise the attribute value is set to the stringified value.
+ * @param sanitizer An optional function used to sanitize the value.
+ * @param namespace Optional namespace to use when setting the attribute.
+ *
+ * @codeGenApi
+ */
+export function Δattribute(
+    name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string) {
+  const index = getSelectedIndex();
+  return ΔelementAttribute(index, name, Δbind(value), sanitizer, namespace);
+}
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index b6e859fd11..a288211792 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -198,7 +198,7 @@ export function ɵɵelement(
 
 
 /**
- * Updates the value of removes an attribute on an Element.
+ * Updates the value or removes an attribute on an Element.
  *
  * @param number index The index of the element in the data array
  * @param name name The name of the attribute.
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 7dcb88d3a5..51e5432bdb 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -20,6 +20,7 @@ import * as r3 from '../index';
  */
 export const angularCoreEnv: {[name: string]: Function} =
     (() => ({
+       'ɵɵattribute': r3.ɵɵattribute,
        'ɵɵdefineBase': r3.ɵɵdefineBase,
        'ɵɵdefineComponent': r3.ɵɵdefineComponent,
        'ɵɵdefineDirective': r3.ɵɵdefineDirective,
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 1a3c687730..1ca6059c4b 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -1,988 +1,962 @@
-export interface AbstractType<T> extends Function {
-    prototype: T;
-}
+export interface AbstractType<T> extends Function { prototype: T; }
 
-export interface AfterContentChecked {
-    ngAfterContentChecked(): void;
-}
+export interface AfterContentChecked { ngAfterContentChecked(): void; }
 
-export interface AfterContentInit {
-    ngAfterContentInit(): void;
-}
+export interface AfterContentInit { ngAfterContentInit(): void; }
 
-export interface AfterViewChecked {
-    ngAfterViewChecked(): void;
-}
+export interface AfterViewChecked { ngAfterViewChecked(): void; }
 
-export interface AfterViewInit {
-    ngAfterViewInit(): void;
-}
+export interface AfterViewInit { ngAfterViewInit(): void; }
 
 export declare const ANALYZE_FOR_ENTRY_COMPONENTS: InjectionToken<any>;
 
-export declare const APP_BOOTSTRAP_LISTENER: InjectionToken<((compRef: ComponentRef<any>) => void)[]>;
+export declare const APP_BOOTSTRAP_LISTENER:
+    InjectionToken<((compRef: ComponentRef<any>) => void)[]>;
 
 export declare const APP_ID: InjectionToken<string>;
 
 export declare const APP_INITIALIZER: InjectionToken<(() => void)[]>;
 
 export declare class ApplicationInitStatus {
-    readonly done = false;
-    readonly donePromise: Promise<any>;
-    constructor(appInits: (() => any)[]);
+  readonly done = false;
+  readonly donePromise: Promise<any>;
+  constructor(appInits: (() => any)[]);
 }
 
-export declare class ApplicationModule {
-    constructor(appRef: ApplicationRef);
-}
+export declare class ApplicationModule { constructor(appRef: ApplicationRef); }
 
 export declare class ApplicationRef {
-    readonly componentTypes: Type<any>[];
-    readonly components: ComponentRef<any>[];
-    readonly isStable: Observable<boolean>;
-    readonly viewCount: number;
-    attachView(viewRef: ViewRef): void;
-    bootstrap<C>(componentOrFactory: ComponentFactory<C> | Type<C>, rootSelectorOrNode?: string | any): ComponentRef<C>;
-    detachView(viewRef: ViewRef): void;
-    tick(): void;
+  readonly componentTypes: Type<any>[];
+  readonly components: ComponentRef<any>[];
+  readonly isStable: Observable<boolean>;
+  readonly viewCount: number;
+  attachView(viewRef: ViewRef): void;
+  bootstrap<C>(componentOrFactory: ComponentFactory<C>|Type<C>, rootSelectorOrNode?: string|any):
+      ComponentRef<C>;
+  detachView(viewRef: ViewRef): void;
+  tick(): void;
 }
 
 export declare function asNativeElements(debugEls: DebugElement[]): any;
 
-export declare function assertPlatform(requiredToken: any): PlatformRef;
+    export declare function assertPlatform(requiredToken: any):
+        PlatformRef;
 
-export interface Attribute {
-    attributeName?: string;
-}
+    export interface Attribute {
+      attributeName?: string;
+    }
 
 export declare const Attribute: AttributeDecorator;
 
 export interface AttributeDecorator {
-    (name: string): any;
-    new (name: string): Attribute;
+  (name: string): any;
+  new (name: string): Attribute;
 }
 
-export declare enum ChangeDetectionStrategy {
-    OnPush = 0,
-    Default = 1
-}
+export declare enum ChangeDetectionStrategy {OnPush = 0, Default = 1}
 
 export declare abstract class ChangeDetectorRef {
-    abstract checkNoChanges(): void;
-    abstract detach(): void;
-    abstract detectChanges(): void;
-    abstract markForCheck(): void;
-    abstract reattach(): void;
+  abstract checkNoChanges(): void;
+  abstract detach(): void;
+  abstract detectChanges(): void;
+  abstract markForCheck(): void;
+  abstract reattach(): void;
 }
 
 export interface ClassProvider extends ClassSansProvider {
-    multi?: boolean;
-    provide: any;
+  multi?: boolean;
+  provide: any;
 }
 
 /** @deprecated */
-export interface CollectionChangeRecord<V> extends IterableChangeRecord<V> {
-}
+export interface CollectionChangeRecord<V> extends IterableChangeRecord<V> {}
 
 export declare class Compiler {
-    compileModuleAndAllComponentsAsync: <T>(moduleType: Type<T>) => Promise<ModuleWithComponentFactories<T>>;
-    compileModuleAndAllComponentsSync: <T>(moduleType: Type<T>) => ModuleWithComponentFactories<T>;
-    compileModuleAsync: <T>(moduleType: Type<T>) => Promise<NgModuleFactory<T>>;
-    compileModuleSync: <T>(moduleType: Type<T>) => NgModuleFactory<T>;
-    clearCache(): void;
-    clearCacheFor(type: Type<any>): void;
-    getModuleId(moduleType: Type<any>): string | undefined;
+  compileModuleAndAllComponentsAsync:
+      <T>(moduleType: Type<T>) => Promise<ModuleWithComponentFactories<T>>;
+  compileModuleAndAllComponentsSync: <T>(moduleType: Type<T>) => ModuleWithComponentFactories<T>;
+  compileModuleAsync: <T>(moduleType: Type<T>) => Promise<NgModuleFactory<T>>;
+  compileModuleSync: <T>(moduleType: Type<T>) => NgModuleFactory<T>;
+  clearCache(): void;
+  clearCacheFor(type: Type<any>): void;
+  getModuleId(moduleType: Type<any>): string|undefined;
 }
 
 export declare const COMPILER_OPTIONS: InjectionToken<CompilerOptions[]>;
 
 export declare abstract class CompilerFactory {
-    abstract createCompiler(options?: CompilerOptions[]): Compiler;
+  abstract createCompiler(options?: CompilerOptions[]): Compiler;
 }
 
 export declare type CompilerOptions = {
-    useJit?: boolean;
-    defaultEncapsulation?: ViewEncapsulation;
-    providers?: StaticProvider[];
-    missingTranslation?: MissingTranslationStrategy;
-    preserveWhitespaces?: boolean;
+  useJit?: boolean; defaultEncapsulation?: ViewEncapsulation; providers?: StaticProvider[];
+  missingTranslation?: MissingTranslationStrategy;
+  preserveWhitespaces?: boolean;
 };
 
 export interface Component extends Directive {
-    animations?: any[];
-    changeDetection?: ChangeDetectionStrategy;
-    encapsulation?: ViewEncapsulation;
-    entryComponents?: Array<Type<any> | any[]>;
-    interpolation?: [string, string];
-    moduleId?: string;
-    preserveWhitespaces?: boolean;
-    styleUrls?: string[];
-    styles?: string[];
-    template?: string;
-    templateUrl?: string;
-    viewProviders?: Provider[];
+  animations?: any[];
+  changeDetection?: ChangeDetectionStrategy;
+  encapsulation?: ViewEncapsulation;
+  entryComponents?: Array<Type<any>|any[]>;
+  interpolation?: [string, string];
+  moduleId?: string;
+  preserveWhitespaces?: boolean;
+  styleUrls?: string[];
+  styles?: string[];
+  template?: string;
+  templateUrl?: string;
+  viewProviders?: Provider[];
 }
 
 export declare const Component: ComponentDecorator;
 
 export interface ComponentDecorator {
-    (obj: Component): TypeDecorator;
-    new (obj: Component): Component;
+  (obj: Component): TypeDecorator;
+  new (obj: Component): Component;
 }
 
 export declare abstract class ComponentFactory<C> {
-    abstract readonly componentType: Type<any>;
-    abstract readonly inputs: {
-        propName: string;
-        templateName: string;
-    }[];
-    abstract readonly ngContentSelectors: string[];
-    abstract readonly outputs: {
-        propName: string;
-        templateName: string;
-    }[];
-    abstract readonly selector: string;
-    abstract create(injector: Injector, projectableNodes?: any[][], rootSelectorOrNode?: string | any, ngModule?: NgModuleRef<any>): ComponentRef<C>;
+  abstract readonly componentType: Type<any>;
+  abstract readonly inputs: {propName: string; templateName: string;}[];
+  abstract readonly ngContentSelectors: string[];
+  abstract readonly outputs: {propName: string; templateName: string;}[];
+  abstract readonly selector: string;
+  abstract create(
+      injector: Injector, projectableNodes?: any[][], rootSelectorOrNode?: string|any,
+      ngModule?: NgModuleRef<any>): ComponentRef<C>;
 }
 
 export declare abstract class ComponentFactoryResolver {
-    abstract resolveComponentFactory<T>(component: Type<T>): ComponentFactory<T>;
-    static NULL: ComponentFactoryResolver;
+  abstract resolveComponentFactory<T>(component: Type<T>): ComponentFactory<T>;
+  static NULL: ComponentFactoryResolver;
 }
 
 export declare abstract class ComponentRef<C> {
-    abstract readonly changeDetectorRef: ChangeDetectorRef;
-    abstract readonly componentType: Type<any>;
-    abstract readonly hostView: ViewRef;
-    abstract readonly injector: Injector;
-    abstract readonly instance: C;
-    abstract readonly location: ElementRef;
-    abstract destroy(): void;
-    abstract onDestroy(callback: Function): void;
+  abstract readonly changeDetectorRef: ChangeDetectorRef;
+  abstract readonly componentType: Type<any>;
+  abstract readonly hostView: ViewRef;
+  abstract readonly injector: Injector;
+  abstract readonly instance: C;
+  abstract readonly location: ElementRef;
+  abstract destroy(): void;
+  abstract onDestroy(callback: Function): void;
 }
 
-export interface ConstructorSansProvider {
-    deps?: any[];
-}
+export interface ConstructorSansProvider { deps?: any[]; }
 
 export declare type ContentChild = Query;
 
 export interface ContentChildDecorator {
-    (selector: Type<any> | Function | string, opts?: {
-        read?: any;
-        static?: boolean;
-    }): any;
-    new (selector: Type<any> | Function | string, opts?: {
-        read?: any;
-        static?: boolean;
-    }): ContentChild;
+  (selector: Type<any>|Function|string, opts?: {read?: any; static?: boolean;}): any;
+  new (selector: Type<any>|Function|string, opts?: {read?: any; static?: boolean;}): ContentChild;
 }
 
 export declare type ContentChildren = Query;
 
 export interface ContentChildrenDecorator {
-    (selector: Type<any> | Function | string, opts?: {
-        descendants?: boolean;
-        read?: any;
-    }): any;
-    new (selector: Type<any> | Function | string, opts?: {
-        descendants?: boolean;
-        read?: any;
-    }): Query;
+  (selector: Type<any>|Function|string, opts?: {descendants?: boolean; read?: any;}): any;
+  new (selector: Type<any>|Function|string, opts?: {descendants?: boolean; read?: any;}): Query;
 }
 
 export declare function createPlatform(injector: Injector): PlatformRef;
 
-export declare function createPlatformFactory(parentPlatformFactory: ((extraProviders?: StaticProvider[]) => PlatformRef) | null, name: string, providers?: StaticProvider[]): (extraProviders?: StaticProvider[]) => PlatformRef;
+    export declare function createPlatformFactory(
+        parentPlatformFactory: ((extraProviders?: StaticProvider[]) => PlatformRef) | null,
+        name: string, providers?: StaticProvider[]): (extraProviders?: StaticProvider[]) =>
+        PlatformRef;
 
-export declare const CUSTOM_ELEMENTS_SCHEMA: SchemaMetadata;
+    export declare const CUSTOM_ELEMENTS_SCHEMA:
+        SchemaMetadata;
 
-export interface DebugElement extends DebugNode {
-    readonly attributes: {
-        [key: string]: string | null;
-    };
-    readonly childNodes: DebugNode[];
-    readonly children: DebugElement[];
-    readonly classes: {
-        [key: string]: boolean;
-    };
-    readonly name: string;
-    readonly nativeElement: any;
-    readonly properties: {
-        [key: string]: any;
-    };
-    readonly styles: {
-        [key: string]: string | null;
-    };
-    query(predicate: Predicate<DebugElement>): DebugElement;
-    queryAll(predicate: Predicate<DebugElement>): DebugElement[];
-    queryAllNodes(predicate: Predicate<DebugNode>): DebugNode[];
-    triggerEventHandler(eventName: string, eventObj: any): void;
-}
+    export interface DebugElement extends DebugNode {
+      readonly attributes: {[key: string]: string | null;};
+      readonly childNodes: DebugNode[];
+      readonly children: DebugElement[];
+      readonly classes: {[key: string]: boolean;};
+      readonly name: string;
+      readonly nativeElement: any;
+      readonly properties: {[key: string]: any;};
+      readonly styles: {[key: string]: string | null;};
+      query(predicate: Predicate<DebugElement>): DebugElement;
+      queryAll(predicate: Predicate<DebugElement>): DebugElement[];
+      queryAllNodes(predicate: Predicate<DebugNode>): DebugNode[];
+      triggerEventHandler(eventName: string, eventObj: any): void;
+    }
 
-export declare const DebugElement: {
-    new (...args: any[]): DebugElement;
-};
+export declare const DebugElement: {new (...args: any[]): DebugElement;};
 
 export declare class DebugEventListener {
-    callback: Function;
-    name: string;
-    constructor(name: string, callback: Function);
+  callback: Function;
+  name: string;
+  constructor(name: string, callback: Function);
 }
 
 export interface DebugNode {
-    readonly componentInstance: any;
-    readonly context: any;
-    readonly injector: Injector;
-    readonly listeners: DebugEventListener[];
-    readonly nativeNode: any;
-    readonly parent: DebugElement | null;
-    readonly providerTokens: any[];
-    readonly references: {
-        [key: string]: any;
-    };
+  readonly componentInstance: any;
+  readonly context: any;
+  readonly injector: Injector;
+  readonly listeners: DebugEventListener[];
+  readonly nativeNode: any;
+  readonly parent: DebugElement|null;
+  readonly providerTokens: any[];
+  readonly references: {[key: string]: any;};
 }
 
-export declare const DebugNode: {
-    new (...args: any[]): DebugNode;
-};
+export declare const DebugNode: {new (...args: any[]): DebugNode;};
 
 /** @deprecated */
 export declare class DefaultIterableDiffer<V> implements IterableDiffer<V>, IterableChanges<V> {
-    readonly collection: V[] | Iterable<V> | null;
-    readonly isDirty: boolean;
-    readonly length: number;
-    constructor(trackByFn?: TrackByFunction<V>);
-    check(collection: NgIterable<V>): boolean;
-    diff(collection: NgIterable<V>): DefaultIterableDiffer<V> | null;
-    forEachAddedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-    forEachIdentityChange(fn: (record: IterableChangeRecord_<V>) => void): void;
-    forEachItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-    forEachMovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-    forEachOperation(fn: (item: IterableChangeRecord<V>, previousIndex: number | null, currentIndex: number | null) => void): void;
-    forEachPreviousItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-    forEachRemovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-    onDestroy(): void;
+  readonly collection: V[]|Iterable<V>|null;
+  readonly isDirty: boolean;
+  readonly length: number;
+  constructor(trackByFn?: TrackByFunction<V>);
+  check(collection: NgIterable<V>): boolean;
+  diff(collection: NgIterable<V>): DefaultIterableDiffer<V>|null;
+  forEachAddedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+  forEachIdentityChange(fn: (record: IterableChangeRecord_<V>) => void): void;
+  forEachItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+  forEachMovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+  forEachOperation(
+      fn: (item: IterableChangeRecord<V>, previousIndex: number|null, currentIndex: number|null) =>
+          void): void;
+  forEachPreviousItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+  forEachRemovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+  onDestroy(): void;
 }
 
 /** @deprecated */
 export declare const defineInjectable: typeof ɵɵdefineInjectable;
 
-export declare function destroyPlatform(): void;
+export declare function destroyPlatform():
+    void;
 
-export interface Directive {
-    exportAs?: string;
-    host?: {
-        [key: string]: string;
-    };
-    inputs?: string[];
-    jit?: true;
-    outputs?: string[];
-    providers?: Provider[];
-    queries?: {
-        [key: string]: any;
-    };
-    selector?: string;
-}
+    export interface Directive {
+      exportAs?: string;
+      host?: {[key: string]: string;};
+      inputs?: string[];
+      jit?: true;
+      outputs?: string[];
+      providers?: Provider[];
+      queries?: {[key: string]: any;};
+      selector?: string;
+    }
 
 export declare const Directive: DirectiveDecorator;
 
 export interface DirectiveDecorator {
-    (obj: Directive): TypeDecorator;
-    new (obj: Directive): Directive;
+  (obj: Directive): TypeDecorator;
+  new (obj: Directive): Directive;
 }
 
-export interface DoBootstrap {
-    ngDoBootstrap(appRef: ApplicationRef): void;
-}
+export interface DoBootstrap { ngDoBootstrap(appRef: ApplicationRef): void; }
 
-export interface DoCheck {
-    ngDoCheck(): void;
-}
+export interface DoCheck { ngDoCheck(): void; }
 
 export declare class ElementRef<T = any> {
-    nativeElement: T;
-    constructor(nativeElement: T);
+  nativeElement: T;
+  constructor(nativeElement: T);
 }
 
 export declare abstract class EmbeddedViewRef<C> extends ViewRef {
-    abstract readonly context: C;
-    abstract readonly rootNodes: any[];
+  abstract readonly context: C;
+  abstract readonly rootNodes: any[];
 }
 
-export declare function enableProdMode(): void;
+export declare function enableProdMode():
+    void;
 
-export declare class ErrorHandler {
-    handleError(error: any): void;
-}
+    export declare class ErrorHandler {
+      handleError(error: any): void;
+    }
 
 export declare class EventEmitter<T> extends Subject<T> {
-    __isAsync: boolean;
-    constructor(isAsync?: boolean);
-    emit(value?: T): void;
-    subscribe(generatorOrNext?: any, error?: any, complete?: any): Subscription;
+  __isAsync: boolean;
+  constructor(isAsync?: boolean);
+  emit(value?: T): void;
+  subscribe(generatorOrNext?: any, error?: any, complete?: any): Subscription;
 }
 
 export interface ExistingProvider extends ExistingSansProvider {
-    multi?: boolean;
-    provide: any;
+  multi?: boolean;
+  provide: any;
 }
 
 export interface FactoryProvider extends FactorySansProvider {
-    multi?: boolean;
-    provide: any;
+  multi?: boolean;
+  provide: any;
 }
 
-export declare function forwardRef(forwardRefFn: ForwardRefFn): Type<any>;
+export declare function forwardRef(forwardRefFn: ForwardRefFn):
+    Type<any>;
 
-export interface ForwardRefFn {
-    (): any;
-}
+    export interface ForwardRefFn {
+      (): any;
+    }
 
 export declare const getDebugNode: (nativeNode: any) => DebugNode | null;
 
 export declare const getModuleFactory: (id: string) => NgModuleFactory<any>;
 
-export declare function getPlatform(): PlatformRef | null;
+export declare function getPlatform():
+    PlatformRef|null;
 
-export interface GetTestability {
-    addToWindow(registry: TestabilityRegistry): void;
-    findTestabilityInTree(registry: TestabilityRegistry, elem: any, findInAncestors: boolean): Testability | null;
-}
+    export interface GetTestability {
+      addToWindow(registry: TestabilityRegistry): void;
+      findTestabilityInTree(
+          registry: TestabilityRegistry, elem: any, findInAncestors: boolean): Testability|null;
+    }
 
-export interface Host {
-}
+export interface Host {}
 
 export declare const Host: HostDecorator;
 
-export interface HostBinding {
-    hostPropertyName?: string;
-}
+export interface HostBinding { hostPropertyName?: string; }
 
 export declare const HostBinding: HostBindingDecorator;
 
 export interface HostBindingDecorator {
-    (hostPropertyName?: string): any;
-    new (hostPropertyName?: string): any;
+  (hostPropertyName?: string): any;
+  new (hostPropertyName?: string): any;
 }
 
 export interface HostDecorator {
-    (): any;
-    new (): Host;
+  (): any;
+  new (): Host;
 }
 
 export interface HostListener {
-    args?: string[];
-    eventName?: string;
+  args?: string[];
+  eventName?: string;
 }
 
 export declare const HostListener: HostListenerDecorator;
 
 export interface HostListenerDecorator {
-    (eventName: string, args?: string[]): any;
-    new (eventName: string, args?: string[]): any;
+  (eventName: string, args?: string[]): any;
+  new (eventName: string, args?: string[]): any;
 }
 
 export declare const inject: typeof ɵɵinject;
 
-export interface Inject {
-    token: any;
-}
+export interface Inject { token: any; }
 
 export declare const Inject: InjectDecorator;
 
-export interface Injectable {
-    providedIn?: Type<any> | 'root' | null;
-}
+export interface Injectable { providedIn?: Type<any>|'root'|null; }
 
 export declare const Injectable: InjectableDecorator;
 
 export interface InjectableDecorator {
-    (): TypeDecorator;
-    (options?: {
-        providedIn: Type<any> | 'root' | null;
-    } & InjectableProvider): TypeDecorator;
-    new (): Injectable;
-    new (options?: {
-        providedIn: Type<any> | 'root' | null;
-    } & InjectableProvider): Injectable;
+  (): TypeDecorator;
+  (options?: {providedIn: Type<any>| 'root' | null;}&InjectableProvider): TypeDecorator;
+  new (): Injectable;
+  new (options?: {providedIn: Type<any>| 'root' | null;}&InjectableProvider): Injectable;
 }
 
-export declare type InjectableProvider = ValueSansProvider | ExistingSansProvider | StaticClassSansProvider | ConstructorSansProvider | FactorySansProvider | ClassSansProvider;
+export declare type InjectableProvider = ValueSansProvider | ExistingSansProvider |
+    StaticClassSansProvider | ConstructorSansProvider | FactorySansProvider | ClassSansProvider;
 
-export interface InjectableType<T> extends Type<T> {
-    ngInjectableDef: never;
-}
+export interface InjectableType<T> extends Type<T> { ngInjectableDef: never; }
 
 export interface InjectDecorator {
-    (token: any): any;
-    new (token: any): Inject;
+  (token: any): any;
+  new (token: any): Inject;
 }
 
-export declare enum InjectFlags {
-    Default = 0,
-    Host = 1,
-    Self = 2,
-    SkipSelf = 4,
-    Optional = 8
-}
+export declare enum InjectFlags {Default = 0, Host = 1, Self = 2, SkipSelf = 4, Optional = 8}
 
 export declare class InjectionToken<T> {
-    protected _desc: string;
-    readonly ngInjectableDef: never | undefined;
-    constructor(_desc: string, options?: {
-        providedIn?: Type<any> | 'root' | null;
-        factory: () => T;
-    });
-    toString(): string;
+  protected _desc: string;
+  readonly ngInjectableDef: never|undefined;
+  constructor(_desc: string, options?: {providedIn?: Type<any>| 'root' | null; factory: () => T;});
+  toString(): string;
 }
 
 export declare abstract class Injector {
-    abstract get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
-    /** @deprecated */ abstract get(token: any, notFoundValue?: any): any;
-    static NULL: Injector;
-    static THROW_IF_NOT_FOUND: Object;
-    static ngInjectableDef: never;
-    /** @deprecated */ static create(providers: StaticProvider[], parent?: Injector): Injector;
-    static create(options: {
-        providers: StaticProvider[];
-        parent?: Injector;
-        name?: string;
-    }): Injector;
+  abstract get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
+  /** @deprecated */ abstract get(token: any, notFoundValue?: any): any;
+  static NULL: Injector;
+  static THROW_IF_NOT_FOUND: Object;
+  static ngInjectableDef: never;
+  /** @deprecated */ static create(providers: StaticProvider[], parent?: Injector): Injector;
+  static create(options: {providers: StaticProvider[]; parent?: Injector; name?: string;}):
+      Injector;
 }
 
 export declare const INJECTOR: InjectionToken<Injector>;
 
-export interface InjectorType<T> extends Type<T> {
-    ngInjectorDef: never;
-}
+export interface InjectorType<T> extends Type<T> { ngInjectorDef: never; }
 
-export interface Input {
-    bindingPropertyName?: string;
-}
+export interface Input { bindingPropertyName?: string; }
 
 export declare const Input: InputDecorator;
 
 export interface InputDecorator {
-    (bindingPropertyName?: string): any;
-    new (bindingPropertyName?: string): any;
+  (bindingPropertyName?: string): any;
+  new (bindingPropertyName?: string): any;
 }
 
-export declare function isDevMode(): boolean;
+export declare function isDevMode():
+    boolean;
 
-export interface IterableChangeRecord<V> {
-    readonly currentIndex: number | null;
-    readonly item: V;
-    readonly previousIndex: number | null;
-    readonly trackById: any;
-}
+    export interface IterableChangeRecord<V> {
+      readonly currentIndex: number|null;
+      readonly item: V;
+      readonly previousIndex: number|null;
+      readonly trackById: any;
+    }
 
 export interface IterableChanges<V> {
-    forEachAddedItem(fn: (record: IterableChangeRecord<V>) => void): void;
-    forEachIdentityChange(fn: (record: IterableChangeRecord<V>) => void): void;
-    forEachItem(fn: (record: IterableChangeRecord<V>) => void): void;
-    forEachMovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
-    forEachOperation(fn: (record: IterableChangeRecord<V>, previousIndex: number | null, currentIndex: number | null) => void): void;
-    forEachPreviousItem(fn: (record: IterableChangeRecord<V>) => void): void;
-    forEachRemovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
+  forEachAddedItem(fn: (record: IterableChangeRecord<V>) => void): void;
+  forEachIdentityChange(fn: (record: IterableChangeRecord<V>) => void): void;
+  forEachItem(fn: (record: IterableChangeRecord<V>) => void): void;
+  forEachMovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
+  forEachOperation(
+      fn:
+          (record: IterableChangeRecord<V>, previousIndex: number|null,
+           currentIndex: number|null) => void): void;
+  forEachPreviousItem(fn: (record: IterableChangeRecord<V>) => void): void;
+  forEachRemovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
 }
 
-export interface IterableDiffer<V> {
-    diff(object: NgIterable<V>): IterableChanges<V> | null;
-}
+export interface IterableDiffer<V> { diff(object: NgIterable<V>): IterableChanges<V>|null; }
 
 export interface IterableDifferFactory {
-    create<V>(trackByFn?: TrackByFunction<V>): IterableDiffer<V>;
-    supports(objects: any): boolean;
+  create<V>(trackByFn?: TrackByFunction<V>): IterableDiffer<V>;
+  supports(objects: any): boolean;
 }
 
 export declare class IterableDiffers {
-    /** @deprecated */ factories: IterableDifferFactory[];
-    constructor(factories: IterableDifferFactory[]);
-    find(iterable: any): IterableDifferFactory;
-    static ngInjectableDef: never;
-    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
-    static extend(factories: IterableDifferFactory[]): StaticProvider;
+  /** @deprecated */ factories: IterableDifferFactory[];
+  constructor(factories: IterableDifferFactory[]);
+  find(iterable: any): IterableDifferFactory;
+  static ngInjectableDef: never;
+  static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+  static extend(factories: IterableDifferFactory[]): StaticProvider;
 }
 
 export interface KeyValueChangeRecord<K, V> {
-    readonly currentValue: V | null;
-    readonly key: K;
-    readonly previousValue: V | null;
+  readonly currentValue: V|null;
+  readonly key: K;
+  readonly previousValue: V|null;
 }
 
 export interface KeyValueChanges<K, V> {
-    forEachAddedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-    forEachChangedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-    forEachItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-    forEachPreviousItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-    forEachRemovedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+  forEachAddedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+  forEachChangedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+  forEachItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+  forEachPreviousItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+  forEachRemovedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
 }
 
 export interface KeyValueDiffer<K, V> {
-    diff(object: Map<K, V>): KeyValueChanges<K, V> | null;
-    diff(object: {
-        [key: string]: V;
-    }): KeyValueChanges<string, V> | null;
+  diff(object: Map<K, V>): KeyValueChanges<K, V>|null;
+  diff(object: {[key: string]: V;}): KeyValueChanges<string, V>|null;
 }
 
 export interface KeyValueDifferFactory {
-    create<K, V>(): KeyValueDiffer<K, V>;
-    supports(objects: any): boolean;
+  create<K, V>(): KeyValueDiffer<K, V>;
+  supports(objects: any): boolean;
 }
 
 export declare class KeyValueDiffers {
-    /** @deprecated */ factories: KeyValueDifferFactory[];
-    constructor(factories: KeyValueDifferFactory[]);
-    find(kv: any): KeyValueDifferFactory;
-    static ngInjectableDef: never;
-    static create<S>(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
-    static extend<S>(factories: KeyValueDifferFactory[]): StaticProvider;
+  /** @deprecated */ factories: KeyValueDifferFactory[];
+  constructor(factories: KeyValueDifferFactory[]);
+  find(kv: any): KeyValueDifferFactory;
+  static ngInjectableDef: never;
+  static create<S>(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+  static extend<S>(factories: KeyValueDifferFactory[]): StaticProvider;
 }
 
 export declare const LOCALE_ID: InjectionToken<string>;
 
-export declare enum MissingTranslationStrategy {
-    Error = 0,
-    Warning = 1,
-    Ignore = 2
-}
+export declare enum MissingTranslationStrategy {Error = 0, Warning = 1, Ignore = 2}
 
 export declare class ModuleWithComponentFactories<T> {
-    componentFactories: ComponentFactory<any>[];
-    ngModuleFactory: NgModuleFactory<T>;
-    constructor(ngModuleFactory: NgModuleFactory<T>, componentFactories: ComponentFactory<any>[]);
+  componentFactories: ComponentFactory<any>[];
+  ngModuleFactory: NgModuleFactory<T>;
+  constructor(ngModuleFactory: NgModuleFactory<T>, componentFactories: ComponentFactory<any>[]);
 }
 
-export interface ModuleWithProviders<T = any /** TODO(alxhub): remove default when callers pass explicit type param */> {
-    ngModule: Type<T>;
-    providers?: Provider[];
+export interface ModuleWithProviders<
+    T = any /** TODO(alxhub): remove default when callers pass explicit type param */> {
+  ngModule: Type<T>;
+  providers?: Provider[];
 }
 
-export declare type NgIterable<T> = Array<T> | Iterable<T>;
+export declare type NgIterable<T> = Array<T>| Iterable<T>;
 
 export interface NgModule {
-    bootstrap?: Array<Type<any> | any[]>;
-    declarations?: Array<Type<any> | any[]>;
-    entryComponents?: Array<Type<any> | any[]>;
-    exports?: Array<Type<any> | any[]>;
-    id?: string;
-    imports?: Array<Type<any> | ModuleWithProviders<{}> | any[]>;
-    jit?: true;
-    providers?: Provider[];
-    schemas?: Array<SchemaMetadata | any[]>;
+  bootstrap?: Array<Type<any>|any[]>;
+  declarations?: Array<Type<any>|any[]>;
+  entryComponents?: Array<Type<any>|any[]>;
+  exports?: Array<Type<any>|any[]>;
+  id?: string;
+  imports?: Array<Type<any>|ModuleWithProviders<{}>|any[]>;
+  jit?: true;
+  providers?: Provider[];
+  schemas?: Array<SchemaMetadata|any[]>;
 }
 
 export declare const NgModule: NgModuleDecorator;
 
 export interface NgModuleDecorator {
-    (obj?: NgModule): TypeDecorator;
-    new (obj?: NgModule): NgModule;
+  (obj?: NgModule): TypeDecorator;
+  new (obj?: NgModule): NgModule;
 }
 
 export declare abstract class NgModuleFactory<T> {
-    abstract readonly moduleType: Type<T>;
-    abstract create(parentInjector: Injector | null): NgModuleRef<T>;
+  abstract readonly moduleType: Type<T>;
+  abstract create(parentInjector: Injector|null): NgModuleRef<T>;
 }
 
 /** @deprecated */
 export declare abstract class NgModuleFactoryLoader {
-    abstract load(path: string): Promise<NgModuleFactory<any>>;
+  abstract load(path: string): Promise<NgModuleFactory<any>>;
 }
 
 export declare abstract class NgModuleRef<T> {
-    abstract readonly componentFactoryResolver: ComponentFactoryResolver;
-    abstract readonly injector: Injector;
-    abstract readonly instance: T;
-    abstract destroy(): void;
-    abstract onDestroy(callback: () => void): void;
+  abstract readonly componentFactoryResolver: ComponentFactoryResolver;
+  abstract readonly injector: Injector;
+  abstract readonly instance: T;
+  abstract destroy(): void;
+  abstract onDestroy(callback: () => void): void;
 }
 
 export declare class NgProbeToken {
-    name: string;
-    token: any;
-    constructor(name: string, token: any);
+  name: string;
+  token: any;
+  constructor(name: string, token: any);
 }
 
 export declare class NgZone {
-    readonly hasPendingMacrotasks: boolean;
-    readonly hasPendingMicrotasks: boolean;
-    readonly isStable: boolean;
-    readonly onError: EventEmitter<any>;
-    readonly onMicrotaskEmpty: EventEmitter<any>;
-    readonly onStable: EventEmitter<any>;
-    readonly onUnstable: EventEmitter<any>;
-    constructor({ enableLongStackTrace }: {
-        enableLongStackTrace?: boolean | undefined;
-    });
-    run<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
-    runGuarded<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
-    runOutsideAngular<T>(fn: (...args: any[]) => T): T;
-    runTask<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[], name?: string): T;
-    static assertInAngularZone(): void;
-    static assertNotInAngularZone(): void;
-    static isInAngularZone(): boolean;
+  readonly hasPendingMacrotasks: boolean;
+  readonly hasPendingMicrotasks: boolean;
+  readonly isStable: boolean;
+  readonly onError: EventEmitter<any>;
+  readonly onMicrotaskEmpty: EventEmitter<any>;
+  readonly onStable: EventEmitter<any>;
+  readonly onUnstable: EventEmitter<any>;
+  constructor({enableLongStackTrace}: {enableLongStackTrace?: boolean | undefined;});
+  run<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
+  runGuarded<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
+  runOutsideAngular<T>(fn: (...args: any[]) => T): T;
+  runTask<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[], name?: string): T;
+  static assertInAngularZone(): void;
+  static assertNotInAngularZone(): void;
+  static isInAngularZone(): boolean;
 }
 
 export declare const NO_ERRORS_SCHEMA: SchemaMetadata;
 
-export interface OnChanges {
-    ngOnChanges(changes: SimpleChanges): void;
-}
+export interface OnChanges { ngOnChanges(changes: SimpleChanges): void; }
 
-export interface OnDestroy {
-    ngOnDestroy(): void;
-}
+export interface OnDestroy { ngOnDestroy(): void; }
 
-export interface OnInit {
-    ngOnInit(): void;
-}
+export interface OnInit { ngOnInit(): void; }
 
-export interface Optional {
-}
+export interface Optional {}
 
 export declare const Optional: OptionalDecorator;
 
 export interface OptionalDecorator {
-    (): any;
-    new (): Optional;
+  (): any;
+  new (): Optional;
 }
 
-export interface Output {
-    bindingPropertyName?: string;
-}
+export interface Output { bindingPropertyName?: string; }
 
 export declare const Output: OutputDecorator;
 
 export interface OutputDecorator {
-    (bindingPropertyName?: string): any;
-    new (bindingPropertyName?: string): any;
+  (bindingPropertyName?: string): any;
+  new (bindingPropertyName?: string): any;
 }
 
-export declare function ɵɵallocHostVars(count: number): void;
+export declare function ɵɵallocHostVars(count: number):
+    void;
 
-export interface ɵɵBaseDef<T> {
-    contentQueries: ContentQueriesFunction<T> | null;
-    /** @deprecated */ readonly declaredInputs: {
-        [P in keyof T]: string;
-    };
-    hostBindings: HostBindingsFunction<T> | null;
-    readonly inputs: {
-        [P in keyof T]: string;
-    };
-    readonly outputs: {
-        [P in keyof T]: string;
-    };
-    viewQuery: ViewQueriesFunction<T> | null;
+    export interface ɵɵBaseDef<T> {
+      contentQueries: ContentQueriesFunction<T>|null;
+      /** @deprecated */ readonly declaredInputs: {[P in keyof T]: string;};
+      hostBindings: HostBindingsFunction<T>|null;
+      readonly inputs: {[P in keyof T]: string;};
+      readonly outputs: {[P in keyof T]: string;};
+      viewQuery: ViewQueriesFunction<T>|null;
+    }
+
+export declare function ɵɵbind<T>(value: T): T |
+    NO_CHANGE;
+
+export declare function ɵɵclassMap(
+    classes: {[styleName: string]: any;} | NO_CHANGE | string | null): void;
+
+    export declare function ɵɵclassProp(
+        classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
+
+    export declare type ɵɵComponentDefWithMeta < T, Selector extends String,
+    ExportAs extends string[], InputMap extends {
+      [key: string]: string;
+    }, OutputMap extends {
+  [key: string]: string;
 }
+, QueryFields extends string[] > = ComponentDef<T>;
 
-export declare function ɵɵbind<T>(value: T): T | NO_CHANGE;
+export declare function ɵɵcomponentHostSyntheticListener<T>(
+    eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean,
+    eventTargetResolver?: GlobalTargetResolver): void;
 
-export declare function ɵɵclassMap(classes: {
-    [styleName: string]: any;
-} | NO_CHANGE | string | null): void;
-
-export declare function ɵɵclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
-
-export declare type ɵɵComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = ComponentDef<T>;
-
-export declare function ɵɵcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
-
-export declare function ɵɵcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+export declare function ɵɵcomponentHostSyntheticProperty<T>(
+    index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
+    nativeOnly?: boolean): void;
 
 export declare function ɵɵcontainer(index: number): void;
 
-export declare function ɵɵcontainerRefreshEnd(): void;
+    export declare function ɵɵcontainerRefreshEnd(): void;
 
-export declare function ɵɵcontainerRefreshStart(index: number): void;
+    export declare function ɵɵcontainerRefreshStart(index: number): void;
 
-export declare function ɵɵcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
+    export declare function ɵɵcontentQuery<T>(
+        directiveIndex: number, predicate: Type<any>| string[], descend: boolean, read: any):
+        QueryList<T>;
 
-export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
+    export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
 
-export declare function ɵɵdefineBase<T>(baseDefinition: {
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    contentQueries?: ContentQueriesFunction<T> | null;
-    viewQuery?: ViewQueriesFunction<T> | null;
-    hostBindings?: HostBindingsFunction<T>;
-}): ɵɵBaseDef<T>;
+    export declare function ɵɵdefineBase<T>(baseDefinition: {
+      inputs?: {[P in keyof T]?: string | [string, string];};
+      outputs?: {[P in keyof T]?: string;};
+      contentQueries?: ContentQueriesFunction<T>|null;
+      viewQuery?: ViewQueriesFunction<T>|null;
+      hostBindings?: HostBindingsFunction<T>;
+    }): ɵɵBaseDef<T>;
 
 export declare function ɵɵdefineComponent<T>(componentDefinition: {
-    type: Type<T>;
-    selectors: CssSelectorList;
-    factory: FactoryFn<T>;
-    consts: number;
-    vars: number;
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    hostBindings?: HostBindingsFunction<T>;
-    contentQueries?: ContentQueriesFunction<T>;
-    exportAs?: string[];
-    template: ComponentTemplate<T>;
-    ngContentSelectors?: string[];
-    viewQuery?: ViewQueriesFunction<T> | null;
-    features?: ComponentDefFeature[];
-    encapsulation?: ViewEncapsulation;
-    data?: {
-        [kind: string]: any;
-    };
-    styles?: string[];
-    changeDetection?: ChangeDetectionStrategy;
-    directives?: DirectiveTypesOrFactory | null;
-    pipes?: PipeTypesOrFactory | null;
-    schemas?: SchemaMetadata[] | null;
+  type: Type<T>; selectors: CssSelectorList; factory: FactoryFn<T>; consts: number; vars: number;
+  inputs?: {[P in keyof T]?: string | [string, string];};
+  outputs?: {[P in keyof T]?: string;};
+  hostBindings?: HostBindingsFunction<T>;
+  contentQueries?: ContentQueriesFunction<T>;
+  exportAs?: string[];
+  template: ComponentTemplate<T>;
+  ngContentSelectors?: string[];
+  viewQuery?: ViewQueriesFunction<T>| null;
+  features?: ComponentDefFeature[];
+  encapsulation?: ViewEncapsulation;
+  data?: {[kind: string]: any;};
+  styles?: string[];
+  changeDetection?: ChangeDetectionStrategy;
+  directives?: DirectiveTypesOrFactory | null;
+  pipes?: PipeTypesOrFactory | null;
+  schemas?: SchemaMetadata[] | null;
 }): never;
 
 export declare const ɵɵdefineDirective: <T>(directiveDefinition: {
-    type: Type<T>;
-    selectors: (string | SelectorFlags)[][];
-    factory: FactoryFn<T>;
-    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
-    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
-    features?: DirectiveDefFeature[] | undefined;
-    hostBindings?: HostBindingsFunction<T> | undefined;
-    contentQueries?: ContentQueriesFunction<T> | undefined;
-    viewQuery?: ViewQueriesFunction<T> | null | undefined;
-    exportAs?: string[] | undefined;
+  type: Type<T>; selectors: (string | SelectorFlags)[][]; factory: FactoryFn<T>;
+  inputs?: {[P in keyof T]?: string | [string, string] | undefined;} | undefined;
+  outputs?: {[P in keyof T]?: string | undefined;} | undefined;
+  features?: DirectiveDefFeature[] | undefined;
+  hostBindings?: HostBindingsFunction<T>| undefined;
+  contentQueries?: ContentQueriesFunction<T>| undefined;
+  viewQuery?: ViewQueriesFunction<T>| null | undefined;
+  exportAs?: string[] | undefined;
 }) => never;
 
-export declare function ɵɵdefineInjectable<T>(opts: {
-    providedIn?: Type<any> | 'root' | 'any' | null;
-    factory: () => T;
-}): never;
+export declare function ɵɵdefineInjectable<T>(
+    opts: {providedIn?: Type<any>| 'root' | 'any' | null; factory: () => T;}): never;
 
-export declare function ɵɵdefineInjector(options: {
-    factory: () => any;
-    providers?: any[];
-    imports?: any[];
-}): never;
+export declare function ɵɵdefineInjector(
+    options: {factory: () => any; providers?: any[]; imports?: any[];}): never;
 
-export declare function ɵɵdefineNgModule<T>(def: {
-    type: T;
-    bootstrap?: Type<any>[] | (() => Type<any>[]);
-    declarations?: Type<any>[] | (() => Type<any>[]);
-    imports?: Type<any>[] | (() => Type<any>[]);
-    exports?: Type<any>[] | (() => Type<any>[]);
-    schemas?: SchemaMetadata[] | null;
-    id?: string | null;
-}): never;
+    export declare function ɵɵdefineNgModule<T>(def: {
+      type: T;
+      bootstrap?: Type<any>[]|(() => Type<any>[]);
+      declarations?: Type<any>[]|(() => Type<any>[]);
+      imports?: Type<any>[]|(() => Type<any>[]);
+      exports?: Type<any>[]|(() => Type<any>[]);
+      schemas?: SchemaMetadata[]|null;
+      id?: string|null;
+    }): never;
 
-export declare function ɵɵdefinePipe<T>(pipeDef: {
-    name: string;
-    type: Type<T>;
-    factory: FactoryFn<T>;
-    pure?: boolean;
-}): never;
+export declare function ɵɵdefinePipe<T>(
+    pipeDef: {name: string; type: Type<T>; factory: FactoryFn<T>; pure?: boolean;}): never;
 
-export declare type ɵɵDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = DirectiveDef<T>;
+export declare type ɵɵDirectiveDefWithMeta < T, Selector extends string, ExportAs extends string[],
+    InputMap extends {
+  [key: string]: string;
+}
+, OutputMap extends {
+  [key: string]: string;
+}
+, QueryFields extends string[] > = DirectiveDef<T>;
 
-export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
+export declare function ɵɵdirectiveInject<T>(token: Type<T>| InjectionToken<T>): T;
+export declare function ɵɵdirectiveInject<T>(
+    token: Type<T>| InjectionToken<T>, flags: InjectFlags): T;
 
 export declare function ɵɵdisableBindings(): void;
 
-export declare function ɵɵelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+    export declare function ɵɵelement(
+        index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
 
-export declare function ɵɵelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
+    export declare function ɵɵelementAttribute(
+        index: number, name: string, value: any, sanitizer?: SanitizerFn | null,
+        namespace?: string): void;
 
-export declare function ɵɵelementContainerEnd(): void;
+    export declare function ɵɵelementContainerEnd(): void;
 
-export declare function ɵɵelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+    export declare function ɵɵelementContainerStart(
+        index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
 
-export declare function ɵɵelementEnd(): void;
+    export declare function ɵɵelementEnd(): void;
 
-export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
+    export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
 
-export declare function ɵɵelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+    export declare function ɵɵelementProperty<T>(
+        index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
+        nativeOnly?: boolean): void;
 
-export declare function ɵɵelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+    export declare function ɵɵelementStart(
+        index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
 
-export declare function ɵɵembeddedViewEnd(): void;
+    export declare function ɵɵembeddedViewEnd(): void;
 
-export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
+    export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number):
+        RenderFlags;
 
-export declare function ɵɵenableBindings(): void;
+    export declare function ɵɵenableBindings(): void;
 
-export declare function ɵɵgetCurrentView(): OpaqueViewState;
+    export declare function ɵɵgetCurrentView(): OpaqueViewState;
 
-export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
+    export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T) | null;
 
-export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
+    export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
 
-export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
+    export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
 
-export declare function ɵɵi18nApply(index: number): void;
+    export declare function ɵɵi18nApply(index: number): void;
 
-export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
+    export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
 
-export declare function ɵɵi18nEnd(): void;
+    export declare function ɵɵi18nEnd(): void;
 
-export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
+    export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
 
-/** @deprecated */
-export declare function ɵɵi18nLocalize(input: string, placeholders?: {
-    [key: string]: string;
-}): string;
+    /** @deprecated */
+    export declare function ɵɵi18nLocalize(input: string, placeholders?: { [key: string]: string;}):
+        string;
 
-export declare function ɵɵi18nPostprocess(message: string, replacements?: {
-    [key: string]: (string | string[]);
-}): string;
+export declare function ɵɵi18nPostprocess(
+    message: string, replacements?: {[key: string]: (string | string[]);}): string;
 
-export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void;
+    export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number):
+        void;
 
-export declare function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
+    export declare function ɵɵInheritDefinitionFeature(
+        definition: DirectiveDef<any>| ComponentDef<any>): void;
 
-export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
+    export declare function ɵɵinject<T>(token: Type<T>| InjectionToken<T>):
+        T;
+    export declare function ɵɵinject<T>(token: Type<T>| InjectionToken<T>, flags?: InjectFlags): T |
+    null;
 
-export interface ɵɵInjectableDef<T> {
-    factory: () => T;
-    providedIn: InjectorType<any> | 'root' | 'any' | null;
-    value: T | undefined;
-}
+    export interface ɵɵInjectableDef<T> {
+      factory: () => T;
+      providedIn: InjectorType<any>|'root'|'any'|null;
+      value: T|undefined;
+    }
 
-export declare function ɵɵinjectAttribute(attrNameToInject: string): string | null;
+export declare function ɵɵinjectAttribute(attrNameToInject: string): string |
+    null;
 
-export interface ɵɵInjectorDef<T> {
-    factory: () => T;
-    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
-    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
-}
+    export interface ɵɵInjectorDef<T> {
+      factory: () => T;
+      imports: (InjectorType<any>| InjectorTypeWithProviders<any>)[];
+      providers:
+          (Type<any>| ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider |
+           StaticClassProvider | ClassProvider | any[])[];
+    }
 
-export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
+export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
+    export declare function ɵɵinterpolation2(
+        prefix: string, v0: any, i0: string, v1: any, suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
+    export declare function ɵɵinterpolation3(
+        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
+    export declare function ɵɵinterpolation4(
+        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+        suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
+    export declare function ɵɵinterpolation5(
+        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+        i3: string, v4: any, suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
+    export declare function ɵɵinterpolation6(
+        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+        i3: string, v4: any, i4: string, v5: any, suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
+    export declare function ɵɵinterpolation7(
+        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+        i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
+    export declare function ɵɵinterpolation8(
+        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+        i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
+        suffix: string): string |
+    NO_CHANGE;
 
-export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
+    export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
 
-export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+    export declare function ɵɵlistener(
+        eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean,
+        eventTargetResolver?: GlobalTargetResolver): void;
 
-export declare function ɵɵload<T>(index: number): T;
+    export declare function ɵɵload<T>(index: number): T;
 
-export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
+    export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
 
-export declare function ɵɵloadViewQuery<T>(): T;
+    export declare function ɵɵloadViewQuery<T>(): T;
 
-export declare function ɵɵnamespaceHTML(): void;
+    export declare function ɵɵnamespaceHTML(): void;
 
-export declare function ɵɵnamespaceMathML(): void;
+    export declare function ɵɵnamespaceMathML(): void;
 
-export declare function ɵɵnamespaceSVG(): void;
+    export declare function ɵɵnamespaceSVG(): void;
 
-export declare function ɵɵnextContext<T = any>(level?: number): T;
+    export declare function ɵɵnextContext<T = any>(level?: number): T;
 
-export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
+    export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
 
-export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
+    export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
 
-export declare function ɵɵpipe(index: number, pipeName: string): any;
+    export declare function ɵɵpipe(index: number, pipeName: string): any;
 
-export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
+    export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
 
-export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
+    export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
 
-export declare function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
+    export declare function ɵɵpipeBind3(
+        index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
 
-export declare function ɵɵpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
+    export declare function ɵɵpipeBind4(
+        index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
 
-export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
+    export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
 
-export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
+    export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
 
-export declare function ɵɵprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
+    export declare function ɵɵprojection(
+        nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
 
-export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
+    export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
 
-export declare function ɵɵproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
+    export declare function ɵɵproperty<T>(
+        propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean):
+        TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate(
+        propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate1(
+        propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn):
+        TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate2(
+        propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
+        sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate3(
+        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+        suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate4(
+        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+        i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate5(
+        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+        i2: string, v3: any, i3: string, v4: any, suffix: string,
+        sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate6(
+        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+        i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string,
+        sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate7(
+        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+        i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any,
+        suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolate8(
+        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+        i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any,
+        i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
+    export declare function ɵɵpropertyInterpolateV(
+        propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
 
-export declare function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
+    export declare function ɵɵProvidersFeature<T>(
+        providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
 
-export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
+    export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any):
+        T;
 
-export declare function ɵɵpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction1(
+        slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
 
-export declare function ɵɵpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction2(
+        slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any):
+        any;
 
-export declare function ɵɵpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction3(
+        slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any,
+        exp3: any, thisArg?: any): any;
 
-export declare function ɵɵpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction4(
+        slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any,
+        exp2: any, exp3: any, exp4: any, thisArg?: any): any;
 
-export declare function ɵɵpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction5(
+        slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any,
+        exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
 
-export declare function ɵɵpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction6(
+        slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any,
+        exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
 
-export declare function ɵɵpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction7(
+        slotOffset: number,
+        pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any,
+        exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
 
-export declare function ɵɵpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
+    export declare function ɵɵpureFunction8(
+        slotOffset: number,
+        pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any,
+        exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any,
+        thisArg?: any): any;
 
-export declare function ɵɵpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
+    export declare function ɵɵpureFunctionV(
+        slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
 
-export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
+    export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
 
-export declare function ɵɵreference<T>(index: number): T;
+    export declare function ɵɵreference<T>(index: number): T;
 
-export declare function ɵɵresolveBody(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: HTMLElement;
-};
+    export declare function ɵɵresolveBody(element: RElement & { ownerDocument: Document;}):
+        {name: string; target: HTMLElement;};
 
-export declare function ɵɵresolveDocument(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: Document;
-};
+export declare function ɵɵresolveDocument(element: RElement & { ownerDocument: Document;}):
+    {name: string; target: Document;};
 
 export declare function ɵɵresolveWindow(element: RElement & {
     ownerDocument: Document;

From 7555a46e2362da31c6dedca7ad94253d7d4e23fb Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 15 May 2019 19:53:13 -0700
Subject: [PATCH 160/275] refactor(ivy): add new attribute interpolation
 instructions (#30503)

PR Close #30503
---
 .../r3_view_compiler_binding_spec.ts          |  45 ++
 .../compiler/src/render3/r3_identifiers.ts    |  21 +
 .../compiler/src/render3/view/template.ts     |  41 +-
 .../core/src/core_render3_private_export.ts   |  10 +
 packages/core/src/render3/index.ts            |  12 +
 packages/core/src/render3/instructions/all.ts |   1 +
 .../instructions/attribute_interpolation.ts   | 413 ++++++++++++++++++
 tools/public_api_guard/core/core.d.ts         | 402 +++++++++++++++++
 8 files changed, 939 insertions(+), 6 deletions(-)
 create mode 100644 packages/core/src/render3/instructions/attribute_interpolation.ts

diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index 7fa4977f60..14a9ac0c86 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -496,6 +496,51 @@ describe('compiler compliance: bindings', () => {
       expectEmit(result.source, template, 'Incorrect handling of interpolated properties');
     });
 
+
+    it('should generate the proper update instructions for interpolated attributes', () => {
+      const files: MockDirectory = getAppFiles(`
+        <div attr.title="a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g{{seven}}h{{eight}}i{{nine}}j"></div>
+        <div attr.title="a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g{{seven}}h{{eight}}i"></div>
+        <div attr.title="a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g{{seven}}h"></div>
+        <div attr.title="a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g"></div>
+        <div attr.title="a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f"></div>
+        <div attr.title="a{{one}}b{{two}}c{{three}}d{{four}}e"></div>
+        <div attr.title="a{{one}}b{{two}}c{{three}}d"></div>
+        <div attr.title="a{{one}}b{{two}}c"></div>
+        <div attr.title="a{{one}}b"></div>
+        <div attr.title="{{one}}"></div>
+      `);
+
+      const template = `
+      …
+        if (rf & 2) {
+          i0.Δselect(0);
+          i0.ΔattributeInterpolateV("title", ["a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i", ctx.nine, "j"]);
+          i0.Δselect(1);
+          i0.ΔattributeInterpolate8("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i");
+          i0.Δselect(2);
+          i0.ΔattributeInterpolate7("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h");
+          i0.Δselect(3);
+          i0.ΔattributeInterpolate6("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g");
+          i0.Δselect(4);
+          i0.ΔattributeInterpolate5("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f");
+          i0.Δselect(5);
+          i0.ΔattributeInterpolate4("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e");
+          i0.Δselect(6);
+          i0.ΔattributeInterpolate3("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d");
+          i0.Δselect(7);
+          i0.ΔattributeInterpolate2("title", "a", ctx.one, "b", ctx.two, "c");
+          i0.Δselect(8);
+          i0.ΔattributeInterpolate1("title", "a", ctx.one, "b");
+          i0.Δselect(9);
+          i0.ΔattributeInterpolate("title", ctx.one);
+      }
+      …
+      `;
+      const result = compile(files, angularFiles);
+      expectEmit(result.source, template, 'Incorrect handling of interpolated properties');
+    });
+
     it('should keep local ref for host element', () => {
       const files: MockDirectory = getAppFiles(`
         <b ngNonBindable #myRef id="my-id">
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 05de920cd9..1a50c5ebb7 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -43,6 +43,27 @@ export class Identifiers {
 
   static attribute: o.ExternalReference = {name: 'ɵɵattribute', moduleName: CORE};
 
+  static attributeInterpolate:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate', moduleName: CORE};
+  static attributeInterpolate1:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate1', moduleName: CORE};
+  static attributeInterpolate2:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate2', moduleName: CORE};
+  static attributeInterpolate3:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate3', moduleName: CORE};
+  static attributeInterpolate4:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate4', moduleName: CORE};
+  static attributeInterpolate5:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate5', moduleName: CORE};
+  static attributeInterpolate6:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate6', moduleName: CORE};
+  static attributeInterpolate7:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate7', moduleName: CORE};
+  static attributeInterpolate8:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolate8', moduleName: CORE};
+  static attributeInterpolateV:
+      o.ExternalReference = {name: 'ɵɵattributeInterpolateV', moduleName: CORE};
+
   static classProp: o.ExternalReference = {name: 'ɵɵclassProp', moduleName: CORE};
 
   static elementContainerStart:
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index c141d350bc..2b0fb06635 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -772,12 +772,12 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           } else if (inputType === BindingType.Attribute) {
             if (value instanceof Interpolation) {
               // attr.name="{{value}}" and friends
-              this.updateInstruction(elementIndex, input.sourceSpan, R3.elementAttribute, () => {
-                return [
-                  o.literal(elementIndex), o.literal(attrName),
-                  this.convertPropertyBinding(implicit, value), ...params
-                ];
-              });
+              this.updateInstruction(
+                  elementIndex, input.sourceSpan, getAttributeInterpolationExpression(value),
+                  () =>
+                      [o.literal(attrName),
+                       ...this.getUpdateInstructionArguments(o.variable(CONTEXT_NAME), value),
+                       ...params]);
             } else {
               // [attr.name]="value"
               this.updateInstruction(elementIndex, input.sourceSpan, R3.attribute, () => {
@@ -1695,6 +1695,35 @@ function getPropertyInterpolationExpression(interpolation: Interpolation) {
   }
 }
 
+/**
+ * Gets the instruction to generate for an interpolated attribute
+ * @param interpolation An Interpolation AST
+ */
+function getAttributeInterpolationExpression(interpolation: Interpolation) {
+  switch (getInterpolationArgsLength(interpolation)) {
+    case 1:
+      return R3.attributeInterpolate;
+    case 3:
+      return R3.attributeInterpolate1;
+    case 5:
+      return R3.attributeInterpolate2;
+    case 7:
+      return R3.attributeInterpolate3;
+    case 9:
+      return R3.attributeInterpolate4;
+    case 11:
+      return R3.attributeInterpolate5;
+    case 13:
+      return R3.attributeInterpolate6;
+    case 15:
+      return R3.attributeInterpolate7;
+    case 17:
+      return R3.attributeInterpolate8;
+    default:
+      return R3.attributeInterpolateV;
+  }
+}
+
 /**
  * Gets the number of arguments expected to be passed to a generated instruction in the case of
  * interpolation instructions.
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 96cfb3bd9b..e6bd93d75e 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -9,6 +9,16 @@
 // clang-format off
 export {
   ɵɵattribute,
+  ɵɵattributeInterpolate,
+  ɵɵattributeInterpolate1,
+  ɵɵattributeInterpolate2,
+  ɵɵattributeInterpolate3,
+  ɵɵattributeInterpolate4,
+  ɵɵattributeInterpolate5,
+  ɵɵattributeInterpolate6,
+  ɵɵattributeInterpolate7,
+  ɵɵattributeInterpolate8,
+  ɵɵattributeInterpolateV,
   ɵɵdefineBase,
   ɵɵdefineComponent,
   ɵɵdefineDirective,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index b0ffe6aa71..00f1480263 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -23,7 +23,19 @@ export {
   tick,
 
   ɵɵallocHostVars,
+
   ɵɵattribute,
+  ɵɵattributeInterpolate,
+  ɵɵattributeInterpolate1,
+  ɵɵattributeInterpolate2,
+  ɵɵattributeInterpolate3,
+  ɵɵattributeInterpolate4,
+  ɵɵattributeInterpolate5,
+  ɵɵattributeInterpolate6,
+  ɵɵattributeInterpolate7,
+  ɵɵattributeInterpolate8,
+  ɵɵattributeInterpolateV,
+
   ɵɵbind,
   ɵɵclassMap,
   ɵɵclassProp,
diff --git a/packages/core/src/render3/instructions/all.ts b/packages/core/src/render3/instructions/all.ts
index 22017700fd..4ae084f172 100644
--- a/packages/core/src/render3/instructions/all.ts
+++ b/packages/core/src/render3/instructions/all.ts
@@ -27,6 +27,7 @@
  */
 export * from './alloc_host_vars';
 export * from './attribute';
+export * from './attribute_interpolation';
 export * from './change_detection';
 export * from './container';
 export * from './storage';
diff --git a/packages/core/src/render3/instructions/attribute_interpolation.ts b/packages/core/src/render3/instructions/attribute_interpolation.ts
new file mode 100644
index 0000000000..f078ef9849
--- /dev/null
+++ b/packages/core/src/render3/instructions/attribute_interpolation.ts
@@ -0,0 +1,413 @@
+/**
+ * @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 {SanitizerFn} from '../interfaces/sanitization';
+import {getSelectedIndex} from '../state';
+import {ΔelementAttribute} from './element';
+import {Δinterpolation1, Δinterpolation2, Δinterpolation3, Δinterpolation4, Δinterpolation5, Δinterpolation6, Δinterpolation7, Δinterpolation8, ΔinterpolationV} from './property_interpolation';
+import {TsickleIssue1009} from './shared';
+
+/**
+ *
+ * Update an interpolated attribute on an element with a lone bound value
+ *
+ * Used when the value passed to a property has 1 interpolated value in it, an no additional text
+ * surrounds that interpolated value:
+ *
+ * ```html
+ * <div attr.title="{{v0}}"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate('title', v0);
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate(
+    attrName: string, v0: any, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
+  ΔattributeInterpolate1(attrName, '', v0, '', sanitizer);
+  return ΔattributeInterpolate;
+}
+
+
+/**
+ *
+ * Update an interpolated attribute on an element with single bound value surrounded by text.
+ *
+ * Used when the value passed to a property has 1 interpolated value in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate1('title', 'prefix', v0, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate1(
+    attrName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn,
+    namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue = Δinterpolation1(prefix, v0, suffix);
+
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+
+  return ΔattributeInterpolate1;
+}
+
+/**
+ *
+ * Update an interpolated attribute on an element with 2 bound values surrounded by text.
+ *
+ * Used when the value passed to a property has 2 interpolated values in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}-{{v1}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate2('title', 'prefix', v0, '-', v1, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param i0 Static value used for concatenation only.
+ * @param v1 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate2(
+    attrName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
+    sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue = Δinterpolation2(prefix, v0, i0, v1, suffix);
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ΔattributeInterpolate2;
+}
+
+/**
+ *
+ * Update an interpolated attribute on an element with 3 bound values surrounded by text.
+ *
+ * Used when the value passed to a property has 3 interpolated values in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}-{{v1}}-{{v2}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate3(
+ * 'title', 'prefix', v0, '-', v1, '-', v2, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param i0 Static value used for concatenation only.
+ * @param v1 Value checked for change.
+ * @param i1 Static value used for concatenation only.
+ * @param v2 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate3(
+    attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+    suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue = Δinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ΔattributeInterpolate3;
+}
+
+/**
+ *
+ * Update an interpolated attribute on an element with 4 bound values surrounded by text.
+ *
+ * Used when the value passed to a property has 4 interpolated values in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate4(
+ * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param i0 Static value used for concatenation only.
+ * @param v1 Value checked for change.
+ * @param i1 Static value used for concatenation only.
+ * @param v2 Value checked for change.
+ * @param i2 Static value used for concatenation only.
+ * @param v3 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate4(
+    attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue = Δinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ΔattributeInterpolate4;
+}
+
+/**
+ *
+ * Update an interpolated attribute on an element with 5 bound values surrounded by text.
+ *
+ * Used when the value passed to a property has 5 interpolated values in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate5(
+ * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param i0 Static value used for concatenation only.
+ * @param v1 Value checked for change.
+ * @param i1 Static value used for concatenation only.
+ * @param v2 Value checked for change.
+ * @param i2 Static value used for concatenation only.
+ * @param v3 Value checked for change.
+ * @param i3 Static value used for concatenation only.
+ * @param v4 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate5(
+    attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn,
+    namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue = Δinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ΔattributeInterpolate5;
+}
+
+/**
+ *
+ * Update an interpolated attribute on an element with 6 bound values surrounded by text.
+ *
+ * Used when the value passed to a property has 6 interpolated values in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate6(
+ *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param i0 Static value used for concatenation only.
+ * @param v1 Value checked for change.
+ * @param i1 Static value used for concatenation only.
+ * @param v2 Value checked for change.
+ * @param i2 Static value used for concatenation only.
+ * @param v3 Value checked for change.
+ * @param i3 Static value used for concatenation only.
+ * @param v4 Value checked for change.
+ * @param i4 Static value used for concatenation only.
+ * @param v5 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate6(
+    attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn,
+    namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue =
+      Δinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ΔattributeInterpolate6;
+}
+
+/**
+ *
+ * Update an interpolated attribute on an element with 7 bound values surrounded by text.
+ *
+ * Used when the value passed to a property has 7 interpolated values in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}-{{v6}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate7(
+ *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param i0 Static value used for concatenation only.
+ * @param v1 Value checked for change.
+ * @param i1 Static value used for concatenation only.
+ * @param v2 Value checked for change.
+ * @param i2 Static value used for concatenation only.
+ * @param v3 Value checked for change.
+ * @param i3 Static value used for concatenation only.
+ * @param v4 Value checked for change.
+ * @param i4 Static value used for concatenation only.
+ * @param v5 Value checked for change.
+ * @param i5 Static value used for concatenation only.
+ * @param v6 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate7(
+    attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
+    sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue =
+      Δinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ΔattributeInterpolate7;
+}
+
+/**
+ *
+ * Update an interpolated attribute on an element with 8 bound values surrounded by text.
+ *
+ * Used when the value passed to a property has 8 interpolated values in it:
+ *
+ * ```html
+ * <div attr.title="prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}-{{v6}}-{{v7}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolate8(
+ *  'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, 'suffix');
+ * ```
+ *
+ * @param attrName The name of the attribute to update
+ * @param prefix Static value used for concatenation only.
+ * @param v0 Value checked for change.
+ * @param i0 Static value used for concatenation only.
+ * @param v1 Value checked for change.
+ * @param i1 Static value used for concatenation only.
+ * @param v2 Value checked for change.
+ * @param i2 Static value used for concatenation only.
+ * @param v3 Value checked for change.
+ * @param i3 Static value used for concatenation only.
+ * @param v4 Value checked for change.
+ * @param i4 Static value used for concatenation only.
+ * @param v5 Value checked for change.
+ * @param i5 Static value used for concatenation only.
+ * @param v6 Value checked for change.
+ * @param i6 Static value used for concatenation only.
+ * @param v7 Value checked for change.
+ * @param suffix Static value used for concatenation only.
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolate8(
+    attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
+    v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
+    suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  const interpolatedValue =
+      Δinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ΔattributeInterpolate8;
+}
+
+/**
+ * Update an interpolated attribute on an element with 8 or more bound values surrounded by text.
+ *
+ * Used when the number of interpolated values exceeds 7.
+ *
+ * ```html
+ * <div
+ *  title="prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}-{{v6}}-{{v7}}-{{v8}}-{{v9}}suffix"></div>
+ * ```
+ *
+ * Its compiled representation is::
+ *
+ * ```ts
+ * ΔattributeInterpolateV(
+ *  'title', ['prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, '-', v9,
+ *  'suffix']);
+ * ```
+ *
+ * @param attrName The name of the attribute to update.
+ * @param values The a collection of values and the strings in-between those values, beginning with
+ * a string prefix and ending with a string suffix.
+ * (e.g. `['prefix', value0, '-', value1, '-', value2, ..., value99, 'suffix']`)
+ * @param sanitizer An optional sanitizer function
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ΔattributeInterpolateV(
+    attrName: string, values: any[], sanitizer?: SanitizerFn,
+    namespace?: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ΔelementAttribute(index, attrName, ΔinterpolationV(values), sanitizer, namespace);
+  return ΔattributeInterpolateV;
+}
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 1ca6059c4b..fecd24d2f0 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -1405,3 +1405,405 @@ export interface WtfScopeFn {
 }
 
 export declare const wtfStartTimeRange: (rangeType: string, action: string) => any;
+
+export declare function ɵɵallocHostVars(count: number): void;
+
+export declare function ɵɵattribute(name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
+
+export declare function ɵɵattributeInterpolate(attrName: string, v0: any, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate1(attrName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate2(attrName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate3(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate4(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate5(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate6(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate7(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate8(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolateV(attrName: string, values: any[], sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export interface ɵɵBaseDef<T> {
+    contentQueries: ContentQueriesFunction<T> | null;
+    /** @deprecated */ readonly declaredInputs: {
+        [P in keyof T]: string;
+    };
+    hostBindings: HostBindingsFunction<T> | null;
+    readonly inputs: {
+        [P in keyof T]: string;
+    };
+    readonly outputs: {
+        [P in keyof T]: string;
+    };
+    viewQuery: ViewQueriesFunction<T> | null;
+}
+
+export declare function ɵɵbind<T>(value: T): T | NO_CHANGE;
+
+export declare function ɵɵclassMap(classes: {
+    [styleName: string]: any;
+} | NO_CHANGE | string | null): void;
+
+export declare function ɵɵclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
+
+export declare type ɵɵComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = ComponentDef<T>;
+
+export declare function ɵɵcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+
+export declare function ɵɵcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+
+export declare function ɵɵcontainer(index: number): void;
+
+export declare function ɵɵcontainerRefreshEnd(): void;
+
+export declare function ɵɵcontainerRefreshStart(index: number): void;
+
+export declare function ɵɵcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
+
+export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
+
+export declare function ɵɵdefineBase<T>(baseDefinition: {
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    contentQueries?: ContentQueriesFunction<T> | null;
+    viewQuery?: ViewQueriesFunction<T> | null;
+    hostBindings?: HostBindingsFunction<T>;
+}): ɵɵBaseDef<T>;
+
+export declare function ɵɵdefineComponent<T>(componentDefinition: {
+    type: Type<T>;
+    selectors: CssSelectorList;
+    factory: FactoryFn<T>;
+    consts: number;
+    vars: number;
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    hostBindings?: HostBindingsFunction<T>;
+    contentQueries?: ContentQueriesFunction<T>;
+    exportAs?: string[];
+    template: ComponentTemplate<T>;
+    ngContentSelectors?: string[];
+    viewQuery?: ViewQueriesFunction<T> | null;
+    features?: ComponentDefFeature[];
+    encapsulation?: ViewEncapsulation;
+    data?: {
+        [kind: string]: any;
+    };
+    styles?: string[];
+    changeDetection?: ChangeDetectionStrategy;
+    directives?: DirectiveTypesOrFactory | null;
+    pipes?: PipeTypesOrFactory | null;
+    schemas?: SchemaMetadata[] | null;
+}): never;
+
+export declare const ɵɵdefineDirective: <T>(directiveDefinition: {
+    type: Type<T>;
+    selectors: (string | SelectorFlags)[][];
+    factory: FactoryFn<T>;
+    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
+    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
+    features?: DirectiveDefFeature[] | undefined;
+    hostBindings?: HostBindingsFunction<T> | undefined;
+    contentQueries?: ContentQueriesFunction<T> | undefined;
+    viewQuery?: ViewQueriesFunction<T> | null | undefined;
+    exportAs?: string[] | undefined;
+}) => never;
+
+export declare function ɵɵdefineInjectable<T>(opts: {
+    providedIn?: Type<any> | 'root' | 'any' | null;
+    factory: () => T;
+}): never;
+
+export declare function ɵɵdefineInjector(options: {
+    factory: () => any;
+    providers?: any[];
+    imports?: any[];
+}): never;
+
+export declare function ɵɵdefineNgModule<T>(def: {
+    type: T;
+    bootstrap?: Type<any>[] | (() => Type<any>[]);
+    declarations?: Type<any>[] | (() => Type<any>[]);
+    imports?: Type<any>[] | (() => Type<any>[]);
+    exports?: Type<any>[] | (() => Type<any>[]);
+    schemas?: SchemaMetadata[] | null;
+    id?: string | null;
+}): never;
+
+export declare function ɵɵdefinePipe<T>(pipeDef: {
+    name: string;
+    type: Type<T>;
+    factory: FactoryFn<T>;
+    pure?: boolean;
+}): never;
+
+export declare type ɵɵDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = DirectiveDef<T>;
+
+export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
+
+export declare function ɵɵdisableBindings(): void;
+
+export declare function ɵɵelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ɵɵelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
+
+export declare function ɵɵelementContainerEnd(): void;
+
+export declare function ɵɵelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ɵɵelementEnd(): void;
+
+export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
+
+export declare function ɵɵelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+
+export declare function ɵɵelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+
+export declare function ɵɵembeddedViewEnd(): void;
+
+export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
+
+export declare function ɵɵenableBindings(): void;
+
+export declare function ɵɵgetCurrentView(): OpaqueViewState;
+
+export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
+
+export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
+
+export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
+
+export declare function ɵɵi18nApply(index: number): void;
+
+export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
+
+export declare function ɵɵi18nEnd(): void;
+
+export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
+
+/** @deprecated */
+export declare function ɵɵi18nLocalize(input: string, placeholders?: {
+    [key: string]: string;
+}): string;
+
+export declare function ɵɵi18nPostprocess(message: string, replacements?: {
+    [key: string]: (string | string[]);
+}): string;
+
+export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void;
+
+export declare function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
+
+export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
+
+export interface ɵɵInjectableDef<T> {
+    factory: () => T;
+    providedIn: InjectorType<any> | 'root' | 'any' | null;
+    value: T | undefined;
+}
+
+export declare function ɵɵinjectAttribute(attrNameToInject: string): string | null;
+
+export interface ɵɵInjectorDef<T> {
+    factory: () => T;
+    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
+    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
+}
+
+export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
+
+export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
+
+export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+
+export declare function ɵɵload<T>(index: number): T;
+
+export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
+
+export declare function ɵɵloadViewQuery<T>(): T;
+
+export declare function ɵɵnamespaceHTML(): void;
+
+export declare function ɵɵnamespaceMathML(): void;
+
+export declare function ɵɵnamespaceSVG(): void;
+
+export declare function ɵɵnextContext<T = any>(level?: number): T;
+
+export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
+
+export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
+
+export declare function ɵɵpipe(index: number, pipeName: string): any;
+
+export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
+
+export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
+
+export declare function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
+
+export declare function ɵɵpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
+
+export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
+
+export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
+
+export declare function ɵɵprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
+
+export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
+
+export declare function ɵɵproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
+
+export declare function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
+
+export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
+
+export declare function ɵɵpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
+
+export declare function ɵɵpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
+
+export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
+
+export declare function ɵɵreference<T>(index: number): T;
+
+export declare function ɵɵresolveBody(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: HTMLElement;
+};
+
+export declare function ɵɵresolveDocument(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: Document;
+};
+
+export declare function ɵɵresolveWindow(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: Window | null;
+};
+
+export declare function ɵɵrestoreView(viewToRestore: OpaqueViewState): void;
+
+export declare function ɵɵsanitizeHtml(unsafeHtml: any): string;
+
+export declare function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string;
+
+export declare function ɵɵsanitizeScript(unsafeScript: any): string;
+
+export declare function ɵɵsanitizeStyle(unsafeStyle: any): string;
+
+export declare function ɵɵsanitizeUrl(unsafeUrl: any): string;
+
+export declare function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any;
+
+export declare function ɵɵselect(index: number): void;
+
+export declare function ɵɵsetComponentScope(type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void;
+
+export declare function ɵɵsetNgModuleScope(type: any, scope: {
+    declarations?: Type<any>[] | (() => Type<any>[]);
+    imports?: Type<any>[] | (() => Type<any>[]);
+    exports?: Type<any>[] | (() => Type<any>[]);
+}): void;
+
+export declare function ɵɵstaticContentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): void;
+
+export declare function ɵɵstaticViewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): void;
+
+export declare function ɵɵstyleMap(styles: {
+    [styleName: string]: any;
+} | NO_CHANGE | null): void;
+
+export declare function ɵɵstyleProp(styleIndex: number, value: string | number | String | PlayerFactory | null, suffix?: string | null, forceOverride?: boolean): void;
+
+export declare function ɵɵstyling(classBindingNames?: string[] | null, styleBindingNames?: string[] | null, styleSanitizer?: StyleSanitizeFn | null): void;
+
+export declare function ɵɵstylingApply(): void;
+
+export declare function ɵɵtemplate(index: number, templateFn: ComponentTemplate<any> | null, consts: number, vars: number, tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null, localRefExtractor?: LocalRefExtractor): void;
+
+export declare function ɵɵtemplateRefExtractor(tNode: TNode, currentView: LView): ViewEngine_TemplateRef<{}> | null;
+
+export declare function ɵɵtext(index: number, value?: any): void;
+
+export declare function ɵɵtextBinding<T>(index: number, value: T | NO_CHANGE): void;
+
+export declare function ɵɵviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;

From 1537aec1f997dee925d5fa3be8b2e080e87c41d5 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 15 May 2019 20:05:12 -0700
Subject: [PATCH 161/275] refactor(ivy): extract repetitious code for adding
 update instructions (#30503)

PR Close #30503
---
 .../compiler/src/render3/view/template.ts     | 59 +++++++++++--------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 2b0fb06635..2b6c48a271 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -754,37 +754,24 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           if (inputType === BindingType.Property) {
             if (value instanceof Interpolation) {
               // prop="{{value}}" and friends
-              this.updateInstruction(
-                  elementIndex, input.sourceSpan, getPropertyInterpolationExpression(value),
-                  () =>
-                      [o.literal(attrName),
-                       ...this.getUpdateInstructionArguments(o.variable(CONTEXT_NAME), value),
-                       ...params]);
-
+              this.interpolatedUpdateInstruction(
+                  getPropertyInterpolationExpression(value), elementIndex, attrName, input, value,
+                  params);
             } else {
               // [prop]="value"
-              this.updateInstruction(elementIndex, input.sourceSpan, R3.property, () => {
-                return [
-                  o.literal(attrName), this.convertPropertyBinding(implicit, value, true), ...params
-                ];
-              });
+              this.boundUpdateInstruction(
+                  R3.property, elementIndex, attrName, input, implicit, value, params);
             }
           } else if (inputType === BindingType.Attribute) {
             if (value instanceof Interpolation) {
               // attr.name="{{value}}" and friends
-              this.updateInstruction(
-                  elementIndex, input.sourceSpan, getAttributeInterpolationExpression(value),
-                  () =>
-                      [o.literal(attrName),
-                       ...this.getUpdateInstructionArguments(o.variable(CONTEXT_NAME), value),
-                       ...params]);
+              this.interpolatedUpdateInstruction(
+                  getAttributeInterpolationExpression(value), elementIndex, attrName, input, value,
+                  params);
             } else {
               // [attr.name]="value"
-              this.updateInstruction(elementIndex, input.sourceSpan, R3.attribute, () => {
-                return [
-                  o.literal(attrName), this.convertPropertyBinding(implicit, value, true), ...params
-                ];
-              });
+              this.boundUpdateInstruction(
+                  R3.attribute, elementIndex, attrName, input, implicit, value, params);
             }
           } else {
             // class prop
@@ -819,6 +806,32 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     }
   }
 
+  /**
+   * Adds an update instruction for a bound property or attribute, such as `[prop]="value"` or
+   * `[attr.title]="value"`
+   */
+  boundUpdateInstruction(
+      instruction: o.ExternalReference, elementIndex: number, attrName: string,
+      input: t.BoundAttribute, implicit: o.ReadVarExpr, value: any, params: any[]) {
+    this.updateInstruction(elementIndex, input.sourceSpan, instruction, () => {
+      return [o.literal(attrName), this.convertPropertyBinding(implicit, value, true), ...params];
+    });
+  }
+
+  /**
+   * Adds an update instruction for an interpolated property or attribute, such as
+   * `prop="{{value}}"` or `attr.title="{{value}}"`
+   */
+  interpolatedUpdateInstruction(
+      instruction: o.ExternalReference, elementIndex: number, attrName: string,
+      input: t.BoundAttribute, value: any, params: any[]) {
+    this.updateInstruction(
+        elementIndex, input.sourceSpan, instruction,
+        () =>
+            [o.literal(attrName),
+             ...this.getUpdateInstructionArguments(o.variable(CONTEXT_NAME), value), ...params]);
+  }
+
   visitTemplate(template: t.Template) {
     const NG_TEMPLATE_TAG_NAME = 'ng-template';
     const templateIndex = this.allocateDataSlot();

From 988afad2afe3b124711ee68ac0218faf911d62e2 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 15 May 2019 20:21:24 -0700
Subject: [PATCH 162/275] =?UTF-8?q?refactor(ivy):=20generate=20new=20?=
 =?UTF-8?q?=C9=B5=C9=B5attribute=20instruction=20in=20host=20bindings=20(#?=
 =?UTF-8?q?30503)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR Close #30503
---
 .../compliance/r3_compiler_compliance_spec.ts |  2 +-
 .../r3_view_compiler_binding_spec.ts          | 42 +++++++++----------
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 22 +++++-----
 .../compiler/src/render3/view/compiler.ts     |  8 ++--
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index b67fa0b21c..6afa8627c8 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -3253,7 +3253,7 @@ describe('compiler compliance', () => {
             $r3$.ɵɵallocHostVars(1);
           }
           if (rf & 2) {
-            $r3$.ɵɵelementAttribute(elIndex, "tabindex", $r3$.ɵɵbind(ctx.tabindex));
+            $r3$.ɵɵattribute("tabindex", ctx.tabindex);
           }
         }
       });
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index 14a9ac0c86..0c0cf93db7 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -308,7 +308,7 @@ describe('compiler compliance: bindings', () => {
               $r3$.ɵɵallocHostVars(1);
             }
             if (rf & 2) {
-              $r3$.ɵɵelementAttribute(elIndex, "required", $r3$.ɵɵbind(ctx.required));
+              $r3$.ɵɵattribute("required", ctx.required);
             }
           }
         });
@@ -514,26 +514,26 @@ describe('compiler compliance: bindings', () => {
       const template = `
       …
         if (rf & 2) {
-          i0.Δselect(0);
-          i0.ΔattributeInterpolateV("title", ["a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i", ctx.nine, "j"]);
-          i0.Δselect(1);
-          i0.ΔattributeInterpolate8("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i");
-          i0.Δselect(2);
-          i0.ΔattributeInterpolate7("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h");
-          i0.Δselect(3);
-          i0.ΔattributeInterpolate6("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g");
-          i0.Δselect(4);
-          i0.ΔattributeInterpolate5("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f");
-          i0.Δselect(5);
-          i0.ΔattributeInterpolate4("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e");
-          i0.Δselect(6);
-          i0.ΔattributeInterpolate3("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d");
-          i0.Δselect(7);
-          i0.ΔattributeInterpolate2("title", "a", ctx.one, "b", ctx.two, "c");
-          i0.Δselect(8);
-          i0.ΔattributeInterpolate1("title", "a", ctx.one, "b");
-          i0.Δselect(9);
-          i0.ΔattributeInterpolate("title", ctx.one);
+          i0.ɵɵselect(0);
+          i0.ɵɵattributeInterpolateV("title", ["a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i", ctx.nine, "j"]);
+          i0.ɵɵselect(1);
+          i0.ɵɵattributeInterpolate8("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h", ctx.eight, "i");
+          i0.ɵɵselect(2);
+          i0.ɵɵattributeInterpolate7("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g", ctx.seven, "h");
+          i0.ɵɵselect(3);
+          i0.ɵɵattributeInterpolate6("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f", ctx.six, "g");
+          i0.ɵɵselect(4);
+          i0.ɵɵattributeInterpolate5("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e", ctx.five, "f");
+          i0.ɵɵselect(5);
+          i0.ɵɵattributeInterpolate4("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d", ctx.four, "e");
+          i0.ɵɵselect(6);
+          i0.ɵɵattributeInterpolate3("title", "a", ctx.one, "b", ctx.two, "c", ctx.three, "d");
+          i0.ɵɵselect(7);
+          i0.ɵɵattributeInterpolate2("title", "a", ctx.one, "b", ctx.two, "c");
+          i0.ɵɵselect(8);
+          i0.ɵɵattributeInterpolate1("title", "a", ctx.one, "b");
+          i0.ɵɵselect(9);
+          i0.ɵɵattributeInterpolate("title", ctx.one);
       }
       …
       `;
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 4150691c0e..5c818815df 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -1769,7 +1769,7 @@ describe('ngtsc behavioral tests', () => {
           i0.ɵɵstyling(_c0);
         }
         if (rf & 2) {
-          i0.ɵɵelementAttribute(elIndex, "hello", i0.ɵɵbind(ctx.foo));
+          i0.ɵɵattribute("hello", ctx.foo);
           i0.ɵɵproperty("prop", ctx.bar, null, true);
           i0.ɵɵclassProp(0, ctx.someClass);
           i0.ɵɵstylingApply();
@@ -1826,7 +1826,7 @@ describe('ngtsc behavioral tests', () => {
     `);
 
     env.driveMain();
-    expect(env.getContents('test.js')).toContain('"hello", i0.ɵɵbind(ctx.foo)');
+    expect(env.getContents('test.js')).toContain('i0.ɵɵattribute("hello", ctx.foo)');
   });
 
   it('should generate host listeners for directives within hostBindings section', () => {
@@ -3216,12 +3216,12 @@ describe('ngtsc behavioral tests', () => {
             i0.ɵɵallocHostVars(6);
           }
           if (rf & 2) {
-            i0.ɵɵelementAttribute(elIndex, "href", i0.ɵɵbind(ctx.attrHref), i0.ɵɵsanitizeUrlOrResourceUrl);
-            i0.ɵɵelementAttribute(elIndex, "src", i0.ɵɵbind(ctx.attrSrc), i0.ɵɵsanitizeUrlOrResourceUrl);
-            i0.ɵɵelementAttribute(elIndex, "action", i0.ɵɵbind(ctx.attrAction), i0.ɵɵsanitizeUrl);
-            i0.ɵɵelementAttribute(elIndex, "profile", i0.ɵɵbind(ctx.attrProfile), i0.ɵɵsanitizeResourceUrl);
-            i0.ɵɵelementAttribute(elIndex, "innerHTML", i0.ɵɵbind(ctx.attrInnerHTML), i0.ɵɵsanitizeHtml);
-            i0.ɵɵelementAttribute(elIndex, "title", i0.ɵɵbind(ctx.attrSafeTitle));
+            i0.ɵɵattribute("href", ctx.attrHref, i0.ɵɵsanitizeUrlOrResourceUrl);
+            i0.ɵɵattribute("src", ctx.attrSrc, i0.ɵɵsanitizeUrlOrResourceUrl);
+            i0.ɵɵattribute("action", ctx.attrAction, i0.ɵɵsanitizeUrl);
+            i0.ɵɵattribute("profile", ctx.attrProfile, i0.ɵɵsanitizeResourceUrl);
+            i0.ɵɵattribute("innerHTML", ctx.attrInnerHTML, i0.ɵɵsanitizeHtml);
+            i0.ɵɵattribute("title", ctx.attrSafeTitle);
           }
         }
       `;
@@ -3314,9 +3314,9 @@ describe('ngtsc behavioral tests', () => {
             i0.ɵɵproperty("src", ctx.srcProp, null, true);
             i0.ɵɵproperty("href", ctx.hrefProp, null, true);
             i0.ɵɵproperty("title", ctx.titleProp, null, true);
-            i0.ɵɵelementAttribute(elIndex, "src", i0.ɵɵbind(ctx.srcAttr));
-            i0.ɵɵelementAttribute(elIndex, "href", i0.ɵɵbind(ctx.hrefAttr));
-            i0.ɵɵelementAttribute(elIndex, "title", i0.ɵɵbind(ctx.titleAttr));
+            i0.ɵɵattribute("src", ctx.srcAttr);
+            i0.ɵɵattribute("href", ctx.hrefAttr);
+            i0.ɵɵattribute("title", ctx.titleAttr);
           }
         }
       `;
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 7ea88f0221..175bee4458 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -667,9 +667,9 @@ function createHostBindingsFunction(
           sanitizerFn = resolveSanitizationFn(securityContexts[0], isAttribute);
         }
       }
-
-      const isPropertyInstruction = instruction === R3.property;
-      const instructionParams: o.Expression[] = isPropertyInstruction ?
+      const isInstructionWithoutElementIndex =
+          instruction === R3.property || instruction === R3.attribute;
+      const instructionParams: o.Expression[] = isInstructionWithoutElementIndex ?
           [
             o.literal(bindingName),
             bindingExpr.currValExpr,
@@ -776,7 +776,7 @@ function getBindingNameAndInstruction(binding: ParsedProperty):
   const attrMatches = bindingName.match(ATTR_REGEX);
   if (attrMatches) {
     bindingName = attrMatches[1];
-    instruction = R3.elementAttribute;
+    instruction = R3.attribute;
   } else {
     if (binding.isAnimation) {
       bindingName = prepareSyntheticPropertyName(bindingName);

From 2cdbe9b2ef7006884aa889028463dbb561e6618a Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 15 May 2019 20:24:29 -0700
Subject: [PATCH 163/275] refactor(ivy): ensure new attribute instructons are
 available in JIT (#30503)

PR Close #30503
---
 .../r3_view_compiler_binding_spec.ts          |    2 +-
 .../compiler/src/render3/r3_identifiers.ts    |    2 -
 .../compiler/src/render3/view/template.ts     |   11 +-
 .../core/src/core_render3_private_export.ts   |    1 -
 packages/core/src/render3/index.ts            |    1 -
 .../src/render3/instructions/attribute.ts     |    9 +-
 .../instructions/attribute_interpolation.ts   |  136 +-
 packages/core/src/render3/jit/environment.ts  |    9 +
 tools/public_api_guard/core/core.d.ts         | 1628 +++++++----------
 9 files changed, 716 insertions(+), 1083 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index 0c0cf93db7..93a4a36e0c 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -533,7 +533,7 @@ describe('compiler compliance: bindings', () => {
           i0.ɵɵselect(8);
           i0.ɵɵattributeInterpolate1("title", "a", ctx.one, "b");
           i0.ɵɵselect(9);
-          i0.ɵɵattributeInterpolate("title", ctx.one);
+          i0.ɵɵattribute("title", ctx.one);
       }
       …
       `;
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 1a50c5ebb7..2c8e1547f3 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -43,8 +43,6 @@ export class Identifiers {
 
   static attribute: o.ExternalReference = {name: 'ɵɵattribute', moduleName: CORE};
 
-  static attributeInterpolate:
-      o.ExternalReference = {name: 'ɵɵattributeInterpolate', moduleName: CORE};
   static attributeInterpolate1:
       o.ExternalReference = {name: 'ɵɵattributeInterpolate1', moduleName: CORE};
   static attributeInterpolate2:
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 2b6c48a271..5714c819fa 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -763,15 +763,16 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
                   R3.property, elementIndex, attrName, input, implicit, value, params);
             }
           } else if (inputType === BindingType.Attribute) {
-            if (value instanceof Interpolation) {
-              // attr.name="{{value}}" and friends
+            if (value instanceof Interpolation && getInterpolationArgsLength(value) > 1) {
+              // attr.name="text{{value}}" and friends
               this.interpolatedUpdateInstruction(
                   getAttributeInterpolationExpression(value), elementIndex, attrName, input, value,
                   params);
             } else {
-              // [attr.name]="value"
+              const boundValue = value instanceof Interpolation ? value.expressions[0] : value;
+              // [attr.name]="value" or attr.name="{{value}}"
               this.boundUpdateInstruction(
-                  R3.attribute, elementIndex, attrName, input, implicit, value, params);
+                  R3.attribute, elementIndex, attrName, input, implicit, boundValue, params);
             }
           } else {
             // class prop
@@ -1714,8 +1715,6 @@ function getPropertyInterpolationExpression(interpolation: Interpolation) {
  */
 function getAttributeInterpolationExpression(interpolation: Interpolation) {
   switch (getInterpolationArgsLength(interpolation)) {
-    case 1:
-      return R3.attributeInterpolate;
     case 3:
       return R3.attributeInterpolate1;
     case 5:
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index e6bd93d75e..324ea277be 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -9,7 +9,6 @@
 // clang-format off
 export {
   ɵɵattribute,
-  ɵɵattributeInterpolate,
   ɵɵattributeInterpolate1,
   ɵɵattributeInterpolate2,
   ɵɵattributeInterpolate3,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 00f1480263..cc6f99edfb 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -25,7 +25,6 @@ export {
   ɵɵallocHostVars,
 
   ɵɵattribute,
-  ɵɵattributeInterpolate,
   ɵɵattributeInterpolate1,
   ɵɵattributeInterpolate2,
   ɵɵattributeInterpolate3,
diff --git a/packages/core/src/render3/instructions/attribute.ts b/packages/core/src/render3/instructions/attribute.ts
index 478a1c2e4a..f5fdc13f8a 100644
--- a/packages/core/src/render3/instructions/attribute.ts
+++ b/packages/core/src/render3/instructions/attribute.ts
@@ -8,8 +8,8 @@
 import {SanitizerFn} from '../interfaces/sanitization';
 import {getSelectedIndex} from '../state';
 
-import {ΔelementAttribute} from './element';
-import {Δbind} from './property';
+import {ɵɵelementAttribute} from './element';
+import {ɵɵbind} from './property';
 
 /**
  * Updates the value of or removes a bound attribute on an Element.
@@ -24,8 +24,9 @@ import {Δbind} from './property';
  *
  * @codeGenApi
  */
-export function Δattribute(
+export function ɵɵattribute(
     name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string) {
   const index = getSelectedIndex();
-  return ΔelementAttribute(index, name, Δbind(value), sanitizer, namespace);
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
+  return ɵɵelementAttribute(index, name, ɵɵbind(value), sanitizer, namespace);
 }
diff --git a/packages/core/src/render3/instructions/attribute_interpolation.ts b/packages/core/src/render3/instructions/attribute_interpolation.ts
index f078ef9849..5214208994 100644
--- a/packages/core/src/render3/instructions/attribute_interpolation.ts
+++ b/packages/core/src/render3/instructions/attribute_interpolation.ts
@@ -7,40 +7,10 @@
  */
 import {SanitizerFn} from '../interfaces/sanitization';
 import {getSelectedIndex} from '../state';
-import {ΔelementAttribute} from './element';
-import {Δinterpolation1, Δinterpolation2, Δinterpolation3, Δinterpolation4, Δinterpolation5, Δinterpolation6, Δinterpolation7, Δinterpolation8, ΔinterpolationV} from './property_interpolation';
+import {ɵɵelementAttribute} from './element';
+import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './property_interpolation';
 import {TsickleIssue1009} from './shared';
 
-/**
- *
- * Update an interpolated attribute on an element with a lone bound value
- *
- * Used when the value passed to a property has 1 interpolated value in it, an no additional text
- * surrounds that interpolated value:
- *
- * ```html
- * <div attr.title="{{v0}}"></div>
- * ```
- *
- * Its compiled representation is::
- *
- * ```ts
- * ΔattributeInterpolate('title', v0);
- * ```
- *
- * @param attrName The name of the attribute to update
- * @param prefix Static value used for concatenation only.
- * @param v0 Value checked for change.
- * @param suffix Static value used for concatenation only.
- * @param sanitizer An optional sanitizer function
- * @returns itself, so that it may be chained.
- * @codeGenApi
- */
-export function ΔattributeInterpolate(
-    attrName: string, v0: any, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
-  ΔattributeInterpolate1(attrName, '', v0, '', sanitizer);
-  return ΔattributeInterpolate;
-}
 
 
 /**
@@ -56,7 +26,7 @@ export function ΔattributeInterpolate(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate1('title', 'prefix', v0, 'suffix');
+ * ɵɵattributeInterpolate1('title', 'prefix', v0, 'suffix');
  * ```
  *
  * @param attrName The name of the attribute to update
@@ -67,15 +37,17 @@ export function ΔattributeInterpolate(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate1(
+export function ɵɵattributeInterpolate1(
     attrName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn,
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation1(prefix, v0, suffix);
 
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
+  const interpolatedValue = ɵɵinterpolation1(prefix, v0, suffix);
 
-  return ΔattributeInterpolate1;
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+
+  return ɵɵattributeInterpolate1;
 }
 
 /**
@@ -91,7 +63,7 @@ export function ΔattributeInterpolate1(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate2('title', 'prefix', v0, '-', v1, 'suffix');
+ * ɵɵattributeInterpolate2('title', 'prefix', v0, '-', v1, 'suffix');
  * ```
  *
  * @param attrName The name of the attribute to update
@@ -104,13 +76,15 @@ export function ΔattributeInterpolate1(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate2(
+export function ɵɵattributeInterpolate2(
     attrName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
     sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation2(prefix, v0, i0, v1, suffix);
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
-  return ΔattributeInterpolate2;
+
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
+  const interpolatedValue = ɵɵinterpolation2(prefix, v0, i0, v1, suffix);
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ɵɵattributeInterpolate2;
 }
 
 /**
@@ -126,7 +100,7 @@ export function ΔattributeInterpolate2(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate3(
+ * ɵɵattributeInterpolate3(
  * 'title', 'prefix', v0, '-', v1, '-', v2, 'suffix');
  * ```
  *
@@ -142,13 +116,15 @@ export function ΔattributeInterpolate2(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate3(
+export function ɵɵattributeInterpolate3(
     attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
     suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
-  return ΔattributeInterpolate3;
+
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
+  const interpolatedValue = ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix);
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ɵɵattributeInterpolate3;
 }
 
 /**
@@ -164,7 +140,7 @@ export function ΔattributeInterpolate3(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate4(
+ * ɵɵattributeInterpolate4(
  * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, 'suffix');
  * ```
  *
@@ -182,13 +158,15 @@ export function ΔattributeInterpolate3(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate4(
+export function ɵɵattributeInterpolate4(
     attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
-  return ΔattributeInterpolate4;
+
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
+  const interpolatedValue = ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ɵɵattributeInterpolate4;
 }
 
 /**
@@ -204,7 +182,7 @@ export function ΔattributeInterpolate4(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate5(
+ * ɵɵattributeInterpolate5(
  * 'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, 'suffix');
  * ```
  *
@@ -224,14 +202,16 @@ export function ΔattributeInterpolate4(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate5(
+export function ɵɵattributeInterpolate5(
     attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn,
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
-  const interpolatedValue = Δinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
-  return ΔattributeInterpolate5;
+
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
+  const interpolatedValue = ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ɵɵattributeInterpolate5;
 }
 
 /**
@@ -247,7 +227,7 @@ export function ΔattributeInterpolate5(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate6(
+ * ɵɵattributeInterpolate6(
  *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, 'suffix');
  * ```
  *
@@ -269,15 +249,16 @@ export function ΔattributeInterpolate5(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate6(
+export function ɵɵattributeInterpolate6(
     attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn,
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const interpolatedValue =
-      Δinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
-  return ΔattributeInterpolate6;
+      ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ɵɵattributeInterpolate6;
 }
 
 /**
@@ -293,7 +274,7 @@ export function ΔattributeInterpolate6(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate7(
+ * ɵɵattributeInterpolate7(
  *    'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, 'suffix');
  * ```
  *
@@ -317,15 +298,16 @@ export function ΔattributeInterpolate6(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate7(
+export function ɵɵattributeInterpolate7(
     attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
     sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const interpolatedValue =
-      Δinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
-  return ΔattributeInterpolate7;
+      ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ɵɵattributeInterpolate7;
 }
 
 /**
@@ -341,7 +323,7 @@ export function ΔattributeInterpolate7(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolate8(
+ * ɵɵattributeInterpolate8(
  *  'title', 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, 'suffix');
  * ```
  *
@@ -367,15 +349,16 @@ export function ΔattributeInterpolate7(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolate8(
+export function ɵɵattributeInterpolate8(
     attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
     v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
     suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
   const interpolatedValue =
-      Δinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
-  ΔelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
-  return ΔattributeInterpolate8;
+      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
+  ɵɵelementAttribute(index, attrName, interpolatedValue, sanitizer, namespace);
+  return ɵɵattributeInterpolate8;
 }
 
 /**
@@ -391,7 +374,7 @@ export function ΔattributeInterpolate8(
  * Its compiled representation is::
  *
  * ```ts
- * ΔattributeInterpolateV(
+ * ɵɵattributeInterpolateV(
  *  'title', ['prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, '-', v9,
  *  'suffix']);
  * ```
@@ -404,10 +387,11 @@ export function ΔattributeInterpolate8(
  * @returns itself, so that it may be chained.
  * @codeGenApi
  */
-export function ΔattributeInterpolateV(
+export function ɵɵattributeInterpolateV(
     attrName: string, values: any[], sanitizer?: SanitizerFn,
     namespace?: string): TsickleIssue1009 {
   const index = getSelectedIndex();
-  ΔelementAttribute(index, attrName, ΔinterpolationV(values), sanitizer, namespace);
-  return ΔattributeInterpolateV;
+  // TODO(FW-1340): Refactor to remove the use of other instructions here.
+  ɵɵelementAttribute(index, attrName, ɵɵinterpolationV(values), sanitizer, namespace);
+  return ɵɵattributeInterpolateV;
 }
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 51e5432bdb..1f1f1eb018 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -21,6 +21,15 @@ import * as r3 from '../index';
 export const angularCoreEnv: {[name: string]: Function} =
     (() => ({
        'ɵɵattribute': r3.ɵɵattribute,
+       'ɵɵattributeInterpolate1': r3.ɵɵattributeInterpolate1,
+       'ɵɵattributeInterpolate2': r3.ɵɵattributeInterpolate2,
+       'ɵɵattributeInterpolate3': r3.ɵɵattributeInterpolate3,
+       'ɵɵattributeInterpolate4': r3.ɵɵattributeInterpolate4,
+       'ɵɵattributeInterpolate5': r3.ɵɵattributeInterpolate5,
+       'ɵɵattributeInterpolate6': r3.ɵɵattributeInterpolate6,
+       'ɵɵattributeInterpolate7': r3.ɵɵattributeInterpolate7,
+       'ɵɵattributeInterpolate8': r3.ɵɵattributeInterpolate8,
+       'ɵɵattributeInterpolateV': r3.ɵɵattributeInterpolateV,
        'ɵɵdefineBase': r3.ɵɵdefineBase,
        'ɵɵdefineComponent': r3.ɵɵdefineComponent,
        'ɵɵdefineDirective': r3.ɵɵdefineDirective,
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index fecd24d2f0..112dc85dbc 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -1,962 +1,1008 @@
-export interface AbstractType<T> extends Function { prototype: T; }
+export interface AbstractType<T> extends Function {
+    prototype: T;
+}
 
-export interface AfterContentChecked { ngAfterContentChecked(): void; }
+export interface AfterContentChecked {
+    ngAfterContentChecked(): void;
+}
 
-export interface AfterContentInit { ngAfterContentInit(): void; }
+export interface AfterContentInit {
+    ngAfterContentInit(): void;
+}
 
-export interface AfterViewChecked { ngAfterViewChecked(): void; }
+export interface AfterViewChecked {
+    ngAfterViewChecked(): void;
+}
 
-export interface AfterViewInit { ngAfterViewInit(): void; }
+export interface AfterViewInit {
+    ngAfterViewInit(): void;
+}
 
 export declare const ANALYZE_FOR_ENTRY_COMPONENTS: InjectionToken<any>;
 
-export declare const APP_BOOTSTRAP_LISTENER:
-    InjectionToken<((compRef: ComponentRef<any>) => void)[]>;
+export declare const APP_BOOTSTRAP_LISTENER: InjectionToken<((compRef: ComponentRef<any>) => void)[]>;
 
 export declare const APP_ID: InjectionToken<string>;
 
 export declare const APP_INITIALIZER: InjectionToken<(() => void)[]>;
 
 export declare class ApplicationInitStatus {
-  readonly done = false;
-  readonly donePromise: Promise<any>;
-  constructor(appInits: (() => any)[]);
+    readonly done = false;
+    readonly donePromise: Promise<any>;
+    constructor(appInits: (() => any)[]);
 }
 
-export declare class ApplicationModule { constructor(appRef: ApplicationRef); }
+export declare class ApplicationModule {
+    constructor(appRef: ApplicationRef);
+}
 
 export declare class ApplicationRef {
-  readonly componentTypes: Type<any>[];
-  readonly components: ComponentRef<any>[];
-  readonly isStable: Observable<boolean>;
-  readonly viewCount: number;
-  attachView(viewRef: ViewRef): void;
-  bootstrap<C>(componentOrFactory: ComponentFactory<C>|Type<C>, rootSelectorOrNode?: string|any):
-      ComponentRef<C>;
-  detachView(viewRef: ViewRef): void;
-  tick(): void;
+    readonly componentTypes: Type<any>[];
+    readonly components: ComponentRef<any>[];
+    readonly isStable: Observable<boolean>;
+    readonly viewCount: number;
+    attachView(viewRef: ViewRef): void;
+    bootstrap<C>(componentOrFactory: ComponentFactory<C> | Type<C>, rootSelectorOrNode?: string | any): ComponentRef<C>;
+    detachView(viewRef: ViewRef): void;
+    tick(): void;
 }
 
 export declare function asNativeElements(debugEls: DebugElement[]): any;
 
-    export declare function assertPlatform(requiredToken: any):
-        PlatformRef;
+export declare function assertPlatform(requiredToken: any): PlatformRef;
 
-    export interface Attribute {
-      attributeName?: string;
-    }
+export interface Attribute {
+    attributeName?: string;
+}
 
 export declare const Attribute: AttributeDecorator;
 
 export interface AttributeDecorator {
-  (name: string): any;
-  new (name: string): Attribute;
+    (name: string): any;
+    new (name: string): Attribute;
 }
 
-export declare enum ChangeDetectionStrategy {OnPush = 0, Default = 1}
+export declare enum ChangeDetectionStrategy {
+    OnPush = 0,
+    Default = 1
+}
 
 export declare abstract class ChangeDetectorRef {
-  abstract checkNoChanges(): void;
-  abstract detach(): void;
-  abstract detectChanges(): void;
-  abstract markForCheck(): void;
-  abstract reattach(): void;
+    abstract checkNoChanges(): void;
+    abstract detach(): void;
+    abstract detectChanges(): void;
+    abstract markForCheck(): void;
+    abstract reattach(): void;
 }
 
 export interface ClassProvider extends ClassSansProvider {
-  multi?: boolean;
-  provide: any;
+    multi?: boolean;
+    provide: any;
 }
 
 /** @deprecated */
-export interface CollectionChangeRecord<V> extends IterableChangeRecord<V> {}
+export interface CollectionChangeRecord<V> extends IterableChangeRecord<V> {
+}
 
 export declare class Compiler {
-  compileModuleAndAllComponentsAsync:
-      <T>(moduleType: Type<T>) => Promise<ModuleWithComponentFactories<T>>;
-  compileModuleAndAllComponentsSync: <T>(moduleType: Type<T>) => ModuleWithComponentFactories<T>;
-  compileModuleAsync: <T>(moduleType: Type<T>) => Promise<NgModuleFactory<T>>;
-  compileModuleSync: <T>(moduleType: Type<T>) => NgModuleFactory<T>;
-  clearCache(): void;
-  clearCacheFor(type: Type<any>): void;
-  getModuleId(moduleType: Type<any>): string|undefined;
+    compileModuleAndAllComponentsAsync: <T>(moduleType: Type<T>) => Promise<ModuleWithComponentFactories<T>>;
+    compileModuleAndAllComponentsSync: <T>(moduleType: Type<T>) => ModuleWithComponentFactories<T>;
+    compileModuleAsync: <T>(moduleType: Type<T>) => Promise<NgModuleFactory<T>>;
+    compileModuleSync: <T>(moduleType: Type<T>) => NgModuleFactory<T>;
+    clearCache(): void;
+    clearCacheFor(type: Type<any>): void;
+    getModuleId(moduleType: Type<any>): string | undefined;
 }
 
 export declare const COMPILER_OPTIONS: InjectionToken<CompilerOptions[]>;
 
 export declare abstract class CompilerFactory {
-  abstract createCompiler(options?: CompilerOptions[]): Compiler;
+    abstract createCompiler(options?: CompilerOptions[]): Compiler;
 }
 
 export declare type CompilerOptions = {
-  useJit?: boolean; defaultEncapsulation?: ViewEncapsulation; providers?: StaticProvider[];
-  missingTranslation?: MissingTranslationStrategy;
-  preserveWhitespaces?: boolean;
+    useJit?: boolean;
+    defaultEncapsulation?: ViewEncapsulation;
+    providers?: StaticProvider[];
+    missingTranslation?: MissingTranslationStrategy;
+    preserveWhitespaces?: boolean;
 };
 
 export interface Component extends Directive {
-  animations?: any[];
-  changeDetection?: ChangeDetectionStrategy;
-  encapsulation?: ViewEncapsulation;
-  entryComponents?: Array<Type<any>|any[]>;
-  interpolation?: [string, string];
-  moduleId?: string;
-  preserveWhitespaces?: boolean;
-  styleUrls?: string[];
-  styles?: string[];
-  template?: string;
-  templateUrl?: string;
-  viewProviders?: Provider[];
+    animations?: any[];
+    changeDetection?: ChangeDetectionStrategy;
+    encapsulation?: ViewEncapsulation;
+    entryComponents?: Array<Type<any> | any[]>;
+    interpolation?: [string, string];
+    moduleId?: string;
+    preserveWhitespaces?: boolean;
+    styleUrls?: string[];
+    styles?: string[];
+    template?: string;
+    templateUrl?: string;
+    viewProviders?: Provider[];
 }
 
 export declare const Component: ComponentDecorator;
 
 export interface ComponentDecorator {
-  (obj: Component): TypeDecorator;
-  new (obj: Component): Component;
+    (obj: Component): TypeDecorator;
+    new (obj: Component): Component;
 }
 
 export declare abstract class ComponentFactory<C> {
-  abstract readonly componentType: Type<any>;
-  abstract readonly inputs: {propName: string; templateName: string;}[];
-  abstract readonly ngContentSelectors: string[];
-  abstract readonly outputs: {propName: string; templateName: string;}[];
-  abstract readonly selector: string;
-  abstract create(
-      injector: Injector, projectableNodes?: any[][], rootSelectorOrNode?: string|any,
-      ngModule?: NgModuleRef<any>): ComponentRef<C>;
+    abstract readonly componentType: Type<any>;
+    abstract readonly inputs: {
+        propName: string;
+        templateName: string;
+    }[];
+    abstract readonly ngContentSelectors: string[];
+    abstract readonly outputs: {
+        propName: string;
+        templateName: string;
+    }[];
+    abstract readonly selector: string;
+    abstract create(injector: Injector, projectableNodes?: any[][], rootSelectorOrNode?: string | any, ngModule?: NgModuleRef<any>): ComponentRef<C>;
 }
 
 export declare abstract class ComponentFactoryResolver {
-  abstract resolveComponentFactory<T>(component: Type<T>): ComponentFactory<T>;
-  static NULL: ComponentFactoryResolver;
+    abstract resolveComponentFactory<T>(component: Type<T>): ComponentFactory<T>;
+    static NULL: ComponentFactoryResolver;
 }
 
 export declare abstract class ComponentRef<C> {
-  abstract readonly changeDetectorRef: ChangeDetectorRef;
-  abstract readonly componentType: Type<any>;
-  abstract readonly hostView: ViewRef;
-  abstract readonly injector: Injector;
-  abstract readonly instance: C;
-  abstract readonly location: ElementRef;
-  abstract destroy(): void;
-  abstract onDestroy(callback: Function): void;
+    abstract readonly changeDetectorRef: ChangeDetectorRef;
+    abstract readonly componentType: Type<any>;
+    abstract readonly hostView: ViewRef;
+    abstract readonly injector: Injector;
+    abstract readonly instance: C;
+    abstract readonly location: ElementRef;
+    abstract destroy(): void;
+    abstract onDestroy(callback: Function): void;
 }
 
-export interface ConstructorSansProvider { deps?: any[]; }
+export interface ConstructorSansProvider {
+    deps?: any[];
+}
 
 export declare type ContentChild = Query;
 
 export interface ContentChildDecorator {
-  (selector: Type<any>|Function|string, opts?: {read?: any; static?: boolean;}): any;
-  new (selector: Type<any>|Function|string, opts?: {read?: any; static?: boolean;}): ContentChild;
+    (selector: Type<any> | Function | string, opts?: {
+        read?: any;
+        static?: boolean;
+    }): any;
+    new (selector: Type<any> | Function | string, opts?: {
+        read?: any;
+        static?: boolean;
+    }): ContentChild;
 }
 
 export declare type ContentChildren = Query;
 
 export interface ContentChildrenDecorator {
-  (selector: Type<any>|Function|string, opts?: {descendants?: boolean; read?: any;}): any;
-  new (selector: Type<any>|Function|string, opts?: {descendants?: boolean; read?: any;}): Query;
+    (selector: Type<any> | Function | string, opts?: {
+        descendants?: boolean;
+        read?: any;
+    }): any;
+    new (selector: Type<any> | Function | string, opts?: {
+        descendants?: boolean;
+        read?: any;
+    }): Query;
 }
 
 export declare function createPlatform(injector: Injector): PlatformRef;
 
-    export declare function createPlatformFactory(
-        parentPlatformFactory: ((extraProviders?: StaticProvider[]) => PlatformRef) | null,
-        name: string, providers?: StaticProvider[]): (extraProviders?: StaticProvider[]) =>
-        PlatformRef;
+export declare function createPlatformFactory(parentPlatformFactory: ((extraProviders?: StaticProvider[]) => PlatformRef) | null, name: string, providers?: StaticProvider[]): (extraProviders?: StaticProvider[]) => PlatformRef;
 
-    export declare const CUSTOM_ELEMENTS_SCHEMA:
-        SchemaMetadata;
+export declare const CUSTOM_ELEMENTS_SCHEMA: SchemaMetadata;
 
-    export interface DebugElement extends DebugNode {
-      readonly attributes: {[key: string]: string | null;};
-      readonly childNodes: DebugNode[];
-      readonly children: DebugElement[];
-      readonly classes: {[key: string]: boolean;};
-      readonly name: string;
-      readonly nativeElement: any;
-      readonly properties: {[key: string]: any;};
-      readonly styles: {[key: string]: string | null;};
-      query(predicate: Predicate<DebugElement>): DebugElement;
-      queryAll(predicate: Predicate<DebugElement>): DebugElement[];
-      queryAllNodes(predicate: Predicate<DebugNode>): DebugNode[];
-      triggerEventHandler(eventName: string, eventObj: any): void;
-    }
+export interface DebugElement extends DebugNode {
+    readonly attributes: {
+        [key: string]: string | null;
+    };
+    readonly childNodes: DebugNode[];
+    readonly children: DebugElement[];
+    readonly classes: {
+        [key: string]: boolean;
+    };
+    readonly name: string;
+    readonly nativeElement: any;
+    readonly properties: {
+        [key: string]: any;
+    };
+    readonly styles: {
+        [key: string]: string | null;
+    };
+    query(predicate: Predicate<DebugElement>): DebugElement;
+    queryAll(predicate: Predicate<DebugElement>): DebugElement[];
+    queryAllNodes(predicate: Predicate<DebugNode>): DebugNode[];
+    triggerEventHandler(eventName: string, eventObj: any): void;
+}
 
-export declare const DebugElement: {new (...args: any[]): DebugElement;};
+export declare const DebugElement: {
+    new (...args: any[]): DebugElement;
+};
 
 export declare class DebugEventListener {
-  callback: Function;
-  name: string;
-  constructor(name: string, callback: Function);
+    callback: Function;
+    name: string;
+    constructor(name: string, callback: Function);
 }
 
 export interface DebugNode {
-  readonly componentInstance: any;
-  readonly context: any;
-  readonly injector: Injector;
-  readonly listeners: DebugEventListener[];
-  readonly nativeNode: any;
-  readonly parent: DebugElement|null;
-  readonly providerTokens: any[];
-  readonly references: {[key: string]: any;};
+    readonly componentInstance: any;
+    readonly context: any;
+    readonly injector: Injector;
+    readonly listeners: DebugEventListener[];
+    readonly nativeNode: any;
+    readonly parent: DebugElement | null;
+    readonly providerTokens: any[];
+    readonly references: {
+        [key: string]: any;
+    };
 }
 
-export declare const DebugNode: {new (...args: any[]): DebugNode;};
+export declare const DebugNode: {
+    new (...args: any[]): DebugNode;
+};
 
 /** @deprecated */
 export declare class DefaultIterableDiffer<V> implements IterableDiffer<V>, IterableChanges<V> {
-  readonly collection: V[]|Iterable<V>|null;
-  readonly isDirty: boolean;
-  readonly length: number;
-  constructor(trackByFn?: TrackByFunction<V>);
-  check(collection: NgIterable<V>): boolean;
-  diff(collection: NgIterable<V>): DefaultIterableDiffer<V>|null;
-  forEachAddedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-  forEachIdentityChange(fn: (record: IterableChangeRecord_<V>) => void): void;
-  forEachItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-  forEachMovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-  forEachOperation(
-      fn: (item: IterableChangeRecord<V>, previousIndex: number|null, currentIndex: number|null) =>
-          void): void;
-  forEachPreviousItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-  forEachRemovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
-  onDestroy(): void;
+    readonly collection: V[] | Iterable<V> | null;
+    readonly isDirty: boolean;
+    readonly length: number;
+    constructor(trackByFn?: TrackByFunction<V>);
+    check(collection: NgIterable<V>): boolean;
+    diff(collection: NgIterable<V>): DefaultIterableDiffer<V> | null;
+    forEachAddedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+    forEachIdentityChange(fn: (record: IterableChangeRecord_<V>) => void): void;
+    forEachItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+    forEachMovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+    forEachOperation(fn: (item: IterableChangeRecord<V>, previousIndex: number | null, currentIndex: number | null) => void): void;
+    forEachPreviousItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+    forEachRemovedItem(fn: (record: IterableChangeRecord_<V>) => void): void;
+    onDestroy(): void;
 }
 
 /** @deprecated */
 export declare const defineInjectable: typeof ɵɵdefineInjectable;
 
-export declare function destroyPlatform():
-    void;
+export declare function destroyPlatform(): void;
 
-    export interface Directive {
-      exportAs?: string;
-      host?: {[key: string]: string;};
-      inputs?: string[];
-      jit?: true;
-      outputs?: string[];
-      providers?: Provider[];
-      queries?: {[key: string]: any;};
-      selector?: string;
-    }
+export interface Directive {
+    exportAs?: string;
+    host?: {
+        [key: string]: string;
+    };
+    inputs?: string[];
+    jit?: true;
+    outputs?: string[];
+    providers?: Provider[];
+    queries?: {
+        [key: string]: any;
+    };
+    selector?: string;
+}
 
 export declare const Directive: DirectiveDecorator;
 
 export interface DirectiveDecorator {
-  (obj: Directive): TypeDecorator;
-  new (obj: Directive): Directive;
+    (obj: Directive): TypeDecorator;
+    new (obj: Directive): Directive;
 }
 
-export interface DoBootstrap { ngDoBootstrap(appRef: ApplicationRef): void; }
+export interface DoBootstrap {
+    ngDoBootstrap(appRef: ApplicationRef): void;
+}
 
-export interface DoCheck { ngDoCheck(): void; }
+export interface DoCheck {
+    ngDoCheck(): void;
+}
 
 export declare class ElementRef<T = any> {
-  nativeElement: T;
-  constructor(nativeElement: T);
+    nativeElement: T;
+    constructor(nativeElement: T);
 }
 
 export declare abstract class EmbeddedViewRef<C> extends ViewRef {
-  abstract readonly context: C;
-  abstract readonly rootNodes: any[];
+    abstract readonly context: C;
+    abstract readonly rootNodes: any[];
 }
 
-export declare function enableProdMode():
-    void;
+export declare function enableProdMode(): void;
 
-    export declare class ErrorHandler {
-      handleError(error: any): void;
-    }
+export declare class ErrorHandler {
+    handleError(error: any): void;
+}
 
 export declare class EventEmitter<T> extends Subject<T> {
-  __isAsync: boolean;
-  constructor(isAsync?: boolean);
-  emit(value?: T): void;
-  subscribe(generatorOrNext?: any, error?: any, complete?: any): Subscription;
+    __isAsync: boolean;
+    constructor(isAsync?: boolean);
+    emit(value?: T): void;
+    subscribe(generatorOrNext?: any, error?: any, complete?: any): Subscription;
 }
 
 export interface ExistingProvider extends ExistingSansProvider {
-  multi?: boolean;
-  provide: any;
+    multi?: boolean;
+    provide: any;
 }
 
 export interface FactoryProvider extends FactorySansProvider {
-  multi?: boolean;
-  provide: any;
+    multi?: boolean;
+    provide: any;
 }
 
-export declare function forwardRef(forwardRefFn: ForwardRefFn):
-    Type<any>;
+export declare function forwardRef(forwardRefFn: ForwardRefFn): Type<any>;
 
-    export interface ForwardRefFn {
-      (): any;
-    }
+export interface ForwardRefFn {
+    (): any;
+}
 
 export declare const getDebugNode: (nativeNode: any) => DebugNode | null;
 
 export declare const getModuleFactory: (id: string) => NgModuleFactory<any>;
 
-export declare function getPlatform():
-    PlatformRef|null;
+export declare function getPlatform(): PlatformRef | null;
 
-    export interface GetTestability {
-      addToWindow(registry: TestabilityRegistry): void;
-      findTestabilityInTree(
-          registry: TestabilityRegistry, elem: any, findInAncestors: boolean): Testability|null;
-    }
+export interface GetTestability {
+    addToWindow(registry: TestabilityRegistry): void;
+    findTestabilityInTree(registry: TestabilityRegistry, elem: any, findInAncestors: boolean): Testability | null;
+}
 
-export interface Host {}
+export interface Host {
+}
 
 export declare const Host: HostDecorator;
 
-export interface HostBinding { hostPropertyName?: string; }
+export interface HostBinding {
+    hostPropertyName?: string;
+}
 
 export declare const HostBinding: HostBindingDecorator;
 
 export interface HostBindingDecorator {
-  (hostPropertyName?: string): any;
-  new (hostPropertyName?: string): any;
+    (hostPropertyName?: string): any;
+    new (hostPropertyName?: string): any;
 }
 
 export interface HostDecorator {
-  (): any;
-  new (): Host;
+    (): any;
+    new (): Host;
 }
 
 export interface HostListener {
-  args?: string[];
-  eventName?: string;
+    args?: string[];
+    eventName?: string;
 }
 
 export declare const HostListener: HostListenerDecorator;
 
 export interface HostListenerDecorator {
-  (eventName: string, args?: string[]): any;
-  new (eventName: string, args?: string[]): any;
+    (eventName: string, args?: string[]): any;
+    new (eventName: string, args?: string[]): any;
 }
 
 export declare const inject: typeof ɵɵinject;
 
-export interface Inject { token: any; }
+export interface Inject {
+    token: any;
+}
 
 export declare const Inject: InjectDecorator;
 
-export interface Injectable { providedIn?: Type<any>|'root'|null; }
+export interface Injectable {
+    providedIn?: Type<any> | 'root' | null;
+}
 
 export declare const Injectable: InjectableDecorator;
 
 export interface InjectableDecorator {
-  (): TypeDecorator;
-  (options?: {providedIn: Type<any>| 'root' | null;}&InjectableProvider): TypeDecorator;
-  new (): Injectable;
-  new (options?: {providedIn: Type<any>| 'root' | null;}&InjectableProvider): Injectable;
+    (): TypeDecorator;
+    (options?: {
+        providedIn: Type<any> | 'root' | null;
+    } & InjectableProvider): TypeDecorator;
+    new (): Injectable;
+    new (options?: {
+        providedIn: Type<any> | 'root' | null;
+    } & InjectableProvider): Injectable;
 }
 
-export declare type InjectableProvider = ValueSansProvider | ExistingSansProvider |
-    StaticClassSansProvider | ConstructorSansProvider | FactorySansProvider | ClassSansProvider;
+export declare type InjectableProvider = ValueSansProvider | ExistingSansProvider | StaticClassSansProvider | ConstructorSansProvider | FactorySansProvider | ClassSansProvider;
 
-export interface InjectableType<T> extends Type<T> { ngInjectableDef: never; }
+export interface InjectableType<T> extends Type<T> {
+    ngInjectableDef: never;
+}
 
 export interface InjectDecorator {
-  (token: any): any;
-  new (token: any): Inject;
+    (token: any): any;
+    new (token: any): Inject;
 }
 
-export declare enum InjectFlags {Default = 0, Host = 1, Self = 2, SkipSelf = 4, Optional = 8}
+export declare enum InjectFlags {
+    Default = 0,
+    Host = 1,
+    Self = 2,
+    SkipSelf = 4,
+    Optional = 8
+}
 
 export declare class InjectionToken<T> {
-  protected _desc: string;
-  readonly ngInjectableDef: never|undefined;
-  constructor(_desc: string, options?: {providedIn?: Type<any>| 'root' | null; factory: () => T;});
-  toString(): string;
+    protected _desc: string;
+    readonly ngInjectableDef: never | undefined;
+    constructor(_desc: string, options?: {
+        providedIn?: Type<any> | 'root' | null;
+        factory: () => T;
+    });
+    toString(): string;
 }
 
 export declare abstract class Injector {
-  abstract get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
-  /** @deprecated */ abstract get(token: any, notFoundValue?: any): any;
-  static NULL: Injector;
-  static THROW_IF_NOT_FOUND: Object;
-  static ngInjectableDef: never;
-  /** @deprecated */ static create(providers: StaticProvider[], parent?: Injector): Injector;
-  static create(options: {providers: StaticProvider[]; parent?: Injector; name?: string;}):
-      Injector;
+    abstract get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
+    /** @deprecated */ abstract get(token: any, notFoundValue?: any): any;
+    static NULL: Injector;
+    static THROW_IF_NOT_FOUND: Object;
+    static ngInjectableDef: never;
+    /** @deprecated */ static create(providers: StaticProvider[], parent?: Injector): Injector;
+    static create(options: {
+        providers: StaticProvider[];
+        parent?: Injector;
+        name?: string;
+    }): Injector;
 }
 
 export declare const INJECTOR: InjectionToken<Injector>;
 
-export interface InjectorType<T> extends Type<T> { ngInjectorDef: never; }
+export interface InjectorType<T> extends Type<T> {
+    ngInjectorDef: never;
+}
 
-export interface Input { bindingPropertyName?: string; }
+export interface Input {
+    bindingPropertyName?: string;
+}
 
 export declare const Input: InputDecorator;
 
 export interface InputDecorator {
-  (bindingPropertyName?: string): any;
-  new (bindingPropertyName?: string): any;
+    (bindingPropertyName?: string): any;
+    new (bindingPropertyName?: string): any;
 }
 
-export declare function isDevMode():
-    boolean;
+export declare function isDevMode(): boolean;
 
-    export interface IterableChangeRecord<V> {
-      readonly currentIndex: number|null;
-      readonly item: V;
-      readonly previousIndex: number|null;
-      readonly trackById: any;
-    }
+export interface IterableChangeRecord<V> {
+    readonly currentIndex: number | null;
+    readonly item: V;
+    readonly previousIndex: number | null;
+    readonly trackById: any;
+}
 
 export interface IterableChanges<V> {
-  forEachAddedItem(fn: (record: IterableChangeRecord<V>) => void): void;
-  forEachIdentityChange(fn: (record: IterableChangeRecord<V>) => void): void;
-  forEachItem(fn: (record: IterableChangeRecord<V>) => void): void;
-  forEachMovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
-  forEachOperation(
-      fn:
-          (record: IterableChangeRecord<V>, previousIndex: number|null,
-           currentIndex: number|null) => void): void;
-  forEachPreviousItem(fn: (record: IterableChangeRecord<V>) => void): void;
-  forEachRemovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
+    forEachAddedItem(fn: (record: IterableChangeRecord<V>) => void): void;
+    forEachIdentityChange(fn: (record: IterableChangeRecord<V>) => void): void;
+    forEachItem(fn: (record: IterableChangeRecord<V>) => void): void;
+    forEachMovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
+    forEachOperation(fn: (record: IterableChangeRecord<V>, previousIndex: number | null, currentIndex: number | null) => void): void;
+    forEachPreviousItem(fn: (record: IterableChangeRecord<V>) => void): void;
+    forEachRemovedItem(fn: (record: IterableChangeRecord<V>) => void): void;
 }
 
-export interface IterableDiffer<V> { diff(object: NgIterable<V>): IterableChanges<V>|null; }
+export interface IterableDiffer<V> {
+    diff(object: NgIterable<V>): IterableChanges<V> | null;
+}
 
 export interface IterableDifferFactory {
-  create<V>(trackByFn?: TrackByFunction<V>): IterableDiffer<V>;
-  supports(objects: any): boolean;
+    create<V>(trackByFn?: TrackByFunction<V>): IterableDiffer<V>;
+    supports(objects: any): boolean;
 }
 
 export declare class IterableDiffers {
-  /** @deprecated */ factories: IterableDifferFactory[];
-  constructor(factories: IterableDifferFactory[]);
-  find(iterable: any): IterableDifferFactory;
-  static ngInjectableDef: never;
-  static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
-  static extend(factories: IterableDifferFactory[]): StaticProvider;
+    /** @deprecated */ factories: IterableDifferFactory[];
+    constructor(factories: IterableDifferFactory[]);
+    find(iterable: any): IterableDifferFactory;
+    static ngInjectableDef: never;
+    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    static extend(factories: IterableDifferFactory[]): StaticProvider;
 }
 
 export interface KeyValueChangeRecord<K, V> {
-  readonly currentValue: V|null;
-  readonly key: K;
-  readonly previousValue: V|null;
+    readonly currentValue: V | null;
+    readonly key: K;
+    readonly previousValue: V | null;
 }
 
 export interface KeyValueChanges<K, V> {
-  forEachAddedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-  forEachChangedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-  forEachItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-  forEachPreviousItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
-  forEachRemovedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+    forEachAddedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+    forEachChangedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+    forEachItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+    forEachPreviousItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
+    forEachRemovedItem(fn: (r: KeyValueChangeRecord<K, V>) => void): void;
 }
 
 export interface KeyValueDiffer<K, V> {
-  diff(object: Map<K, V>): KeyValueChanges<K, V>|null;
-  diff(object: {[key: string]: V;}): KeyValueChanges<string, V>|null;
+    diff(object: Map<K, V>): KeyValueChanges<K, V> | null;
+    diff(object: {
+        [key: string]: V;
+    }): KeyValueChanges<string, V> | null;
 }
 
 export interface KeyValueDifferFactory {
-  create<K, V>(): KeyValueDiffer<K, V>;
-  supports(objects: any): boolean;
+    create<K, V>(): KeyValueDiffer<K, V>;
+    supports(objects: any): boolean;
 }
 
 export declare class KeyValueDiffers {
-  /** @deprecated */ factories: KeyValueDifferFactory[];
-  constructor(factories: KeyValueDifferFactory[]);
-  find(kv: any): KeyValueDifferFactory;
-  static ngInjectableDef: never;
-  static create<S>(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
-  static extend<S>(factories: KeyValueDifferFactory[]): StaticProvider;
+    /** @deprecated */ factories: KeyValueDifferFactory[];
+    constructor(factories: KeyValueDifferFactory[]);
+    find(kv: any): KeyValueDifferFactory;
+    static ngInjectableDef: never;
+    static create<S>(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    static extend<S>(factories: KeyValueDifferFactory[]): StaticProvider;
 }
 
 export declare const LOCALE_ID: InjectionToken<string>;
 
-export declare enum MissingTranslationStrategy {Error = 0, Warning = 1, Ignore = 2}
+export declare enum MissingTranslationStrategy {
+    Error = 0,
+    Warning = 1,
+    Ignore = 2
+}
 
 export declare class ModuleWithComponentFactories<T> {
-  componentFactories: ComponentFactory<any>[];
-  ngModuleFactory: NgModuleFactory<T>;
-  constructor(ngModuleFactory: NgModuleFactory<T>, componentFactories: ComponentFactory<any>[]);
+    componentFactories: ComponentFactory<any>[];
+    ngModuleFactory: NgModuleFactory<T>;
+    constructor(ngModuleFactory: NgModuleFactory<T>, componentFactories: ComponentFactory<any>[]);
 }
 
-export interface ModuleWithProviders<
-    T = any /** TODO(alxhub): remove default when callers pass explicit type param */> {
-  ngModule: Type<T>;
-  providers?: Provider[];
+export interface ModuleWithProviders<T = any /** TODO(alxhub): remove default when callers pass explicit type param */> {
+    ngModule: Type<T>;
+    providers?: Provider[];
 }
 
-export declare type NgIterable<T> = Array<T>| Iterable<T>;
+export declare type NgIterable<T> = Array<T> | Iterable<T>;
 
 export interface NgModule {
-  bootstrap?: Array<Type<any>|any[]>;
-  declarations?: Array<Type<any>|any[]>;
-  entryComponents?: Array<Type<any>|any[]>;
-  exports?: Array<Type<any>|any[]>;
-  id?: string;
-  imports?: Array<Type<any>|ModuleWithProviders<{}>|any[]>;
-  jit?: true;
-  providers?: Provider[];
-  schemas?: Array<SchemaMetadata|any[]>;
+    bootstrap?: Array<Type<any> | any[]>;
+    declarations?: Array<Type<any> | any[]>;
+    entryComponents?: Array<Type<any> | any[]>;
+    exports?: Array<Type<any> | any[]>;
+    id?: string;
+    imports?: Array<Type<any> | ModuleWithProviders<{}> | any[]>;
+    jit?: true;
+    providers?: Provider[];
+    schemas?: Array<SchemaMetadata | any[]>;
 }
 
 export declare const NgModule: NgModuleDecorator;
 
 export interface NgModuleDecorator {
-  (obj?: NgModule): TypeDecorator;
-  new (obj?: NgModule): NgModule;
+    (obj?: NgModule): TypeDecorator;
+    new (obj?: NgModule): NgModule;
 }
 
 export declare abstract class NgModuleFactory<T> {
-  abstract readonly moduleType: Type<T>;
-  abstract create(parentInjector: Injector|null): NgModuleRef<T>;
+    abstract readonly moduleType: Type<T>;
+    abstract create(parentInjector: Injector | null): NgModuleRef<T>;
 }
 
 /** @deprecated */
 export declare abstract class NgModuleFactoryLoader {
-  abstract load(path: string): Promise<NgModuleFactory<any>>;
+    abstract load(path: string): Promise<NgModuleFactory<any>>;
 }
 
 export declare abstract class NgModuleRef<T> {
-  abstract readonly componentFactoryResolver: ComponentFactoryResolver;
-  abstract readonly injector: Injector;
-  abstract readonly instance: T;
-  abstract destroy(): void;
-  abstract onDestroy(callback: () => void): void;
+    abstract readonly componentFactoryResolver: ComponentFactoryResolver;
+    abstract readonly injector: Injector;
+    abstract readonly instance: T;
+    abstract destroy(): void;
+    abstract onDestroy(callback: () => void): void;
 }
 
 export declare class NgProbeToken {
-  name: string;
-  token: any;
-  constructor(name: string, token: any);
+    name: string;
+    token: any;
+    constructor(name: string, token: any);
 }
 
 export declare class NgZone {
-  readonly hasPendingMacrotasks: boolean;
-  readonly hasPendingMicrotasks: boolean;
-  readonly isStable: boolean;
-  readonly onError: EventEmitter<any>;
-  readonly onMicrotaskEmpty: EventEmitter<any>;
-  readonly onStable: EventEmitter<any>;
-  readonly onUnstable: EventEmitter<any>;
-  constructor({enableLongStackTrace}: {enableLongStackTrace?: boolean | undefined;});
-  run<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
-  runGuarded<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
-  runOutsideAngular<T>(fn: (...args: any[]) => T): T;
-  runTask<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[], name?: string): T;
-  static assertInAngularZone(): void;
-  static assertNotInAngularZone(): void;
-  static isInAngularZone(): boolean;
+    readonly hasPendingMacrotasks: boolean;
+    readonly hasPendingMicrotasks: boolean;
+    readonly isStable: boolean;
+    readonly onError: EventEmitter<any>;
+    readonly onMicrotaskEmpty: EventEmitter<any>;
+    readonly onStable: EventEmitter<any>;
+    readonly onUnstable: EventEmitter<any>;
+    constructor({ enableLongStackTrace }: {
+        enableLongStackTrace?: boolean | undefined;
+    });
+    run<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
+    runGuarded<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[]): T;
+    runOutsideAngular<T>(fn: (...args: any[]) => T): T;
+    runTask<T>(fn: (...args: any[]) => T, applyThis?: any, applyArgs?: any[], name?: string): T;
+    static assertInAngularZone(): void;
+    static assertNotInAngularZone(): void;
+    static isInAngularZone(): boolean;
 }
 
 export declare const NO_ERRORS_SCHEMA: SchemaMetadata;
 
-export interface OnChanges { ngOnChanges(changes: SimpleChanges): void; }
+export interface OnChanges {
+    ngOnChanges(changes: SimpleChanges): void;
+}
 
-export interface OnDestroy { ngOnDestroy(): void; }
+export interface OnDestroy {
+    ngOnDestroy(): void;
+}
 
-export interface OnInit { ngOnInit(): void; }
+export interface OnInit {
+    ngOnInit(): void;
+}
 
-export interface Optional {}
+export interface Optional {
+}
 
 export declare const Optional: OptionalDecorator;
 
 export interface OptionalDecorator {
-  (): any;
-  new (): Optional;
+    (): any;
+    new (): Optional;
 }
 
-export interface Output { bindingPropertyName?: string; }
+export interface Output {
+    bindingPropertyName?: string;
+}
 
 export declare const Output: OutputDecorator;
 
 export interface OutputDecorator {
-  (bindingPropertyName?: string): any;
-  new (bindingPropertyName?: string): any;
+    (bindingPropertyName?: string): any;
+    new (bindingPropertyName?: string): any;
 }
 
-export declare function ɵɵallocHostVars(count: number):
-    void;
+export declare function ɵɵallocHostVars(count: number): void;
 
-    export interface ɵɵBaseDef<T> {
-      contentQueries: ContentQueriesFunction<T>|null;
-      /** @deprecated */ readonly declaredInputs: {[P in keyof T]: string;};
-      hostBindings: HostBindingsFunction<T>|null;
-      readonly inputs: {[P in keyof T]: string;};
-      readonly outputs: {[P in keyof T]: string;};
-      viewQuery: ViewQueriesFunction<T>|null;
-    }
+export declare function ɵɵattribute(name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
 
-export declare function ɵɵbind<T>(value: T): T |
-    NO_CHANGE;
+export declare function ɵɵattributeInterpolate1(attrName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
 
-export declare function ɵɵclassMap(
-    classes: {[styleName: string]: any;} | NO_CHANGE | string | null): void;
+export declare function ɵɵattributeInterpolate2(attrName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
 
-    export declare function ɵɵclassProp(
-        classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
+export declare function ɵɵattributeInterpolate3(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
 
-    export declare type ɵɵComponentDefWithMeta < T, Selector extends String,
-    ExportAs extends string[], InputMap extends {
-      [key: string]: string;
-    }, OutputMap extends {
-  [key: string]: string;
+export declare function ɵɵattributeInterpolate4(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate5(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate6(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate7(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolate8(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export declare function ɵɵattributeInterpolateV(attrName: string, values: any[], sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
+
+export interface ɵɵBaseDef<T> {
+    contentQueries: ContentQueriesFunction<T> | null;
+    /** @deprecated */ readonly declaredInputs: {
+        [P in keyof T]: string;
+    };
+    hostBindings: HostBindingsFunction<T> | null;
+    readonly inputs: {
+        [P in keyof T]: string;
+    };
+    readonly outputs: {
+        [P in keyof T]: string;
+    };
+    viewQuery: ViewQueriesFunction<T> | null;
 }
-, QueryFields extends string[] > = ComponentDef<T>;
 
-export declare function ɵɵcomponentHostSyntheticListener<T>(
-    eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean,
-    eventTargetResolver?: GlobalTargetResolver): void;
+export declare function ɵɵbind<T>(value: T): T | NO_CHANGE;
 
-export declare function ɵɵcomponentHostSyntheticProperty<T>(
-    index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
-    nativeOnly?: boolean): void;
+export declare function ɵɵclassMap(classes: {
+    [styleName: string]: any;
+} | NO_CHANGE | string | null): void;
+
+export declare function ɵɵclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
+
+export declare type ɵɵComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = ComponentDef<T>;
+
+export declare function ɵɵcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
+
+export declare function ɵɵcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
 
 export declare function ɵɵcontainer(index: number): void;
 
-    export declare function ɵɵcontainerRefreshEnd(): void;
+export declare function ɵɵcontainerRefreshEnd(): void;
 
-    export declare function ɵɵcontainerRefreshStart(index: number): void;
+export declare function ɵɵcontainerRefreshStart(index: number): void;
 
-    export declare function ɵɵcontentQuery<T>(
-        directiveIndex: number, predicate: Type<any>| string[], descend: boolean, read: any):
-        QueryList<T>;
+export declare function ɵɵcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
 
-    export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
+export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
 
-    export declare function ɵɵdefineBase<T>(baseDefinition: {
-      inputs?: {[P in keyof T]?: string | [string, string];};
-      outputs?: {[P in keyof T]?: string;};
-      contentQueries?: ContentQueriesFunction<T>|null;
-      viewQuery?: ViewQueriesFunction<T>|null;
-      hostBindings?: HostBindingsFunction<T>;
-    }): ɵɵBaseDef<T>;
+export declare function ɵɵdefineBase<T>(baseDefinition: {
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    contentQueries?: ContentQueriesFunction<T> | null;
+    viewQuery?: ViewQueriesFunction<T> | null;
+    hostBindings?: HostBindingsFunction<T>;
+}): ɵɵBaseDef<T>;
 
 export declare function ɵɵdefineComponent<T>(componentDefinition: {
-  type: Type<T>; selectors: CssSelectorList; factory: FactoryFn<T>; consts: number; vars: number;
-  inputs?: {[P in keyof T]?: string | [string, string];};
-  outputs?: {[P in keyof T]?: string;};
-  hostBindings?: HostBindingsFunction<T>;
-  contentQueries?: ContentQueriesFunction<T>;
-  exportAs?: string[];
-  template: ComponentTemplate<T>;
-  ngContentSelectors?: string[];
-  viewQuery?: ViewQueriesFunction<T>| null;
-  features?: ComponentDefFeature[];
-  encapsulation?: ViewEncapsulation;
-  data?: {[kind: string]: any;};
-  styles?: string[];
-  changeDetection?: ChangeDetectionStrategy;
-  directives?: DirectiveTypesOrFactory | null;
-  pipes?: PipeTypesOrFactory | null;
-  schemas?: SchemaMetadata[] | null;
+    type: Type<T>;
+    selectors: CssSelectorList;
+    factory: FactoryFn<T>;
+    consts: number;
+    vars: number;
+    inputs?: {
+        [P in keyof T]?: string | [string, string];
+    };
+    outputs?: {
+        [P in keyof T]?: string;
+    };
+    hostBindings?: HostBindingsFunction<T>;
+    contentQueries?: ContentQueriesFunction<T>;
+    exportAs?: string[];
+    template: ComponentTemplate<T>;
+    ngContentSelectors?: string[];
+    viewQuery?: ViewQueriesFunction<T> | null;
+    features?: ComponentDefFeature[];
+    encapsulation?: ViewEncapsulation;
+    data?: {
+        [kind: string]: any;
+    };
+    styles?: string[];
+    changeDetection?: ChangeDetectionStrategy;
+    directives?: DirectiveTypesOrFactory | null;
+    pipes?: PipeTypesOrFactory | null;
+    schemas?: SchemaMetadata[] | null;
 }): never;
 
 export declare const ɵɵdefineDirective: <T>(directiveDefinition: {
-  type: Type<T>; selectors: (string | SelectorFlags)[][]; factory: FactoryFn<T>;
-  inputs?: {[P in keyof T]?: string | [string, string] | undefined;} | undefined;
-  outputs?: {[P in keyof T]?: string | undefined;} | undefined;
-  features?: DirectiveDefFeature[] | undefined;
-  hostBindings?: HostBindingsFunction<T>| undefined;
-  contentQueries?: ContentQueriesFunction<T>| undefined;
-  viewQuery?: ViewQueriesFunction<T>| null | undefined;
-  exportAs?: string[] | undefined;
+    type: Type<T>;
+    selectors: (string | SelectorFlags)[][];
+    factory: FactoryFn<T>;
+    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
+    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
+    features?: DirectiveDefFeature[] | undefined;
+    hostBindings?: HostBindingsFunction<T> | undefined;
+    contentQueries?: ContentQueriesFunction<T> | undefined;
+    viewQuery?: ViewQueriesFunction<T> | null | undefined;
+    exportAs?: string[] | undefined;
 }) => never;
 
-export declare function ɵɵdefineInjectable<T>(
-    opts: {providedIn?: Type<any>| 'root' | 'any' | null; factory: () => T;}): never;
+export declare function ɵɵdefineInjectable<T>(opts: {
+    providedIn?: Type<any> | 'root' | 'any' | null;
+    factory: () => T;
+}): never;
 
-export declare function ɵɵdefineInjector(
-    options: {factory: () => any; providers?: any[]; imports?: any[];}): never;
+export declare function ɵɵdefineInjector(options: {
+    factory: () => any;
+    providers?: any[];
+    imports?: any[];
+}): never;
 
-    export declare function ɵɵdefineNgModule<T>(def: {
-      type: T;
-      bootstrap?: Type<any>[]|(() => Type<any>[]);
-      declarations?: Type<any>[]|(() => Type<any>[]);
-      imports?: Type<any>[]|(() => Type<any>[]);
-      exports?: Type<any>[]|(() => Type<any>[]);
-      schemas?: SchemaMetadata[]|null;
-      id?: string|null;
-    }): never;
+export declare function ɵɵdefineNgModule<T>(def: {
+    type: T;
+    bootstrap?: Type<any>[] | (() => Type<any>[]);
+    declarations?: Type<any>[] | (() => Type<any>[]);
+    imports?: Type<any>[] | (() => Type<any>[]);
+    exports?: Type<any>[] | (() => Type<any>[]);
+    schemas?: SchemaMetadata[] | null;
+    id?: string | null;
+}): never;
 
-export declare function ɵɵdefinePipe<T>(
-    pipeDef: {name: string; type: Type<T>; factory: FactoryFn<T>; pure?: boolean;}): never;
+export declare function ɵɵdefinePipe<T>(pipeDef: {
+    name: string;
+    type: Type<T>;
+    factory: FactoryFn<T>;
+    pure?: boolean;
+}): never;
 
-export declare type ɵɵDirectiveDefWithMeta < T, Selector extends string, ExportAs extends string[],
-    InputMap extends {
-  [key: string]: string;
-}
-, OutputMap extends {
-  [key: string]: string;
-}
-, QueryFields extends string[] > = DirectiveDef<T>;
+export declare type ɵɵDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
+    [key: string]: string;
+}, OutputMap extends {
+    [key: string]: string;
+}, QueryFields extends string[]> = DirectiveDef<T>;
 
-export declare function ɵɵdirectiveInject<T>(token: Type<T>| InjectionToken<T>): T;
-export declare function ɵɵdirectiveInject<T>(
-    token: Type<T>| InjectionToken<T>, flags: InjectFlags): T;
+export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
 
 export declare function ɵɵdisableBindings(): void;
 
-    export declare function ɵɵelement(
-        index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+export declare function ɵɵelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
 
-    export declare function ɵɵelementAttribute(
-        index: number, name: string, value: any, sanitizer?: SanitizerFn | null,
-        namespace?: string): void;
+export declare function ɵɵelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
 
-    export declare function ɵɵelementContainerEnd(): void;
+export declare function ɵɵelementContainerEnd(): void;
 
-    export declare function ɵɵelementContainerStart(
-        index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+export declare function ɵɵelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
 
-    export declare function ɵɵelementEnd(): void;
+export declare function ɵɵelementEnd(): void;
 
-    export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
+export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
 
-    export declare function ɵɵelementProperty<T>(
-        index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
-        nativeOnly?: boolean): void;
+export declare function ɵɵelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
 
-    export declare function ɵɵelementStart(
-        index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
+export declare function ɵɵelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
 
-    export declare function ɵɵembeddedViewEnd(): void;
+export declare function ɵɵembeddedViewEnd(): void;
 
-    export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number):
-        RenderFlags;
+export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
 
-    export declare function ɵɵenableBindings(): void;
+export declare function ɵɵenableBindings(): void;
 
-    export declare function ɵɵgetCurrentView(): OpaqueViewState;
+export declare function ɵɵgetCurrentView(): OpaqueViewState;
 
-    export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T>| null) => T) | null;
+export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
 
-    export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
+export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
 
-    export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
+export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
 
-    export declare function ɵɵi18nApply(index: number): void;
+export declare function ɵɵi18nApply(index: number): void;
 
-    export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
+export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
 
-    export declare function ɵɵi18nEnd(): void;
+export declare function ɵɵi18nEnd(): void;
 
-    export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
+export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
 
-    /** @deprecated */
-    export declare function ɵɵi18nLocalize(input: string, placeholders?: { [key: string]: string;}):
-        string;
+/** @deprecated */
+export declare function ɵɵi18nLocalize(input: string, placeholders?: {
+    [key: string]: string;
+}): string;
 
-export declare function ɵɵi18nPostprocess(
-    message: string, replacements?: {[key: string]: (string | string[]);}): string;
+export declare function ɵɵi18nPostprocess(message: string, replacements?: {
+    [key: string]: (string | string[]);
+}): string;
 
-    export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number):
-        void;
+export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void;
 
-    export declare function ɵɵInheritDefinitionFeature(
-        definition: DirectiveDef<any>| ComponentDef<any>): void;
+export declare function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
 
-    export declare function ɵɵinject<T>(token: Type<T>| InjectionToken<T>):
-        T;
-    export declare function ɵɵinject<T>(token: Type<T>| InjectionToken<T>, flags?: InjectFlags): T |
-    null;
+export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>): T;
+export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
 
-    export interface ɵɵInjectableDef<T> {
-      factory: () => T;
-      providedIn: InjectorType<any>|'root'|'any'|null;
-      value: T|undefined;
-    }
+export interface ɵɵInjectableDef<T> {
+    factory: () => T;
+    providedIn: InjectorType<any> | 'root' | 'any' | null;
+    value: T | undefined;
+}
 
-export declare function ɵɵinjectAttribute(attrNameToInject: string): string |
-    null;
+export declare function ɵɵinjectAttribute(attrNameToInject: string): string | null;
 
-    export interface ɵɵInjectorDef<T> {
-      factory: () => T;
-      imports: (InjectorType<any>| InjectorTypeWithProviders<any>)[];
-      providers:
-          (Type<any>| ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider |
-           StaticClassProvider | ClassProvider | any[])[];
-    }
+export interface ɵɵInjectorDef<T> {
+    factory: () => T;
+    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
+    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
+}
 
-export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolation2(
-        prefix: string, v0: any, i0: string, v1: any, suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolation3(
-        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolation4(
-        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-        suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolation5(
-        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-        i3: string, v4: any, suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolation6(
-        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-        i3: string, v4: any, i4: string, v5: any, suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolation7(
-        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-        i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolation8(
-        prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-        i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
-        suffix: string): string |
-    NO_CHANGE;
+export declare function ɵɵinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
 
-    export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
+export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
 
-    export declare function ɵɵlistener(
-        eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean,
-        eventTargetResolver?: GlobalTargetResolver): void;
+export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
 
-    export declare function ɵɵload<T>(index: number): T;
+export declare function ɵɵload<T>(index: number): T;
 
-    export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
+export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
 
-    export declare function ɵɵloadViewQuery<T>(): T;
+export declare function ɵɵloadViewQuery<T>(): T;
 
-    export declare function ɵɵnamespaceHTML(): void;
+export declare function ɵɵnamespaceHTML(): void;
 
-    export declare function ɵɵnamespaceMathML(): void;
+export declare function ɵɵnamespaceMathML(): void;
 
-    export declare function ɵɵnamespaceSVG(): void;
+export declare function ɵɵnamespaceSVG(): void;
 
-    export declare function ɵɵnextContext<T = any>(level?: number): T;
+export declare function ɵɵnextContext<T = any>(level?: number): T;
 
-    export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
+export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
 
-    export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
+export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
 
-    export declare function ɵɵpipe(index: number, pipeName: string): any;
+export declare function ɵɵpipe(index: number, pipeName: string): any;
 
-    export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
+export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
 
-    export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
+export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
 
-    export declare function ɵɵpipeBind3(
-        index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
+export declare function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
 
-    export declare function ɵɵpipeBind4(
-        index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
+export declare function ɵɵpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
 
-    export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
+export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
 
-    export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
+export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
 
-    export declare function ɵɵprojection(
-        nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
+export declare function ɵɵprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
 
-    export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
+export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
 
-    export declare function ɵɵproperty<T>(
-        propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean):
-        TsickleIssue1009;
+export declare function ɵɵproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate(
-        propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate1(
-        propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn):
-        TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate2(
-        propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
-        sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate3(
-        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
-        suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate4(
-        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
-        i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate5(
-        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
-        i2: string, v3: any, i3: string, v4: any, suffix: string,
-        sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate6(
-        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
-        i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string,
-        sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate7(
-        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
-        i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any,
-        suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolate8(
-        propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
-        i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any,
-        i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵpropertyInterpolateV(
-        propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
+export declare function ɵɵpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
 
-    export declare function ɵɵProvidersFeature<T>(
-        providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
+export declare function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
 
-    export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any):
-        T;
+export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
 
-    export declare function ɵɵpureFunction1(
-        slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
+export declare function ɵɵpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunction2(
-        slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any):
-        any;
+export declare function ɵɵpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunction3(
-        slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any,
-        exp3: any, thisArg?: any): any;
+export declare function ɵɵpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunction4(
-        slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any,
-        exp2: any, exp3: any, exp4: any, thisArg?: any): any;
+export declare function ɵɵpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunction5(
-        slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any,
-        exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
+export declare function ɵɵpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunction6(
-        slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any,
-        exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
+export declare function ɵɵpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunction7(
-        slotOffset: number,
-        pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any,
-        exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
+export declare function ɵɵpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunction8(
-        slotOffset: number,
-        pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any,
-        exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any,
-        thisArg?: any): any;
+export declare function ɵɵpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
 
-    export declare function ɵɵpureFunctionV(
-        slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
+export declare function ɵɵpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
 
-    export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
+export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
 
-    export declare function ɵɵreference<T>(index: number): T;
+export declare function ɵɵreference<T>(index: number): T;
 
-    export declare function ɵɵresolveBody(element: RElement & { ownerDocument: Document;}):
-        {name: string; target: HTMLElement;};
+export declare function ɵɵresolveBody(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: HTMLElement;
+};
 
-export declare function ɵɵresolveDocument(element: RElement & { ownerDocument: Document;}):
-    {name: string; target: Document;};
+export declare function ɵɵresolveDocument(element: RElement & {
+    ownerDocument: Document;
+}): {
+    name: string;
+    target: Document;
+};
 
 export declare function ɵɵresolveWindow(element: RElement & {
     ownerDocument: Document;
@@ -1405,405 +1451,3 @@ export interface WtfScopeFn {
 }
 
 export declare const wtfStartTimeRange: (rangeType: string, action: string) => any;
-
-export declare function ɵɵallocHostVars(count: number): void;
-
-export declare function ɵɵattribute(name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
-
-export declare function ɵɵattributeInterpolate(attrName: string, v0: any, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate1(attrName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate2(attrName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate3(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate4(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate5(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate6(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate7(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolate8(attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export declare function ɵɵattributeInterpolateV(attrName: string, values: any[], sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009;
-
-export interface ɵɵBaseDef<T> {
-    contentQueries: ContentQueriesFunction<T> | null;
-    /** @deprecated */ readonly declaredInputs: {
-        [P in keyof T]: string;
-    };
-    hostBindings: HostBindingsFunction<T> | null;
-    readonly inputs: {
-        [P in keyof T]: string;
-    };
-    readonly outputs: {
-        [P in keyof T]: string;
-    };
-    viewQuery: ViewQueriesFunction<T> | null;
-}
-
-export declare function ɵɵbind<T>(value: T): T | NO_CHANGE;
-
-export declare function ɵɵclassMap(classes: {
-    [styleName: string]: any;
-} | NO_CHANGE | string | null): void;
-
-export declare function ɵɵclassProp(classIndex: number, value: boolean | PlayerFactory, forceOverride?: boolean): void;
-
-export declare type ɵɵComponentDefWithMeta<T, Selector extends String, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = ComponentDef<T>;
-
-export declare function ɵɵcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
-
-export declare function ɵɵcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
-
-export declare function ɵɵcontainer(index: number): void;
-
-export declare function ɵɵcontainerRefreshEnd(): void;
-
-export declare function ɵɵcontainerRefreshStart(index: number): void;
-
-export declare function ɵɵcontentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
-
-export declare const ɵɵdefaultStyleSanitizer: StyleSanitizeFn;
-
-export declare function ɵɵdefineBase<T>(baseDefinition: {
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    contentQueries?: ContentQueriesFunction<T> | null;
-    viewQuery?: ViewQueriesFunction<T> | null;
-    hostBindings?: HostBindingsFunction<T>;
-}): ɵɵBaseDef<T>;
-
-export declare function ɵɵdefineComponent<T>(componentDefinition: {
-    type: Type<T>;
-    selectors: CssSelectorList;
-    factory: FactoryFn<T>;
-    consts: number;
-    vars: number;
-    inputs?: {
-        [P in keyof T]?: string | [string, string];
-    };
-    outputs?: {
-        [P in keyof T]?: string;
-    };
-    hostBindings?: HostBindingsFunction<T>;
-    contentQueries?: ContentQueriesFunction<T>;
-    exportAs?: string[];
-    template: ComponentTemplate<T>;
-    ngContentSelectors?: string[];
-    viewQuery?: ViewQueriesFunction<T> | null;
-    features?: ComponentDefFeature[];
-    encapsulation?: ViewEncapsulation;
-    data?: {
-        [kind: string]: any;
-    };
-    styles?: string[];
-    changeDetection?: ChangeDetectionStrategy;
-    directives?: DirectiveTypesOrFactory | null;
-    pipes?: PipeTypesOrFactory | null;
-    schemas?: SchemaMetadata[] | null;
-}): never;
-
-export declare const ɵɵdefineDirective: <T>(directiveDefinition: {
-    type: Type<T>;
-    selectors: (string | SelectorFlags)[][];
-    factory: FactoryFn<T>;
-    inputs?: { [P in keyof T]?: string | [string, string] | undefined; } | undefined;
-    outputs?: { [P in keyof T]?: string | undefined; } | undefined;
-    features?: DirectiveDefFeature[] | undefined;
-    hostBindings?: HostBindingsFunction<T> | undefined;
-    contentQueries?: ContentQueriesFunction<T> | undefined;
-    viewQuery?: ViewQueriesFunction<T> | null | undefined;
-    exportAs?: string[] | undefined;
-}) => never;
-
-export declare function ɵɵdefineInjectable<T>(opts: {
-    providedIn?: Type<any> | 'root' | 'any' | null;
-    factory: () => T;
-}): never;
-
-export declare function ɵɵdefineInjector(options: {
-    factory: () => any;
-    providers?: any[];
-    imports?: any[];
-}): never;
-
-export declare function ɵɵdefineNgModule<T>(def: {
-    type: T;
-    bootstrap?: Type<any>[] | (() => Type<any>[]);
-    declarations?: Type<any>[] | (() => Type<any>[]);
-    imports?: Type<any>[] | (() => Type<any>[]);
-    exports?: Type<any>[] | (() => Type<any>[]);
-    schemas?: SchemaMetadata[] | null;
-    id?: string | null;
-}): never;
-
-export declare function ɵɵdefinePipe<T>(pipeDef: {
-    name: string;
-    type: Type<T>;
-    factory: FactoryFn<T>;
-    pure?: boolean;
-}): never;
-
-export declare type ɵɵDirectiveDefWithMeta<T, Selector extends string, ExportAs extends string[], InputMap extends {
-    [key: string]: string;
-}, OutputMap extends {
-    [key: string]: string;
-}, QueryFields extends string[]> = DirectiveDef<T>;
-
-export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function ɵɵdirectiveInject<T>(token: Type<T> | InjectionToken<T>, flags: InjectFlags): T;
-
-export declare function ɵɵdisableBindings(): void;
-
-export declare function ɵɵelement(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ɵɵelementAttribute(index: number, name: string, value: any, sanitizer?: SanitizerFn | null, namespace?: string): void;
-
-export declare function ɵɵelementContainerEnd(): void;
-
-export declare function ɵɵelementContainerStart(index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ɵɵelementEnd(): void;
-
-export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
-
-export declare function ɵɵelementProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
-
-export declare function ɵɵelementStart(index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void;
-
-export declare function ɵɵembeddedViewEnd(): void;
-
-export declare function ɵɵembeddedViewStart(viewBlockId: number, consts: number, vars: number): RenderFlags;
-
-export declare function ɵɵenableBindings(): void;
-
-export declare function ɵɵgetCurrentView(): OpaqueViewState;
-
-export declare function ɵɵgetFactoryOf<T>(type: Type<any>): ((type: Type<T> | null) => T) | null;
-
-export declare function ɵɵgetInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T;
-
-export declare function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void;
-
-export declare function ɵɵi18nApply(index: number): void;
-
-export declare function ɵɵi18nAttributes(index: number, values: string[]): void;
-
-export declare function ɵɵi18nEnd(): void;
-
-export declare function ɵɵi18nExp<T>(expression: T | NO_CHANGE): void;
-
-/** @deprecated */
-export declare function ɵɵi18nLocalize(input: string, placeholders?: {
-    [key: string]: string;
-}): string;
-
-export declare function ɵɵi18nPostprocess(message: string, replacements?: {
-    [key: string]: (string | string[]);
-}): string;
-
-export declare function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void;
-
-export declare function ɵɵInheritDefinitionFeature(definition: DirectiveDef<any> | ComponentDef<any>): void;
-
-export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>): T;
-export declare function ɵɵinject<T>(token: Type<T> | InjectionToken<T>, flags?: InjectFlags): T | null;
-
-export interface ɵɵInjectableDef<T> {
-    factory: () => T;
-    providedIn: InjectorType<any> | 'root' | 'any' | null;
-    value: T | undefined;
-}
-
-export declare function ɵɵinjectAttribute(attrNameToInject: string): string | null;
-
-export interface ɵɵInjectorDef<T> {
-    factory: () => T;
-    imports: (InjectorType<any> | InjectorTypeWithProviders<any>)[];
-    providers: (Type<any> | ValueProvider | ExistingProvider | FactoryProvider | ConstructorProvider | StaticClassProvider | ClassProvider | any[])[];
-}
-
-export declare function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation2(prefix: string, v0: any, i0: string, v1: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolation8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): string | NO_CHANGE;
-
-export declare function ɵɵinterpolationV(values: any[]): string | NO_CHANGE;
-
-export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
-
-export declare function ɵɵload<T>(index: number): T;
-
-export declare function ɵɵloadContentQuery<T>(): QueryList<T>;
-
-export declare function ɵɵloadViewQuery<T>(): T;
-
-export declare function ɵɵnamespaceHTML(): void;
-
-export declare function ɵɵnamespaceMathML(): void;
-
-export declare function ɵɵnamespaceSVG(): void;
-
-export declare function ɵɵnextContext<T = any>(level?: number): T;
-
-export declare type ɵɵNgModuleDefWithMeta<T, Declarations, Imports, Exports> = NgModuleDef<T>;
-
-export declare function ɵɵNgOnChangesFeature<T>(): DirectiveDefFeature;
-
-export declare function ɵɵpipe(index: number, pipeName: string): any;
-
-export declare function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any;
-
-export declare function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any;
-
-export declare function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any;
-
-export declare function ɵɵpipeBind4(index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any;
-
-export declare function ɵɵpipeBindV(index: number, slotOffset: number, values: any[]): any;
-
-export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
-
-export declare function ɵɵprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
-
-export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
-
-export declare function ɵɵproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate(propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate1(propName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate2(propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate3(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate4(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate5(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate6(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate7(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolate8(propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵpropertyInterpolateV(propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009;
-
-export declare function ɵɵProvidersFeature<T>(providers: Provider[], viewProviders?: Provider[]): (definition: DirectiveDef<T>) => void;
-
-export declare function ɵɵpureFunction0<T>(slotOffset: number, pureFn: () => T, thisArg?: any): T;
-
-export declare function ɵɵpureFunction1(slotOffset: number, pureFn: (v: any) => any, exp: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction2(slotOffset: number, pureFn: (v1: any, v2: any) => any, exp1: any, exp2: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction3(slotOffset: number, pureFn: (v1: any, v2: any, v3: any) => any, exp1: any, exp2: any, exp3: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction4(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction5(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction6(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction7(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunction8(slotOffset: number, pureFn: (v1: any, v2: any, v3: any, v4: any, v5: any, v6: any, v7: any, v8: any) => any, exp1: any, exp2: any, exp3: any, exp4: any, exp5: any, exp6: any, exp7: any, exp8: any, thisArg?: any): any;
-
-export declare function ɵɵpureFunctionV(slotOffset: number, pureFn: (...v: any[]) => any, exps: any[], thisArg?: any): any;
-
-export declare function ɵɵqueryRefresh(queryList: QueryList<any>): boolean;
-
-export declare function ɵɵreference<T>(index: number): T;
-
-export declare function ɵɵresolveBody(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: HTMLElement;
-};
-
-export declare function ɵɵresolveDocument(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: Document;
-};
-
-export declare function ɵɵresolveWindow(element: RElement & {
-    ownerDocument: Document;
-}): {
-    name: string;
-    target: Window | null;
-};
-
-export declare function ɵɵrestoreView(viewToRestore: OpaqueViewState): void;
-
-export declare function ɵɵsanitizeHtml(unsafeHtml: any): string;
-
-export declare function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string;
-
-export declare function ɵɵsanitizeScript(unsafeScript: any): string;
-
-export declare function ɵɵsanitizeStyle(unsafeStyle: any): string;
-
-export declare function ɵɵsanitizeUrl(unsafeUrl: any): string;
-
-export declare function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop: string): any;
-
-export declare function ɵɵselect(index: number): void;
-
-export declare function ɵɵsetComponentScope(type: ComponentType<any>, directives: Type<any>[], pipes: Type<any>[]): void;
-
-export declare function ɵɵsetNgModuleScope(type: any, scope: {
-    declarations?: Type<any>[] | (() => Type<any>[]);
-    imports?: Type<any>[] | (() => Type<any>[]);
-    exports?: Type<any>[] | (() => Type<any>[]);
-}): void;
-
-export declare function ɵɵstaticContentQuery<T>(directiveIndex: number, predicate: Type<any> | string[], descend: boolean, read: any): void;
-
-export declare function ɵɵstaticViewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): void;
-
-export declare function ɵɵstyleMap(styles: {
-    [styleName: string]: any;
-} | NO_CHANGE | null): void;
-
-export declare function ɵɵstyleProp(styleIndex: number, value: string | number | String | PlayerFactory | null, suffix?: string | null, forceOverride?: boolean): void;
-
-export declare function ɵɵstyling(classBindingNames?: string[] | null, styleBindingNames?: string[] | null, styleSanitizer?: StyleSanitizeFn | null): void;
-
-export declare function ɵɵstylingApply(): void;
-
-export declare function ɵɵtemplate(index: number, templateFn: ComponentTemplate<any> | null, consts: number, vars: number, tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null, localRefExtractor?: LocalRefExtractor): void;
-
-export declare function ɵɵtemplateRefExtractor(tNode: TNode, currentView: LView): ViewEngine_TemplateRef<{}> | null;
-
-export declare function ɵɵtext(index: number, value?: any): void;
-
-export declare function ɵɵtextBinding<T>(index: number, value: T | NO_CHANGE): void;
-
-export declare function ɵɵviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;

From 975845596d576d41bd3eb986673770cd7aad4da1 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Tue, 14 May 2019 21:21:26 -0700
Subject: [PATCH 164/275] perf(ivy): use string concatination instead template
 string (#30453)

PR Close #30453
---
 packages/platform-browser/src/dom/dom_renderer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/platform-browser/src/dom/dom_renderer.ts b/packages/platform-browser/src/dom/dom_renderer.ts
index ae04ba7aee..2ec54e612e 100644
--- a/packages/platform-browser/src/dom/dom_renderer.ts
+++ b/packages/platform-browser/src/dom/dom_renderer.ts
@@ -157,7 +157,7 @@ class DefaultDomRenderer2 implements Renderer2 {
 
   setAttribute(el: any, name: string, value: string, namespace?: string): void {
     if (namespace) {
-      name = `${namespace}:${name}`;
+      name = namespace + ':' + name;
       // TODO(benlesh): Ivy may cause issues here because it's passing around
       // full URIs for namespaces, therefore this lookup will fail.
       const namespaceUri = NAMESPACE_URIS[namespace];

From 300f1b289afa24b87739c8b56e100c34dd983ce2 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Tue, 14 May 2019 21:32:10 -0700
Subject: [PATCH 165/275] fix(ivy): improve assert error message (#30453)

PR Close #30453
---
 packages/core/src/render3/assert.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/render3/assert.ts b/packages/core/src/render3/assert.ts
index 8dc9d23802..483b8d2ccd 100644
--- a/packages/core/src/render3/assert.ts
+++ b/packages/core/src/render3/assert.ts
@@ -36,8 +36,9 @@ export function assertPreviousIsParent(isParent: boolean) {
   assertEqual(isParent, true, 'previousOrParentTNode should be a parent');
 }
 
-export function assertHasParent(tNode: TNode) {
-  assertDefined(tNode.parent, 'previousOrParentTNode should have a parent');
+export function assertHasParent(tNode: TNode | null) {
+  assertDefined(tNode, 'previousOrParentTNode should exist!');
+  assertDefined(tNode !.parent, 'previousOrParentTNode should have a parent');
 }
 
 export function assertDataNext(lView: LView, index: number, arr?: any[]) {

From 2545445ffb328c4cd1675a788019cd498ceb1d58 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Tue, 14 May 2019 21:34:47 -0700
Subject: [PATCH 166/275] perf(ivy): extract multiple reads to local var
 (#30453)

PR Close #30453
---
 packages/core/src/render3/instructions/element.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index a288211792..ab7a79a4fe 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -78,12 +78,13 @@ export function ɵɵelementStart(
     // instantiated into a context per element)
     setNodeStylingTemplate(tView, tNode, attrs, lastAttrIndex);
 
-    if (tNode.stylingTemplate) {
+    const stylingTemplate = tNode.stylingTemplate;
+    if (stylingTemplate) {
       // the initial style/class values are rendered immediately after having been
       // initialized into the context so the element styling is ready when directives
       // are initialized (since they may read style/class values in their constructor)
-      initialStylesIndex = renderInitialStyles(native, tNode.stylingTemplate, renderer);
-      initialClassesIndex = renderInitialClasses(native, tNode.stylingTemplate, renderer);
+      initialStylesIndex = renderInitialStyles(native, stylingTemplate, renderer);
+      initialClassesIndex = renderInitialClasses(native, stylingTemplate, renderer);
     }
   }
 

From 9ce9561737fed57de3772de8c5c7d58afc852d8c Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Tue, 14 May 2019 21:45:40 -0700
Subject: [PATCH 167/275] perf(ivy): clean up createNodeAtIndex for speed
 (#30453)

PR Close #30453
---
 packages/core/src/render3/instructions/shared.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 869e16e88f..c2667855cf 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -259,9 +259,9 @@ export function createNodeAtIndex(
   lView[adjustedIndex] = native;
 
   const previousOrParentTNode = getPreviousOrParentTNode();
-  const isParent = getIsParent();
   let tNode = tView.data[adjustedIndex] as TNode;
   if (tNode == null) {
+    const isParent = getIsParent();
     const parent =
         isParent ? previousOrParentTNode : previousOrParentTNode && previousOrParentTNode.parent;
 
@@ -282,10 +282,9 @@ export function createNodeAtIndex(
         previousOrParentTNode.next = tNode;
       }
     }
-  }
-
-  if (tView.firstChild == null) {
-    tView.firstChild = tNode;
+    if (index === 0) {
+      tView.firstChild = tNode;
+    }
   }
 
   setPreviousOrParentTNode(tNode);

From e122b44269334bbca1a3dd3daae1333810632421 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Tue, 14 May 2019 21:46:13 -0700
Subject: [PATCH 168/275] perf(ivy): clean up findComponentView for speed
 (#30453)

PR Close #30453
---
 packages/core/src/render3/util/view_traversal_utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/render3/util/view_traversal_utils.ts b/packages/core/src/render3/util/view_traversal_utils.ts
index dc672ec83e..7677edf333 100644
--- a/packages/core/src/render3/util/view_traversal_utils.ts
+++ b/packages/core/src/render3/util/view_traversal_utils.ts
@@ -49,7 +49,7 @@ export function getRootView(componentOrLView: LView | {}): LView {
  */
 export function findComponentView(lView: LView): LView {
   let rootTNode = lView[T_HOST];
-  while (rootTNode && rootTNode.type === TNodeType.View) {
+  while (rootTNode !== null && rootTNode.type === TNodeType.View) {
     ngDevMode && assertDefined(lView[DECLARATION_VIEW], 'lView[DECLARATION_VIEW]');
     lView = lView[DECLARATION_VIEW] !;
     rootTNode = lView[T_HOST];

From 2f336f15be3d440128b035f7c8541ae141ba07ca Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Tue, 14 May 2019 21:47:11 -0700
Subject: [PATCH 169/275] refactor(core): unify setPreviousOrParentTNode and
 setIsParent into single setPreviousOrParentTNode (#30453)

PR Close #30453
---
 packages/core/src/render3/i18n.ts             | 16 ++++------
 .../src/render3/instructions/container.ts     | 14 ++++-----
 .../core/src/render3/instructions/element.ts  |  9 +++---
 .../render3/instructions/element_container.ts |  7 +++--
 .../src/render3/instructions/embedded_view.ts |  5 ++--
 .../src/render3/instructions/projection.ts    |  4 +--
 .../core/src/render3/instructions/shared.ts   | 30 +++++++------------
 .../core/src/render3/instructions/text.ts     |  4 +--
 packages/core/src/render3/state.ts            | 10 +++++--
 .../cyclic_import/bundle.golden_symbols.json  |  2 +-
 .../hello_world/bundle.golden_symbols.json    |  2 +-
 .../bundling/todo/bundle.golden_symbols.json  |  2 +-
 12 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 26e7eae042..0d9acf4c1a 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -26,7 +26,7 @@ import {SanitizerFn} from './interfaces/sanitization';
 import {StylingContext} from './interfaces/styling';
 import {BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, TView, T_HOST} from './interfaces/view';
 import {appendChild, createTextNode, nativeRemoveNode} from './node_manipulation';
-import {getIsParent, getLView, getPreviousOrParentTNode, setIsParent, setPreviousOrParentTNode} from './state';
+import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from './state';
 import {NO_CHANGE} from './tokens';
 import {renderStringify} from './util/misc_utils';
 import {getNativeByIndex, getNativeByTNode, getTNode, isLContainer} from './util/view_utils';
@@ -701,7 +701,7 @@ function readCreateOpCodes(
       previousTNode = currentTNode;
       currentTNode = createDynamicNodeAtIndex(textNodeIndex, TNodeType.Element, textRNode, null);
       visitedNodes.push(textNodeIndex);
-      setIsParent(false);
+      setIsNotParent();
     } else if (typeof opCode == 'number') {
       switch (opCode & I18nMutateOpCode.MASK_OPCODE) {
         case I18nMutateOpCode.AppendChild:
@@ -726,17 +726,13 @@ function readCreateOpCodes(
           previousTNode = currentTNode;
           currentTNode = getTNode(nodeIndex, viewData);
           if (currentTNode) {
-            setPreviousOrParentTNode(currentTNode);
-            if (currentTNode.type === TNodeType.Element) {
-              setIsParent(true);
-            }
+            setPreviousOrParentTNode(currentTNode, currentTNode.type === TNodeType.Element);
           }
           break;
         case I18nMutateOpCode.ElementEnd:
           const elementIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;
           previousTNode = currentTNode = getTNode(elementIndex, viewData);
-          setPreviousOrParentTNode(currentTNode);
-          setIsParent(false);
+          setPreviousOrParentTNode(currentTNode, false);
           break;
         case I18nMutateOpCode.Attr:
           const elementNodeIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;
@@ -764,7 +760,7 @@ function readCreateOpCodes(
           attachPatchData(commentRNode, viewData);
           (currentTNode as TIcuContainerNode).activeCaseIndex = null;
           // We will add the case nodes later, during the update phase
-          setIsParent(false);
+          setIsNotParent();
           break;
         case ELEMENT_MARKER:
           const tagNameValue = createOpCodes[++i] as string;
@@ -785,7 +781,7 @@ function readCreateOpCodes(
     }
   }
 
-  setIsParent(false);
+  setIsNotParent();
 
   return visitedNodes;
 }
diff --git a/packages/core/src/render3/instructions/container.ts b/packages/core/src/render3/instructions/container.ts
index f5909b2947..5dda4b18ee 100644
--- a/packages/core/src/render3/instructions/container.ts
+++ b/packages/core/src/render3/instructions/container.ts
@@ -15,7 +15,7 @@ import {LocalRefExtractor, TAttributes, TContainerNode, TNode, TNodeType} from '
 import {BINDING_INDEX, HEADER_OFFSET, LView, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild, removeView} from '../node_manipulation';
-import {getCheckNoChangesMode, getIsParent, getLView, getPreviousOrParentTNode, setIsParent, setPreviousOrParentTNode} from '../state';
+import {getCheckNoChangesMode, getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from '../state';
 import {getNativeByTNode, loadInternal} from '../util/view_utils';
 import {addToViewTree, createDirectivesAndLocals, createLContainer, createNodeAtIndex, createTView} from './shared';
 
@@ -37,7 +37,7 @@ export function ɵɵcontainer(index: number): void {
     tNode.tViews = [];
   }
   addTContainerToQueries(lView, tNode);
-  setIsParent(false);
+  setIsNotParent();
 }
 
 /**
@@ -77,7 +77,7 @@ export function ɵɵtemplate(
   addTContainerToQueries(lView, tContainerNode);
   attachPatchData(getNativeByTNode(tContainerNode, lView), lView);
   registerPostOrderHooks(tView, tContainerNode);
-  setIsParent(false);
+  setIsNotParent();
 }
 
 /**
@@ -91,10 +91,8 @@ export function ɵɵcontainerRefreshStart(index: number): void {
   const lView = getLView();
   const tView = lView[TVIEW];
   let previousOrParentTNode = loadInternal(tView.data, index) as TNode;
-  setPreviousOrParentTNode(previousOrParentTNode);
-
   ngDevMode && assertNodeType(previousOrParentTNode, TNodeType.Container);
-  setIsParent(true);
+  setPreviousOrParentTNode(previousOrParentTNode, true);
 
   lView[index + HEADER_OFFSET][ACTIVE_INDEX] = 0;
 
@@ -113,12 +111,12 @@ export function ɵɵcontainerRefreshStart(index: number): void {
 export function ɵɵcontainerRefreshEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
   if (getIsParent()) {
-    setIsParent(false);
+    setIsNotParent();
   } else {
     ngDevMode && assertNodeType(previousOrParentTNode, TNodeType.View);
     ngDevMode && assertHasParent(previousOrParentTNode);
     previousOrParentTNode = previousOrParentTNode.parent !;
-    setPreviousOrParentTNode(previousOrParentTNode);
+    setPreviousOrParentTNode(previousOrParentTNode, false);
   }
 
   ngDevMode && assertNodeType(previousOrParentTNode, TNodeType.Container);
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index ab7a79a4fe..ed404dbbf9 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {validateAgainstEventAttributes} from '../../sanitization/sanitization';
-import {assertDataInRange, assertEqual} from '../../util/assert';
+import {assertDataInRange, assertDefined, assertEqual} from '../../util/assert';
 import {assertHasParent} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {registerPostOrderHooks} from '../hooks';
@@ -18,7 +18,7 @@ import {BINDING_INDEX, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
 import {applyOnCreateInstructions} from '../node_util';
-import {decreaseElementDepthCount, getElementDepthCount, getIsParent, getLView, getPreviousOrParentTNode, getSelectedIndex, increaseElementDepthCount, setIsParent, setPreviousOrParentTNode} from '../state';
+import {decreaseElementDepthCount, getElementDepthCount, getIsParent, getLView, getPreviousOrParentTNode, getSelectedIndex, increaseElementDepthCount, setIsNotParent, setPreviousOrParentTNode} from '../state';
 import {getInitialClassNameValue, getInitialStyleStringValue, initializeStaticContext, patchContextWithStaticAttrs, renderInitialClasses, renderInitialStyles} from '../styling/class_and_style_bindings';
 import {getStylingContextFromLView, hasClassInput, hasStyleInput} from '../styling/util';
 import {registerInitialStylingIntoContext} from '../styling_next/instructions';
@@ -139,12 +139,13 @@ export function ɵɵelementStart(
  */
 export function ɵɵelementEnd(): void {
   let previousOrParentTNode = getPreviousOrParentTNode();
+  ngDevMode && assertDefined(previousOrParentTNode, 'No parent node to close.');
   if (getIsParent()) {
-    setIsParent(false);
+    setIsNotParent();
   } else {
     ngDevMode && assertHasParent(getPreviousOrParentTNode());
     previousOrParentTNode = previousOrParentTNode.parent !;
-    setPreviousOrParentTNode(previousOrParentTNode);
+    setPreviousOrParentTNode(previousOrParentTNode, false);
   }
 
   // this is required for all host-level styling-related instructions to run
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index 4ad34536f2..58db303b72 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -14,7 +14,8 @@ import {BINDING_INDEX, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
 import {applyOnCreateInstructions} from '../node_util';
-import {getIsParent, getLView, getPreviousOrParentTNode, setIsParent, setPreviousOrParentTNode} from '../state';
+import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from '../state';
+
 import {createDirectivesAndLocals, createNodeAtIndex, executeContentQueries, setNodeStylingTemplate} from './shared';
 
 /**
@@ -77,11 +78,11 @@ export function ɵɵelementContainerEnd(): void {
   const lView = getLView();
   const tView = lView[TVIEW];
   if (getIsParent()) {
-    setIsParent(false);
+    setIsNotParent();
   } else {
     ngDevMode && assertHasParent(previousOrParentTNode);
     previousOrParentTNode = previousOrParentTNode.parent !;
-    setPreviousOrParentTNode(previousOrParentTNode);
+    setPreviousOrParentTNode(previousOrParentTNode, false);
   }
 
   ngDevMode && assertNodeType(previousOrParentTNode, TNodeType.ElementContainer);
diff --git a/packages/core/src/render3/instructions/embedded_view.ts b/packages/core/src/render3/instructions/embedded_view.ts
index e2e5ea31f8..e805c59143 100644
--- a/packages/core/src/render3/instructions/embedded_view.ts
+++ b/packages/core/src/render3/instructions/embedded_view.ts
@@ -40,7 +40,7 @@ export function ɵɵembeddedViewStart(
   let viewToRender = scanForView(lContainer, lContainer[ACTIVE_INDEX] !, viewBlockId);
 
   if (viewToRender) {
-    setIsParent(true);
+    setIsParent();
     enterView(viewToRender, viewToRender[TVIEW].node);
   } else {
     // When we create a new LView, we always reset the state of the instructions.
@@ -141,6 +141,5 @@ export function ɵɵembeddedViewEnd(): void {
   const lContainer = lView[PARENT] as LContainer;
   ngDevMode && assertLContainerOrUndefined(lContainer);
   leaveView(lContainer[PARENT] !);
-  setPreviousOrParentTNode(viewHost !);
-  setIsParent(false);
+  setPreviousOrParentTNode(viewHost !, false);
 }
diff --git a/packages/core/src/render3/instructions/projection.ts b/packages/core/src/render3/instructions/projection.ts
index 301b43bc48..e36df3b93e 100644
--- a/packages/core/src/render3/instructions/projection.ts
+++ b/packages/core/src/render3/instructions/projection.ts
@@ -10,7 +10,7 @@ import {CssSelectorList} from '../interfaces/projection';
 import {T_HOST} from '../interfaces/view';
 import {appendProjectedNodes} from '../node_manipulation';
 import {matchingProjectionSelectorIndex} from '../node_selector_matcher';
-import {getLView, setIsParent} from '../state';
+import {getLView, setIsNotParent} from '../state';
 import {findComponentView} from '../util/view_traversal_utils';
 
 import {createNodeAtIndex} from './shared';
@@ -88,7 +88,7 @@ export function ɵɵprojection(
   if (tProjectionNode.projection === null) tProjectionNode.projection = selectorIndex;
 
   // `<ng-content>` has no content
-  setIsParent(false);
+  setIsNotParent();
 
   // re-distribution of projectable nodes is stored on a component's view level
   appendProjectedNodes(lView, tProjectionNode, selectorIndex, findComponentView(lView));
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index c2667855cf..85c8eb853e 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -287,8 +287,7 @@ export function createNodeAtIndex(
     }
   }
 
-  setPreviousOrParentTNode(tNode);
-  setIsParent(true);
+  setPreviousOrParentTNode(tNode, true);
   return tNode as TElementNode & TViewNode & TContainerNode & TElementContainerNode &
       TProjectionNode & TIcuContainerNode;
 }
@@ -351,8 +350,7 @@ export function createEmbeddedViewAndNode<T>(
     injectorIndex: number): LView {
   const _isParent = getIsParent();
   const _previousOrParentTNode = getPreviousOrParentTNode();
-  setIsParent(true);
-  setPreviousOrParentTNode(null !);
+  setPreviousOrParentTNode(null !, true);
 
   const lView = createLView(declarationView, tView, context, LViewFlags.CheckAlways, null, null);
   lView[DECLARATION_VIEW] = declarationView;
@@ -366,8 +364,7 @@ export function createEmbeddedViewAndNode<T>(
     tView.node !.injectorIndex = injectorIndex;
   }
 
-  setIsParent(_isParent);
-  setPreviousOrParentTNode(_previousOrParentTNode);
+  setPreviousOrParentTNode(_previousOrParentTNode, _isParent);
   return lView;
 }
 
@@ -390,8 +387,7 @@ export function renderEmbeddedTemplate<T>(viewToRender: LView, tView: TView, con
     tickRootContext(getRootContext(viewToRender));
   } else {
     try {
-      setIsParent(true);
-      setPreviousOrParentTNode(null !);
+      setPreviousOrParentTNode(null !, true);
 
       oldView = enterView(viewToRender, viewToRender[T_HOST]);
       resetPreOrderHookFlags(viewToRender);
@@ -406,8 +402,7 @@ export function renderEmbeddedTemplate<T>(viewToRender: LView, tView: TView, con
       refreshDescendantViews(viewToRender);
     } finally {
       leaveView(oldView !);
-      setIsParent(_isParent);
-      setPreviousOrParentTNode(_previousOrParentTNode);
+      setPreviousOrParentTNode(_previousOrParentTNode, _isParent);
     }
   }
 }
@@ -1254,7 +1249,7 @@ function addComponentLogic<T>(
       lView, createLView(
                  lView, tView, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
                  lView[previousOrParentTNode.index], previousOrParentTNode as TElementNode,
-                 rendererFactory, lView[RENDERER_FACTORY].createRenderer(native as RElement, def)));
+                 rendererFactory, rendererFactory.createRenderer(native as RElement, def)));
 
   componentView[T_HOST] = previousOrParentTNode as TElementNode;
 
@@ -1695,17 +1690,14 @@ export function storeBindingMetadata(lView: LView, prefix = '', suffix = ''): st
 
 export const CLEAN_PROMISE = _CLEAN_PROMISE;
 
-export function initializeTNodeInputs(tNode: TNode | null): PropertyAliases|null {
+export function initializeTNodeInputs(tNode: TNode): PropertyAliases|null {
   // If tNode.inputs is undefined, a listener has created outputs, but inputs haven't
   // yet been checked.
-  if (tNode) {
-    if (tNode.inputs === undefined) {
-      // mark inputs as checked
-      tNode.inputs = generatePropertyAliases(tNode, BindingDirection.Input);
-    }
-    return tNode.inputs;
+  if (tNode.inputs === undefined) {
+    // mark inputs as checked
+    tNode.inputs = generatePropertyAliases(tNode, BindingDirection.Input);
   }
-  return null;
+  return tNode.inputs;
 }
 
 
diff --git a/packages/core/src/render3/instructions/text.ts b/packages/core/src/render3/instructions/text.ts
index 13bff5d10d..df0a539473 100644
--- a/packages/core/src/render3/instructions/text.ts
+++ b/packages/core/src/render3/instructions/text.ts
@@ -10,7 +10,7 @@ import {TNodeType} from '../interfaces/node';
 import {RText, isProceduralRenderer} from '../interfaces/renderer';
 import {BINDING_INDEX, HEADER_OFFSET, RENDERER, TVIEW} from '../interfaces/view';
 import {appendChild, createTextNode} from '../node_manipulation';
-import {getLView, setIsParent} from '../state';
+import {getLView, setIsNotParent} from '../state';
 import {NO_CHANGE} from '../tokens';
 import {renderStringify} from '../util/misc_utils';
 import {getNativeByIndex} from '../util/view_utils';
@@ -34,7 +34,7 @@ export function ɵɵtext(index: number, value?: any): void {
   const tNode = createNodeAtIndex(index, TNodeType.Element, textNative, null, null);
 
   // Text nodes are self closing.
-  setIsParent(false);
+  setIsNotParent();
   appendChild(textNative, tNode, lView);
 }
 
diff --git a/packages/core/src/render3/state.ts b/packages/core/src/render3/state.ts
index 6d409d0b83..582d77e7bc 100644
--- a/packages/core/src/render3/state.ts
+++ b/packages/core/src/render3/state.ts
@@ -303,8 +303,9 @@ export function getPreviousOrParentTNode(): TNode {
   return previousOrParentTNode;
 }
 
-export function setPreviousOrParentTNode(tNode: TNode) {
+export function setPreviousOrParentTNode(tNode: TNode, _isParent: boolean) {
   previousOrParentTNode = tNode;
+  isParent = _isParent;
 }
 
 export function setTNodeAndViewData(tNode: TNode, view: LView) {
@@ -325,8 +326,11 @@ export function getIsParent(): boolean {
   return isParent;
 }
 
-export function setIsParent(value: boolean): void {
-  isParent = value;
+export function setIsNotParent(): void {
+  isParent = false;
+}
+export function setIsParent(): void {
+  isParent = true;
 }
 
 
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index a9e77d9110..4a213bed80 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -693,7 +693,7 @@
     "name": "setInputsFromAttrs"
   },
   {
-    "name": "setIsParent"
+    "name": "setIsNotParent"
   },
   {
     "name": "setNodeStylingTemplate"
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 7e4eba0c56..53c7d21ec3 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -468,7 +468,7 @@
     "name": "setInjectImplementation"
   },
   {
-    "name": "setIsParent"
+    "name": "setIsNotParent"
   },
   {
     "name": "setPreviousOrParentTNode"
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 8b49e0c126..d5aaa32bce 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -1386,7 +1386,7 @@
     "name": "setInputsFromAttrs"
   },
   {
-    "name": "setIsParent"
+    "name": "setIsNotParent"
   },
   {
     "name": "setNodeStylingTemplate"

From 5c5cee9f396a26046dd076b5b50cf05c40aa51ee Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Wed, 15 May 2019 20:59:55 -0700
Subject: [PATCH 170/275] refactor(ivy): t-functions should not depend on
 l-data (#30453)

PR Close #30453
---
 packages/core/src/render3/component.ts         |  5 ++++-
 packages/core/src/render3/i18n.ts              | 15 +++++++++------
 .../core/src/render3/instructions/container.ts |  8 +++++---
 .../core/src/render3/instructions/element.ts   | 11 ++++-------
 .../render3/instructions/element_container.ts  |  8 ++++----
 .../src/render3/instructions/projection.ts     |  6 +++---
 .../core/src/render3/instructions/shared.ts    | 18 +++++++-----------
 packages/core/src/render3/instructions/text.ts |  5 +++--
 packages/core/test/render3/di_spec.ts          |  2 +-
 9 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 7682ce0b6c..5fac476310 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -11,6 +11,7 @@
 import {Type} from '../core';
 import {Injector} from '../di/injector';
 import {Sanitizer} from '../sanitization/security';
+import {assertDataInRange, assertEqual} from '../util/assert';
 
 import {assertComponentType} from './assert';
 import {getComponentDef} from './definition';
@@ -172,7 +173,9 @@ export function createRootComponentView(
     rendererFactory: RendererFactory3, renderer: Renderer3, sanitizer?: Sanitizer | null): LView {
   resetComponentState();
   const tView = rootView[TVIEW];
-  const tNode: TElementNode = createNodeAtIndex(0, TNodeType.Element, rNode, null, null);
+  ngDevMode && assertDataInRange(rootView, 0 + HEADER_OFFSET);
+  rootView[0 + HEADER_OFFSET] = rNode;
+  const tNode: TElementNode = createNodeAtIndex(0, TNodeType.Element, null, null);
   const componentView = createLView(
       rootView, getOrCreateTView(def), null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
       rootView[HEADER_OFFSET], tNode, rendererFactory, renderer, sanitizer);
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 0d9acf4c1a..940160ce15 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -12,7 +12,7 @@ import {SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS, getTemplateContent
 import {InertBodyHelper} from '../sanitization/inert_body';
 import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer';
 import {addAllToArray} from '../util/array_utils';
-import {assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
+import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
 
 import {attachPatchData} from './context_discovery';
 import {attachI18nOpCodesDebug} from './debug';
@@ -671,10 +671,12 @@ function i18nEndFirstPass(tView: TView) {
  * Creates and stores the dynamic TNode, and unhooks it from the tree for now.
  */
 function createDynamicNodeAtIndex(
-    index: number, type: TNodeType, native: RElement | RText | null,
+    lView: LView, index: number, type: TNodeType, native: RElement | RText | null,
     name: string | null): TElementNode|TIcuContainerNode {
   const previousOrParentTNode = getPreviousOrParentTNode();
-  const tNode = createNodeAtIndex(index, type as any, native, name, null);
+  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
+  lView[index + HEADER_OFFSET] = native;
+  const tNode = createNodeAtIndex(index, type as any, name, null);
 
   // We are creating a dynamic node, the previous tNode might not be pointing at this node.
   // We will link ourselves into the tree later with `appendI18nNode`.
@@ -699,7 +701,8 @@ function readCreateOpCodes(
       const textNodeIndex = createOpCodes[++i] as number;
       ngDevMode && ngDevMode.rendererCreateTextNode++;
       previousTNode = currentTNode;
-      currentTNode = createDynamicNodeAtIndex(textNodeIndex, TNodeType.Element, textRNode, null);
+      currentTNode =
+          createDynamicNodeAtIndex(viewData, textNodeIndex, TNodeType.Element, textRNode, null);
       visitedNodes.push(textNodeIndex);
       setIsNotParent();
     } else if (typeof opCode == 'number') {
@@ -755,7 +758,7 @@ function readCreateOpCodes(
           ngDevMode && ngDevMode.rendererCreateComment++;
           previousTNode = currentTNode;
           currentTNode = createDynamicNodeAtIndex(
-              commentNodeIndex, TNodeType.IcuContainer, commentRNode, null);
+              viewData, commentNodeIndex, TNodeType.IcuContainer, commentRNode, null);
           visitedNodes.push(commentNodeIndex);
           attachPatchData(commentRNode, viewData);
           (currentTNode as TIcuContainerNode).activeCaseIndex = null;
@@ -772,7 +775,7 @@ function readCreateOpCodes(
           ngDevMode && ngDevMode.rendererCreateElement++;
           previousTNode = currentTNode;
           currentTNode = createDynamicNodeAtIndex(
-              elementNodeIndex, TNodeType.Element, elementRNode, tagNameValue);
+              viewData, elementNodeIndex, TNodeType.Element, elementRNode, tagNameValue);
           visitedNodes.push(elementNodeIndex);
           break;
         default:
diff --git a/packages/core/src/render3/instructions/container.ts b/packages/core/src/render3/instructions/container.ts
index 5dda4b18ee..f66e488bb7 100644
--- a/packages/core/src/render3/instructions/container.ts
+++ b/packages/core/src/render3/instructions/container.ts
@@ -5,7 +5,7 @@
  * 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 {assertEqual} from '../../util/assert';
+import {assertDataInRange, assertEqual} from '../../util/assert';
 import {assertHasParent} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {executePreOrderHooks, registerPostOrderHooks} from '../hooks';
@@ -164,9 +164,11 @@ function containerInternal(
                    'container nodes should be created before any bindings');
 
   const adjustedIndex = index + HEADER_OFFSET;
-  const comment = lView[RENDERER].createComment(ngDevMode ? 'container' : '');
+  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
   ngDevMode && ngDevMode.rendererCreateComment++;
-  const tNode = createNodeAtIndex(index, TNodeType.Container, comment, tagName, attrs);
+  const comment = lView[index + HEADER_OFFSET] =
+      lView[RENDERER].createComment(ngDevMode ? 'container' : '');
+  const tNode = createNodeAtIndex(index, TNodeType.Container, tagName, attrs);
   const lContainer = lView[adjustedIndex] =
       createLContainer(lView[adjustedIndex], lView, comment, tNode);
 
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index ed404dbbf9..a603edca0f 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -14,7 +14,7 @@ import {TAttributes, TNodeFlags, TNodeType} from '../interfaces/node';
 import {RElement, isProceduralRenderer} from '../interfaces/renderer';
 import {SanitizerFn} from '../interfaces/sanitization';
 import {StylingContext} from '../interfaces/styling';
-import {BINDING_INDEX, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
 import {applyOnCreateInstructions} from '../node_util';
@@ -55,13 +55,10 @@ export function ɵɵelementStart(
                    'elements should be created before any bindings ');
 
   ngDevMode && ngDevMode.rendererCreateElement++;
-
-  const native = elementCreate(name);
+  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
+  const native = lView[index + HEADER_OFFSET] = elementCreate(name);
   const renderer = lView[RENDERER];
-
-  ngDevMode && assertDataInRange(lView, index - 1);
-
-  const tNode = createNodeAtIndex(index, TNodeType.Element, native !, name, attrs || null);
+  const tNode = createNodeAtIndex(index, TNodeType.Element, name, attrs || null);
   let initialStylesIndex = 0;
   let initialClassesIndex = 0;
 
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index 58db303b72..dac999f7a1 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -10,7 +10,7 @@ import {assertHasParent} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {registerPostOrderHooks} from '../hooks';
 import {TAttributes, TNodeType} from '../interfaces/node';
-import {BINDING_INDEX, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
 import {applyOnCreateInstructions} from '../node_util';
@@ -43,11 +43,11 @@ export function ɵɵelementContainerStart(
                    'element containers should be created before any bindings');
 
   ngDevMode && ngDevMode.rendererCreateComment++;
-  const native = renderer.createComment(ngDevMode ? tagName : '');
+  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
+  const native = lView[index + HEADER_OFFSET] = renderer.createComment(ngDevMode ? tagName : '');
 
   ngDevMode && assertDataInRange(lView, index - 1);
-  const tNode =
-      createNodeAtIndex(index, TNodeType.ElementContainer, native, tagName, attrs || null);
+  const tNode = createNodeAtIndex(index, TNodeType.ElementContainer, tagName, attrs || null);
 
 
   if (attrs) {
diff --git a/packages/core/src/render3/instructions/projection.ts b/packages/core/src/render3/instructions/projection.ts
index e36df3b93e..efe348ee10 100644
--- a/packages/core/src/render3/instructions/projection.ts
+++ b/packages/core/src/render3/instructions/projection.ts
@@ -5,9 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import {assertDataInRange} from '../../util/assert';
 import {TAttributes, TElementNode, TNode, TNodeType} from '../interfaces/node';
 import {CssSelectorList} from '../interfaces/projection';
-import {T_HOST} from '../interfaces/view';
+import {HEADER_OFFSET, T_HOST} from '../interfaces/view';
 import {appendProjectedNodes} from '../node_manipulation';
 import {matchingProjectionSelectorIndex} from '../node_selector_matcher';
 import {getLView, setIsNotParent} from '../state';
@@ -81,8 +82,7 @@ export function ɵɵprojectionDef(selectors?: CssSelectorList[]): void {
 export function ɵɵprojection(
     nodeIndex: number, selectorIndex: number = 0, attrs?: TAttributes): void {
   const lView = getLView();
-  const tProjectionNode =
-      createNodeAtIndex(nodeIndex, TNodeType.Projection, null, null, attrs || null);
+  const tProjectionNode = createNodeAtIndex(nodeIndex, TNodeType.Projection, null, attrs || null);
 
   // We can't use viewData[HOST_NODE] because projection nodes can be nested in embedded views.
   if (tProjectionNode.projection === null) tProjectionNode.projection = selectorIndex;
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 85c8eb853e..43dfcefe84 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -233,30 +233,26 @@ export function createLView<T>(
  * @param attrs Any attrs for the native element, if applicable
  */
 export function createNodeAtIndex(
-    index: number, type: TNodeType.Element, native: RElement | RText | null, name: string | null,
+    index: number, type: TNodeType.Element, name: string | null,
     attrs: TAttributes | null): TElementNode;
 export function createNodeAtIndex(
-    index: number, type: TNodeType.Container, native: RComment, name: string | null,
+    index: number, type: TNodeType.Container, name: string | null,
     attrs: TAttributes | null): TContainerNode;
 export function createNodeAtIndex(
-    index: number, type: TNodeType.Projection, native: null, name: null,
+    index: number, type: TNodeType.Projection, name: null,
     attrs: TAttributes | null): TProjectionNode;
 export function createNodeAtIndex(
-    index: number, type: TNodeType.ElementContainer, native: RComment, name: string | null,
+    index: number, type: TNodeType.ElementContainer, name: string | null,
     attrs: TAttributes | null): TElementContainerNode;
 export function createNodeAtIndex(
-    index: number, type: TNodeType.IcuContainer, native: RComment, name: null,
+    index: number, type: TNodeType.IcuContainer, name: null,
     attrs: TAttributes | null): TElementContainerNode;
 export function createNodeAtIndex(
-    index: number, type: TNodeType, native: RText | RElement | RComment | null, name: string | null,
-    attrs: TAttributes | null): TElementNode&TContainerNode&TElementContainerNode&TProjectionNode&
-    TIcuContainerNode {
+    index: number, type: TNodeType, name: string | null, attrs: TAttributes | null): TElementNode&
+    TContainerNode&TElementContainerNode&TProjectionNode&TIcuContainerNode {
   const lView = getLView();
   const tView = lView[TVIEW];
   const adjustedIndex = index + HEADER_OFFSET;
-  ngDevMode &&
-      assertLessThan(adjustedIndex, lView.length, `Slot should have been initialized with null`);
-  lView[adjustedIndex] = native;
 
   const previousOrParentTNode = getPreviousOrParentTNode();
   let tNode = tView.data[adjustedIndex] as TNode;
diff --git a/packages/core/src/render3/instructions/text.ts b/packages/core/src/render3/instructions/text.ts
index df0a539473..0833ddf958 100644
--- a/packages/core/src/render3/instructions/text.ts
+++ b/packages/core/src/render3/instructions/text.ts
@@ -30,8 +30,9 @@ export function ɵɵtext(index: number, value?: any): void {
                    lView[BINDING_INDEX], lView[TVIEW].bindingStartIndex,
                    'text nodes should be created before any bindings');
   ngDevMode && ngDevMode.rendererCreateTextNode++;
-  const textNative = createTextNode(value, lView[RENDERER]);
-  const tNode = createNodeAtIndex(index, TNodeType.Element, textNative, null, null);
+  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
+  const textNative = lView[index + HEADER_OFFSET] = createTextNode(value, lView[RENDERER]);
+  const tNode = createNodeAtIndex(index, TNodeType.Element, null, null);
 
   // Text nodes are self closing.
   setIsNotParent();
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 7ad45750f1..d4ac5315ab 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -605,7 +605,7 @@ describe('di', () => {
           null, null, {} as any, {} as any);
       const oldView = enterView(contentView, null);
       try {
-        const parentTNode = createNodeAtIndex(0, TNodeType.Element, null, null, null);
+        const parentTNode = createNodeAtIndex(0, TNodeType.Element, null, null);
         // Simulate the situation where the previous parent is not initialized.
         // This happens on first bootstrap because we don't init existing values
         // so that we have smaller HelloWorld.

From 01cf04c85fd93354339c589ef520c8c480ea6073 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Wed, 15 May 2019 21:08:31 -0700
Subject: [PATCH 171/275] refactor(ivy): createNodeAtIndex links TNodes on
 first pass only (#30453)

PR Close #30453
---
 .../core/src/render3/instructions/shared.ts   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 43dfcefe84..d94795fc78 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -253,10 +253,9 @@ export function createNodeAtIndex(
   const lView = getLView();
   const tView = lView[TVIEW];
   const adjustedIndex = index + HEADER_OFFSET;
-
-  const previousOrParentTNode = getPreviousOrParentTNode();
   let tNode = tView.data[adjustedIndex] as TNode;
   if (tNode == null) {
+    const previousOrParentTNode = getPreviousOrParentTNode();
     const isParent = getIsParent();
     const parent =
         isParent ? previousOrParentTNode : previousOrParentTNode && previousOrParentTNode.parent;
@@ -369,7 +368,8 @@ export function createEmbeddedViewAndNode<T>(
  *
  * Dynamically created views must store/retrieve their TViews differently from component views
  * because their template functions are nested in the template functions of their hosts, creating
- * closures. If their host template happens to be an embedded template in a loop (e.g. ngFor inside
+ * closures. If their host template happens to be an embedded template in a loop (e.g. ngFor
+ * inside
  * an ngFor), the nesting would mean we'd have multiple instances of the template function, so we
  * can't store TViews in the template function itself (as we do for comps). Instead, we store the
  * TView for dynamically created views on their host TNode, which only has one instance.
@@ -811,7 +811,8 @@ export function elementPropertyInternal<T>(
     savePropertyDebugData(tNode, lView, propName, lView[TVIEW].data, nativeOnly);
 
     const renderer = loadRendererFn ? loadRendererFn(tNode, lView) : lView[RENDERER];
-    // It is assumed that the sanitizer is only added when the compiler determines that the property
+    // It is assumed that the sanitizer is only added when the compiler determines that the
+    // property
     // is risky, so sanitization can be done without further checks.
     value = sanitizer != null ? (sanitizer(value, tNode.tagName || '', propName) as any) : value;
     if (isProceduralRenderer(renderer)) {
@@ -957,7 +958,8 @@ export function instantiateRootComponent<T>(
 function resolveDirectives(
     tView: TView, viewData: LView, directives: DirectiveDef<any>[] | null, tNode: TNode,
     localRefs: string[] | null): void {
-  // Please make sure to have explicit type for `exportsMap`. Inferred type triggers bug in tsickle.
+  // Please make sure to have explicit type for `exportsMap`. Inferred type triggers bug in
+  // tsickle.
   ngDevMode && assertEqual(tView.firstTemplatePass, true, 'should run on first template pass only');
   const exportsMap: ({[key: string]: number} | null) = localRefs ? {'': -1} : null;
   if (directives) {
@@ -1383,7 +1385,8 @@ export function createLContainer(
 
 
 /**
- * Goes over dynamic embedded views (ones created through ViewContainerRef APIs) and refreshes them
+ * Goes over dynamic embedded views (ones created through ViewContainerRef APIs) and refreshes
+ * them
  * by executing an associated template function.
  */
 function refreshDynamicEmbeddedViews(lView: LView) {
@@ -1394,7 +1397,8 @@ function refreshDynamicEmbeddedViews(lView: LView) {
     if (current[ACTIVE_INDEX] === -1 && isLContainer(current)) {
       for (let i = CONTAINER_HEADER_OFFSET; i < current.length; i++) {
         const dynamicViewData = current[i];
-        // The directives and pipes are not needed here as an existing view is only being refreshed.
+        // The directives and pipes are not needed here as an existing view is only being
+        // refreshed.
         ngDevMode && assertDefined(dynamicViewData[TVIEW], 'TView must be allocated');
         renderEmbeddedTemplate(dynamicViewData, dynamicViewData[TVIEW], dynamicViewData[CONTEXT] !);
       }
@@ -1471,9 +1475,12 @@ function syncViewWithBlueprint(componentView: LView) {
  * @returns The state passed in
  */
 export function addToViewTree<T extends LView|LContainer>(lView: LView, lViewOrLContainer: T): T {
-  // TODO(benlesh/misko): This implementation is incorrect, because it always adds the LContainer to
-  // the end of the queue, which means if the developer retrieves the LContainers from RNodes out of
-  // order, the change detection will run out of order, as the act of retrieving the the LContainer
+  // TODO(benlesh/misko): This implementation is incorrect, because it always adds the LContainer
+  // to
+  // the end of the queue, which means if the developer retrieves the LContainers from RNodes out
+  // of
+  // order, the change detection will run out of order, as the act of retrieving the the
+  // LContainer
   // from the RNode is what adds it to the queue.
   if (lView[CHILD_HEAD]) {
     lView[CHILD_TAIL] ![NEXT] = lViewOrLContainer;
@@ -1626,7 +1633,8 @@ export function checkNoChangesInRootView(lView: LView): void {
   }
 }
 
-/** Checks the view of the component provided. Does not gate on dirty checks or execute doCheck. */
+/** Checks the view of the component provided. Does not gate on dirty checks or execute doCheck.
+ */
 export function checkView<T>(hostView: LView, component: T) {
   const hostTView = hostView[TVIEW];
   const oldView = enterView(hostView, hostView[T_HOST]);

From 21e8ac1e0233b08a5eef14ee5344568cd5c6b9d9 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Wed, 15 May 2019 22:51:40 -0700
Subject: [PATCH 172/275] refactor(ivy): createNodeAtIndex no longer depends on
 L* (#30453)

PR Close #30453
---
 packages/core/src/render3/component.ts        |   4 +-
 packages/core/src/render3/i18n.ts             |   4 +-
 .../src/render3/instructions/container.ts     |   9 +-
 .../core/src/render3/instructions/element.ts  |   9 +-
 .../render3/instructions/element_container.ts |   8 +-
 .../src/render3/instructions/projection.ts    |   8 +-
 .../core/src/render3/instructions/shared.ts   | 100 ++++++++++--------
 .../core/src/render3/instructions/text.ts     |   6 +-
 .../cyclic_import/bundle.golden_symbols.json  |   9 +-
 .../hello_world/bundle.golden_symbols.json    |   9 +-
 .../bundling/todo/bundle.golden_symbols.json  |   9 +-
 packages/core/test/render3/di_spec.ts         |   7 +-
 packages/core/test/render3/render_util.ts     |  12 ++-
 13 files changed, 111 insertions(+), 83 deletions(-)

diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 5fac476310..6f436b01f8 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -17,7 +17,7 @@ import {assertComponentType} from './assert';
 import {getComponentDef} from './definition';
 import {diPublicInInjector, getOrCreateNodeInjectorForNode} from './di';
 import {registerPostOrderHooks, registerPreOrderHooks} from './hooks';
-import {CLEAN_PROMISE, addToViewTree, createLView, createNodeAtIndex, createTView, getOrCreateTView, initNodeFlags, instantiateRootComponent, invokeHostBindingsInCreationMode, locateHostElement, queueComponentIndexForCheck, refreshDescendantViews} from './instructions/shared';
+import {CLEAN_PROMISE, addToViewTree, createLView, createTView, getOrCreateTNode, getOrCreateTView, initNodeFlags, instantiateRootComponent, invokeHostBindingsInCreationMode, locateHostElement, queueComponentIndexForCheck, refreshDescendantViews} from './instructions/shared';
 import {ComponentDef, ComponentType, RenderFlags} from './interfaces/definition';
 import {TElementNode, TNode, TNodeFlags, TNodeType} from './interfaces/node';
 import {PlayerHandler} from './interfaces/player';
@@ -175,7 +175,7 @@ export function createRootComponentView(
   const tView = rootView[TVIEW];
   ngDevMode && assertDataInRange(rootView, 0 + HEADER_OFFSET);
   rootView[0 + HEADER_OFFSET] = rNode;
-  const tNode: TElementNode = createNodeAtIndex(0, TNodeType.Element, null, null);
+  const tNode: TElementNode = getOrCreateTNode(tView, null, 0, TNodeType.Element, null, null);
   const componentView = createLView(
       rootView, getOrCreateTView(def), null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways,
       rootView[HEADER_OFFSET], tNode, rendererFactory, renderer, sanitizer);
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 940160ce15..5cfb37f14e 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -17,7 +17,7 @@ import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '
 import {attachPatchData} from './context_discovery';
 import {attachI18nOpCodesDebug} from './debug';
 import {ɵɵelementAttribute, ɵɵload, ɵɵtextBinding} from './instructions/all';
-import {allocExpando, createNodeAtIndex} from './instructions/shared';
+import {allocExpando, getOrCreateTNode} from './instructions/shared';
 import {LContainer, NATIVE} from './interfaces/container';
 import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
 import {TElementNode, TIcuContainerNode, TNode, TNodeType} from './interfaces/node';
@@ -676,7 +676,7 @@ function createDynamicNodeAtIndex(
   const previousOrParentTNode = getPreviousOrParentTNode();
   ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
   lView[index + HEADER_OFFSET] = native;
-  const tNode = createNodeAtIndex(index, type as any, name, null);
+  const tNode = getOrCreateTNode(lView[TVIEW], lView[T_HOST], index, type as any, name, null);
 
   // We are creating a dynamic node, the previous tNode might not be pointing at this node.
   // We will link ourselves into the tree later with `appendI18nNode`.
diff --git a/packages/core/src/render3/instructions/container.ts b/packages/core/src/render3/instructions/container.ts
index f66e488bb7..c3869b2698 100644
--- a/packages/core/src/render3/instructions/container.ts
+++ b/packages/core/src/render3/instructions/container.ts
@@ -12,12 +12,14 @@ import {executePreOrderHooks, registerPostOrderHooks} from '../hooks';
 import {ACTIVE_INDEX, CONTAINER_HEADER_OFFSET, LContainer} from '../interfaces/container';
 import {ComponentTemplate} from '../interfaces/definition';
 import {LocalRefExtractor, TAttributes, TContainerNode, TNode, TNodeType} from '../interfaces/node';
-import {BINDING_INDEX, HEADER_OFFSET, LView, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, LView, QUERIES, RENDERER, TVIEW, T_HOST} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild, removeView} from '../node_manipulation';
 import {getCheckNoChangesMode, getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from '../state';
 import {getNativeByTNode, loadInternal} from '../util/view_utils';
-import {addToViewTree, createDirectivesAndLocals, createLContainer, createNodeAtIndex, createTView} from './shared';
+
+import {addToViewTree, createDirectivesAndLocals, createLContainer, createTView, getOrCreateTNode} from './shared';
+
 
 /**
  * Creates an LContainer for inline views, e.g.
@@ -168,7 +170,8 @@ function containerInternal(
   ngDevMode && ngDevMode.rendererCreateComment++;
   const comment = lView[index + HEADER_OFFSET] =
       lView[RENDERER].createComment(ngDevMode ? 'container' : '');
-  const tNode = createNodeAtIndex(index, TNodeType.Container, tagName, attrs);
+  const tNode =
+      getOrCreateTNode(lView[TVIEW], lView[T_HOST], index, TNodeType.Container, tagName, attrs);
   const lContainer = lView[adjustedIndex] =
       createLContainer(lView[adjustedIndex], lView, comment, tNode);
 
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index a603edca0f..b75bc91eb8 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -14,7 +14,7 @@ import {TAttributes, TNodeFlags, TNodeType} from '../interfaces/node';
 import {RElement, isProceduralRenderer} from '../interfaces/renderer';
 import {SanitizerFn} from '../interfaces/sanitization';
 import {StylingContext} from '../interfaces/styling';
-import {BINDING_INDEX, HEADER_OFFSET, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, QUERIES, RENDERER, TVIEW, T_HOST} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
 import {applyOnCreateInstructions} from '../node_util';
@@ -27,10 +27,12 @@ import {NO_CHANGE} from '../tokens';
 import {attrsStylingIndexOf, setUpAttributes} from '../util/attrs_utils';
 import {renderStringify} from '../util/misc_utils';
 import {getNativeByIndex, getNativeByTNode, getTNode} from '../util/view_utils';
-import {createDirectivesAndLocals, createNodeAtIndex, elementCreate, executeContentQueries, initializeTNodeInputs, setInputsForProperty, setNodeStylingTemplate} from './shared';
+
+import {createDirectivesAndLocals, elementCreate, executeContentQueries, getOrCreateTNode, initializeTNodeInputs, setInputsForProperty, setNodeStylingTemplate} from './shared';
 import {getActiveDirectiveStylingIndex} from './styling';
 
 
+
 /**
  * Create DOM element. The instruction must later be followed by `elementEnd()` call.
  *
@@ -58,7 +60,8 @@ export function ɵɵelementStart(
   ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
   const native = lView[index + HEADER_OFFSET] = elementCreate(name);
   const renderer = lView[RENDERER];
-  const tNode = createNodeAtIndex(index, TNodeType.Element, name, attrs || null);
+  const tNode =
+      getOrCreateTNode(tView, lView[T_HOST], index, TNodeType.Element, name, attrs || null);
   let initialStylesIndex = 0;
   let initialClassesIndex = 0;
 
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index dac999f7a1..1c38196a91 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -10,13 +10,14 @@ import {assertHasParent} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {registerPostOrderHooks} from '../hooks';
 import {TAttributes, TNodeType} from '../interfaces/node';
-import {BINDING_INDEX, HEADER_OFFSET, QUERIES, RENDERER, TVIEW} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, QUERIES, RENDERER, TVIEW, T_HOST} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
 import {applyOnCreateInstructions} from '../node_util';
 import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from '../state';
 
-import {createDirectivesAndLocals, createNodeAtIndex, executeContentQueries, setNodeStylingTemplate} from './shared';
+import {createDirectivesAndLocals, executeContentQueries, getOrCreateTNode, setNodeStylingTemplate} from './shared';
+
 
 /**
  * Creates a logical container for other nodes (<ng-container>) backed by a comment node in the DOM.
@@ -47,7 +48,8 @@ export function ɵɵelementContainerStart(
   const native = lView[index + HEADER_OFFSET] = renderer.createComment(ngDevMode ? tagName : '');
 
   ngDevMode && assertDataInRange(lView, index - 1);
-  const tNode = createNodeAtIndex(index, TNodeType.ElementContainer, tagName, attrs || null);
+  const tNode = getOrCreateTNode(
+      tView, lView[T_HOST], index, TNodeType.ElementContainer, tagName, attrs || null);
 
 
   if (attrs) {
diff --git a/packages/core/src/render3/instructions/projection.ts b/packages/core/src/render3/instructions/projection.ts
index efe348ee10..9d8f699734 100644
--- a/packages/core/src/render3/instructions/projection.ts
+++ b/packages/core/src/render3/instructions/projection.ts
@@ -8,13 +8,14 @@
 import {assertDataInRange} from '../../util/assert';
 import {TAttributes, TElementNode, TNode, TNodeType} from '../interfaces/node';
 import {CssSelectorList} from '../interfaces/projection';
-import {HEADER_OFFSET, T_HOST} from '../interfaces/view';
+import {HEADER_OFFSET, TVIEW, T_HOST} from '../interfaces/view';
 import {appendProjectedNodes} from '../node_manipulation';
 import {matchingProjectionSelectorIndex} from '../node_selector_matcher';
 import {getLView, setIsNotParent} from '../state';
 import {findComponentView} from '../util/view_traversal_utils';
 
-import {createNodeAtIndex} from './shared';
+import {getOrCreateTNode} from './shared';
+
 
 
 /**
@@ -82,7 +83,8 @@ export function ɵɵprojectionDef(selectors?: CssSelectorList[]): void {
 export function ɵɵprojection(
     nodeIndex: number, selectorIndex: number = 0, attrs?: TAttributes): void {
   const lView = getLView();
-  const tProjectionNode = createNodeAtIndex(nodeIndex, TNodeType.Projection, null, attrs || null);
+  const tProjectionNode = getOrCreateTNode(
+      lView[TVIEW], lView[T_HOST], nodeIndex, TNodeType.Projection, null, attrs || null);
 
   // We can't use viewData[HOST_NODE] because projection nodes can be nested in embedded views.
   if (tProjectionNode.projection === null) tProjectionNode.projection = selectorIndex;
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index d94795fc78..948c3617d5 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -225,6 +225,10 @@ export function createLView<T>(
 /**
  * Create and stores the TNode, and hooks it up to the tree.
  *
+ * @param tView The current `TView`.
+ * @param tHostNode This is a hack and we should not have to pass this value in. It is only used to
+ * determine if the parent belongs to a different tView. Instead we should not have parentTView
+ * point to TView other the current one.
  * @param index The index at which the TNode should be saved (null if view, since they are not
  * saved).
  * @param type The type of TNode to create
@@ -232,61 +236,63 @@ export function createLView<T>(
  * @param name The tag name of the associated native element, if applicable
  * @param attrs Any attrs for the native element, if applicable
  */
-export function createNodeAtIndex(
-    index: number, type: TNodeType.Element, name: string | null,
-    attrs: TAttributes | null): TElementNode;
-export function createNodeAtIndex(
-    index: number, type: TNodeType.Container, name: string | null,
-    attrs: TAttributes | null): TContainerNode;
-export function createNodeAtIndex(
-    index: number, type: TNodeType.Projection, name: null,
+export function getOrCreateTNode(
+    tView: TView, tHostNode: TNode | null, index: number, type: TNodeType.Element,
+    name: string | null, attrs: TAttributes | null): TElementNode;
+export function getOrCreateTNode(
+    tView: TView, tHostNode: TNode | null, index: number, type: TNodeType.Container,
+    name: string | null, attrs: TAttributes | null): TContainerNode;
+export function getOrCreateTNode(
+    tView: TView, tHostNode: TNode | null, index: number, type: TNodeType.Projection, name: null,
     attrs: TAttributes | null): TProjectionNode;
-export function createNodeAtIndex(
-    index: number, type: TNodeType.ElementContainer, name: string | null,
+export function getOrCreateTNode(
+    tView: TView, tHostNode: TNode | null, index: number, type: TNodeType.ElementContainer,
+    name: string | null, attrs: TAttributes | null): TElementContainerNode;
+export function getOrCreateTNode(
+    tView: TView, tHostNode: TNode | null, index: number, type: TNodeType.IcuContainer, name: null,
     attrs: TAttributes | null): TElementContainerNode;
-export function createNodeAtIndex(
-    index: number, type: TNodeType.IcuContainer, name: null,
-    attrs: TAttributes | null): TElementContainerNode;
-export function createNodeAtIndex(
-    index: number, type: TNodeType, name: string | null, attrs: TAttributes | null): TElementNode&
-    TContainerNode&TElementContainerNode&TProjectionNode&TIcuContainerNode {
-  const lView = getLView();
-  const tView = lView[TVIEW];
+export function getOrCreateTNode(
+    tView: TView, tHostNode: TNode | null, index: number, type: TNodeType, name: string | null,
+    attrs: TAttributes | null): TElementNode&TContainerNode&TElementContainerNode&TProjectionNode&
+    TIcuContainerNode {
+  // Keep this function short, so that the VM will inline it.
   const adjustedIndex = index + HEADER_OFFSET;
-  let tNode = tView.data[adjustedIndex] as TNode;
-  if (tNode == null) {
-    const previousOrParentTNode = getPreviousOrParentTNode();
-    const isParent = getIsParent();
-    const parent =
-        isParent ? previousOrParentTNode : previousOrParentTNode && previousOrParentTNode.parent;
-
-    // Parents cannot cross component boundaries because components will be used in multiple places,
-    // so it's only set if the view is the same.
-    const parentInSameView = parent && parent !== lView[T_HOST];
-    const tParentNode = parentInSameView ? parent as TElementNode | TContainerNode : null;
-
-    tNode = tView.data[adjustedIndex] = createTNode(tParentNode, type, adjustedIndex, name, attrs);
-
-    // Now link ourselves into the tree.
-    if (previousOrParentTNode) {
-      if (isParent && previousOrParentTNode.child == null &&
-          (tNode.parent !== null || previousOrParentTNode.type === TNodeType.View)) {
-        // We are in the same view, which means we are adding content node to the parent view.
-        previousOrParentTNode.child = tNode;
-      } else if (!isParent) {
-        previousOrParentTNode.next = tNode;
-      }
-    }
-    if (index === 0) {
-      tView.firstChild = tNode;
-    }
-  }
-
+  const tNode = tView.data[adjustedIndex] as TNode ||
+      createTNodeAtIndex(tView, tHostNode, adjustedIndex, type, name, attrs, index);
   setPreviousOrParentTNode(tNode, true);
   return tNode as TElementNode & TViewNode & TContainerNode & TElementContainerNode &
       TProjectionNode & TIcuContainerNode;
 }
 
+function createTNodeAtIndex(
+    tView: TView, tHostNode: TNode | null, adjustedIndex: number, type: TNodeType,
+    name: string | null, attrs: TAttributes | null, index: number) {
+  const previousOrParentTNode = getPreviousOrParentTNode();
+  const isParent = getIsParent();
+  const parent =
+      isParent ? previousOrParentTNode : previousOrParentTNode && previousOrParentTNode.parent;
+  // Parents cannot cross component boundaries because components will be used in multiple places,
+  // so it's only set if the view is the same.
+  const parentInSameView = parent && parent !== tHostNode;
+  const tParentNode = parentInSameView ? parent as TElementNode | TContainerNode : null;
+  const tNode = tView.data[adjustedIndex] =
+      createTNode(tParentNode, type, adjustedIndex, name, attrs);
+  if (index === 0) {
+    tView.firstChild = tNode;
+  }
+  // Now link ourselves into the tree.
+  if (previousOrParentTNode) {
+    if (isParent && previousOrParentTNode.child == null &&
+        (tNode.parent !== null || previousOrParentTNode.type === TNodeType.View)) {
+      // We are in the same view, which means we are adding content node to the parent view.
+      previousOrParentTNode.child = tNode;
+    } else if (!isParent) {
+      previousOrParentTNode.next = tNode;
+    }
+  }
+  return tNode;
+}
+
 export function assignTViewNodeToLView(
     tView: TView, tParentNode: TNode | null, index: number, lView: LView): TViewNode {
   // View nodes are not stored in data because they can be added / removed at runtime (which
diff --git a/packages/core/src/render3/instructions/text.ts b/packages/core/src/render3/instructions/text.ts
index 0833ddf958..7d11848ec4 100644
--- a/packages/core/src/render3/instructions/text.ts
+++ b/packages/core/src/render3/instructions/text.ts
@@ -8,13 +8,13 @@
 import {assertDataInRange, assertDefined, assertEqual} from '../../util/assert';
 import {TNodeType} from '../interfaces/node';
 import {RText, isProceduralRenderer} from '../interfaces/renderer';
-import {BINDING_INDEX, HEADER_OFFSET, RENDERER, TVIEW} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, RENDERER, TVIEW, T_HOST} from '../interfaces/view';
 import {appendChild, createTextNode} from '../node_manipulation';
 import {getLView, setIsNotParent} from '../state';
 import {NO_CHANGE} from '../tokens';
 import {renderStringify} from '../util/misc_utils';
 import {getNativeByIndex} from '../util/view_utils';
-import {createNodeAtIndex} from './shared';
+import {getOrCreateTNode} from './shared';
 
 /**
  * Create static text node
@@ -32,7 +32,7 @@ export function ɵɵtext(index: number, value?: any): void {
   ngDevMode && ngDevMode.rendererCreateTextNode++;
   ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
   const textNative = lView[index + HEADER_OFFSET] = createTextNode(value, lView[RENDERER]);
-  const tNode = createNodeAtIndex(index, TNodeType.Element, null, null);
+  const tNode = getOrCreateTNode(lView[TVIEW], lView[T_HOST], index, TNodeType.Element, null, null);
 
   // Text nodes are self closing.
   setIsNotParent();
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index 4a213bed80..191b915e60 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -245,9 +245,6 @@
   {
     "name": "createLView"
   },
-  {
-    "name": "createNodeAtIndex"
-  },
   {
     "name": "createRootComponent"
   },
@@ -260,6 +257,9 @@
   {
     "name": "createTNode"
   },
+  {
+    "name": "createTNodeAtIndex"
+  },
   {
     "name": "createTView"
   },
@@ -404,6 +404,9 @@
   {
     "name": "getOrCreateNodeInjectorForNode"
   },
+  {
+    "name": "getOrCreateTNode"
+  },
   {
     "name": "getOrCreateTView"
   },
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 53c7d21ec3..08560f42bc 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -173,9 +173,6 @@
   {
     "name": "createLView"
   },
-  {
-    "name": "createNodeAtIndex"
-  },
   {
     "name": "createRootComponent"
   },
@@ -188,6 +185,9 @@
   {
     "name": "createTNode"
   },
+  {
+    "name": "createTNodeAtIndex"
+  },
   {
     "name": "createTView"
   },
@@ -287,6 +287,9 @@
   {
     "name": "getOrCreateNodeInjectorForNode"
   },
+  {
+    "name": "getOrCreateTNode"
+  },
   {
     "name": "getOrCreateTView"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index d5aaa32bce..6fd35afd5c 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -560,9 +560,6 @@
   {
     "name": "createLView"
   },
-  {
-    "name": "createNodeAtIndex"
-  },
   {
     "name": "createRootComponent"
   },
@@ -575,6 +572,9 @@
   {
     "name": "createTNode"
   },
+  {
+    "name": "createTNodeAtIndex"
+  },
   {
     "name": "createTView"
   },
@@ -866,6 +866,9 @@
   {
     "name": "getOrCreateNodeInjectorForNode"
   },
+  {
+    "name": "getOrCreateTNode"
+  },
   {
     "name": "getOrCreateTView"
   },
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index d4ac5315ab..f56827c9ec 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {ChangeDetectorRef, Host, InjectFlags, Injector, Optional, Renderer2, Self, ViewContainerRef} from '@angular/core';
-import {createLView, createNodeAtIndex, createTView} from '@angular/core/src/render3/instructions/shared';
+import {createLView, createTView, getOrCreateTNode} from '@angular/core/src/render3/instructions/shared';
 import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
 
 import {ɵɵdefineComponent} from '../../src/render3/definition';
@@ -16,7 +16,7 @@ import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshSt
 import {TNODE} from '../../src/render3/interfaces/injector';
 import {TNodeType} from '../../src/render3/interfaces/node';
 import {isProceduralRenderer} from '../../src/render3/interfaces/renderer';
-import {LViewFlags} from '../../src/render3/interfaces/view';
+import {LViewFlags, TVIEW} from '../../src/render3/interfaces/view';
 import {enterView, leaveView} from '../../src/render3/state';
 import {ViewRef} from '../../src/render3/view_ref';
 
@@ -605,7 +605,8 @@ describe('di', () => {
           null, null, {} as any, {} as any);
       const oldView = enterView(contentView, null);
       try {
-        const parentTNode = createNodeAtIndex(0, TNodeType.Element, null, null);
+        const parentTNode =
+            getOrCreateTNode(contentView[TVIEW], null, 0, TNodeType.Element, null, null);
         // Simulate the situation where the previous parent is not initialized.
         // This happens on first bootstrap because we don't init existing values
         // so that we have smaller HelloWorld.
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 51e8d418d5..da2ff926bc 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -12,7 +12,7 @@ import {ElementRef} from '@angular/core/src/linker/element_ref';
 import {TemplateRef} from '@angular/core/src/linker/template_ref';
 import {ViewContainerRef} from '@angular/core/src/linker/view_container_ref';
 import {Renderer2} from '@angular/core/src/render/api';
-import {createLView, createNodeAtIndex, createTView, getOrCreateTView, renderComponentOrTemplate} from '@angular/core/src/render3/instructions/shared';
+import {createLView, createTView, getOrCreateTNode, getOrCreateTView, renderComponentOrTemplate} from '@angular/core/src/render3/instructions/shared';
 import {TNodeType} from '@angular/core/src/render3/interfaces/node';
 import {enterView, getLView, resetComponentState} from '@angular/core/src/render3/state';
 import {stringifyElement} from '@angular/platform-browser/testing/src/browser_util';
@@ -32,7 +32,7 @@ import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveT
 import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {PlayerHandler} from '../../src/render3/interfaces/player';
 import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, RendererFactory3, RendererStyleFlags3, domRendererFactory3} from '../../src/render3/interfaces/renderer';
-import {HEADER_OFFSET, LView, LViewFlags} from '../../src/render3/interfaces/view';
+import {HEADER_OFFSET, LView, LViewFlags, TVIEW, T_HOST} from '../../src/render3/interfaces/view';
 import {destroyLView} from '../../src/render3/node_manipulation';
 import {getRootView} from '../../src/render3/util/view_traversal_utils';
 import {Sanitizer} from '../../src/sanitization/security';
@@ -253,9 +253,10 @@ export function renderTemplate<T>(
     const renderer = providedRendererFactory.createRenderer(null, null);
 
     // We need to create a root view so it's possible to look up the host element through its index
+    const tView = createTView(-1, null, 1, 0, null, null, null, null);
     const hostLView = createLView(
-        null, createTView(-1, null, 1, 0, null, null, null, null), {},
-        LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null, providedRendererFactory, renderer);
+        null, tView, {}, LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null,
+        providedRendererFactory, renderer);
     enterView(hostLView, null);  // SUSPECT! why do we need to enter the View?
 
     const def: ComponentDef<any> = ɵɵdefineComponent({
@@ -270,7 +271,8 @@ export function renderTemplate<T>(
     def.pipeDefs = pipes || null;
 
     const componentTView = getOrCreateTView(def);
-    const hostTNode = createNodeAtIndex(0, TNodeType.Element, hostNode, null, null);
+    const hostTNode = getOrCreateTNode(tView, hostLView[T_HOST], 0, TNodeType.Element, null, null);
+    hostLView[hostTNode.index] = hostNode;
     componentView = createLView(
         hostLView, componentTView, context, LViewFlags.CheckAlways, hostNode, hostTNode,
         providedRendererFactory, renderer, sanitizer);

From 4299ecf9be7752d1bd00886b5fc30afd2ffbe56a Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 22 May 2019 17:15:41 -0700
Subject: [PATCH 173/275] test(core): update core tests (unrelated to queries) 
 to use static flag (#30626)

PR Close #30626
---
 .../test/acceptance/change_detection_spec.ts  | 34 +++----
 .../core/test/acceptance/component_spec.ts    |  2 +-
 packages/core/test/acceptance/content_spec.ts |  2 +-
 packages/core/test/acceptance/di_spec.ts      | 92 +++++++++----------
 .../core/test/acceptance/directive_spec.ts    |  2 +-
 .../test/acceptance/discover_utils_spec.ts    |  6 +-
 .../core/test/acceptance/host_binding_spec.ts | 32 +++----
 packages/core/test/acceptance/i18n_spec.ts    |  4 +-
 .../core/test/acceptance/integration_spec.ts  | 41 +++++----
 .../core/test/acceptance/lifecycle_spec.ts    |  2 +-
 .../core/test/acceptance/listener_spec.ts     |  2 +-
 packages/core/test/acceptance/outputs_spec.ts | 24 ++---
 packages/core/test/acceptance/pipe_spec.ts    |  2 +-
 .../core/test/acceptance/template_ref_spec.ts | 12 +--
 .../acceptance/view_container_ref_spec.ts     |  6 +-
 .../animation/animation_integration_spec.ts   | 30 +++---
 .../animation_query_integration_spec.ts       | 47 +++++-----
 ...s_keyframes_animations_integration_spec.ts | 17 +---
 ...ns_with_web_animations_integration_spec.ts |  6 +-
 packages/core/test/application_ref_spec.ts    |  9 +-
 packages/core/test/debug/debug_node_spec.ts   |  2 +-
 .../change_detection_integration_spec.ts      |  8 +-
 .../linker/projection_integration_spec.ts     |  2 +-
 .../linker/regression_integration_spec.ts     |  4 +-
 24 files changed, 185 insertions(+), 203 deletions(-)

diff --git a/packages/core/test/acceptance/change_detection_spec.ts b/packages/core/test/acceptance/change_detection_spec.ts
index 596e67e2b7..59aa0c8f96 100644
--- a/packages/core/test/acceptance/change_detection_spec.ts
+++ b/packages/core/test/acceptance/change_detection_spec.ts
@@ -80,7 +80,7 @@ describe('change detection', () => {
       })
       class TestCmpt {
         counter = 0;
-        @ViewChild('vc', {read: ViewContainerRef}) vcRef !: ViewContainerRef;
+        @ViewChild('vc', {read: ViewContainerRef, static: false}) vcRef !: ViewContainerRef;
 
         constructor(private _cfr: ComponentFactoryResolver) {}
 
@@ -146,7 +146,7 @@ describe('change detection', () => {
 
     @Component({selector: 'my-app', template: '<my-comp [name]="name"></my-comp>'})
     class MyApp {
-      @ViewChild(MyComponent) comp !: MyComponent;
+      @ViewChild(MyComponent, {static: false}) comp !: MyComponent;
       name: string = 'Nancy';
     }
 
@@ -238,7 +238,7 @@ describe('change detection', () => {
         template: '<my-comp></my-comp><button id="parent" (click)="noop()"></button>'
       })
       class ButtonParent {
-        @ViewChild(MyComponent) comp !: MyComponent;
+        @ViewChild(MyComponent, {static: false}) comp !: MyComponent;
         noop() {}
       }
 
@@ -264,7 +264,7 @@ describe('change detection', () => {
         changeDetection: ChangeDetectionStrategy.OnPush
       })
       class ButtonParent implements DoCheck {
-        @ViewChild(MyComponent) comp !: MyComponent;
+        @ViewChild(MyComponent, {static: false}) comp !: MyComponent;
         noop() {}
 
         doCheckCount = 0;
@@ -273,7 +273,7 @@ describe('change detection', () => {
 
       @Component({selector: 'my-button-app', template: '<button-parent></button-parent>'})
       class MyButtonApp {
-        @ViewChild(ButtonParent) parent !: ButtonParent;
+        @ViewChild(ButtonParent, {static: false}) parent !: ButtonParent;
       }
 
       TestBed.configureTestingModule({declarations: [MyButtonApp, MyComponent, ButtonParent]});
@@ -326,7 +326,7 @@ describe('change detection', () => {
 
       @Component({selector: 'parent-comp', template: `{{ doCheckCount}} - <my-comp></my-comp>`})
       class ParentComp implements DoCheck {
-        @ViewChild(MyComp) myComp !: MyComp;
+        @ViewChild(MyComp, {static: false}) myComp !: MyComp;
 
         doCheckCount = 0;
 
@@ -411,8 +411,8 @@ describe('change detection', () => {
       it('should check component view when called by directive on component node', () => {
         @Component({template: '<my-comp dir></my-comp>'})
         class MyApp {
-          @ViewChild(MyComp) myComp !: MyComp;
-          @ViewChild(Dir) dir !: Dir;
+          @ViewChild(MyComp, {static: false}) myComp !: MyComp;
+          @ViewChild(Dir, {static: false}) dir !: Dir;
         }
 
         TestBed.configureTestingModule({declarations: [MyComp, Dir, MyApp]});
@@ -429,8 +429,8 @@ describe('change detection', () => {
       it('should check host component when called by directive on element node', () => {
         @Component({template: '{{ value }}<div dir></div>'})
         class MyApp {
-          @ViewChild(MyComp) myComp !: MyComp;
-          @ViewChild(Dir) dir !: Dir;
+          @ViewChild(MyComp, {static: false}) myComp !: MyComp;
+          @ViewChild(Dir, {static: false}) dir !: Dir;
           value = '';
         }
 
@@ -450,7 +450,7 @@ describe('change detection', () => {
       it('should check the host component when called from EmbeddedViewRef', () => {
         @Component({template: '{{ name }}<div *ngIf="showing" dir></div>'})
         class MyApp {
-          @ViewChild(Dir) dir !: Dir;
+          @ViewChild(Dir, {static: false}) dir !: Dir;
           showing = true;
           name = 'Amelia';
         }
@@ -563,7 +563,7 @@ describe('change detection', () => {
                 '<ng-template #foo let-ctx="ctx">{{ ctx.value }}</ng-template><structural-comp [tmp]="foo"></structural-comp>'
           })
           class App {
-            @ViewChild(StructuralComp) structuralComp !: StructuralComp;
+            @ViewChild(StructuralComp, {static: false}) structuralComp !: StructuralComp;
           }
 
           TestBed.configureTestingModule({declarations: [App, StructuralComp]});
@@ -592,7 +592,7 @@ describe('change detection', () => {
             template: '<ng-template #foo>Template text</ng-template><structural-comp [tmp]="foo">'
           })
           class App {
-            @ViewChild(StructuralComp) structuralComp !: StructuralComp;
+            @ViewChild(StructuralComp, {static: false}) structuralComp !: StructuralComp;
           }
 
           TestBed.configureTestingModule({declarations: [App, StructuralComp]});
@@ -623,7 +623,7 @@ describe('change detection', () => {
 
       @Component({template: '<detached-comp></detached-comp>'})
       class MyApp {
-        @ViewChild(DetachedComp) comp !: DetachedComp;
+        @ViewChild(DetachedComp, {static: false}) comp !: DetachedComp;
 
         constructor(public cdr: ChangeDetectorRef) {}
       }
@@ -734,7 +734,7 @@ describe('change detection', () => {
 
         @Component({template: '<on-push-comp [value]="value"></on-push-comp>'})
         class OnPushApp {
-          @ViewChild(OnPushComp) onPushComp !: OnPushComp;
+          @ViewChild(OnPushComp, {static: false}) onPushComp !: OnPushComp;
           value = '';
         }
 
@@ -781,7 +781,7 @@ describe('change detection', () => {
         changeDetection: ChangeDetectionStrategy.OnPush
       })
       class OnPushParent {
-        @ViewChild(OnPushComp) comp !: OnPushComp;
+        @ViewChild(OnPushComp, {static: false}) comp !: OnPushComp;
         value = 'one';
       }
 
@@ -843,7 +843,7 @@ describe('change detection', () => {
           changeDetection: ChangeDetectionStrategy.OnPush
         })
         class EmbeddedViewParent {
-          @ViewChild(OnPushComp) comp !: OnPushComp;
+          @ViewChild(OnPushComp, {static: false}) comp !: OnPushComp;
           value = 'one';
           showing = true;
         }
diff --git a/packages/core/test/acceptance/component_spec.ts b/packages/core/test/acceptance/component_spec.ts
index 940e1dc5f1..7fe1e54939 100644
--- a/packages/core/test/acceptance/component_spec.ts
+++ b/packages/core/test/acceptance/component_spec.ts
@@ -70,7 +70,7 @@ describe('component', () => {
       entryComponents: [OtherComponent]
     })
     class TestComponent {
-      @ViewChild('vc', {read: ViewContainerRef}) vcref !: ViewContainerRef;
+      @ViewChild('vc', {read: ViewContainerRef, static: true}) vcref !: ViewContainerRef;
 
       constructor(private _cfr: ComponentFactoryResolver) {}
 
diff --git a/packages/core/test/acceptance/content_spec.ts b/packages/core/test/acceptance/content_spec.ts
index c84aa1d5fc..5673111585 100644
--- a/packages/core/test/acceptance/content_spec.ts
+++ b/packages/core/test/acceptance/content_spec.ts
@@ -245,7 +245,7 @@ describe('projection', () => {
        @Component(
            {selector: 'comp', template: `<ng-template><ng-content></ng-content></ng-template>`})
        class Comp {
-         @ViewChild(TemplateRef) template !: TemplateRef<any>;
+         @ViewChild(TemplateRef, {static: true}) template !: TemplateRef<any>;
        }
 
        @Directive({selector: '[trigger]'})
diff --git a/packages/core/test/acceptance/di_spec.ts b/packages/core/test/acceptance/di_spec.ts
index a60bf34bbb..a624e478ac 100644
--- a/packages/core/test/acceptance/di_spec.ts
+++ b/packages/core/test/acceptance/di_spec.ts
@@ -377,7 +377,7 @@ describe('di', () => {
          </div>`
         })
         class MyComp {
-          @ViewChild(StructuralDirective) structuralDir !: StructuralDirective;
+          @ViewChild(StructuralDirective, {static: false}) structuralDir !: StructuralDirective;
         }
 
         TestBed.configureTestingModule(
@@ -421,8 +421,8 @@ describe('di', () => {
           </div>`
         })
         class MyApp {
-          @ViewChild(HostBindingDirective) hostBindingDir !: HostBindingDirective;
-          @ViewChild(DirectiveA) dirA !: DirectiveA;
+          @ViewChild(HostBindingDirective, {static: false}) hostBindingDir !: HostBindingDirective;
+          @ViewChild(DirectiveA, {static: false}) dirA !: DirectiveA;
         }
 
         TestBed.configureTestingModule(
@@ -535,7 +535,7 @@ describe('di', () => {
 
           @Component({template: '<div dirA></div>'})
           class MyComp {
-            @ViewChild(DirectiveA) dirA !: DirectiveA;
+            @ViewChild(DirectiveA, {static: false}) dirA !: DirectiveA;
           }
 
           TestBed.configureTestingModule({declarations: [DirectiveA, DirectiveB, MyComp]});
@@ -555,7 +555,7 @@ describe('di', () => {
 
           @Component({template: '<div dirC></div>'})
           class MyComp {
-            @ViewChild(DirectiveC) dirC !: DirectiveC;
+            @ViewChild(DirectiveC, {static: false}) dirC !: DirectiveC;
           }
 
           TestBed.configureTestingModule({declarations: [DirectiveC, MyComp]});
@@ -575,7 +575,7 @@ describe('di', () => {
 
           @Component({template: '<div dirB></div><div dirC></div>'})
           class MyComp {
-            @ViewChild(DirectiveC) dirC !: DirectiveC;
+            @ViewChild(DirectiveC, {static: false}) dirC !: DirectiveC;
           }
 
           TestBed.configureTestingModule({declarations: [DirectiveB, DirectiveC, MyComp]});
@@ -596,12 +596,12 @@ describe('di', () => {
 
         @Component({selector: 'my-comp', template: '<div dirA dirB="self"></div>'})
         class MyComp {
-          @ViewChild(DirectiveA) dirA !: DirectiveA;
+          @ViewChild(DirectiveA, {static: false}) dirA !: DirectiveA;
         }
 
         @Component({template: '<my-comp dirB="parent"></my-comp>'})
         class MyApp {
-          @ViewChild(MyComp) myComp !: MyComp;
+          @ViewChild(MyComp, {static: false}) myComp !: MyComp;
         }
 
         TestBed.configureTestingModule({declarations: [DirectiveA, DirectiveB, MyComp, MyApp]});
@@ -646,12 +646,12 @@ describe('di', () => {
             viewProviders: [{provide: String, useValue: 'Foo'}]
           })
           class MyComp {
-            @ViewChild(DirectiveString) dirString !: DirectiveString;
+            @ViewChild(DirectiveString, {static: false}) dirString !: DirectiveString;
           }
 
           @Component({template: '<my-comp></my-comp>'})
           class MyApp {
-            @ViewChild(MyComp) myComp !: MyComp;
+            @ViewChild(MyComp, {static: false}) myComp !: MyComp;
           }
 
           TestBed.configureTestingModule({declarations: [DirectiveString, MyComp, MyApp]});
@@ -670,12 +670,12 @@ describe('di', () => {
 
           @Component({selector: 'my-comp', template: '<div dirComp></div>'})
           class MyComp {
-            @ViewChild(DirectiveComp) dirComp !: DirectiveComp;
+            @ViewChild(DirectiveComp, {static: false}) dirComp !: DirectiveComp;
           }
 
           @Component({template: '<my-comp></my-comp>'})
           class MyApp {
-            @ViewChild(MyComp) myComp !: MyComp;
+            @ViewChild(MyComp, {static: false}) myComp !: MyComp;
           }
 
           TestBed.configureTestingModule({declarations: [DirectiveComp, MyComp, MyApp]});
@@ -734,7 +734,7 @@ describe('di', () => {
 
               @Component({template: '<my-comp dirB></my-comp>'})
               class MyApp {
-                @ViewChild(MyComp) myComp !: MyComp;
+                @ViewChild(MyComp, {static: false}) myComp !: MyComp;
               }
 
               TestBed.configureTestingModule(
@@ -751,8 +751,8 @@ describe('di', () => {
           @Component({template: '<div dirB><div *ngIf="showing" dirA></div></div>'})
           class MyApp {
             showing = false;
-            @ViewChild(DirectiveA) dirA !: DirectiveA;
-            @ViewChild(DirectiveB) dirB !: DirectiveB;
+            @ViewChild(DirectiveA, {static: false}) dirA !: DirectiveA;
+            @ViewChild(DirectiveB, {static: false}) dirB !: DirectiveB;
           }
 
           TestBed.configureTestingModule({declarations: [DirectiveA, DirectiveB, MyApp]});
@@ -952,8 +952,8 @@ describe('di', () => {
 
         @Component({template: '<div injectorDir otherInjectorDir></div>'})
         class MyComp {
-          @ViewChild(InjectorDir) injectorDir !: InjectorDir;
-          @ViewChild(OtherInjectorDir) otherInjectorDir !: OtherInjectorDir;
+          @ViewChild(InjectorDir, {static: false}) injectorDir !: InjectorDir;
+          @ViewChild(OtherInjectorDir, {static: false}) otherInjectorDir !: OtherInjectorDir;
         }
 
         TestBed.configureTestingModule({declarations: [InjectorDir, OtherInjectorDir, MyComp]});
@@ -978,7 +978,7 @@ describe('di', () => {
 
         @Component({template: '<div injectorDir></div>'})
         class MyComp {
-          @ViewChild(InjectorDir) injectorDir !: InjectorDir;
+          @ViewChild(InjectorDir, {static: false}) injectorDir !: InjectorDir;
         }
 
         TestBed.configureTestingModule({declarations: [InjectorDir, MyComp]});
@@ -1015,8 +1015,8 @@ describe('di', () => {
 
         @Component({template: '<div dir otherDir></div>'})
         class MyComp {
-          @ViewChild(MyDir) directive !: MyDir;
-          @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+          @ViewChild(MyDir, {static: false}) directive !: MyDir;
+          @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
         }
 
         TestBed.configureTestingModule({declarations: [MyDir, MyOtherDir, MyComp]});
@@ -1047,7 +1047,7 @@ describe('di', () => {
 
            @Component({template: '<ng-template dir></ng-template>'})
            class MyComp {
-             @ViewChild(MyDir) directive !: MyDir;
+             @ViewChild(MyDir, {static: false}) directive !: MyDir;
            }
 
            TestBed.configureTestingModule({declarations: [MyDir, MyComp]});
@@ -1085,8 +1085,8 @@ describe('di', () => {
               template: '<ng-template dir otherDir #dir="dir" #otherDir="otherDir"></ng-template>'
             })
             class MyComp {
-              @ViewChild(MyDir) directive !: MyDir;
-              @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+              @ViewChild(MyDir, {static: false}) directive !: MyDir;
+              @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
             }
 
             TestBed.configureTestingModule({declarations: [MyDir, MyOtherDir, MyComp]});
@@ -1129,7 +1129,7 @@ describe('di', () => {
         }
         @Component({template: '<div optionalDir></div>'})
         class MyComp {
-          @ViewChild(OptionalDir) directive !: OptionalDir;
+          @ViewChild(OptionalDir, {static: false}) directive !: OptionalDir;
         }
 
         TestBed.configureTestingModule({declarations: [OptionalDir, MyComp]});
@@ -1158,8 +1158,8 @@ describe('di', () => {
             }
             @Component({template: '<div dir otherDir #dir="dir" #otherDir="otherDir"></div>'})
             class MyComp {
-              @ViewChild(MyDir) directive !: MyDir;
-              @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+              @ViewChild(MyDir, {static: false}) directive !: MyDir;
+              @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
             }
 
             TestBed.configureTestingModule({declarations: [MyDir, MyOtherDir, MyComp]});
@@ -1224,9 +1224,9 @@ describe('di', () => {
          () => {
            @Component({selector: 'my-app', template: '<my-comp dir otherDir #dir="dir"></my-comp>'})
            class MyApp {
-             @ViewChild(MyComp) component !: MyComp;
-             @ViewChild(MyDir) directive !: MyDir;
-             @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+             @ViewChild(MyComp, {static: false}) component !: MyComp;
+             @ViewChild(MyDir, {static: false}) directive !: MyDir;
+             @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
            }
            TestBed.configureTestingModule({declarations: [MyApp, MyComp, MyDir, MyOtherDir]});
            const fixture = TestBed.createComponent(MyApp);
@@ -1247,8 +1247,8 @@ describe('di', () => {
            @Component({selector: 'my-comp', template: '<div dir otherDir #dir="dir"></div>'})
            class MyComp {
              constructor(public cdr: ChangeDetectorRef) {}
-             @ViewChild(MyDir) directive !: MyDir;
-             @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+             @ViewChild(MyDir, {static: false}) directive !: MyDir;
+             @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
            }
            TestBed.configureTestingModule({declarations: [MyComp, MyDir, MyOtherDir]});
            const fixture = TestBed.createComponent(MyComp);
@@ -1274,9 +1274,9 @@ describe('di', () => {
            })
            class MyApp {
              constructor(public cdr: ChangeDetectorRef) {}
-             @ViewChild(MyComp) component !: MyComp;
-             @ViewChild(MyDir) directive !: MyDir;
-             @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+             @ViewChild(MyComp, {static: false}) component !: MyComp;
+             @ViewChild(MyDir, {static: false}) directive !: MyDir;
+             @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
            }
            TestBed.configureTestingModule({declarations: [MyApp, MyComp, MyDir, MyOtherDir]});
            const fixture = TestBed.createComponent(MyApp);
@@ -1302,8 +1302,8 @@ describe('di', () => {
         class MyComp {
           showing = true;
           constructor(public cdr: ChangeDetectorRef) {}
-          @ViewChild(MyDir) directive !: MyDir;
-          @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+          @ViewChild(MyDir, {static: false}) directive !: MyDir;
+          @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
         }
 
         TestBed.configureTestingModule({declarations: [MyComp, MyDir, MyOtherDir]});
@@ -1325,8 +1325,8 @@ describe('di', () => {
         class MyComp {
           showing = true;
           constructor(public cdr: ChangeDetectorRef) {}
-          @ViewChild(MyDir) directive !: MyDir;
-          @ViewChild(MyOtherDir) otherDirective !: MyOtherDir;
+          @ViewChild(MyDir, {static: false}) directive !: MyDir;
+          @ViewChild(MyOtherDir, {static: false}) otherDirective !: MyOtherDir;
         }
 
         TestBed.configureTestingModule({declarations: [MyComp, MyDir, MyOtherDir]});
@@ -1375,7 +1375,7 @@ describe('di', () => {
 
       @Component({template: '<div injectorDir></div>'})
       class MyComp {
-        @ViewChild(InjectorDir) injectorDirInstance !: InjectorDir;
+        @ViewChild(InjectorDir, {static: false}) injectorDirInstance !: InjectorDir;
       }
 
       TestBed.configureTestingModule({declarations: [InjectorDir, MyComp]});
@@ -1468,7 +1468,7 @@ describe('di', () => {
       providers: [{provide: LOCALE_ID, useValue: 'en-GB'}]
     })
     class MyComp {
-      @ViewChild(MyDir) myDir !: MyDir;
+      @ViewChild(MyDir, {static: false}) myDir !: MyDir;
       constructor(@Inject(LOCALE_ID) public localeId: string) {}
     }
 
@@ -1490,7 +1490,7 @@ describe('di', () => {
 
       @Component({template: '<div dir exist="existValue" other="ignore"></div>'})
       class MyComp {
-        @ViewChild(MyDir) directiveInstance !: MyDir;
+        @ViewChild(MyDir, {static: false}) directiveInstance !: MyDir;
       }
 
       TestBed.configureTestingModule({declarations: [MyDir, MyComp]});
@@ -1514,7 +1514,7 @@ describe('di', () => {
       @Component(
           {template: '<ng-template dir="initial" exist="existValue" other="ignore"></ng-template>'})
       class MyComp {
-        @ViewChild(MyDir) directiveInstance !: MyDir;
+        @ViewChild(MyDir, {static: false}) directiveInstance !: MyDir;
       }
 
       TestBed.configureTestingModule({declarations: [MyDir, MyComp]});
@@ -1539,7 +1539,7 @@ describe('di', () => {
         template: '<ng-container dir="initial" exist="existValue" other="ignore"></ng-container>'
       })
       class MyComp {
-        @ViewChild(MyDir) directiveInstance !: MyDir;
+        @ViewChild(MyDir, {static: false}) directiveInstance !: MyDir;
       }
 
       TestBed.configureTestingModule({declarations: [MyDir, MyComp]});
@@ -1566,7 +1566,7 @@ describe('di', () => {
             '<div dir style="margin: 1px; color: red;" class="hello there" other-attr="value"></div>'
       })
       class MyComp {
-        @ViewChild(MyDir) directiveInstance !: MyDir;
+        @ViewChild(MyDir, {static: false}) directiveInstance !: MyDir;
       }
 
       TestBed.configureTestingModule({declarations: [MyDir, MyComp]});
@@ -1593,7 +1593,7 @@ describe('di', () => {
         template: '<div dir exist="existValue" svg:exist="testExistValue" other="otherValue"></div>'
       })
       class MyComp {
-        @ViewChild(MyDir) directiveInstance !: MyDir;
+        @ViewChild(MyDir, {static: false}) directiveInstance !: MyDir;
       }
 
       TestBed.configureTestingModule({declarations: [MyDir, MyComp]});
@@ -1624,7 +1624,7 @@ describe('di', () => {
             '<div dir exist="existValue" [binding]="bindingValue" (output)="outputValue" other="otherValue" ignore="ignoreValue"></div>'
       })
       class MyComp {
-        @ViewChild(MyDir) directiveInstance !: MyDir;
+        @ViewChild(MyDir, {static: false}) directiveInstance !: MyDir;
       }
 
       TestBed.configureTestingModule({declarations: [MyDir, MyComp]});
diff --git a/packages/core/test/acceptance/directive_spec.ts b/packages/core/test/acceptance/directive_spec.ts
index 4ff44eb326..e6d7dde5c7 100644
--- a/packages/core/test/acceptance/directive_spec.ts
+++ b/packages/core/test/acceptance/directive_spec.ts
@@ -213,7 +213,7 @@ describe('directives', () => {
     it('should allow outputs of directive on ng-template', () => {
       @Component({template: `<ng-template (out)="value = true"></ng-template>`})
       class TestComp {
-        @ViewChild(TestDir) testDir: TestDir|undefined;
+        @ViewChild(TestDir, {static: true}) testDir: TestDir|undefined;
         value = false;
       }
 
diff --git a/packages/core/test/acceptance/discover_utils_spec.ts b/packages/core/test/acceptance/discover_utils_spec.ts
index d55eb3d91d..6c13d569f0 100644
--- a/packages/core/test/acceptance/discover_utils_spec.ts
+++ b/packages/core/test/acceptance/discover_utils_spec.ts
@@ -312,9 +312,9 @@ onlyInIvy('Ivy-specific utilities').describe('discovery utils deprecated', () =>
         `
       })
       class Comp {
-        @ViewChild(MyDir1) myDir1Instance !: MyDir1;
-        @ViewChild(MyDir2) myDir2Instance !: MyDir2;
-        @ViewChild(MyDir3) myDir3Instance !: MyDir3;
+        @ViewChild(MyDir1, {static: false}) myDir1Instance !: MyDir1;
+        @ViewChild(MyDir2, {static: false}) myDir2Instance !: MyDir2;
+        @ViewChild(MyDir3, {static: false}) myDir3Instance !: MyDir3;
       }
 
       TestBed.configureTestingModule({declarations: [Comp, MyDir1, MyDir2, MyDir3]});
diff --git a/packages/core/test/acceptance/host_binding_spec.ts b/packages/core/test/acceptance/host_binding_spec.ts
index cb61683447..4e0d3e17b0 100644
--- a/packages/core/test/acceptance/host_binding_spec.ts
+++ b/packages/core/test/acceptance/host_binding_spec.ts
@@ -121,7 +121,7 @@ describe('host bindings', () => {
       class ParentCmp {
         private _prop = '';
 
-        @ViewChild('template', {read: ViewContainerRef})
+        @ViewChild('template', {read: ViewContainerRef, static: false})
         vcr: ViewContainerRef = null !;
 
         private child: ComponentRef<ChildCmp> = null !;
@@ -314,7 +314,7 @@ describe('host bindings', () => {
 
     @Component({template: '<span dir></span>'})
     class App {
-      @ViewChild(Dir) directiveInstance !: Dir;
+      @ViewChild(Dir, {static: false}) directiveInstance !: Dir;
     }
 
     TestBed.configureTestingModule({declarations: [App, Dir]});
@@ -403,7 +403,7 @@ describe('host bindings', () => {
         `
     })
     class App {
-      @ViewChild(HostBindingDir) hostBindingDir !: HostBindingDir;
+      @ViewChild(HostBindingDir, {static: false}) hostBindingDir !: HostBindingDir;
     }
 
     TestBed.configureTestingModule({declarations: [App, SomeDir, HostTitleComp, HostBindingDir]});
@@ -471,7 +471,7 @@ describe('host bindings', () => {
 
        @Component({template: '<div someDir hostBindingDir></div>'})
        class App {
-         @ViewChild(HostBindingDir) hostBindingDir !: HostBindingDir;
+         @ViewChild(HostBindingDir, {static: false}) hostBindingDir !: HostBindingDir;
        }
 
        TestBed.configureTestingModule({declarations: [App, SomeDir, HostBindingDir]});
@@ -539,7 +539,7 @@ describe('host bindings', () => {
 
     @Component({template: '<input hostBindingDir [disabled]="isDisabled">'})
     class App {
-      @ViewChild(HostBindingInputDir) hostBindingInputDir !: HostBindingInputDir;
+      @ViewChild(HostBindingInputDir, {static: false}) hostBindingInputDir !: HostBindingInputDir;
       isDisabled = true;
     }
 
@@ -629,7 +629,7 @@ describe('host bindings', () => {
         `
     })
     class App {
-      @ViewChild(NameComp) nameComp !: NameComp;
+      @ViewChild(NameComp, {static: false}) nameComp !: NameComp;
       name = '';
     }
 
@@ -685,8 +685,8 @@ describe('host bindings', () => {
         `
     })
     class App {
-      @ViewChild(HostBindingComp) hostBindingComp !: HostBindingComp;
-      @ViewChild(NameComp) nameComp !: NameComp;
+      @ViewChild(HostBindingComp, {static: false}) hostBindingComp !: HostBindingComp;
+      @ViewChild(NameComp, {static: false}) nameComp !: NameComp;
       name = '';
       otherName = '';
     }
@@ -760,8 +760,8 @@ describe('host bindings', () => {
 
     @Component({template: '<host-binding-comp hostDir></host-binding-comp>'})
     class App {
-      @ViewChild(HostBindingComp) hostBindingComp !: HostBindingComp;
-      @ViewChild(HostBindingDir) hostBindingDir !: HostBindingDir;
+      @ViewChild(HostBindingComp, {static: false}) hostBindingComp !: HostBindingComp;
+      @ViewChild(HostBindingDir, {static: false}) hostBindingDir !: HostBindingDir;
     }
 
     TestBed.configureTestingModule({declarations: [App, HostBindingComp, HostBindingDir]});
@@ -799,7 +799,7 @@ describe('host bindings', () => {
 
     @Component({template: `<host-binding-comp></host-binding-comp>{{ name }}`})
     class App {
-      @ViewChild(HostBindingComp) hostBindingComp !: HostBindingComp;
+      @ViewChild(HostBindingComp, {static: false}) hostBindingComp !: HostBindingComp;
       name = '';
     }
 
@@ -849,8 +849,8 @@ describe('host bindings', () => {
       `
         })
         class App {
-          @ViewChild(SubDirective) subDir !: SubDirective;
-          @ViewChild(SuperDirective) superDir !: SuperDirective;
+          @ViewChild(SubDirective, {static: false}) subDir !: SubDirective;
+          @ViewChild(SuperDirective, {static: false}) superDir !: SuperDirective;
         }
 
         TestBed.configureTestingModule({declarations: [App, SuperDirective, SubDirective]});
@@ -958,7 +958,7 @@ describe('host bindings', () => {
 
       @Component({template: '<host-binding-to-styles></host-binding-to-styles>'})
       class App {
-        @ViewChild(HostBindingToStyles) hostBindingDir !: HostBindingToStyles;
+        @ViewChild(HostBindingToStyles, {static: false}) hostBindingDir !: HostBindingToStyles;
       }
 
       TestBed.configureTestingModule({declarations: [App, HostBindingToStyles]});
@@ -987,7 +987,7 @@ describe('host bindings', () => {
 
       @Component({template: '<div hostStyles containerDir></div>'})
       class App {
-        @ViewChild(HostBindingToStyles) hostBindingDir !: HostBindingToStyles;
+        @ViewChild(HostBindingToStyles, {static: false}) hostBindingDir !: HostBindingToStyles;
       }
 
       TestBed.configureTestingModule({declarations: [App, HostBindingToStyles, ContainerDir]});
@@ -1037,7 +1037,7 @@ describe('host bindings', () => {
 
         @Component({template: `<${tag} unsafeUrlHostBindingDir></${tag}>`})
         class App {
-          @ViewChild(UnsafeDir) unsafeDir !: UnsafeDir;
+          @ViewChild(UnsafeDir, {static: false}) unsafeDir !: UnsafeDir;
         }
 
         TestBed.configureTestingModule({declarations: [App, UnsafeDir]});
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index 9679058eb2..046aad5755 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -896,10 +896,10 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       @Component({selector: 'div-query', template: '<ng-container #vc></ng-container>'})
       class DivQuery {
         // TODO(issue/24571): remove '!'.
-        @ContentChild(TemplateRef) template !: TemplateRef<any>;
+        @ContentChild(TemplateRef, {static: true}) template !: TemplateRef<any>;
 
         // TODO(issue/24571): remove '!'.
-        @ViewChild('vc', {read: ViewContainerRef})
+        @ViewChild('vc', {read: ViewContainerRef, static: true})
         vc !: ViewContainerRef;
 
         // TODO(issue/24571): remove '!'.
diff --git a/packages/core/test/acceptance/integration_spec.ts b/packages/core/test/acceptance/integration_spec.ts
index be4b6b58cc..2a59030167 100644
--- a/packages/core/test/acceptance/integration_spec.ts
+++ b/packages/core/test/acceptance/integration_spec.ts
@@ -143,7 +143,7 @@ describe('acceptance integration tests', () => {
            template: '<ng-template testDirective><ng-container>content</ng-container></ng-template>'
          })
          class App {
-           @ViewChild(TestDirective) testDirective !: TestDirective;
+           @ViewChild(TestDirective, {static: true}) testDirective !: TestDirective;
          }
 
          TestBed.configureTestingModule({declarations: [App, TestDirective]});
@@ -213,7 +213,7 @@ describe('acceptance integration tests', () => {
             '<ng-template testDirective><ng-container><ng-container><ng-container>content</ng-container></ng-container></ng-container></ng-template>'
       })
       class App {
-        @ViewChild(TestDirective) testDirective !: TestDirective;
+        @ViewChild(TestDirective, {static: true}) testDirective !: TestDirective;
       }
 
       TestBed.configureTestingModule({declarations: [App, TestDirective]});
@@ -243,7 +243,7 @@ describe('acceptance integration tests', () => {
 
       @Component({template: '<div><ng-container dir></ng-container></div>'})
       class App {
-        @ViewChild(TestDirective) testDirective !: TestDirective;
+        @ViewChild(TestDirective, {static: false}) testDirective !: TestDirective;
       }
 
       TestBed.configureTestingModule({declarations: [App, TestDirective]});
@@ -273,7 +273,7 @@ describe('acceptance integration tests', () => {
             '<ng-container dir [contentTpl]="content"><ng-template #content>Content</ng-template></ng-container>'
       })
       class App {
-        @ViewChild(TestDirective) testDirective !: TestDirective;
+        @ViewChild(TestDirective, {static: false}) testDirective !: TestDirective;
       }
 
       TestBed.configureTestingModule({declarations: [App, TestDirective]});
@@ -303,7 +303,7 @@ describe('acceptance integration tests', () => {
 
       @Component({template: '<ng-container><ng-template dir>Content</ng-template></ng-container>'})
       class App {
-        @ViewChild(TestDirective) testDirective !: TestDirective;
+        @ViewChild(TestDirective, {static: false}) testDirective !: TestDirective;
       }
 
       TestBed.configureTestingModule({declarations: [App, TestDirective]});
@@ -608,7 +608,8 @@ describe('acceptance integration tests', () => {
 
       @Component({template: '<todo></todo>'})
       class App {
-        @ViewChild(TodoComponentHostBinding) todoComponentHostBinding !: TodoComponentHostBinding;
+        @ViewChild(TodoComponentHostBinding, {static: false})
+        todoComponentHostBinding !: TodoComponentHostBinding;
       }
 
       TestBed.configureTestingModule({declarations: [App, TodoComponentHostBinding]});
@@ -843,7 +844,7 @@ describe('acceptance integration tests', () => {
 
         @Component({template: '<div hostBindingDir></div>'})
         class App {
-          @ViewChild(HostBindingDir) hostBindingDir !: HostBindingDir;
+          @ViewChild(HostBindingDir, {static: false}) hostBindingDir !: HostBindingDir;
         }
 
         TestBed.configureTestingModule({declarations: [App, HostBindingDir]});
@@ -1011,7 +1012,7 @@ describe('acceptance integration tests', () => {
           `
         })
         class App {
-          @ViewChild(StructuralComp) structuralComp !: StructuralComp;
+          @ViewChild(StructuralComp, {static: false}) structuralComp !: StructuralComp;
           value: any;
         }
 
@@ -1052,7 +1053,8 @@ describe('acceptance integration tests', () => {
          () => {
            @Component({template: '<div class="apple orange banana" DirWithClass></div>'})
            class App {
-             @ViewChild(DirWithClassDirective) mockClassDirective !: DirWithClassDirective;
+             @ViewChild(DirWithClassDirective, {static: false})
+             mockClassDirective !: DirWithClassDirective;
            }
 
            TestBed.configureTestingModule({declarations: [App, DirWithClassDirective]});
@@ -1067,7 +1069,8 @@ describe('acceptance integration tests', () => {
          () => {
            @Component({template: '<div style="width:100px;height:200px" DirWithStyle></div>'})
            class App {
-             @ViewChild(DirWithStyleDirective) mockStyleDirective !: DirWithStyleDirective;
+             @ViewChild(DirWithStyleDirective, {static: false})
+             mockStyleDirective !: DirWithStyleDirective;
            }
 
            TestBed.configureTestingModule({declarations: [App, DirWithStyleDirective]});
@@ -1085,7 +1088,8 @@ describe('acceptance integration tests', () => {
          () => {
            @Component({template: '<div DirWithClass [class]="value"></div>'})
            class App {
-             @ViewChild(DirWithClassDirective) mockClassDirective !: DirWithClassDirective;
+             @ViewChild(DirWithClassDirective, {static: false})
+             mockClassDirective !: DirWithClassDirective;
              value = '';
            }
 
@@ -1103,7 +1107,8 @@ describe('acceptance integration tests', () => {
               () => {
                 @Component({template: '<div DirWithStyle [style]="value"></div>'})
                 class App {
-                  @ViewChild(DirWithStyleDirective) mockStyleDirective !: DirWithStyleDirective;
+                  @ViewChild(DirWithStyleDirective, {static: false})
+                  mockStyleDirective !: DirWithStyleDirective;
                   value !: {[key: string]: string};
                 }
 
@@ -1179,7 +1184,7 @@ describe('acceptance integration tests', () => {
             `
                 })
                 class App {
-                  @ViewChild(DirWithSingleStylingBindings)
+                  @ViewChild(DirWithSingleStylingBindings, {static: false})
                   dirInstance !: DirWithSingleStylingBindings;
                 }
 
@@ -1235,8 +1240,8 @@ describe('acceptance integration tests', () => {
                 @Component(
                     {template: '<div Dir1WithStyle Dir2WithStyle [style.width]="width"></div>'})
                 class App {
-                  @ViewChild(Dir1WithStyle) dir1Instance !: Dir1WithStyle;
-                  @ViewChild(Dir2WithStyle) dir2Instance !: Dir2WithStyle;
+                  @ViewChild(Dir1WithStyle, {static: false}) dir1Instance !: Dir1WithStyle;
+                  @ViewChild(Dir2WithStyle, {static: false}) dir2Instance !: Dir2WithStyle;
                   width: string|null = null;
                 }
 
@@ -1300,8 +1305,8 @@ describe('acceptance integration tests', () => {
                       '<div Dir1WithStyling Dir2WithStyling [style]="stylesExp" [class]="classesExp"></div>'
                 })
                 class App {
-                  @ViewChild(Dir1WithStyling) dir1Instance !: Dir1WithStyling;
-                  @ViewChild(Dir2WithStyling) dir2Instance !: Dir2WithStyling;
+                  @ViewChild(Dir1WithStyling, {static: false}) dir1Instance !: Dir1WithStyling;
+                  @ViewChild(Dir2WithStyling, {static: false}) dir2Instance !: Dir2WithStyling;
                   stylesExp: any = {};
                   classesExp: any = {};
                 }
@@ -1491,7 +1496,7 @@ describe('acceptance integration tests', () => {
     @Component(
         {selector: 'test-component', template: `foo`, host: {'[attr.aria-disabled]': 'true'}})
     class TestComponent {
-      @ContentChild(TemplateRef) tpl !: TemplateRef<any>;
+      @ContentChild(TemplateRef, {static: true}) tpl !: TemplateRef<any>;
     }
 
     TestBed.configureTestingModule({declarations: [TestComponent]});
diff --git a/packages/core/test/acceptance/lifecycle_spec.ts b/packages/core/test/acceptance/lifecycle_spec.ts
index 5175d3dd7d..77d6d37161 100644
--- a/packages/core/test/acceptance/lifecycle_spec.ts
+++ b/packages/core/test/acceptance/lifecycle_spec.ts
@@ -1293,7 +1293,7 @@ describe('onInit', () => {
       `,
     })
     class App {
-      @ViewChild('container', {read: ViewContainerRef})
+      @ViewChild('container', {read: ViewContainerRef, static: false})
       viewContainerRef !: ViewContainerRef;
 
       constructor(public compFactoryResolver: ComponentFactoryResolver) {}
diff --git a/packages/core/test/acceptance/listener_spec.ts b/packages/core/test/acceptance/listener_spec.ts
index 044520b060..52dfca3b00 100644
--- a/packages/core/test/acceptance/listener_spec.ts
+++ b/packages/core/test/acceptance/listener_spec.ts
@@ -220,7 +220,7 @@ describe('event listeners', () => {
         count = 0;
         someValue = -1;
 
-        @ViewChild(FooDirective) fooDirective: FooDirective|null = null;
+        @ViewChild(FooDirective, {static: false}) fooDirective: FooDirective|null = null;
 
         fooChange() { this.count++; }
 
diff --git a/packages/core/test/acceptance/outputs_spec.ts b/packages/core/test/acceptance/outputs_spec.ts
index 873b663388..35716f1625 100644
--- a/packages/core/test/acceptance/outputs_spec.ts
+++ b/packages/core/test/acceptance/outputs_spec.ts
@@ -43,7 +43,7 @@ describe('outputs', () => {
 
     @Component({template: '<button-toggle (change)="onChange()"></button-toggle>'})
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
       onChange() { counter++; }
     }
     TestBed.configureTestingModule({declarations: [App, ButtonToggle]});
@@ -64,7 +64,7 @@ describe('outputs', () => {
     @Component(
         {template: '<button-toggle (change)="onChange()" (reset)="onReset()"></button-toggle>'})
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
       onChange() { counter++; }
       onReset() { resetCounter++; }
     }
@@ -82,7 +82,7 @@ describe('outputs', () => {
   it('should eval component output expression when event is emitted', () => {
     @Component({template: '<button-toggle (change)="counter = counter + 1"></button-toggle>'})
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
       counter = 0;
     }
     TestBed.configureTestingModule({declarations: [App, ButtonToggle]});
@@ -102,7 +102,7 @@ describe('outputs', () => {
     @Component(
         {template: '<button-toggle *ngIf="condition" (change)="onChange()"></button-toggle>'})
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
       condition = true;
 
       onChange() { counter++; }
@@ -133,7 +133,7 @@ describe('outputs', () => {
       `
     })
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
       condition = true;
       condition2 = true;
 
@@ -168,8 +168,8 @@ describe('outputs', () => {
       `
     })
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
-      @ViewChild(DestroyComp) destroyComp !: DestroyComp;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
+      @ViewChild(DestroyComp, {static: false}) destroyComp !: DestroyComp;
       condition = true;
 
       onClick() { clickCounter++; }
@@ -206,7 +206,7 @@ describe('outputs', () => {
 
     @Component({template: '<button myButton (click)="onClick()">Click me</button>'})
     class App {
-      @ViewChild(MyButton) buttonDir !: MyButton;
+      @ViewChild(MyButton, {static: false}) buttonDir !: MyButton;
       onClick() { counter++; }
     }
     TestBed.configureTestingModule({declarations: [App, MyButton]});
@@ -228,8 +228,8 @@ describe('outputs', () => {
 
     @Component({template: '<button-toggle (change)="onChange()" otherDir></button-toggle>'})
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
-      @ViewChild(OtherDir) otherDir !: OtherDir;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
+      @ViewChild(OtherDir, {static: false}) otherDir !: OtherDir;
       onChange() { counter++; }
     }
     TestBed.configureTestingModule({declarations: [App, ButtonToggle, OtherDir]});
@@ -257,8 +257,8 @@ describe('outputs', () => {
           '<button-toggle (change)="onChange()" otherChangeDir [change]="change"></button-toggle>'
     })
     class App {
-      @ViewChild(ButtonToggle) buttonToggle !: ButtonToggle;
-      @ViewChild(OtherChangeDir) otherDir !: OtherChangeDir;
+      @ViewChild(ButtonToggle, {static: false}) buttonToggle !: ButtonToggle;
+      @ViewChild(OtherChangeDir, {static: false}) otherDir !: OtherChangeDir;
       change = true;
 
       onChange() { counter++; }
diff --git a/packages/core/test/acceptance/pipe_spec.ts b/packages/core/test/acceptance/pipe_spec.ts
index a5b5c8c48e..56efdd827c 100644
--- a/packages/core/test/acceptance/pipe_spec.ts
+++ b/packages/core/test/acceptance/pipe_spec.ts
@@ -70,7 +70,7 @@ describe('pipe', () => {
       template: `<div my-dir [dirProp]="'a'|double"></div>`,
     })
     class App {
-      @ViewChild(Dir) directive !: Dir;
+      @ViewChild(Dir, {static: false}) directive !: Dir;
     }
 
     TestBed.configureTestingModule({declarations: [App, DoublePipe, Dir]});
diff --git a/packages/core/test/acceptance/template_ref_spec.ts b/packages/core/test/acceptance/template_ref_spec.ts
index 7184479bad..447f893876 100644
--- a/packages/core/test/acceptance/template_ref_spec.ts
+++ b/packages/core/test/acceptance/template_ref_spec.ts
@@ -25,7 +25,7 @@ describe('TemplateRef', () => {
         exportAs: 'menuContent'
       })
       class MenuContent {
-        @ViewChild(TemplateRef) template !: TemplateRef<any>;
+        @ViewChild(TemplateRef, {static: true}) template !: TemplateRef<any>;
       }
 
       @Component({
@@ -37,7 +37,7 @@ describe('TemplateRef', () => {
         `
       })
       class App {
-        @ViewChild(MenuContent) content !: MenuContent;
+        @ViewChild(MenuContent, {static: false}) content !: MenuContent;
 
         constructor(public viewContainerRef: ViewContainerRef) {}
       }
@@ -65,7 +65,7 @@ describe('TemplateRef', () => {
         `
       })
       class App {
-        @ViewChild('templateRef')
+        @ViewChild('templateRef', {static: true})
         templateRef !: TemplateRef<any>;
       }
 
@@ -94,7 +94,7 @@ describe('TemplateRef', () => {
             `
           })
           class App {
-            @ViewChild('templateRef')
+            @ViewChild('templateRef', {static: true})
             templateRef !: TemplateRef<any>;
           }
 
@@ -120,7 +120,7 @@ describe('TemplateRef', () => {
         `
       })
       class App {
-        @ViewChild('templateRef')
+        @ViewChild('templateRef', {static: true})
         templateRef !: TemplateRef<any>;
       }
 
@@ -149,7 +149,7 @@ describe('TemplateRef', () => {
         `
       })
       class App {
-        @ViewChild('templateRef')
+        @ViewChild('templateRef', {static: true})
         templateRef !: TemplateRef<any>;
       }
 
diff --git a/packages/core/test/acceptance/view_container_ref_spec.ts b/packages/core/test/acceptance/view_container_ref_spec.ts
index ca428508b4..45d4a5d10f 100644
--- a/packages/core/test/acceptance/view_container_ref_spec.ts
+++ b/packages/core/test/acceptance/view_container_ref_spec.ts
@@ -1770,7 +1770,7 @@ class ViewContainerRefComp {
   `
 })
 class ViewContainerRefApp {
-  @ViewChild(ViewContainerRefComp) vcrComp !: ViewContainerRefComp;
+  @ViewChild(ViewContainerRefComp, {static: false}) vcrComp !: ViewContainerRefComp;
 }
 
 @Directive({selector: '[structDir]'})
@@ -1803,7 +1803,7 @@ class ConstructorDir {
   `
 })
 class ConstructorApp {
-  @ViewChild('foo') foo !: ElementRef;
+  @ViewChild('foo', {static: true}) foo !: ElementRef;
 }
 
 @Component({
@@ -1815,5 +1815,5 @@ class ConstructorApp {
   `
 })
 class ConstructorAppWithQueries {
-  @ViewChild('foo') foo !: TemplateRef<any>;
+  @ViewChild('foo', {static: true}) foo !: TemplateRef<any>;
 }
diff --git a/packages/core/test/animation/animation_integration_spec.ts b/packages/core/test/animation/animation_integration_spec.ts
index 590c254b17..809464e825 100644
--- a/packages/core/test/animation/animation_integration_spec.ts
+++ b/packages/core/test/animation/animation_integration_spec.ts
@@ -345,7 +345,7 @@ const DEFAULT_COMPONENT_ID = '1';
           ]
         })
         class Cmp {
-          @ViewChild('element')
+          @ViewChild('element', {static: false})
           element: any;
           exp: any = '';
         }
@@ -1433,7 +1433,7 @@ const DEFAULT_COMPONENT_ID = '1';
               ])]
         })
         class Cmp {
-          @ViewChild('green') public element: any;
+          @ViewChild('green', {static: false}) public element: any;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1770,7 +1770,7 @@ const DEFAULT_COMPONENT_ID = '1';
         class Cmp {
           public exp: any;
 
-          @ViewChild('parent') public parentElement: any;
+          @ViewChild('parent', {static: false}) public parentElement: any;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1824,9 +1824,9 @@ const DEFAULT_COMPONENT_ID = '1';
              public exp1: any;
              public exp2: any;
 
-             @ViewChild('parent') public parent: any;
+             @ViewChild('parent', {static: false}) public parent: any;
 
-             @ViewChild('child') public child: any;
+             @ViewChild('child', {static: false}) public child: any;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1881,11 +1881,11 @@ const DEFAULT_COMPONENT_ID = '1';
              public exp1: any;
              public exp2: any;
 
-             @ViewChild('parent') public parent: any;
+             @ViewChild('parent', {static: false}) public parent: any;
 
-             @ViewChild('child1') public child1Elm: any;
+             @ViewChild('child1', {static: false}) public child1Elm: any;
 
-             @ViewChild('child2') public child2Elm: any;
+             @ViewChild('child2', {static: false}) public child2Elm: any;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2240,7 +2240,7 @@ const DEFAULT_COMPONENT_ID = '1';
               [transition(':enter', [style({opacity: 0}), animate('1s', style({opacity: 1}))])])]
         })
         class OuterCmp {
-          @ViewChild('inner') public inner: any;
+          @ViewChild('inner', {static: false}) public inner: any;
           public exp: any = null;
 
           update() { this.exp = 'go'; }
@@ -3073,7 +3073,7 @@ const DEFAULT_COMPONENT_ID = '1';
             exp: any = false;
             disableExp = false;
 
-            @ViewChild('elm') public element: any;
+            @ViewChild('elm', {static: true}) public element: any;
           }
 
           TestBed.configureTestingModule({declarations: [Cmp]});
@@ -3231,7 +3231,7 @@ const DEFAULT_COMPONENT_ID = '1';
             ]
           })
           class Cmp {
-            @ViewChild('parent') public parentElm: any;
+            @ViewChild('parent', {static: false}) public parentElm: any;
             disableExp = false;
             exp = false;
           }
@@ -3322,7 +3322,7 @@ const DEFAULT_COMPONENT_ID = '1';
                 `
              })
              class ParentCmp {
-               @ViewChild('child') public child: ChildCmp|null = null;
+               @ViewChild('child', {static: false}) public child: ChildCmp|null = null;
                disableExp = false;
              }
 
@@ -3438,7 +3438,7 @@ const DEFAULT_COMPONENT_ID = '1';
                 `
              })
              class Cmp {
-               @ViewChild('container') public container: any;
+               @ViewChild('container', {static: false}) public container: any;
 
                disableExp = false;
                exp = '';
@@ -3661,7 +3661,7 @@ const DEFAULT_COMPONENT_ID = '1';
     });
 
     modifiedInIvy('FW-952 - Error recovery is handled differently in Ivy than VE')
-        .it('should continue to clean up DOM-related animation artificats even if a compiler-level error is thrown midway',
+        .it('should continue to clean up DOM-related animation artifacts even if a compiler-level error is thrown midway',
             () => {
               @Component({
                 selector: 'if-cmp',
@@ -3684,7 +3684,7 @@ const DEFAULT_COMPONENT_ID = '1';
               class Cmp {
                 exp: any = false;
 
-                @ViewChild('contents') public contents: any;
+                @ViewChild('contents', {static: true}) public contents: any;
               }
 
               TestBed.configureTestingModule({declarations: [Cmp]});
diff --git a/packages/core/test/animation/animation_query_integration_spec.ts b/packages/core/test/animation/animation_query_integration_spec.ts
index 6a4a339765..9ee2dfc0da 100644
--- a/packages/core/test/animation/animation_query_integration_spec.ts
+++ b/packages/core/test/animation/animation_query_integration_spec.ts
@@ -14,7 +14,6 @@ import {CommonModule} from '@angular/common';
 import {Component, HostBinding, ViewChild} from '@angular/core';
 import {TestBed, fakeAsync, flushMicrotasks} from '@angular/core/testing';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {ivyEnabled} from '@angular/private/testing';
 
 import {HostListener} from '../../src/metadata/directives';
 
@@ -888,7 +887,7 @@ import {HostListener} from '../../src/metadata/directives';
              ]
            })
            class Cmp {
-             @ViewChild('container') public container: any;
+             @ViewChild('container', {static: false}) public container: any;
              public items: any[] = [];
            }
 
@@ -1202,9 +1201,9 @@ import {HostListener} from '../../src/metadata/directives';
              public exp1: any = '';
              public exp2: any = true;
 
-             @ViewChild('ancestor') public ancestorElm: any;
+             @ViewChild('ancestor', {static: false}) public ancestorElm: any;
 
-             @ViewChild('parent') public parentElm: any;
+             @ViewChild('parent', {static: false}) public parentElm: any;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1281,9 +1280,9 @@ import {HostListener} from '../../src/metadata/directives';
              public exp2: any = '';
              public parentExp: any = true;
 
-             @ViewChild('ancestor') public ancestorElm: any;
+             @ViewChild('ancestor', {static: false}) public ancestorElm: any;
 
-             @ViewChild('parent') public parentElm: any;
+             @ViewChild('parent', {static: false}) public parentElm: any;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1637,7 +1636,7 @@ import {HostListener} from '../../src/metadata/directives';
            class ParentCmp {
              public exp: any;
 
-             @ViewChild('child') public child: any;
+             @ViewChild('child', {static: false}) public child: any;
            }
 
            @Component({
@@ -1686,7 +1685,7 @@ import {HostListener} from '../../src/metadata/directives';
            class ParentCmp {
              public exp: any;
 
-             @ViewChild('child') public child: any;
+             @ViewChild('child', {static: true}) public child: any;
            }
 
            @Component({
@@ -1705,10 +1704,6 @@ import {HostListener} from '../../src/metadata/directives';
            const fixture = TestBed.createComponent(ParentCmp);
            const cmp = fixture.componentInstance;
 
-           // In Ivy, change detection needs to run before the ViewQuery for cmp.child will resolve.
-           // Keeping this test enabled since we still want to test the animation logic in Ivy.
-           if (ivyEnabled) fixture.detectChanges();
-
            cmp.child.items = [4, 5, 6];
            fixture.detectChanges();
 
@@ -1853,9 +1848,9 @@ import {HostListener} from '../../src/metadata/directives';
           public exp1: any;
           public exp2: any;
 
-          @ViewChild('parent') public elm1: any;
+          @ViewChild('parent', {static: false}) public elm1: any;
 
-          @ViewChild('child') public elm2: any;
+          @ViewChild('child', {static: false}) public elm2: any;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1915,7 +1910,7 @@ import {HostListener} from '../../src/metadata/directives';
              public exp: any;
              public items: any[] = [0, 1, 2, 3, 4];
 
-             @ViewChild('parent') public elm: any;
+             @ViewChild('parent', {static: false}) public elm: any;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -1985,7 +1980,7 @@ import {HostListener} from '../../src/metadata/directives';
           public exp: any;
           public items: any[] = [0, 1, 2, 3, 4];
 
-          @ViewChild('parent') public elm: any;
+          @ViewChild('parent', {static: false}) public elm: any;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2038,7 +2033,7 @@ import {HostListener} from '../../src/metadata/directives';
              public exp1: any;
              public exp2: any;
 
-             @ViewChild('parent') public elm: any;
+             @ViewChild('parent', {static: false}) public elm: any;
            }
 
            TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2108,7 +2103,7 @@ import {HostListener} from '../../src/metadata/directives';
           public exp1: any;
           public exp2: any;
 
-          @ViewChild('parent') public elm: any;
+          @ViewChild('parent', {static: false}) public elm: any;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2161,7 +2156,7 @@ import {HostListener} from '../../src/metadata/directives';
           public exp1: any;
           public exp2: any;
 
-          @ViewChild('parent') public elm: any;
+          @ViewChild('parent', {static: false}) public elm: any;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2213,7 +2208,7 @@ import {HostListener} from '../../src/metadata/directives';
           public exp1: any;
           public exp2: any;
 
-          @ViewChild('parent') public elm: any;
+          @ViewChild('parent', {static: false}) public elm: any;
         }
 
         TestBed.configureTestingModule({declarations: [Cmp]});
@@ -2262,7 +2257,7 @@ import {HostListener} from '../../src/metadata/directives';
            })
            class ParentCmp {
              public exp: boolean = true;
-             @ViewChild('child') public childElm: any;
+             @ViewChild('child', {static: false}) public childElm: any;
 
              public childEvent: any;
 
@@ -2698,7 +2693,7 @@ import {HostListener} from '../../src/metadata/directives';
         class ParentCmp {
           public exp: any;
 
-          @ViewChild('child') public childCmp: any;
+          @ViewChild('child', {static: false}) public childCmp: any;
         }
 
         @Component({
@@ -2762,7 +2757,7 @@ import {HostListener} from '../../src/metadata/directives';
           `
            })
            class ParentCmp {
-             @ViewChild('child') public childCmp: any;
+             @ViewChild('child', {static: false}) public childCmp: any;
 
              public exp: any;
              public log: string[] = [];
@@ -2940,7 +2935,7 @@ import {HostListener} from '../../src/metadata/directives';
            class ParentCmp {
              public exp: any;
 
-             @ViewChild('child') public childCmp: any;
+             @ViewChild('child', {static: false}) public childCmp: any;
            }
 
            @Component({
@@ -3018,13 +3013,13 @@ import {HostListener} from '../../src/metadata/directives';
            class ParentCmp {
              public exp: any;
 
-             @ViewChild('child') public innerCmp: any;
+             @ViewChild('child', {static: false}) public innerCmp: any;
            }
 
            @Component(
                {selector: 'child-cmp', template: '<grandchild-cmp #grandchild></grandchild-cmp>'})
            class ChildCmp {
-             @ViewChild('grandchild') public innerCmp: any;
+             @ViewChild('grandchild', {static: false}) public innerCmp: any;
            }
 
            @Component({
diff --git a/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts b/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts
index 150b68d96f..5e6baa888d 100644
--- a/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts
+++ b/packages/core/test/animation/animations_with_css_keyframes_animations_integration_spec.ts
@@ -11,7 +11,6 @@ import {AnimationGroupPlayer} from '@angular/animations/src/players/animation_gr
 import {Component, ViewChild} from '@angular/core';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {browserDetection} from '@angular/platform-browser/testing/src/browser_util';
-import {ivyEnabled} from '@angular/private/testing';
 
 import {TestBed} from '../../testing';
 
@@ -166,7 +165,7 @@ import {TestBed} from '../../testing';
         ]
       })
       class Cmp {
-        @ViewChild('elm') public element: any;
+        @ViewChild('elm', {static: false}) public element: any;
 
         public myAnimationExp = '';
       }
@@ -217,7 +216,7 @@ import {TestBed} from '../../testing';
         ]
       })
       class Cmp {
-        @ViewChild('elm') public element: any;
+        @ViewChild('elm', {static: false}) public element: any;
 
         public myAnimationExp = '';
       }
@@ -280,7 +279,7 @@ import {TestBed} from '../../testing';
            ]
          })
          class Cmp {
-           @ViewChild('elm') public element: any;
+           @ViewChild('elm', {static: true}) public element: any;
 
            public myAnimationExp = '';
          }
@@ -291,10 +290,6 @@ import {TestBed} from '../../testing';
          const fixture = TestBed.createComponent(Cmp);
          const cmp = fixture.componentInstance;
 
-         // In Ivy, change detection needs to run before the ViewQuery for cmp.element will resolve.
-         // Keeping this test enabled since we still want to test the animation logic in Ivy.
-         if (ivyEnabled) fixture.detectChanges();
-
          const elm = cmp.element.nativeElement;
          const foo = elm.querySelector('.foo') as HTMLElement;
 
@@ -332,7 +327,7 @@ import {TestBed} from '../../testing';
            ]
          })
          class Cmp {
-           @ViewChild('elm') public element: any;
+           @ViewChild('elm', {static: true}) public element: any;
 
            public myAnimationExp = '';
          }
@@ -343,10 +338,6 @@ import {TestBed} from '../../testing';
          const fixture = TestBed.createComponent(Cmp);
          const cmp = fixture.componentInstance;
 
-         // In Ivy, change detection needs to run before the ViewQuery for cmp.element will resolve.
-         // Keeping this test enabled since we still want to test the animation logic in Ivy.
-         if (ivyEnabled) fixture.detectChanges();
-
          const elm = cmp.element.nativeElement;
          expect(elm.style.getPropertyValue('display')).toEqual('table');
          expect(elm.style.getPropertyValue('position')).toEqual('fixed');
diff --git a/packages/core/test/animation/animations_with_web_animations_integration_spec.ts b/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
index 7096a28b8e..f21c76dc53 100644
--- a/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
+++ b/packages/core/test/animation/animations_with_web_animations_integration_spec.ts
@@ -479,7 +479,7 @@ import {ivyEnabled} from '@angular/private/testing';
            ]
          })
          class Cmp {
-           @ViewChild('elm') public element: any;
+           @ViewChild('elm', {static: true}) public element: any;
 
            public myAnimationExp = '';
          }
@@ -490,10 +490,6 @@ import {ivyEnabled} from '@angular/private/testing';
          const fixture = TestBed.createComponent(Cmp);
          const cmp = fixture.componentInstance;
 
-         // In Ivy, change detection needs to run before the ViewQuery for cmp.element will resolve.
-         // Keeping this test enabled since we still want to test the animation logic in Ivy.
-         if (ivyEnabled) fixture.detectChanges();
-
          const elm = cmp.element.nativeElement;
          expect(elm.style.getPropertyValue('display')).toEqual('table');
          expect(elm.style.getPropertyValue('position')).toEqual('fixed');
diff --git a/packages/core/test/application_ref_spec.ts b/packages/core/test/application_ref_spec.ts
index 8a56680ec3..571ad7b111 100644
--- a/packages/core/test/application_ref_spec.ts
+++ b/packages/core/test/application_ref_spec.ts
@@ -16,7 +16,6 @@ import {BrowserModule} from '@angular/platform-browser';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {ivyEnabled} from '@angular/private/testing';
 
 import {NoopNgZone} from '../src/zone/ng_zone';
 import {ComponentFixtureNoNgZone, TestBed, async, inject, withModule} from '../testing';
@@ -386,14 +385,14 @@ class SomeComponent {
       @Component({template: '<ng-container #vc></ng-container>'})
       class ContainerComp {
         // TODO(issue/24571): remove '!'.
-        @ViewChild('vc', {read: ViewContainerRef})
+        @ViewChild('vc', {read: ViewContainerRef, static: false})
         vc !: ViewContainerRef;
       }
 
       @Component({template: '<ng-template #t>Dynamic content</ng-template>'})
       class EmbeddedViewComp {
         // TODO(issue/24571): remove '!'.
-        @ViewChild(TemplateRef)
+        @ViewChild(TemplateRef, {static: true})
         tplRef !: TemplateRef<Object>;
       }
 
@@ -447,10 +446,6 @@ class SomeComponent {
         const comp = TestBed.createComponent(EmbeddedViewComp);
         const appRef: ApplicationRef = TestBed.get(ApplicationRef);
 
-        // In Ivy, change detection needs to run before the ViewQuery for tplRef will resolve.
-        // Keeping this test enabled since we still want to test this destroy logic in Ivy.
-        if (ivyEnabled) comp.detectChanges();
-
         const embeddedViewRef = comp.componentInstance.tplRef.createEmbeddedView({});
 
         appRef.attachView(embeddedViewRef);
diff --git a/packages/core/test/debug/debug_node_spec.ts b/packages/core/test/debug/debug_node_spec.ts
index 150c20c60a..ac3773b873 100644
--- a/packages/core/test/debug/debug_node_spec.ts
+++ b/packages/core/test/debug/debug_node_spec.ts
@@ -160,7 +160,7 @@ class BankAccount {
  `
 })
 class SimpleContentComp {
-  @ViewChild('content') content !: ElementRef;
+  @ViewChild('content', {static: false}) content !: ElementRef;
 }
 
 @Component({
diff --git a/packages/core/test/linker/change_detection_integration_spec.ts b/packages/core/test/linker/change_detection_integration_spec.ts
index 7d1322f772..0602fb671c 100644
--- a/packages/core/test/linker/change_detection_integration_spec.ts
+++ b/packages/core/test/linker/change_detection_integration_spec.ts
@@ -1356,9 +1356,9 @@ const TEST_COMPILER_PROVIDERS: Provider[] = [
            class Comp {
              name = 'Tom';
              // TODO(issue/24571): remove '!'.
-             @ViewChild('vc', {read: ViewContainerRef}) vc !: ViewContainerRef;
+             @ViewChild('vc', {read: ViewContainerRef, static: true}) vc !: ViewContainerRef;
              // TODO(issue/24571): remove '!'.
-             @ViewChild(TemplateRef) template !: TemplateRef<any>;
+             @ViewChild(TemplateRef, {static: true}) template !: TemplateRef<any>;
            }
 
            TestBed.configureTestingModule({declarations: [Comp]});
@@ -1399,7 +1399,7 @@ const TEST_COMPILER_PROVIDERS: Provider[] = [
         })
         class OuterComp {
           // TODO(issue/24571): remove '!'.
-          @ContentChild(TemplateRef)
+          @ContentChild(TemplateRef, {static: true})
           tpl !: TemplateRef<any>;
 
           constructor(public cdRef: ChangeDetectorRef) {}
@@ -1413,7 +1413,7 @@ const TEST_COMPILER_PROVIDERS: Provider[] = [
         })
         class InnerComp {
           // TODO(issue/24571): remove '!'.
-          @ContentChild(TemplateRef)
+          @ContentChild(TemplateRef, {static: true})
           tpl !: TemplateRef<any>;
 
           // TODO(issue/24571): remove '!'.
diff --git a/packages/core/test/linker/projection_integration_spec.ts b/packages/core/test/linker/projection_integration_spec.ts
index d55447c3ea..7829aaf48a 100644
--- a/packages/core/test/linker/projection_integration_spec.ts
+++ b/packages/core/test/linker/projection_integration_spec.ts
@@ -689,7 +689,7 @@ describe('projection', () => {
 
     @Component({selector: 'with-content', template: ''})
     class WithContentCmpt {
-      @ViewChild('ref') directiveRef: any;
+      @ViewChild('ref', {static: true}) directiveRef: any;
     }
 
     @Component({selector: 're-project', template: '<ng-content></ng-content>'})
diff --git a/packages/core/test/linker/regression_integration_spec.ts b/packages/core/test/linker/regression_integration_spec.ts
index 502e16734d..85c472b201 100644
--- a/packages/core/test/linker/regression_integration_spec.ts
+++ b/packages/core/test/linker/regression_integration_spec.ts
@@ -362,7 +362,7 @@ function declareTests(config?: {useJit: boolean}) {
               @Directive({selector: 'test'})
               class Test {
                 // TODO(issue/24571): remove '!'.
-                @Input() @ContentChild(TemplateRef) tpl !: TemplateRef<any>;
+                @Input() @ContentChild(TemplateRef, {static: true}) tpl !: TemplateRef<any>;
               }
 
               @Component({
@@ -392,7 +392,7 @@ function declareTests(config?: {useJit: boolean}) {
         .it('should throw if @ContentChild and @Input are on the same property', () => {
           @Directive({selector: 'test'})
           class Test {
-            @Input() @ContentChild(TemplateRef) tpl !: TemplateRef<any>;
+            @Input() @ContentChild(TemplateRef, {static: true}) tpl !: TemplateRef<any>;
           }
 
           @Component({selector: 'my-app', template: `<test></test>`})

From dcdecfa9a8110a2bafb0f9a83f22143023df3a8d Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 22 May 2019 17:22:42 -0700
Subject: [PATCH 174/275] test(common): update common tests to use static flag
 (#30626)

PR Close #30626
---
 .../directives/ng_component_outlet_spec.ts    | 26 +++++++++----------
 .../common/test/directives/ng_switch_spec.ts  |  4 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/common/test/directives/ng_component_outlet_spec.ts b/packages/common/test/directives/ng_component_outlet_spec.ts
index bc8ae923df..bc25a7b83d 100644
--- a/packages/common/test/directives/ng_component_outlet_spec.ts
+++ b/packages/common/test/directives/ng_component_outlet_spec.ts
@@ -11,7 +11,6 @@ import {NgComponentOutlet} from '@angular/common/src/directives/ng_component_out
 import {Compiler, Component, ComponentRef, Inject, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleFactory, Optional, QueryList, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
 import {TestBed, async} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {modifiedInIvy} from '@angular/private/testing';
 
 describe('insert/remove', () => {
 
@@ -108,19 +107,18 @@ describe('insert/remove', () => {
      }));
 
 
-  modifiedInIvy('Static ViewChild and ContentChild queries are resolved in update mode')
-      .it('should resolve with an injector', async(() => {
-            let fixture = TestBed.createComponent(TestComponent);
+  it('should resolve with an injector', async(() => {
+       let fixture = TestBed.createComponent(TestComponent);
 
-            // We are accessing a ViewChild (ngComponentOutlet) before change detection has run
-            fixture.componentInstance.cmpRef = null;
-            fixture.componentInstance.currentComponent = InjectedComponent;
-            fixture.detectChanges();
-            let cmpRef: ComponentRef<InjectedComponent> = fixture.componentInstance.cmpRef !;
-            expect(cmpRef).toBeAnInstanceOf(ComponentRef);
-            expect(cmpRef.instance).toBeAnInstanceOf(InjectedComponent);
-            expect(cmpRef.instance.testToken).toBeNull();
-          }));
+       // We are accessing a ViewChild (ngComponentOutlet) before change detection has run
+       fixture.componentInstance.cmpRef = null;
+       fixture.componentInstance.currentComponent = InjectedComponent;
+       fixture.detectChanges();
+       let cmpRef: ComponentRef<InjectedComponent> = fixture.componentInstance.cmpRef !;
+       expect(cmpRef).toBeAnInstanceOf(ComponentRef);
+       expect(cmpRef.instance).toBeAnInstanceOf(InjectedComponent);
+       expect(cmpRef.instance.testToken).toBeNull();
+     }));
 
   it('should render projectable nodes, if supplied', async(() => {
        const template = `<ng-template>projected foo</ng-template>${TEST_CMP_TEMPLATE}`;
@@ -240,7 +238,7 @@ class TestComponent {
   // TODO(issue/24571): remove '!'.
   @ViewChildren(TemplateRef) tplRefs !: QueryList<TemplateRef<any>>;
   // TODO(issue/24571): remove '!'.
-  @ViewChild(NgComponentOutlet) ngComponentOutlet !: NgComponentOutlet;
+  @ViewChild(NgComponentOutlet, {static: true}) ngComponentOutlet !: NgComponentOutlet;
 
   constructor(public vcRef: ViewContainerRef) {}
 }
diff --git a/packages/common/test/directives/ng_switch_spec.ts b/packages/common/test/directives/ng_switch_spec.ts
index f7042859e5..436d8ad36b 100644
--- a/packages/common/test/directives/ng_switch_spec.ts
+++ b/packages/common/test/directives/ng_switch_spec.ts
@@ -223,8 +223,8 @@ class TestComponent {
 `
 })
 class ComplexComponent {
-  @ViewChild('foo') foo !: TemplateRef<any>;
-  @ViewChild('bar') bar !: TemplateRef<any>;
+  @ViewChild('foo', {static: true}) foo !: TemplateRef<any>;
+  @ViewChild('bar', {static: true}) bar !: TemplateRef<any>;
   state: string = 'case1';
 }
 

From 214ae0ea4c962b4411b6fd70cc311d28a49733e4 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 22 May 2019 20:42:34 -0700
Subject: [PATCH 175/275] test(compiler): update examples and compiler tests
 (#30626)

PR Close #30626
---
 .../compliance/r3_compiler_compliance_spec.ts | 12 +++----
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     | 12 +++----
 packages/compiler/test/core_spec.ts           | 14 ++++----
 .../compiler/test/directive_resolver_spec.ts  | 34 +++++++++++--------
 packages/core/test/render3/ivy/jit_spec.ts    |  6 ++--
 packages/examples/common/ngIf/ts/module.ts    |  2 +-
 .../ts/contentChild/content_child_example.ts  |  2 +-
 .../di/ts/contentChild/content_child_howto.ts |  4 +--
 .../di/ts/viewChild/view_child_example.ts     |  2 +-
 .../core/di/ts/viewChild/view_child_howto.ts  |  4 +--
 10 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 6afa8627c8..998a42e2b1 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -1714,7 +1714,7 @@ describe('compiler compliance', () => {
               \`
             })
             export class ContentQueryComponent {
-              @ContentChild(SomeDirective) someDir: SomeDirective;
+              @ContentChild(SomeDirective, {static: false}) someDir: SomeDirective;
               @ContentChildren(SomeDirective) someDirList !: QueryList<SomeDirective>;
             }
 
@@ -1786,7 +1786,7 @@ describe('compiler compliance', () => {
               \`
             })
             export class ContentQueryComponent {
-              @ContentChild('myRef') myRef: any;
+              @ContentChild('myRef', {static: false}) myRef: any;
               @ContentChildren('myRef1, myRef2, myRef3') myRefs: QueryList<any>;
             }
             @NgModule({declarations: [ContentQueryComponent]})
@@ -1911,9 +1911,9 @@ describe('compiler compliance', () => {
               \`
             })
             export class ContentQueryComponent {
-              @ContentChild('myRef', {read: TemplateRef}) myRef: TemplateRef;
+              @ContentChild('myRef', {read: TemplateRef, static: false}) myRef: TemplateRef;
               @ContentChildren('myRef1, myRef2, myRef3', {read: ElementRef}) myRefs: QueryList<ElementRef>;
-              @ContentChild(SomeDirective, {read: ElementRef}) someDir: ElementRef;
+              @ContentChild(SomeDirective, {read: ElementRef, static: false}) someDir: ElementRef;
               @ContentChildren(SomeDirective, {read: TemplateRef}) someDirs: QueryList<TemplateRef>;
             }
             @NgModule({declarations: [ContentQueryComponent]})
@@ -1966,7 +1966,7 @@ describe('compiler compliance', () => {
               \`
             })
             export class ContentQueryComponent {
-              @Input() @ContentChild('foo') foo: any;
+              @Input() @ContentChild('foo', {static: false}) foo: any;
             }
 
             @Component({
@@ -3139,7 +3139,7 @@ describe('compiler compliance', () => {
           'spec.ts': `
             import {Component, NgModule, ContentChild} from '@angular/core';
             export class BaseClass {
-              @ContentChild('something') something: any;
+              @ContentChild('something', {static: false}) something: any;
             }
 
             @Component({
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 5c818815df..1bbcc200f6 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -1536,10 +1536,10 @@ describe('ngtsc behavioral tests', () => {
           }
         })
         class FooCmp {
-          @ContentChild('bar', {read: TemplateRef}) child: any;
+          @ContentChild('bar', {read: TemplateRef, static: false}) child: any;
           @ContentChildren(TemplateRef) children: any;
           get aview(): any { return null; }
-          @ViewChild('accessor') set aview(value: any) {}
+          @ViewChild('accessor', {static: false}) set aview(value: any) {}
         }
     `);
 
@@ -1568,7 +1568,7 @@ describe('ngtsc behavioral tests', () => {
           }
         })
         class FooCmp {
-          @ContentChild('bar', {read: TemplateRef}) child: any;
+          @ContentChild('bar', {read: TemplateRef, static: false}) child: any;
           @ContentChildren(TemplateRef) children: any;
           get aview(): any { return null; }
           @ViewChild('accessor') set aview(value: any) {}
@@ -1600,11 +1600,11 @@ describe('ngtsc behavioral tests', () => {
           template: '<div #foo></div>',
         })
         class FooCmp {
-          @ContentChild(forwardRef(() => TemplateRef)) child: any;
+          @ContentChild(forwardRef(() => TemplateRef), {static: false}) child: any;
 
-          @ContentChild(forwardRef(function() { return ViewContainerRef; })) child2: any;
+          @ContentChild(forwardRef(function() { return ViewContainerRef; }), {static: false}) child2: any;
 
-          @ContentChild((forwardRef((function() { return 'parens'; }) as any))) childInParens: any;
+          @ContentChild((forwardRef((function() { return 'parens'; }) as any)), {static: false}) childInParens: any;
         }
     `);
 
diff --git a/packages/compiler/test/core_spec.ts b/packages/compiler/test/core_spec.ts
index f5864584cc..c4acff371b 100644
--- a/packages/compiler/test/core_spec.ts
+++ b/packages/compiler/test/core_spec.ts
@@ -27,10 +27,11 @@ import * as core from '@angular/core';
       typeExtends<compilerCore.Query, core.Query>();
       typeExtends<core.Query, compilerCore.Query>();
       compareRuntimeShape(
-          new core.ContentChild('someSelector'), compilerCore.createContentChild('someSelector'));
+          new core.ContentChild('someSelector', {static: false}),
+          compilerCore.createContentChild('someSelector', {static: false}));
       compareRuntimeShape(
-          new core.ContentChild('someSelector', {read: 'someRead'}),
-          compilerCore.createContentChild('someSelector', {read: 'someRead'}));
+          new core.ContentChild('someSelector', {read: 'someRead', static: false}),
+          compilerCore.createContentChild('someSelector', {read: 'someRead', static: false}));
       compareRuntimeShape(
           new core.ContentChildren('someSelector'),
           compilerCore.createContentChildren('someSelector'));
@@ -39,10 +40,11 @@ import * as core from '@angular/core';
           compilerCore.createContentChildren(
               'someSelector', {read: 'someRead', descendants: false}));
       compareRuntimeShape(
-          new core.ViewChild('someSelector'), compilerCore.createViewChild('someSelector'));
+          new core.ViewChild('someSelector', {static: false}),
+          compilerCore.createViewChild('someSelector', {static: false}));
       compareRuntimeShape(
-          new core.ViewChild('someSelector', {read: 'someRead'}),
-          compilerCore.createViewChild('someSelector', {read: 'someRead'}));
+          new core.ViewChild('someSelector', {read: 'someRead', static: false}),
+          compilerCore.createViewChild('someSelector', {read: 'someRead', static: false}));
       compareRuntimeShape(
           new core.ViewChildren('someSelector'), compilerCore.createViewChildren('someSelector'));
       compareRuntimeShape(
diff --git a/packages/compiler/test/directive_resolver_spec.ts b/packages/compiler/test/directive_resolver_spec.ts
index 4d211643f9..e0ad64bb9f 100644
--- a/packages/compiler/test/directive_resolver_spec.ts
+++ b/packages/compiler/test/directive_resolver_spec.ts
@@ -68,15 +68,15 @@ class SomeDirectiveWithViewChildren {
   c: any;
 }
 
-@Directive({selector: 'someDirective', queries: {'c': new ContentChild('c')}})
+@Directive({selector: 'someDirective', queries: {'c': new ContentChild('c', {static: false})}})
 class SomeDirectiveWithContentChild {
-  @ContentChild('a') a: any;
+  @ContentChild('a', {static: false}) a: any;
   c: any;
 }
 
-@Directive({selector: 'someDirective', queries: {'c': new ViewChild('c')}})
+@Directive({selector: 'someDirective', queries: {'c': new ViewChild('c', {static: false})}})
 class SomeDirectiveWithViewChild {
-  @ViewChild('a') a: any;
+  @ViewChild('a', {static: false}) a: any;
   c: any;
 }
 
@@ -408,37 +408,41 @@ class SomeDirectiveWithoutMetadata {}
 
       it('should append ContentChild', () => {
         const directiveMetadata = resolver.resolve(SomeDirectiveWithContentChild);
-        expect(directiveMetadata.queries)
-            .toEqual({'c': new ContentChild('c'), 'a': new ContentChild('a')});
+        expect(directiveMetadata.queries).toEqual({
+          'c': new ContentChild('c', {static: false}),
+          'a': new ContentChild('a', {static: false})
+        });
       });
 
       it('should append ViewChild', () => {
         const directiveMetadata = resolver.resolve(SomeDirectiveWithViewChild);
-        expect(directiveMetadata.queries)
-            .toEqual({'c': new ViewChild('c'), 'a': new ViewChild('a')});
+        expect(directiveMetadata.queries).toEqual({
+          'c': new ViewChild('c', {static: false}),
+          'a': new ViewChild('a', {static: false})
+        });
       });
 
       it('should support inheriting queries', () => {
         @Directive({selector: 'p'})
         class Parent {
-          @ContentChild('p1')
+          @ContentChild('p1', {static: false})
           p1: any;
-          @ContentChild('p21')
+          @ContentChild('p21', {static: false})
           p2: any;
         }
 
         class Child extends Parent {
-          @ContentChild('p22')
+          @ContentChild('p22', {static: false})
           p2: any;
-          @ContentChild('p3')
+          @ContentChild('p3', {static: false})
           p3: any;
         }
 
         const directiveMetadata = resolver.resolve(Child);
         expect(directiveMetadata.queries).toEqual({
-          'p1': new ContentChild('p1'),
-          'p2': new ContentChild('p22'),
-          'p3': new ContentChild('p3')
+          'p1': new ContentChild('p1', {static: false}),
+          'p2': new ContentChild('p22', {static: false}),
+          'p3': new ContentChild('p3', {static: false})
         });
       });
     });
diff --git a/packages/core/test/render3/ivy/jit_spec.ts b/packages/core/test/render3/ivy/jit_spec.ts
index 6fb5771030..cb976aec2a 100644
--- a/packages/core/test/render3/ivy/jit_spec.ts
+++ b/packages/core/test/render3/ivy/jit_spec.ts
@@ -295,7 +295,7 @@ ivyEnabled && describe('render3 jit', () => {
   it('should compile ContentChild query with string predicate on a directive', () => {
     @Directive({selector: '[test]'})
     class TestDirective {
-      @ContentChild('foo') foo: ElementRef|undefined;
+      @ContentChild('foo', {static: false}) foo: ElementRef|undefined;
     }
 
     expect((TestDirective as any).ngDirectiveDef.contentQueries).not.toBeNull();
@@ -317,7 +317,7 @@ ivyEnabled && describe('render3 jit', () => {
 
     @Directive({selector: '[test]'})
     class TestDirective {
-      @ContentChild(SomeDir) dir: SomeDir|undefined;
+      @ContentChild(SomeDir, {static: false}) dir: SomeDir|undefined;
     }
 
     expect((TestDirective as any).ngDirectiveDef.contentQueries).not.toBeNull();
@@ -326,7 +326,7 @@ ivyEnabled && describe('render3 jit', () => {
   it('should compile ViewChild query on a component', () => {
     @Component({selector: 'test', template: ''})
     class TestComponent {
-      @ViewChild('foo') foo: ElementRef|undefined;
+      @ViewChild('foo', {static: false}) foo: ElementRef|undefined;
     }
 
     expect((TestComponent as any).ngComponentDef.foo).not.toBeNull();
diff --git a/packages/examples/common/ngIf/ts/module.ts b/packages/examples/common/ngIf/ts/module.ts
index 229ae2e666..913b6e3dc3 100644
--- a/packages/examples/common/ngIf/ts/module.ts
+++ b/packages/examples/common/ngIf/ts/module.ts
@@ -62,7 +62,7 @@ export class NgIfThenElse implements OnInit {
 
   @ViewChild('primaryBlock', {static: true})
   primaryBlock: TemplateRef<any>|null = null;
-  @ViewChild('secondaryBlock')
+  @ViewChild('secondaryBlock', {static: true})
   secondaryBlock: TemplateRef<any>|null = null;
 
   switchPrimary() {
diff --git a/packages/examples/core/di/ts/contentChild/content_child_example.ts b/packages/examples/core/di/ts/contentChild/content_child_example.ts
index a734781912..28928cc4ad 100644
--- a/packages/examples/core/di/ts/contentChild/content_child_example.ts
+++ b/packages/examples/core/di/ts/contentChild/content_child_example.ts
@@ -23,7 +23,7 @@ export class Pane {
 })
 export class Tab {
   // TODO(issue/24571): remove '!'.
-  @ContentChild(Pane) pane !: Pane;
+  @ContentChild(Pane, {static: false}) pane !: Pane;
 }
 
 @Component({
diff --git a/packages/examples/core/di/ts/contentChild/content_child_howto.ts b/packages/examples/core/di/ts/contentChild/content_child_howto.ts
index 5bcaa1afda..455979bfd0 100644
--- a/packages/examples/core/di/ts/contentChild/content_child_howto.ts
+++ b/packages/examples/core/di/ts/contentChild/content_child_howto.ts
@@ -15,10 +15,10 @@ class ChildDirective {
 
 @Directive({selector: 'someDir'})
 class SomeDir implements AfterContentInit {
-  @ContentChild(ChildDirective) contentChild !: ChildDirective;
+  @ContentChild(ChildDirective, {static: false}) contentChild !: ChildDirective;
 
   ngAfterContentInit() {
     // contentChild is set
   }
 }
-// #enddocregion
\ No newline at end of file
+// #enddocregion
diff --git a/packages/examples/core/di/ts/viewChild/view_child_example.ts b/packages/examples/core/di/ts/viewChild/view_child_example.ts
index 4f7ccd15b1..c624cf87e3 100644
--- a/packages/examples/core/di/ts/viewChild/view_child_example.ts
+++ b/packages/examples/core/di/ts/viewChild/view_child_example.ts
@@ -27,7 +27,7 @@ export class Pane {
   `,
 })
 export class ViewChildComp {
-  @ViewChild(Pane)
+  @ViewChild(Pane, {static: false})
   set pane(v: Pane) {
     setTimeout(() => { this.selectedPane = v.id; }, 0);
   }
diff --git a/packages/examples/core/di/ts/viewChild/view_child_howto.ts b/packages/examples/core/di/ts/viewChild/view_child_howto.ts
index a0753ddbbb..f3d74ac953 100644
--- a/packages/examples/core/di/ts/viewChild/view_child_howto.ts
+++ b/packages/examples/core/di/ts/viewChild/view_child_howto.ts
@@ -16,10 +16,10 @@ class ChildDirective {
 @Component({selector: 'someCmp', templateUrl: 'someCmp.html'})
 class SomeCmp implements AfterViewInit {
   // TODO(issue/24571): remove '!'.
-  @ViewChild(ChildDirective) child !: ChildDirective;
+  @ViewChild(ChildDirective, {static: false}) child !: ChildDirective;
 
   ngAfterViewInit() {
     // child is set
   }
 }
-// #enddocregion
\ No newline at end of file
+// #enddocregion

From faac51fd2ea8dc7fcbf8914f1bce077dc2daa2b5 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Wed, 22 May 2019 21:05:26 -0700
Subject: [PATCH 176/275] test(core): update query-specific tests in core
 (#30626)

PR Close #30626
---
 packages/core/test/acceptance/query_spec.ts   | 33 ++++++-------
 .../test/linker/query_integration_spec.ts     | 48 ++++++++++---------
 packages/core/test/metadata/di_spec.ts        |  4 +-
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/packages/core/test/acceptance/query_spec.ts b/packages/core/test/acceptance/query_spec.ts
index c269578e39..12a75203a1 100644
--- a/packages/core/test/acceptance/query_spec.ts
+++ b/packages/core/test/acceptance/query_spec.ts
@@ -177,7 +177,7 @@ describe('query logic', () => {
 
     it('should support ViewChild query inherited from undecorated superclasses', () => {
       class MyComp {
-        @ViewChild('foo') foo: any;
+        @ViewChild('foo', {static: false}) foo: any;
       }
 
       @Component({selector: 'sub-comp', template: '<div #foo></div>'})
@@ -193,7 +193,7 @@ describe('query logic', () => {
 
     it('should support ViewChild query inherited from undecorated grand superclasses', () => {
       class MySuperComp {
-        @ViewChild('foo') foo: any;
+        @ViewChild('foo', {static: false}) foo: any;
       }
 
       class MyComp extends MySuperComp {}
@@ -493,7 +493,7 @@ describe('query logic', () => {
 
     it('should support ContentChild query inherited from undecorated superclasses', () => {
       class MyComp {
-        @ContentChild('foo') foo: any;
+        @ContentChild('foo', {static: false}) foo: any;
       }
 
       @Component({selector: 'sub-comp', template: '<ng-content></ng-content>'})
@@ -502,7 +502,7 @@ describe('query logic', () => {
 
       @Component({template: '<sub-comp><div #foo></div></sub-comp>'})
       class App {
-        @ViewChild(SubComp) subComp !: SubComp;
+        @ViewChild(SubComp, {static: false}) subComp !: SubComp;
       }
 
       TestBed.configureTestingModule({declarations: [App, SubComp]});
@@ -514,7 +514,7 @@ describe('query logic', () => {
 
     it('should support ContentChild query inherited from undecorated grand superclasses', () => {
       class MySuperComp {
-        @ContentChild('foo') foo: any;
+        @ContentChild('foo', {static: false}) foo: any;
       }
 
       class MyComp extends MySuperComp {}
@@ -525,7 +525,7 @@ describe('query logic', () => {
 
       @Component({template: '<sub-comp><div #foo></div></sub-comp>'})
       class App {
-        @ViewChild(SubComp) subComp !: SubComp;
+        @ViewChild(SubComp, {static: false}) subComp !: SubComp;
       }
 
       TestBed.configureTestingModule({declarations: [App, SubComp]});
@@ -557,7 +557,7 @@ describe('query logic', () => {
       `
       })
       class App {
-        @ViewChild(SubComp) subComp !: SubComp;
+        @ViewChild(SubComp, {static: false}) subComp !: SubComp;
       }
 
       TestBed.configureTestingModule({declarations: [App, SubComp, SomeDir]});
@@ -592,7 +592,7 @@ describe('query logic', () => {
       `
       })
       class App {
-        @ViewChild(SubComp) subComp !: SubComp;
+        @ViewChild(SubComp, {static: false}) subComp !: SubComp;
       }
 
       TestBed.configureTestingModule({declarations: [App, SubComp, SomeDir]});
@@ -806,9 +806,10 @@ describe('query logic', () => {
              `,
            })
            class TestComponent {
-             @ViewChild(ViewContainerManipulatorDirective) vc !: ViewContainerManipulatorDirective;
-             @ViewChild('tpl1') tpl1 !: TemplateRef<any>;
-             @ViewChild('tpl2') tpl2 !: TemplateRef<any>;
+             @ViewChild(ViewContainerManipulatorDirective, {static: false})
+             vc !: ViewContainerManipulatorDirective;
+             @ViewChild('tpl1', {static: false}) tpl1 !: TemplateRef<any>;
+             @ViewChild('tpl2', {static: false}) tpl2 !: TemplateRef<any>;
              @ViewChildren('foo') query !: QueryList<any>;
            }
 
@@ -878,9 +879,9 @@ describe('query logic', () => {
              `,
                 })
                 class TestComponent {
-                  @ViewChild('tpl') tpl !: TemplateRef<any>;
-                  @ViewChild('vi0') vi0 !: ViewContainerManipulatorDirective;
-                  @ViewChild('vi1') vi1 !: ViewContainerManipulatorDirective;
+                  @ViewChild('tpl', {static: false}) tpl !: TemplateRef<any>;
+                  @ViewChild('vi0', {static: false}) vi0 !: ViewContainerManipulatorDirective;
+                  @ViewChild('vi1', {static: false}) vi1 !: ViewContainerManipulatorDirective;
                   @ViewChildren('foo') query !: QueryList<any>;
                 }
 
@@ -963,8 +964,8 @@ function initWithTemplate(compType: Type<any>, template: string) {
 
 @Component({selector: 'local-ref-query-component', template: '<ng-content></ng-content>'})
 class QueryComp {
-  @ViewChild('viewQuery') viewChild !: any;
-  @ContentChild('contentQuery') contentChild !: any;
+  @ViewChild('viewQuery', {static: false}) viewChild !: any;
+  @ContentChild('contentQuery', {static: false}) contentChild !: any;
 
   @ViewChildren('viewQuery') viewChildren !: QueryList<any>;
   @ContentChildren('contentQuery') contentChildren !: QueryList<any>;
diff --git a/packages/core/test/linker/query_integration_spec.ts b/packages/core/test/linker/query_integration_spec.ts
index 1f68c34363..41378a6245 100644
--- a/packages/core/test/linker/query_integration_spec.ts
+++ b/packages/core/test/linker/query_integration_spec.ts
@@ -752,7 +752,7 @@ describe('Query API', () => {
               class AutoProjecting {
                 // TODO(issue/24571):
                 // remove '!'.
-                @ContentChild(TemplateRef)
+                @ContentChild(TemplateRef, {static: false})
                 content !: TemplateRef<any>;
 
                 // TODO(issue/24571):
@@ -784,7 +784,7 @@ describe('Query API', () => {
            class AutoProjecting {
              // TODO(issue/24571):
              // remove '!'.
-             @ContentChild(TemplateRef)
+             @ContentChild(TemplateRef, {static: false})
              content !: TemplateRef<any>;
 
              // TODO(issue/24571):
@@ -839,7 +839,7 @@ class NeedsContentChild implements AfterContentInit, AfterContentChecked {
   // TODO(issue/24571): remove '!'.
   _child !: TextDirective;
 
-  @ContentChild(TextDirective)
+  @ContentChild(TextDirective, {static: false})
   set child(value) {
     this._child = value;
     this.logs.push(['setter', value ? value.text : null]);
@@ -856,7 +856,7 @@ class NeedsContentChild implements AfterContentInit, AfterContentChecked {
 @Directive({selector: '[directive-needs-content-child]'})
 class DirectiveNeedsContentChild {
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TextDirective) child !: TextDirective;
+  @ContentChild(TextDirective, {static: false}) child !: TextDirective;
 }
 
 @Component({selector: 'needs-view-child', template: `<div *ngIf="shouldShow" text="foo"></div>`})
@@ -867,7 +867,7 @@ class NeedsViewChild implements AfterViewInit, AfterViewChecked {
   // TODO(issue/24571): remove '!'.
   _child !: TextDirective;
 
-  @ViewChild(TextDirective)
+  @ViewChild(TextDirective, {static: false})
   set child(value) {
     this._child = value;
     this.logs.push(['setter', value ? value.text : null]);
@@ -896,9 +896,9 @@ function createTestCmpAndDetectChanges<T>(type: Type<T>, template: string): Comp
 @Component({selector: 'needs-static-content-view-child', template: `<div text="viewFoo"></div>`})
 class NeedsStaticContentAndViewChild {
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TextDirective) contentChild !: TextDirective;
+  @ContentChild(TextDirective, {static: true}) contentChild !: TextDirective;
   // TODO(issue/24571): remove '!'.
-  @ViewChild(TextDirective) viewChild !: TextDirective;
+  @ViewChild(TextDirective, {static: true}) viewChild !: TextDirective;
 }
 
 @Directive({selector: '[dir]'})
@@ -917,13 +917,13 @@ class NeedsQuery {
 @Component({selector: 'needs-four-queries', template: ''})
 class NeedsFourQueries {
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TextDirective) query1 !: TextDirective;
+  @ContentChild(TextDirective, {static: false}) query1 !: TextDirective;
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TextDirective) query2 !: TextDirective;
+  @ContentChild(TextDirective, {static: false}) query2 !: TextDirective;
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TextDirective) query3 !: TextDirective;
+  @ContentChild(TextDirective, {static: false}) query3 !: TextDirective;
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TextDirective) query4 !: TextDirective;
+  @ContentChild(TextDirective, {static: false}) query4 !: TextDirective;
 }
 
 @Component({
@@ -1025,9 +1025,9 @@ class NeedsTpl {
     {selector: 'needs-named-tpl', template: '<ng-template #tpl><div>shadow</div></ng-template>'})
 class NeedsNamedTpl {
   // TODO(issue/24571): remove '!'.
-  @ViewChild('tpl') viewTpl !: TemplateRef<Object>;
+  @ViewChild('tpl', {static: true}) viewTpl !: TemplateRef<Object>;
   // TODO(issue/24571): remove '!'.
-  @ContentChild('tpl') contentTpl !: TemplateRef<Object>;
+  @ContentChild('tpl', {static: true}) contentTpl !: TemplateRef<Object>;
   constructor(public vc: ViewContainerRef) {}
 }
 
@@ -1042,9 +1042,10 @@ class NeedsContentChildrenWithRead {
 @Component({selector: 'needs-content-child-read', template: ''})
 class NeedsContentChildWithRead {
   // TODO(issue/24571): remove '!'.
-  @ContentChild('q', {read: TextDirective}) textDirChild !: TextDirective;
+  @ContentChild('q', {read: TextDirective, static: false}) textDirChild !: TextDirective;
   // TODO(issue/24571): remove '!'.
-  @ContentChild('nonExisting', {read: TextDirective}) nonExistingVar !: TextDirective;
+  @ContentChild('nonExisting', {read: TextDirective, static: false})
+  nonExistingVar !: TextDirective;
 }
 
 @Component({selector: 'needs-content-children-shallow', template: ''})
@@ -1059,7 +1060,7 @@ class NeedsContentChildrenShallow {
 })
 class NeedsContentChildTemplateRef {
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TemplateRef) templateRef !: TemplateRef<any>;
+  @ContentChild(TemplateRef, {static: true}) templateRef !: TemplateRef<any>;
 }
 
 @Component({
@@ -1088,19 +1089,20 @@ class NeedsViewChildrenWithRead {
 })
 class NeedsViewChildWithRead {
   // TODO(issue/24571): remove '!'.
-  @ViewChild('q', {read: TextDirective}) textDirChild !: TextDirective;
+  @ViewChild('q', {read: TextDirective, static: false}) textDirChild !: TextDirective;
   // TODO(issue/24571): remove '!'.
-  @ViewChild('nonExisting', {read: TextDirective}) nonExistingVar !: TextDirective;
+  @ViewChild('nonExisting', {read: TextDirective, static: false}) nonExistingVar !: TextDirective;
 }
 
 @Component({selector: 'needs-viewcontainer-read', template: '<div #q></div>'})
 class NeedsViewContainerWithRead {
   // TODO(issue/24571): remove '!'.
-  @ViewChild('q', {read: ViewContainerRef}) vc !: ViewContainerRef;
+  @ViewChild('q', {read: ViewContainerRef, static: false}) vc !: ViewContainerRef;
   // TODO(issue/24571): remove '!'.
-  @ViewChild('nonExisting', {read: ViewContainerRef}) nonExistingVar !: ViewContainerRef;
+  @ViewChild('nonExisting', {read: ViewContainerRef, static: false})
+  nonExistingVar !: ViewContainerRef;
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TemplateRef) template !: TemplateRef<Object>;
+  @ContentChild(TemplateRef, {static: true}) template !: TemplateRef<Object>;
 
   createView() { this.vc.createEmbeddedView(this.template); }
 }
@@ -1123,10 +1125,10 @@ class MyCompBroken0 {
 @Component({selector: 'manual-projecting', template: '<div #vc></div>'})
 class ManualProjecting {
   // TODO(issue/24571): remove '!'.
-  @ContentChild(TemplateRef) template !: TemplateRef<any>;
+  @ContentChild(TemplateRef, {static: true}) template !: TemplateRef<any>;
 
   // TODO(issue/24571): remove '!'.
-  @ViewChild('vc', {read: ViewContainerRef})
+  @ViewChild('vc', {read: ViewContainerRef, static: false})
   vc !: ViewContainerRef;
 
   // TODO(issue/24571): remove '!'.
diff --git a/packages/core/test/metadata/di_spec.ts b/packages/core/test/metadata/di_spec.ts
index 733328e53c..408f2ac67d 100644
--- a/packages/core/test/metadata/di_spec.ts
+++ b/packages/core/test/metadata/di_spec.ts
@@ -83,13 +83,13 @@ class Simple {
 @Component({selector: 'view-child-type-selector', template: ''})
 class ViewChildTypeSelectorComponent {
   // TODO(issue/24571): remove '!'.
-  @ViewChild(Simple) child !: Simple;
+  @ViewChild(Simple, {static: false}) child !: Simple;
 }
 
 @Component({selector: 'view-child-string-selector', template: ''})
 class ViewChildStringSelectorComponent {
   // TODO(issue/24571): remove '!'.
-  @ViewChild('child') child !: ElementRef;
+  @ViewChild('child', {static: false}) child !: ElementRef;
 }
 
 @Component({selector: 'view-children-type-selector', template: ''})

From 5640cedc82151dfcfc18fa59a740d0ffa26cd427 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 23 May 2019 00:55:18 +0200
Subject: [PATCH 177/275] refactor(core): static-query migration should always
 use template strategy (#30628)

We are removing the prompt for the `static-query` migration and make the
template strategy the migration strategy for the migration. The usage
strategy is good for best-practices, but for now we want to ensure that
the migration is a seamless as possible and that is only achievable my
re-using the same logic that View Engine uses for determining the
timing of a query.

PR Close #30628
---
 .../migrations/static-queries/index.ts        | 18 ++++---
 .../static-queries/strategy_prompt.ts         | 50 -------------------
 .../static_queries_migration_usage_spec.ts    | 17 -------
 3 files changed, 12 insertions(+), 73 deletions(-)
 delete mode 100644 packages/core/schematics/migrations/static-queries/strategy_prompt.ts

diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index 505c404bde..971c01f40e 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -21,9 +21,14 @@ import {QueryTemplateStrategy} from './strategies/template_strategy/template_str
 import {QueryTestStrategy} from './strategies/test_strategy/test_strategy';
 import {TimingStrategy} from './strategies/timing-strategy';
 import {QueryUsageStrategy} from './strategies/usage_strategy/usage_strategy';
-import {SELECTED_STRATEGY, promptForMigrationStrategy} from './strategy_prompt';
 import {getTransformedQueryCallExpr} from './transform';
 
+enum SELECTED_STRATEGY {
+  TEMPLATE,
+  USAGE,
+  TESTS,
+}
+
 interface AnalyzedProject {
   program: ts.Program;
   host: ts.CompilerHost;
@@ -50,8 +55,9 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   const logger = context.logger;
 
   logger.info('------ Static Query migration ------');
-  logger.info('In preparation for Ivy, developers can now explicitly specify the');
-  logger.info('timing of their queries. Read more about this here:');
+  logger.info('With Angular version 8, developers need to');
+  logger.info('explicitly specify the timing of ViewChild or');
+  logger.info('ContentChild queries. Read more about this here:');
   logger.info('https://github.com/angular/angular/pull/28810');
 
   if (!buildPaths.length && !testPaths.length) {
@@ -63,6 +69,9 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   const analyzedFiles = new Set<string>();
   const buildProjects = new Set<AnalyzedProject>();
   const failures = [];
+  const strategy = process.env['NG_STATIC_QUERY_USAGE_STRATEGY'] === 'true' ?
+      SELECTED_STRATEGY.USAGE :
+      SELECTED_STRATEGY.TEMPLATE;
 
   for (const tsconfigPath of buildPaths) {
     const project = analyzeProject(tree, tsconfigPath, basePath, analyzedFiles);
@@ -71,10 +80,7 @@ async function runMigration(tree: Tree, context: SchematicContext) {
     }
   }
 
-  // In case there are projects which contain queries that need to be migrated,
-  // we want to prompt for the migration strategy and run the migration.
   if (buildProjects.size) {
-    const strategy = await promptForMigrationStrategy(logger);
     for (let project of Array.from(buildProjects.values())) {
       failures.push(...await runStaticQueryMigration(tree, project, strategy, logger));
     }
diff --git a/packages/core/schematics/migrations/static-queries/strategy_prompt.ts b/packages/core/schematics/migrations/static-queries/strategy_prompt.ts
deleted file mode 100644
index e0cbf514a9..0000000000
--- a/packages/core/schematics/migrations/static-queries/strategy_prompt.ts
+++ /dev/null
@@ -1,50 +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 {logging} from '@angular-devkit/core';
-
-import {getInquirer, supportsPrompt} from '../../utils/schematics_prompt';
-
-export enum SELECTED_STRATEGY {
-  TEMPLATE,
-  USAGE,
-  TESTS,
-}
-
-/**
- * Prompts the user for the migration strategy that should be used. Defaults to the
- * template strategy as it provides a migration with rare manual corrections.
- * */
-export async function promptForMigrationStrategy(logger: logging.LoggerApi) {
-  if (supportsPrompt()) {
-    logger.info('There are two available migration strategies that can be selected:');
-    logger.info('  • Template strategy  -  migration tool (short-term gains, rare corrections)');
-    logger.info('  • Usage strategy  -  best practices (long-term gains, manual corrections)');
-    logger.info('For an easy migration, the template strategy is recommended. The usage');
-    logger.info('strategy can be used for best practices and a code base that will be more');
-    logger.info('flexible to changes going forward.');
-    const {strategyName} = await getInquirer().prompt<{strategyName: string}>({
-      type: 'list',
-      name: 'strategyName',
-      message: 'What migration strategy do you want to use?',
-      choices: [
-        {name: 'Template strategy', value: 'template'}, {name: 'Usage strategy', value: 'usage'}
-      ],
-      default: 'template',
-    });
-    logger.info('');
-    return strategyName === 'usage' ? SELECTED_STRATEGY.USAGE : SELECTED_STRATEGY.TEMPLATE;
-  } else {
-    // In case prompts are not supported, we still want to allow developers to opt
-    // into the usage strategy by specifying an environment variable. The tests also
-    // use the environment variable as there is no headless way to select via prompt.
-    return !!process.env['NG_STATIC_QUERY_USAGE_STRATEGY'] ? SELECTED_STRATEGY.USAGE :
-                                                             SELECTED_STRATEGY.TEMPLATE;
-  }
-}
diff --git a/packages/core/schematics/test/static_queries_migration_usage_spec.ts b/packages/core/schematics/test/static_queries_migration_usage_spec.ts
index fa92fa1e0b..c1e065276f 100644
--- a/packages/core/schematics/test/static_queries_migration_usage_spec.ts
+++ b/packages/core/schematics/test/static_queries_migration_usage_spec.ts
@@ -1506,23 +1506,6 @@ describe('static-queries migration with usage strategy', () => {
           .toContain(`@${queryType}('test', { static: false }) query: any;`);
     });
 
-    it(`should not prompt for migration strategy if no @${queryType} query is used`, async() => {
-      writeFile('/index.ts', `
-        import {Component, ${queryType}} from '@angular/core';
-
-        @Component({template: '<span #test></span>'})
-        export class NoQueriesDeclared {
-        }
-      `);
-
-      const testModule = require('../migrations/static-queries/strategy_prompt');
-      spyOn(testModule, 'promptForMigrationStrategy').and.callThrough();
-
-      await runMigration();
-
-      expect(testModule.promptForMigrationStrategy).toHaveBeenCalledTimes(0);
-    });
-
     it('should support function call with default parameter value', async() => {
       writeFile('/index.ts', `
         import {Component, ${queryType}} from '@angular/core';

From 132c61dfd4d67a89f9e64b7d256eca0d21fc5863 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 23 May 2019 02:56:27 +0200
Subject: [PATCH 178/275] refactor(core): static-query migration should warn
 about syntax failures (#30628)

Currently if a project has source-files with syntax failures and the migration
has been started on a broken project, we silently migrate *as much as possible*,
but never notify the developer that the project was in a broken state and that
he can re-run the migration after the failures are fixed.

Additionally the template strategy does not need to exit gracefully if it detects
Angular semantic diagnostics on generated files (template type checking). These
diagnostics are not relevant for the query timing analysis.

PR Close #30628
---
 .../migrations/static-queries/index.ts        |  23 +++-
 .../template_strategy/template_strategy.ts    |  14 +--
 .../static_queries_migration_template_spec.ts | 109 ++++++++++++++++++
 3 files changed, 133 insertions(+), 13 deletions(-)

diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index 971c01f40e..f379869892 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -74,7 +74,7 @@ async function runMigration(tree: Tree, context: SchematicContext) {
       SELECTED_STRATEGY.TEMPLATE;
 
   for (const tsconfigPath of buildPaths) {
-    const project = analyzeProject(tree, tsconfigPath, basePath, analyzedFiles);
+    const project = analyzeProject(tree, tsconfigPath, basePath, analyzedFiles, logger);
     if (project) {
       buildProjects.add(project);
     }
@@ -89,7 +89,7 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   // For the "test" tsconfig projects we always want to use the test strategy as
   // we can't detect the proper timing within spec files.
   for (const tsconfigPath of testPaths) {
-    const project = await analyzeProject(tree, tsconfigPath, basePath, analyzedFiles);
+    const project = await analyzeProject(tree, tsconfigPath, basePath, analyzedFiles, logger);
     if (project) {
       failures.push(
           ...await runStaticQueryMigration(tree, project, SELECTED_STRATEGY.TESTS, logger));
@@ -111,7 +111,8 @@ async function runMigration(tree: Tree, context: SchematicContext) {
  * migrated. In case there are no queries that can be migrated, null is returned.
  */
 function analyzeProject(
-    tree: Tree, tsconfigPath: string, basePath: string, analyzedFiles: Set<string>):
+    tree: Tree, tsconfigPath: string, basePath: string, analyzedFiles: Set<string>,
+    logger: logging.LoggerApi):
     AnalyzedProject|null {
       const parsed = parseTsconfigFile(tsconfigPath, dirname(tsconfigPath));
       const host = ts.createCompilerHost(parsed.options, true);
@@ -126,6 +127,20 @@ function analyzeProject(
       };
 
       const program = ts.createProgram(parsed.fileNames, parsed.options, host);
+      const syntacticDiagnostics = program.getSyntacticDiagnostics();
+
+      // Syntactic TypeScript errors can throw off the query analysis and therefore we want
+      // to notify the developer that we couldn't analyze parts of the project. Developers
+      // can just re-run the migration after fixing these failures.
+      if (syntacticDiagnostics.length) {
+        logger.warn(
+            `\nTypeScript project "${tsconfigPath}" has syntactical errors which could cause ` +
+            `an incomplete migration. Please fix the following failures and rerun the migration:`);
+        logger.error(ts.formatDiagnostics(syntacticDiagnostics, host));
+        logger.info(
+            'Migration can be rerun with: "ng update @angular/core --from 7 --to 8 --migrate-only"\n');
+      }
+
       const typeChecker = program.getTypeChecker();
       const sourceFiles = program.getSourceFiles().filter(
           f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
@@ -198,7 +213,7 @@ async function runStaticQueryMigration(
   } catch (e) {
     if (selectedStrategy === SELECTED_STRATEGY.TEMPLATE) {
       logger.warn(
-          `The template migration strategy uses the Angular compiler ` +
+          `\nThe template migration strategy uses the Angular compiler ` +
           `internally and therefore projects that no longer build successfully after ` +
           `the update cannot use the template migration strategy. Please ensure ` +
           `there are no AOT compilation errors.\n`);
diff --git a/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts b/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts
index 6157ab3b99..4028d01866 100644
--- a/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts
+++ b/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts
@@ -57,13 +57,9 @@ export class QueryTemplateStrategy implements TimingStrategy {
     // used to determine the timing for registered queries.
     const analyzedModules = (aotProgram as any)['analyzedModules'] as NgAnalyzedModules;
 
-    const ngDiagnostics = [
-      ...aotProgram.getNgStructuralDiagnostics(),
-      ...aotProgram.getNgSemanticDiagnostics(),
-    ];
-
-    if (ngDiagnostics.length) {
-      throw this._createDiagnosticsError(ngDiagnostics);
+    const ngStructuralDiagnostics = aotProgram.getNgStructuralDiagnostics();
+    if (ngStructuralDiagnostics.length) {
+      throw this._createDiagnosticsError(ngStructuralDiagnostics);
     }
 
     analyzedModules.files.forEach(file => {
@@ -178,8 +174,8 @@ export class QueryTemplateStrategy implements TimingStrategy {
         .template;
   }
 
-  private _createDiagnosticsError(diagnostics: (ts.Diagnostic|Diagnostic)[]) {
-    return new Error(`${diagnostics.map(d => d.messageText).join(`\n `)}`);
+  private _createDiagnosticsError(diagnostics: ReadonlyArray<Diagnostic>) {
+    return new Error(ts.formatDiagnostics(diagnostics as ts.Diagnostic[], this.host));
   }
 
   private _getViewQueryUniqueKey(filePath: string, className: string, propName: string) {
diff --git a/packages/core/schematics/test/static_queries_migration_template_spec.ts b/packages/core/schematics/test/static_queries_migration_template_spec.ts
index 4376b2d97f..bafd77b11f 100644
--- a/packages/core/schematics/test/static_queries_migration_template_spec.ts
+++ b/packages/core/schematics/test/static_queries_migration_template_spec.ts
@@ -498,6 +498,115 @@ describe('static-queries migration with template strategy', () => {
               /^⮑ {3}index.ts@5:11: Multiple components use the query with different timings./);
     });
 
+    it('should be able to migrate an application with type checking failure which ' +
+           'does not affect analysis',
+       async() => {
+         // Fakes the `@angular/package` by creating a `ViewChild` decorator
+         // function that requires developers to specify the "static" flag.
+         writeFile('/node_modules/@angular/core/index.d.ts', `
+           export interface ViewChildDecorator {
+             (selector: Type<any> | Function | string, opts: {
+               static: boolean;
+               read?: any;
+             }): any;
+           }
+         
+           export declare const ViewChild: ViewChildDecorator;
+         `);
+
+         writeFile('/index.ts', `
+           import {NgModule, Component, ViewChild} from '@angular/core';
+           
+           @Component({
+             template: '<ng-template><p #myRef></p></ng-template>'
+           })
+           export class MyComp {
+             @ViewChild('myRef') query: any;
+           }
+         `);
+
+         writeFile('/my-module.ts', `
+           import {NgModule} from '@angular/core';
+           import {MyComp} from './index';
+           
+           @NgModule({declarations: [MyComp]})
+           export class MyModule {}
+         `);
+
+         await runMigration();
+
+         expect(errorOutput.length).toBe(0);
+         expect(tree.readContent('/index.ts'))
+             .toContain(`@ViewChild('myRef', { static: false }) query: any;`);
+       });
+
+    it('should be able to migrate applications with template type checking failure ' +
+           'which does not affect analysis',
+       async() => {
+         writeFile('/index.ts', `
+           import {NgModule, Component, ViewChild} from '@angular/core';
+           
+           @Component({
+             template: '<p #myRef>{{myVar.hello()}}</p>'
+           })
+           export class MyComp {
+             // This causes a type checking exception as the template
+             // tries to call a function called "hello()" on this variable.
+             myVar: boolean = false;
+             
+             @ViewChild('myRef') query: any;
+           }
+         `);
+
+         writeFile('/my-module.ts', `
+           import {NgModule} from '@angular/core';
+           import {MyComp} from './index';
+           
+           @NgModule({declarations: [MyComp]})
+           export class MyModule {}
+         `);
+
+         await runMigration();
+
+         expect(errorOutput.length).toBe(0);
+         expect(tree.readContent('/index.ts'))
+             .toContain(`@ViewChild('myRef', { static: true }) query: any;`);
+       });
+
+    it('should notify user if project has syntax errors which can affect analysis', async() => {
+      writeFile('/index.ts', `
+        import {Component, ViewChild} from '@angular/core';
+        
+        @Component({
+          template: '<p #myRef></p>'
+        })
+        export class MyComp {
+          @ViewChild('myRef') query: any;
+        }
+      `);
+
+      writeFile('/file-with-syntax-error.ts', `     
+        export classX ClassWithSyntaxError {
+          // ...
+        }
+      `);
+
+      writeFile('/my-module.ts', `
+        import {NgModule} from '@angular/core';
+        import {MyComp} from './index';
+        
+        @NgModule({declarations: [MyComp]})
+        export class MyModule {}
+      `);
+
+      await runMigration();
+
+      expect(errorOutput.length).toBe(1);
+      expect(errorOutput[0]).toMatch(/file-with-syntax-error\.ts\(2,9\): error TS1128.*/);
+      expect(tree.readContent('/index.ts'))
+          .toContain(`@ViewChild('myRef', { static: true }) query: any;`);
+    });
+
     it('should gracefully exit migration if queries could not be analyzed', async() => {
       writeFile('/index.ts', `
         import {Component, ViewChild} from '@angular/core';

From b5c893916d48011c7f7234d2fb4df062806b2c63 Mon Sep 17 00:00:00 2001
From: Kapunahele Wong <kapunahelewong@gmail.com>
Date: Tue, 21 May 2019 17:34:22 -0400
Subject: [PATCH 179/275] docs: add v8 deprecations (#30598)

PR Close #30598
---
 aio/content/guide/deprecations.md | 86 +++++++++++++++++++++++++++++--
 1 file changed, 82 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index b7537e0878..09106111f4 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -50,7 +50,7 @@ v8 - v11
 | `@angular/upgrade` | [`@angular/upgrade`](#upgrade) | <!--v8--> v9 |
 | `@angular/upgrade` | [`getAngularLib`](#upgrade-static) | <!--v8--> v9 |
 | `@angular/upgrade` | [`setAngularLib`](#upgrade-static) | <!--v8--> v9 |
-| template syntax | [`/deep/`, `>>>`, and `::ng-deep`](#deep-component-style-selector) | <!--v7--> v9 |
+| template syntax | [`/deep/`, `>>>`, and `::ng-deep`](#deep-component-style-selector) | <!--v7--> unspecified |
 | template syntax | [`<template`>](#template-tag) | <!--v7--> v9 |
 | service worker | [`versionedFiles` setting](#sw-versionedfiles)| v9 |
 | polyfills | [reflect-metadata](#reflect-metadata) | <!--v8--> v9 |
@@ -234,7 +234,7 @@ Reminder: If you use these `Deprecated*` pipes, you should migrate to the curren
 
 When Angular first introduced lazy routes, there wasn't browser support for dynamically loading additional JavaScript. Angular created our own scheme using the syntax `loadChildren: './lazy/lazy.module#LazyModule'` and built tooling to support it. Now that ECMAScript dynamic import is supported in many browsers, Angular is moving toward this new syntax.
 
-In v8, the string syntax for the [`loadChildren`](api/router/LoadChildren) route specification was deprecated, in favor of new syntax that uses `import()` syntax.
+In version 8, the string syntax for the [`loadChildren`](api/router/LoadChildren) route specification was deprecated, in favor of new syntax that uses `import()` syntax.
 
 Before:
 
@@ -260,7 +260,7 @@ const routes: Routes = [{
 <div class="alert is-helpful">
 
 
-**v8 update**: When you update to version 8, the [`ng update`](cli/update) command performs the transformation automatically. Prior to version 7, the `import()` syntax only works in JIT mode (with view engine).
+**Version 8 update**: When you update to version 8, the [`ng update`](cli/update) command performs the transformation automatically. Prior to version 7, the `import()` syntax only works in JIT mode (with view engine).
 
 
 </div>
@@ -286,10 +286,88 @@ Angular applications, and specifically applications that relied on the JIT compi
 
 The need for this polyfill was removed in Angular version 8.0 ([see #14473](https://github.com/angular/angular-cli/pull/14473)), rendering the presence of the poylfill in most Angular applications unnecessary. Because the polyfill can be depended on by 3rd-party libraries, instead of removing it from all Angular projects, we are deprecating the requirement for this polyfill as of version 8.0. This should give library authors and application developers sufficient time to evaluate if they need the polyfill, and perform any refactoring necessary to remove the dependency on it.
 
-In typical Angular project, the polyfill is not used in production builds, so deprecating it (rather than removing it)  doesn't have impact on the production applications. The goal behind this removal is overall simplification of the build setup and decrease in the number of external dependencies.
+In a typical Angular project, the polyfill is not used in production builds, so removing it should not impact production applications. The goal behind this removal is overall simplification of the build setup and decrease in the number of external dependencies.
 
 We expect to remove the polyfill from most if not all CLI projects via an `ng upgrade` migration from version 8 to 9.
 
+{@a static-query-resolution}
+### `@ViewChild()` / `@ContentChild()` static resolution as the default
+
+The API docs have always recommended searching for `ViewChild()` query results in
+the `ngAfterViewInit()` hook at the earliest and searching for
+`ContentChild()` query results in the `ngAfterContentInit()` hook at the earliest.
+
+However, in practice, `@ViewChild()` and `@ContentChild()` queries are sometimes
+resolved earlier in the lifecycle (that is, before change detection runs) if the
+results are not influenced by bindings (for example, some results are
+embedded in an `*ngIf` or `*ngFor`).
+
+This default resolution behavior is deprecated. In a future version of Angular, all queries will be resolved only before their guaranteed hooks by default.
+
+If you do need to access the `ViewChild()` or `ContentChild()` value
+before change detection runs (for example, in `ngOnInit()`), you can
+use a static flag as in the following example:
+
+```
+@ViewChild('foo', {static: true}) foo !: ElementRef;
+```
+
+{@a contentchild-input-together}
+### `@ContentChild()` / `@Input()` used together
+
+The following pattern is deprecated:
+
+```ts
+@Input() @ContentChild(TemplateRef) tpl !: TemplateRef<any>;
+```
+
+Rather than using this pattern, separate the two decorators into their own
+properties and add fallback logic as in the following example:
+
+```ts
+@Input() tpl !: TemplateRef<any>;
+@ContentChild(TemplateRef) inlineTemplate !: TemplateRef<any>;
+```
+{@a cant-assign-template-vars}
+### Cannot assign to template variables
+
+In the following example, the two-way binding means that `optionName`
+should be written when the `valueChange` event fires.
+
+```html
+<option *ngFor="let optionName of options" [(value)]="optionName"></cmp>
+```
+
+However, in practice, Angular simply ignores two-way bindings to template variables. Starting in version 8, attempting to write to template variables is deprecated. In a future version, we will throw to indicate that the write is not supported.
+
+```html
+<option *ngFor="let optionName of options" [value]="optionName"></cmp>
+```
+
+{@a binding-to-innertext}
+### Binding to `innerText` in `platform-server`
+
+[Domino](https://github.com/fgnass/domino), which is used in server-side rendering, doesn't support `innerText`, so in platform-server's "domino adapter", there was special code to fall back to `textContent` if you tried to bind to `innerText`.
+
+These two properties have subtle differences, so switching to `textContent` under the hood can be surprising to users. For this reason, we are deprecating this behavior. Going forward, users should explicitly bind to `textContent` when using Domino.
+
+{@a wtf-apis}
+### `wtfStartTimeRange` and all `wtf*` APIs
+
+All of the `wtf*` APIs are deprecated and will be removed in a future version.
+
+{@a platform-webworker}
+### `platform-webworker`
+
+The `@angular/platform-*` packages enable Angular to be run in different contexts. Some examples are running Angular on the server (`@angular/platform-server`), in the browser (`@angular/platform-browser`), or in a [web worker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) (`@angular/platform-webworker`).
+
+Though web worker is useful to offload things requiring lots of processing, pushing whole apps to run in the web worker isn't a winning strategy due to many unresolved issues.
+
+Angular CLI doesn't allow use of these APIs because the build system and bundling doesn't support them. This whole package is deprecated in Angular version 8 and will be removed in the future.
+
+Instead, use web workers primarily for offloading CPU intensive, but functionally not critical, work needed for initial rendering (for example, in memory search, image processing, and so on).
+
+
 
 {@a removed}
 ## Removed APIs

From f310a5960e8b7976d9225f5226ae88ca0ffa1b6f Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 23 May 2019 12:28:12 -0700
Subject: [PATCH 180/275] feat(core): deprecate integration with the Web
 Tracing Framework (WTF) (#30642)

DEPRECATION:

Angular previously has supported an integration with the Web Tracing
Framework (WTF) for performance testing of Angular applications. This
integration has not been maintained and likely does not work for the
majority of Angular applications today. As a result, we are deprecating
the integration in Angular version 8.

This deprecation covers the following public APIs:
* `WtfScopeFn`
* `wtfCreateScope`
* `wtfStartTimeRange`
* `wtfEndTimeRange`
* `wtfLeave`

FW-1338 #resolve

PR Close #30642
---
 aio/content/guide/deprecations.md     | 11 +++++++++++
 packages/core/src/profile/profile.ts  |  4 ++++
 packages/core/src/profile/wtf_impl.ts |  1 +
 tools/public_api_guard/core/core.d.ts |  5 +++++
 4 files changed, 21 insertions(+)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index 09106111f4..c056238c3f 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -101,6 +101,11 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 | [`Renderer`](api/core/Renderer) | [`Renderer2`](api/core/Renderer2) | v4 | none |
 | [`RootRenderer`](api/core/RootRenderer) | [`RendererFactory2`](api/core/RendererFactory2) | v4 | none |
 | [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32).
+| [`WtfScopeFn`](api/core/WtfScopeFn) | none | v8 | See [Web Tracing Framework](#wtf) |
+| [`wtfCreateScope`](api/core/wtfCreateScope) | none | v8 | See [Web Tracing Framework](#wtf) |
+| [`wtfStartTimeRange`](api/core/wtfStartTimeRange) | none | v8 | See [Web Tracing Framework](#wtf) |
+| [`wtfEndTimeRange`](api/core/wtfEndTimeRange) | none | v8 | See [Web Tracing Framework](#wtf) |
+| [`wtfLeave`](api/core/wtfLeave) | none | v8 | See [Web Tracing Framework](#wtf) |
 
 
 {@a forms}
@@ -142,6 +147,12 @@ This section lists all of the currently-deprecated features, which includes temp
 
 
 
+{@a wtf}
+### Web Tracing Framework integration
+
+Angular previously has supported an integration with the Web Tracing Framework (WTF) for performance testing of Angular applications. This integration has not been maintained and likely does not work for the majority of Angular applications today. As a result, we are deprecating the integration in Angular version 8.
+
+
 {@a deep-component-style-selector}
 ### `/deep/`, `>>>` and `:ng-deep` component style selectors
 
diff --git a/packages/core/src/profile/profile.ts b/packages/core/src/profile/profile.ts
index 07a774c133..70563b59f1 100644
--- a/packages/core/src/profile/profile.ts
+++ b/packages/core/src/profile/profile.ts
@@ -49,6 +49,7 @@ function noopScope(arg0?: any, arg1?: any): any {
  * an exception is expected during normal execution while profiling.
  *
  * @publicApi
+ * @deprecated the Web Tracing Framework is no longer supported in Angular
  */
 export const wtfCreateScope: (signature: string, flags?: any) => WtfScopeFn =
     wtfEnabled ? createScope : (signature: string, flags?: any) => noopScope;
@@ -61,6 +62,7 @@ export const wtfCreateScope: (signature: string, flags?: any) => WtfScopeFn =
  *
  * Returns the `returnValue for easy chaining.
  * @publicApi
+ * @deprecated the Web Tracing Framework is no longer supported in Angular
  */
 export const wtfLeave: <T>(scope: any, returnValue?: T) => T =
     wtfEnabled ? leave : (s: any, r?: any) => r;
@@ -77,6 +79,7 @@ export const wtfLeave: <T>(scope: any, returnValue?: T) => T =
  *        });
  *     }
  * @publicApi
+ * @deprecated the Web Tracing Framework is no longer supported in Angular
  */
 export const wtfStartTimeRange: (rangeType: string, action: string) => any =
     wtfEnabled ? startTimeRange : (rangeType: string, action: string) => null;
@@ -86,5 +89,6 @@ export const wtfStartTimeRange: (rangeType: string, action: string) => any =
  * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
  * enabled.
  * @publicApi
+ * @deprecated the Web Tracing Framework is no longer supported in Angular
  */
 export const wtfEndTimeRange: (range: any) => void = wtfEnabled ? endTimeRange : (r: any) => null;
diff --git a/packages/core/src/profile/wtf_impl.ts b/packages/core/src/profile/wtf_impl.ts
index ca2972d13c..ce2720d08a 100644
--- a/packages/core/src/profile/wtf_impl.ts
+++ b/packages/core/src/profile/wtf_impl.ts
@@ -12,6 +12,7 @@ import {global} from '../util/global';
  * A scope function for the Web Tracing Framework (WTF).
  *
  * @publicApi
+ * @deprecated the Web Tracing Framework is no longer supported in Angular
  */
 export interface WtfScopeFn { (arg0?: any, arg1?: any): any; }
 
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 112dc85dbc..9147efb09d 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -1440,14 +1440,19 @@ export declare class WrappedValue {
     static wrap(value: any): WrappedValue;
 }
 
+/** @deprecated */
 export declare const wtfCreateScope: (signature: string, flags?: any) => WtfScopeFn;
 
+/** @deprecated */
 export declare const wtfEndTimeRange: (range: any) => void;
 
+/** @deprecated */
 export declare const wtfLeave: <T>(scope: any, returnValue?: T) => T;
 
+/** @deprecated */
 export interface WtfScopeFn {
     (arg0?: any, arg1?: any): any;
 }
 
+/** @deprecated */
 export declare const wtfStartTimeRange: (rangeType: string, action: string) => any;

From ccc76f74988deafb993dff241bf9cbfabb3afe88 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 23 May 2019 12:39:20 -0700
Subject: [PATCH 181/275] feat(platform-webworker): deprecate
 platform-webworker (#30642)

DEPRECATION:

platform-webworker has been around since the initial release of Angular
version 2. It began as an experiment to leverage Angular's rendering
architecture and try something different: to run an entire web application
in a web worker.

We've learned a lot from this experiment, and have come to the conclusion
that pushing entire applications to run in a web worker is not a recipe for
success for most applications. This is due to a number of unresolved issues,
including:

* Poor or non-existent support for web worker APIs in web crawlers/indexers.
* Poor support in build and bundling tooling.

As a result, as of Angular version 8, we are deprecating the
`platform-webworker` APIs in Angular. This consists of both NPM packages,
`@angular/platform-webworker` and `@angular/platform-webworker-dynamic`.

Going forward, we will focus our efforts related to web workers around their
primary use case of offloading CPU-intensive but not critical work.

FW-1339 #resolve

PR Close #30642
---
 aio/content/guide/deprecations.md             | 28 +++++++++++++++++++
 .../src/platform-webworker-dynamic.ts         |  1 +
 .../platform-webworker-dynamic/src/version.ts |  1 +
 .../src/platform-webworker.ts                 |  1 +
 packages/platform-webworker/src/version.ts    |  1 +
 .../shared/client_message_broker.ts           |  2 ++
 .../src/web_workers/shared/message_bus.ts     |  1 +
 .../src/web_workers/shared/serializer.ts      |  1 +
 .../shared/service_message_broker.ts          |  3 ++
 .../src/web_workers/ui/location_providers.ts  |  1 +
 .../web_workers/worker/location_providers.ts  |  1 +
 packages/platform-webworker/src/worker_app.ts |  2 ++
 .../platform-webworker/src/worker_render.ts   |  3 ++
 .../platform-webworker-dynamic.d.ts           |  2 ++
 .../platform-webworker.d.ts                   | 13 +++++++++
 15 files changed, 61 insertions(+)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index c056238c3f..ce4ab4314a 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -122,6 +122,19 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 | --- | ----------- | --------------------- | ----- |
 | [`preserveQueryParams`](api/router/NavigationExtras#preserveQueryParams) | [`queryParamsHandling`](api/router/NavigationExtras#queryParamsHandling) | v4 | none |
 
+{@a platform-webworker}
+### @angular/platform-webworker
+
+| API | Replacement | Deprecation announced | Notes |
+| --- | ----------- | --------------------- | ----- |
+| [All entry points](api/platform-webworker) | none | v8 | See [platform-webworker](#webworker-apps). |
+
+{@a platform-webworker-dynamic}
+### @angular/platform-webworker-dynamic
+
+| API | Replacement | Deprecation announced | Notes |
+| --- | ----------- | --------------------- | ----- |
+| [All entry points](api/platform-webworker-dynamic) | none | v8 | See [platform-webworker](#webworker-apps). |
 
 {@a upgrade}
 ### @angular/upgrade
@@ -380,6 +393,21 @@ Instead, use web workers primarily for offloading CPU intensive, but functionall
 
 
 
+{@a webworker-apps}
+### platform-webworker Angular applications
+
+
+platform-webworker has been around since the initial release of Angular version 2. It began as an experiment to leverage Angular's rendering architecture and try something different: to run an entire web application in a web worker.
+
+We've learned a lot from this experiment, and have come to the conclusion that pushing entire applications to run in a web worker is not a recipe for success for most applications. This is due to a number of unresolved issues, including:
+
+* Poor or non-existent support for web worker APIs in web crawlers/indexers.
+* Poor support in build and bundling tooling.
+
+As a result, as of Angular version 8, we are deprecating the `platform-webworker` APIs in Angular. This consists of both NPM packages, `@angular/platform-webworker` and `@angular/platform-webworker-dynamic`.
+
+Going forward, we will focus our efforts related to web workers around their primary use case of offloading CPU-intensive but not critical work.
+
 {@a removed}
 ## Removed APIs
 
diff --git a/packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts b/packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
index 08f100e41d..68180cfd67 100644
--- a/packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
+++ b/packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
@@ -16,6 +16,7 @@ export {VERSION} from './version';
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const platformWorkerAppDynamic =
     createPlatformFactory(platformCoreDynamic, 'workerAppDynamic', [
diff --git a/packages/platform-webworker-dynamic/src/version.ts b/packages/platform-webworker-dynamic/src/version.ts
index 9469ebe5e5..91b55934de 100644
--- a/packages/platform-webworker-dynamic/src/version.ts
+++ b/packages/platform-webworker-dynamic/src/version.ts
@@ -16,5 +16,6 @@ import {Version} from '@angular/core';
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-webworker/src/platform-webworker.ts b/packages/platform-webworker/src/platform-webworker.ts
index 7dab62437f..ed593eb65b 100644
--- a/packages/platform-webworker/src/platform-webworker.ts
+++ b/packages/platform-webworker/src/platform-webworker.ts
@@ -24,6 +24,7 @@ export {platformWorkerUi} from './worker_render';
  * Bootstraps the worker ui.
  *
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export function bootstrapWorkerUi(
     workerScriptUri: string, customProviders: StaticProvider[] = []): Promise<PlatformRef> {
diff --git a/packages/platform-webworker/src/version.ts b/packages/platform-webworker/src/version.ts
index 9469ebe5e5..91b55934de 100644
--- a/packages/platform-webworker/src/version.ts
+++ b/packages/platform-webworker/src/version.ts
@@ -16,5 +16,6 @@ import {Version} from '@angular/core';
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-webworker/src/web_workers/shared/client_message_broker.ts b/packages/platform-webworker/src/web_workers/shared/client_message_broker.ts
index dc974b65e7..0a79ccd883 100644
--- a/packages/platform-webworker/src/web_workers/shared/client_message_broker.ts
+++ b/packages/platform-webworker/src/web_workers/shared/client_message_broker.ts
@@ -12,6 +12,7 @@ import {Serializer, SerializerTypes} from './serializer';
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 @Injectable()
 export class ClientMessageBrokerFactory {
@@ -39,6 +40,7 @@ interface PromiseCompleter {
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export class ClientMessageBroker {
   private _pending = new Map<string, PromiseCompleter>();
diff --git a/packages/platform-webworker/src/web_workers/shared/message_bus.ts b/packages/platform-webworker/src/web_workers/shared/message_bus.ts
index 51cd04e87f..3afa95f327 100644
--- a/packages/platform-webworker/src/web_workers/shared/message_bus.ts
+++ b/packages/platform-webworker/src/web_workers/shared/message_bus.ts
@@ -17,6 +17,7 @@ import {EventEmitter, NgZone} from '@angular/core';
  * by the corresponding MessageBusSource.
  *
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export abstract class MessageBus implements MessageBusSource, MessageBusSink {
   /**
diff --git a/packages/platform-webworker/src/web_workers/shared/serializer.ts b/packages/platform-webworker/src/web_workers/shared/serializer.ts
index 2a47cf7458..7b2d16631f 100644
--- a/packages/platform-webworker/src/web_workers/shared/serializer.ts
+++ b/packages/platform-webworker/src/web_workers/shared/serializer.ts
@@ -12,6 +12,7 @@ import {RenderStore} from './render_store';
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const enum SerializerTypes {
   // RendererType2
diff --git a/packages/platform-webworker/src/web_workers/shared/service_message_broker.ts b/packages/platform-webworker/src/web_workers/shared/service_message_broker.ts
index ba97a1124f..f18d7feaa6 100644
--- a/packages/platform-webworker/src/web_workers/shared/service_message_broker.ts
+++ b/packages/platform-webworker/src/web_workers/shared/service_message_broker.ts
@@ -13,6 +13,7 @@ import {Serializer, SerializerTypes} from '../shared/serializer';
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 @Injectable()
 export class ServiceMessageBrokerFactory {
@@ -40,6 +41,7 @@ export class ServiceMessageBrokerFactory {
  * If that method returns a promise, the UIMessageBroker returns the result to the worker.
  *
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export class ServiceMessageBroker {
   private _sink: EventEmitter<any>;
@@ -91,6 +93,7 @@ export class ServiceMessageBroker {
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export interface ReceivedMessage {
   method: string;
diff --git a/packages/platform-webworker/src/web_workers/ui/location_providers.ts b/packages/platform-webworker/src/web_workers/ui/location_providers.ts
index ac91a2025d..ac35c15f4a 100644
--- a/packages/platform-webworker/src/web_workers/ui/location_providers.ts
+++ b/packages/platform-webworker/src/web_workers/ui/location_providers.ts
@@ -22,6 +22,7 @@ import {MessageBasedPlatformLocation} from './platform_location';
  * A list of {@link Provider}s. To use the router in a Worker enabled application you must
  * include these providers when setting up the render thread.
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const WORKER_UI_LOCATION_PROVIDERS = <StaticProvider[]>[
   {provide: MessageBasedPlatformLocation, deps: [ServiceMessageBrokerFactory,
diff --git a/packages/platform-webworker/src/web_workers/worker/location_providers.ts b/packages/platform-webworker/src/web_workers/worker/location_providers.ts
index 5438cd1bbe..e61ce5cf5b 100644
--- a/packages/platform-webworker/src/web_workers/worker/location_providers.ts
+++ b/packages/platform-webworker/src/web_workers/worker/location_providers.ts
@@ -17,6 +17,7 @@ import {WebWorkerPlatformLocation} from './platform_location';
  * a worker context.
  *
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const WORKER_APP_LOCATION_PROVIDERS = [
   {provide: PlatformLocation, useClass: WebWorkerPlatformLocation}, {
diff --git a/packages/platform-webworker/src/worker_app.ts b/packages/platform-webworker/src/worker_app.ts
index 061ca060ee..987e613586 100644
--- a/packages/platform-webworker/src/worker_app.ts
+++ b/packages/platform-webworker/src/worker_app.ts
@@ -24,6 +24,7 @@ import {WorkerDomAdapter} from './web_workers/worker/worker_adapter';
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const platformWorkerApp = createPlatformFactory(
     platformCore, 'workerApp', [{provide: PLATFORM_ID, useValue: PLATFORM_WORKER_APP_ID}]);
@@ -56,6 +57,7 @@ export function setupWebWorker(): void {
  * The ng module for the worker app side.
  *
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 @NgModule({
   providers: [
diff --git a/packages/platform-webworker/src/worker_render.ts b/packages/platform-webworker/src/worker_render.ts
index f5b3ea5e27..b03dbb7776 100644
--- a/packages/platform-webworker/src/worker_render.ts
+++ b/packages/platform-webworker/src/worker_render.ts
@@ -26,6 +26,7 @@ import {MessageBasedRenderer2} from './web_workers/ui/renderer';
  * and underlying {@link MessageBus} for lower level message passing.
  *
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 @Injectable()
 export class WebWorkerInstance {
@@ -43,6 +44,7 @@ export class WebWorkerInstance {
 
 /**
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const WORKER_SCRIPT = new InjectionToken<string>('WebWorkerScript');
 
@@ -51,6 +53,7 @@ export const WORKER_SCRIPT = new InjectionToken<string>('WebWorkerScript');
  * created.
  *
  * @publicApi
+ * @deprecated platform-webworker is deprecated in Angular and will be removed in version 10
  */
 export const WORKER_UI_STARTABLE_MESSAGING_SERVICE =
     new InjectionToken<({start: () => void})[]>('WorkerRenderStartableMsgService');
diff --git a/tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts b/tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts
index 8b8e2110a5..f2abbd6e3b 100644
--- a/tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts
+++ b/tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts
@@ -1,3 +1,5 @@
+/** @deprecated */
 export declare const platformWorkerAppDynamic: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
+/** @deprecated */
 export declare const VERSION: Version;
diff --git a/tools/public_api_guard/platform-webworker/platform-webworker.d.ts b/tools/public_api_guard/platform-webworker/platform-webworker.d.ts
index d9d000f23b..8293c24d7a 100644
--- a/tools/public_api_guard/platform-webworker/platform-webworker.d.ts
+++ b/tools/public_api_guard/platform-webworker/platform-webworker.d.ts
@@ -1,9 +1,12 @@
+/** @deprecated */
 export declare function bootstrapWorkerUi(workerScriptUri: string, customProviders?: StaticProvider[]): Promise<PlatformRef>;
 
+/** @deprecated */
 export declare class ClientMessageBroker {
     runOnService(args: UiArguments, returnType: Type<any> | SerializerTypes | null): Promise<any> | null;
 }
 
+/** @deprecated */
 export declare class ClientMessageBrokerFactory {
     createMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
 }
@@ -14,6 +17,7 @@ export declare class FnArg {
     constructor(value: any, type?: Type<any> | SerializerTypes);
 }
 
+/** @deprecated */
 export declare abstract class MessageBus implements MessageBusSource, MessageBusSink {
     abstract attachToZone(zone: NgZone): void;
     abstract from(channel: string): EventEmitter<any>;
@@ -33,10 +37,12 @@ export interface MessageBusSource {
     initChannel(channel: string, runInZone: boolean): void;
 }
 
+/** @deprecated */
 export declare const platformWorkerApp: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 export declare const platformWorkerUi: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
+/** @deprecated */
 export interface ReceivedMessage {
     args: any[];
     id: string;
@@ -44,16 +50,19 @@ export interface ReceivedMessage {
     type: string;
 }
 
+/** @deprecated */
 export declare const enum SerializerTypes {
     RENDERER_TYPE_2 = 0,
     PRIMITIVE = 1,
     RENDER_STORE_OBJECT = 2
 }
 
+/** @deprecated */
 export declare class ServiceMessageBroker {
     registerMethod(methodName: string, signature: Array<Type<any> | SerializerTypes> | null, method: (..._: any[]) => Promise<any> | void, returnType?: Type<any> | SerializerTypes): void;
 }
 
+/** @deprecated */
 export declare class ServiceMessageBrokerFactory {
     createMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
 }
@@ -64,8 +73,10 @@ export declare class UiArguments {
     constructor(method: string, args?: FnArg[] | undefined);
 }
 
+/** @deprecated */
 export declare const VERSION: Version;
 
+/** @deprecated */
 export declare const WORKER_APP_LOCATION_PROVIDERS: ({
     provide: typeof PlatformLocation;
     useClass: typeof WebWorkerPlatformLocation;
@@ -86,7 +97,9 @@ export declare const WORKER_APP_LOCATION_PROVIDERS: ({
     multi?: undefined;
 })[];
 
+/** @deprecated */
 export declare const WORKER_UI_LOCATION_PROVIDERS: StaticProvider[];
 
+/** @deprecated */
 export declare class WorkerAppModule {
 }

From 9b035e4038730a4a02c12585767cd53392d410ed Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 23 May 2019 13:31:12 -0700
Subject: [PATCH 182/275] docs(core): add migration guide for static queries
 (#30644)

PR Close #30644
---
 aio/content/guide/static-query-migration.md | 147 ++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 aio/content/guide/static-query-migration.md

diff --git a/aio/content/guide/static-query-migration.md b/aio/content/guide/static-query-migration.md
new file mode 100644
index 0000000000..a75b7446bb
--- /dev/null
+++ b/aio/content/guide/static-query-migration.md
@@ -0,0 +1,147 @@
+# Static Query Migration Guide
+​
+**Important note for library authors: This migration is especially crucial for library authors to facilitate their users upgrading to version 9 when it becomes available (approx Oct 2019).**
+
+In version 9, the default setting for `@ViewChild` and `@ContentChild` queries is changing in order to fix buggy and surprising behavior in queries (see the section below for more details on that).
+
+In preparation for this change, in version 8, we are migrating all applications and libraries to explicitly specify the resolution strategy for `@ViewChild` and `@ContentChild` queries.
+
+Specifically, this migration adds an explicit "static" flag that dictates when that query's results should be assigned. 
+Adding this flag will ensure your code works the same way when upgrading to version 9.   
+
+Before:
+
+```
+// query results sometimes available in `ngOnInit`, sometimes in `ngAfterViewInit` (based on template)
+@ViewChild('foo') foo: ElementRef; 
+```
+
+After:
+
+```
+// query results available in ngOnInit
+@ViewChild('foo', {static: true}) foo: ElementRef; 
+
+OR
+
+// query results available in ngAfterViewInit
+@ViewChild('foo', {static: false}) foo: ElementRef;
+```
+
+Starting with version 9, the `static` flag will default to false. 
+At that time, any `{static: false}` flags can be safely removed, and we will have a schematic that will update your code for you.
+
+Note: this flag only applies to `@ViewChild` and `@ContentChild` queries specifically, as `@ViewChildren` and `@ContentChildren` queries do not have a concept of static and dynamic (they are always resolved as if they are "dynamic").
+
+## FAQ
+
+### Does this change affect `@ViewChildren` or `@ContentChildren` queries?
+
+No, this change only affects `@ViewChild` and `@ContentChild` queries specifically. 
+`@ViewChildren` and `@ContentChildren` queries are already "dynamic" by default and don't support static resolution.
+
+### What does this flag mean and why is it necessary?
+
+The default behavior for queries has historically been undocumented and confusing, and has also commonly led to issues that are difficult to debug. 
+In version 9, we would like to make query behavior more consistent and simple to understand. 
+
+To explain why, first it's important to understand how queries have worked up until now.
+
+Without the `static` flag, the compiler decided when each query would be resolved on a case-by-case basis. 
+All `@ViewChild`/`@ContentChild` queries were categorized into one of two buckets at compile time: "static" or "dynamic". 
+This classification determined when query results would become available to users.
+
+- **Static queries** were queries where the result could be determined statically because the result didn't depend on runtime values like bindings. 
+Results from queries classified as static were available before change detection ran for that view (accessible in `ngOnInit`).
+
+- **Dynamic queries** were queries where the result could NOT be determined statically because the result depended on runtime values (aka bindings). 
+Results from queries classified as dynamic were not available until after change detection ran for that view (accessible in `ngAfterContentInit` for content queries or `ngAfterViewInit` for view queries).
+
+For example, let's say we have a component, `Comp`. Inside it, we have this query:
+
+```
+@ViewChild(Foo) foo: Foo;
+```
+
+and this template:
+
+```
+<div foo></div>
+```
+
+This `Foo` query would be categorized as static because at compile-time it's known that the `Foo` instance on the `<div>` is the correct result for the query. 
+Because the query result is not dependent on runtime values, we don't have to wait for change detection to run on the template before resolving the query. 
+Consequently, results can be made available in `ngOnInit`.
+
+Let's say the query is the same, but the component template looks like this:
+
+```
+<div foo *ngIf="showing"></div>
+```
+
+With that template, the query would be categorized as a dynamic query. 
+We would need to know the runtime value of `showing` before determining what the correct results are for the query. 
+As a result, change detection must run first, and results can only be made available in `ngAfterViewInit` or a setter for the query property.
+
+The effect of this implementation is that adding an `*ngIf` or `*ngFor` anywhere above a query match can change when that query's results become available. 
+
+Keep in mind that these categories only applied to `@ViewChild` and `@ContentChild` queries specifically. 
+`@ViewChildren` and `@ContentChildren` queries did not have a concept of static and dynamic, so they were always resolved as if they were "dynamic".
+
+This strategy of resolving queries at different times based on the location of potential query matches has caused a lot of confusion. Namely: 
+
+* Sometimes queries are available in `ngOnInit`, but sometimes they aren't and it's not clear why (see [21800](https://github.com/angular/angular/issues/21800) or [19872](https://github.com/angular/angular/issues/19872)).
+
+* `@ViewChild` queries are resolved at a different time from `@ViewChildren` queries, and `@ContentChild` queries are resolved at a different time from `@ContentChildren` queries. 
+If a user turns a `@ViewChild` query into a `@ViewChildren` query, their code can break suddenly because the timing has shifted.
+ 
+* Code depending on a query result can suddenly stop working as soon as an `*ngIf` or an `*ngFor` is added to a template.
+
+* A `@ContentChild` query for the same component will resolve at different times in the lifecycle for each usage of the component. 
+This leads to buggy behavior where using a component with `*ngIf` is broken in subtle ways that aren't obvious to the component author.
+
+In version 9, we plan to simplify the behavior so all queries resolve after change detection runs by default. 
+The location of query matches in the template cannot affect when the query result will become available and suddenly break your code, and the default behavior is always the same. 
+This makes the logic more consistent and predictable for users. 
+
+That said, if an application does need query results earlier (for example, the query result is needed to create an embedded view), it's possible to add the `{static: true}` flag to explicitly ask for static resolution. 
+With this flag, users can indicate that they only care about results that are statically available and the query results will be populated before `ngOnInit`.
+
+### What should I do if I see a `/* TODO: add static flag */` comment printed by the schematic?
+
+If you see this comment, it means that the schematic couldn't statically figure out the correct flag. In this case, you'll have to add the correct flag based on your application's behavior. 
+For more information on how to choose, see the next question.
+
+### How do I choose which `static` flag value to use: `true` or `false`?
+
+In the official API docs, we have always recommended retrieving query results in [`ngAfterViewInit` for view queries](https://angular.io/api/core/ViewChild#description) and [`ngAfterContentInit` for content queries](https://angular.io/api/core/ContentChild#description). 
+This is because by the time those lifecycle hooks run, change detection has completed for the relevant nodes and we can guarantee that we have collected all the possible query results. 
+
+Most applications will want to use `{static: false}` for the same reason. This setting will ensure query matches that are dependent on binding resolution (e.g. results inside `*ngIf`s or `*ngFor`s) will be found by the query. 
+
+There are rarer cases where `{static: true}` flag might be necessary (see next question).
+
+### Is there a case where I should use `{static: true}`?
+
+This option was introduced to support creating embedded views on the fly. 
+If you need to get ahold of a `TemplateRef` in a query to create a view dynamically, you won't be able to do so in `ngAfterViewInit`. 
+Change detection has already run on that view, so creating a new view with the template will cause an `ExpressionHasChangedAfterChecked` error to be thrown. 
+In this case, you will want to set the `static` flag to `true` and create your view in `ngOnInit`.
+
+Note: Selecting this option means that query results nested in `*ngIf` or `*ngFor` will not be found by the query. 
+These results are only retrievable after change detection runs. 
+
+### ​Why generate `{static: false}`? Isn't that the default?
+
+The goal of this migration is to transition apps that aren't yet on version 9 to a query pattern that is compatible with version 9. 
+However, most applications use libraries, and it's likely that some of these libraries may not be upgraded to version 8 yet (and thus might not have the proper flags). 
+Since the application's version of Angular will be used for compilation, if we change the default, the behavior of queries in the library's components will change to the version 8 default and possibly break. 
+This way, an application's dependencies will behave the same way during the transition as they did in the previous version. 
+
+In Angular version 9 and later, it will be safe to remove any `{static: false}` flags and we will do this cleanup for you in a schematic.
+
+###  Can I keep on using Angular libraries that haven’t yet updated to version 8 yet?
+
+Yes, absolutely! 
+Because we have not changed the default query behavior in version 8 (i.e. the compiler still chooses a timing if no flag is set), when your application runs with a library that has not updated to version 8, the library will run the same way it did in version 7.
+This guarantees your app will work in version 8 even if libraries take longer to update their code.  

From 250887244eba4e156b56dbec7185a1b0c85f21a4 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 23 May 2019 13:46:25 -0700
Subject: [PATCH 183/275] docs(core): update deprecations guide (#30644)

PR Close #30644
---
 aio/content/guide/deprecations.md | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index ce4ab4314a..e6dc264347 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -317,24 +317,7 @@ We expect to remove the polyfill from most if not all CLI projects via an `ng up
 {@a static-query-resolution}
 ### `@ViewChild()` / `@ContentChild()` static resolution as the default
 
-The API docs have always recommended searching for `ViewChild()` query results in
-the `ngAfterViewInit()` hook at the earliest and searching for
-`ContentChild()` query results in the `ngAfterContentInit()` hook at the earliest.
-
-However, in practice, `@ViewChild()` and `@ContentChild()` queries are sometimes
-resolved earlier in the lifecycle (that is, before change detection runs) if the
-results are not influenced by bindings (for example, some results are
-embedded in an `*ngIf` or `*ngFor`).
-
-This default resolution behavior is deprecated. In a future version of Angular, all queries will be resolved only before their guaranteed hooks by default.
-
-If you do need to access the `ViewChild()` or `ContentChild()` value
-before change detection runs (for example, in `ngOnInit()`), you can
-use a static flag as in the following example:
-
-```
-@ViewChild('foo', {static: true}) foo !: ElementRef;
-```
+See our [dedicated migration guide for static queries](guide/static-query-migration).
 
 {@a contentchild-input-together}
 ### `@ContentChild()` / `@Input()` used together

From 8479cb4233ba00cc6a7156467b46f51ed9a753f7 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 23 May 2019 16:28:57 -0700
Subject: [PATCH 184/275] docs(core): update static query schematic with guide
 link (#30646)

PR Close #30646
---
 .../schematics/migrations/static-queries/index.ts    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index f379869892..f574371283 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -54,16 +54,16 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   const basePath = process.cwd();
   const logger = context.logger;
 
-  logger.info('------ Static Query migration ------');
+  logger.info('------ Static Query Migration ------');
   logger.info('With Angular version 8, developers need to');
-  logger.info('explicitly specify the timing of ViewChild or');
+  logger.info('explicitly specify the timing of ViewChild and');
   logger.info('ContentChild queries. Read more about this here:');
-  logger.info('https://github.com/angular/angular/pull/28810');
+  logger.info('https://angular.io/guide/static-query-migration');
 
   if (!buildPaths.length && !testPaths.length) {
     throw new SchematicsException(
         'Could not find any tsconfig file. Cannot migrate queries ' +
-        'to explicit timing.');
+        'to add static flag.');
   }
 
   const analyzedFiles = new Set<string>();
@@ -99,7 +99,9 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   if (failures.length) {
     logger.info('');
     logger.info('Some queries could not be migrated automatically. Please go');
-    logger.info('through those manually and apply the appropriate timing:');
+    logger.info('through these manually and apply the appropriate timing.');
+    logger.info('For more info on how to choose a flag, please see: ');
+    logger.info('https://angular.io/guide/static-query-migration');
     failures.forEach(failure => logger.warn(`⮑   ${failure}`));
   }
 

From 911a8160ecda9a951e038d9d71dbe904f999ac3d Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Thu, 23 May 2019 16:35:47 -0700
Subject: [PATCH 185/275] docs(core): add more info to static query guide
 (#30646)

PR Close #30646
---
 aio/content/guide/static-query-migration.md | 67 ++++++++++++---------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/aio/content/guide/static-query-migration.md b/aio/content/guide/static-query-migration.md
index a75b7446bb..a8e4bd0279 100644
--- a/aio/content/guide/static-query-migration.md
+++ b/aio/content/guide/static-query-migration.md
@@ -2,7 +2,7 @@
 ​
 **Important note for library authors: This migration is especially crucial for library authors to facilitate their users upgrading to version 9 when it becomes available (approx Oct 2019).**
 
-In version 9, the default setting for `@ViewChild` and `@ContentChild` queries is changing in order to fix buggy and surprising behavior in queries (see the section below for more details on that).
+In version 9, the default setting for `@ViewChild` and `@ContentChild` queries is changing in order to fix buggy and surprising behavior in queries (read more about that [here](#what-does-this-flag-mean)).
 
 In preparation for this change, in version 8, we are migrating all applications and libraries to explicitly specify the resolution strategy for `@ViewChild` and `@ContentChild` queries.
 
@@ -35,11 +35,38 @@ Note: this flag only applies to `@ViewChild` and `@ContentChild` queries specifi
 
 ## FAQ
 
-### Does this change affect `@ViewChildren` or `@ContentChildren` queries?
+{@a what-to-do-with-todo}
+### What should I do if I see a `/* TODO: add static flag */` comment printed by the schematic?
 
-No, this change only affects `@ViewChild` and `@ContentChild` queries specifically. 
-`@ViewChildren` and `@ContentChildren` queries are already "dynamic" by default and don't support static resolution.
+If you see this comment, it means that the schematic couldn't statically figure out the correct flag. In this case, you'll have to add the correct flag based on your application's behavior. 
+For more information on how to choose, see the [next question](#how-do-i-choose).
 
+{@a how-do-i-choose}
+### How do I choose which `static` flag value to use: `true` or `false`?
+
+In the official API docs, we have always recommended retrieving query results in [`ngAfterViewInit` for view queries](https://angular.io/api/core/ViewChild#description) and [`ngAfterContentInit` for content queries](https://angular.io/api/core/ContentChild#description). 
+This is because by the time those lifecycle hooks run, change detection has completed for the relevant nodes and we can guarantee that we have collected all the possible query results. 
+
+Most applications will want to use `{static: false}` for the same reason. This setting will ensure query matches that are dependent on binding resolution (e.g. results inside `*ngIf`s or `*ngFor`s) will be found by the query. 
+
+There are rarer cases where `{static: true}` flag might be necessary (see [answer here](#should-i-use-static-true)).
+
+{@a should-i-use-static-true}
+### Is there a case where I should use `{static: true}`?
+
+This option was introduced to support creating embedded views on the fly. 
+If you need access to a `TemplateRef` in a query to create a view dynamically, you won't be able to do so in `ngAfterViewInit`. 
+Change detection has already run on that view, so creating a new view with the template will cause an `ExpressionHasChangedAfterChecked` error to be thrown. 
+In this case, you will want to set the `static` flag to `true` and create your view in `ngOnInit`. 
+In most other cases, the best practice is to use `{static: false}`.
+
+However, to facilitate the migration to version 8, you may also want to set the `static` flag to `true` if your component code already depends on the query results being available some time **before** `ngAfterViewInit` (for view queries) or `ngAfterContentInit` (for content queries).
+For example, if your component relies on the query results being populated in the `ngOnInit` hook or in `@Input` setters, you will need to either set the flag to `true` or re-work your component to adjust to later timing. 
+
+Note: Selecting the static option means that query results nested in `*ngIf` or `*ngFor` will not be found by the query. 
+These results are only retrievable after change detection runs. 
+
+{@a what-does-this-flag-mean}
 ### What does this flag mean and why is it necessary?
 
 The default behavior for queries has historically been undocumented and confusing, and has also commonly led to issues that are difficult to debug. 
@@ -90,7 +117,7 @@ Keep in mind that these categories only applied to `@ViewChild` and `@ContentChi
 
 This strategy of resolving queries at different times based on the location of potential query matches has caused a lot of confusion. Namely: 
 
-* Sometimes queries are available in `ngOnInit`, but sometimes they aren't and it's not clear why (see [21800](https://github.com/angular/angular/issues/21800) or [19872](https://github.com/angular/angular/issues/19872)).
+* Sometimes query results are available in `ngOnInit`, but sometimes they aren't and it's not clear why (see [21800](https://github.com/angular/angular/issues/21800) or [19872](https://github.com/angular/angular/issues/19872)).
 
 * `@ViewChild` queries are resolved at a different time from `@ViewChildren` queries, and `@ContentChild` queries are resolved at a different time from `@ContentChildren` queries. 
 If a user turns a `@ViewChild` query into a `@ViewChildren` query, their code can break suddenly because the timing has shifted.
@@ -107,31 +134,14 @@ This makes the logic more consistent and predictable for users.
 That said, if an application does need query results earlier (for example, the query result is needed to create an embedded view), it's possible to add the `{static: true}` flag to explicitly ask for static resolution. 
 With this flag, users can indicate that they only care about results that are statically available and the query results will be populated before `ngOnInit`.
 
-### What should I do if I see a `/* TODO: add static flag */` comment printed by the schematic?
+{@a view-children-and-content-children}
+### Does this change affect `@ViewChildren` or `@ContentChildren` queries?
 
-If you see this comment, it means that the schematic couldn't statically figure out the correct flag. In this case, you'll have to add the correct flag based on your application's behavior. 
-For more information on how to choose, see the next question.
+No, this change only affects `@ViewChild` and `@ContentChild` queries specifically. 
+`@ViewChildren` and `@ContentChildren` queries are already "dynamic" by default and don't support static resolution.
 
-### How do I choose which `static` flag value to use: `true` or `false`?
-
-In the official API docs, we have always recommended retrieving query results in [`ngAfterViewInit` for view queries](https://angular.io/api/core/ViewChild#description) and [`ngAfterContentInit` for content queries](https://angular.io/api/core/ContentChild#description). 
-This is because by the time those lifecycle hooks run, change detection has completed for the relevant nodes and we can guarantee that we have collected all the possible query results. 
-
-Most applications will want to use `{static: false}` for the same reason. This setting will ensure query matches that are dependent on binding resolution (e.g. results inside `*ngIf`s or `*ngFor`s) will be found by the query. 
-
-There are rarer cases where `{static: true}` flag might be necessary (see next question).
-
-### Is there a case where I should use `{static: true}`?
-
-This option was introduced to support creating embedded views on the fly. 
-If you need to get ahold of a `TemplateRef` in a query to create a view dynamically, you won't be able to do so in `ngAfterViewInit`. 
-Change detection has already run on that view, so creating a new view with the template will cause an `ExpressionHasChangedAfterChecked` error to be thrown. 
-In this case, you will want to set the `static` flag to `true` and create your view in `ngOnInit`.
-
-Note: Selecting this option means that query results nested in `*ngIf` or `*ngFor` will not be found by the query. 
-These results are only retrievable after change detection runs. 
-
-### ​Why generate `{static: false}`? Isn't that the default?
+{@a why-specify-static-false}
+### ​Why do I have to specify `{static: false}`? Isn't that the default?
 
 The goal of this migration is to transition apps that aren't yet on version 9 to a query pattern that is compatible with version 9. 
 However, most applications use libraries, and it's likely that some of these libraries may not be upgraded to version 8 yet (and thus might not have the proper flags). 
@@ -140,6 +150,7 @@ This way, an application's dependencies will behave the same way during the tran
 
 In Angular version 9 and later, it will be safe to remove any `{static: false}` flags and we will do this cleanup for you in a schematic.
 
+{@a libraries}
 ###  Can I keep on using Angular libraries that haven’t yet updated to version 8 yet?
 
 Yes, absolutely! 

From bfedfa79ed5fee9acceed898e7a2d9d67ef88e59 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@google.com>
Date: Thu, 23 May 2019 22:53:07 -0700
Subject: [PATCH 186/275] docs: release notes for the v8.0.0-rc.5 release

---
 CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62a58d745e..86d5e7b11c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,44 @@
+  <a name="8.0.0-rc.5"></a>
+# [8.0.0-rc.5](https://github.com/angular/angular/compare/8.0.0-rc.4...8.0.0-rc.5) (2019-05-24)
+
+
+### Bug Fixes
+
+* **bazel:** allow ts_library interop with list-typed inputs ([#30600](https://github.com/angular/angular/issues/30600)) ([bf38df4](https://github.com/angular/angular/commit/bf38df4))
+* **bazel:** Disable sandbox on Mac OS ([#30460](https://github.com/angular/angular/issues/30460)) ([3de26a8](https://github.com/angular/angular/commit/3de26a8))
+* **bazel:** ng test should run specific ts_web_test_suite ([#30526](https://github.com/angular/angular/issues/30526)) ([8bc4da8](https://github.com/angular/angular/commit/8bc4da8))
+* **core:** remove deprecated `TestBed.deprecatedOverrideProvider` API ([#30576](https://github.com/angular/angular/issues/30576)) ([5a46f94](https://github.com/angular/angular/commit/5a46f94))
+* **core:** require 'static' flag on queries in typings ([#30641](https://github.com/angular/angular/issues/30641)) ([c8af830](https://github.com/angular/angular/commit/c8af830))
+* **core:** temporarily remove [@deprecated](https://github.com/deprecated) jsdoc tag for a TextBed.get overload ([#30514](https://github.com/angular/angular/issues/30514)) ([561e01d](https://github.com/angular/angular/commit/561e01d)), closes [#29290](https://github.com/angular/angular/issues/29290) [#29905](https://github.com/angular/angular/issues/29905)
+* **router:** type cast correctly for IE 11 bug breaking URL Unification when comparing objects ([#30464](https://github.com/angular/angular/issues/30464)) ([32daa93](https://github.com/angular/angular/commit/32daa93))
+
+
+### Features
+
+* **common:** add ability to watch for AngularJS URL updates through `onUrlChange` hook ([#30466](https://github.com/angular/angular/issues/30466)) ([8022d36](https://github.com/angular/angular/commit/8022d36))
+* **common:** stricter types for SlicePipe ([#30156](https://github.com/angular/angular/issues/30156)) ([722b2fa](https://github.com/angular/angular/commit/722b2fa))
+
+
+### DEPRECATIONS
+
+* **core:** deprecate integration with the Web Tracing Framework (WTF) ([#30642](https://github.com/angular/angular/issues/30642)) ([b408445](https://github.com/angular/angular/commit/b408445))
+* **platform-webworker:** deprecate platform-webworker ([#30642](https://github.com/angular/angular/issues/30642)) ([361f181](https://github.com/angular/angular/commit/361f181))
+
+
+### BREAKING CHANGES
+
+* **core:** In Angular version 8, it's required that all @ViewChild and @ContentChild
+queries have a 'static' flag specifying whether the query is 'static' or
+'dynamic'. The compiler previously sorted queries automatically, but in
+8.0 developers are required to explicitly specify which behavior is wanted.
+This is a temporary requirement as part of a migration; see
+https://angular.io/guide/static-query-migration for more details.
+
+@ViewChildren and @ContentChildren queries are always dynamic, and so are
+unaffected.
+
+
+
 <a name="8.0.0-rc.4"></a>
 # [8.0.0-rc.4](https://github.com/angular/angular/compare/8.0.0-rc.3...8.0.0-rc.4) (2019-05-15)
 

From cdb5ea42003f2b961080054cb397d1156726f18f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 24 May 2019 08:08:45 +0200
Subject: [PATCH 187/275] docs: update link to static queries in changelog
 (#30649) PR Close #30649

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86d5e7b11c..c018d4cfce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,7 @@ queries have a 'static' flag specifying whether the query is 'static' or
 'dynamic'. The compiler previously sorted queries automatically, but in
 8.0 developers are required to explicitly specify which behavior is wanted.
 This is a temporary requirement as part of a migration; see
-https://angular.io/guide/static-query-migration for more details.
+https://v8.angular.io/guide/static-query-migration for more details.
 
 @ViewChildren and @ContentChildren queries are always dynamic, and so are
 unaffected.

From 6bf5ec241d03f158fc2876cb747fcc5273e450d6 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 24 May 2019 12:19:37 +0200
Subject: [PATCH 188/275] docs(core): static-query migration should use
 permalink for migration guide (#30649)

8479cb4233ba00cc6a7156467b46f51ed9a753f7 updated the static-query migration
to refer to the new guide on AIO. Unfortunately these URLs are currently not
valid as the guide is only available on `next.angular.io` right now. In order to
make the link work permanently (e.g. if we eventually remove the guide in future
major versions), we use the permalink from the `v8` subdomain.

PR Close #30649
---
 packages/core/schematics/migrations/static-queries/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index f574371283..a12f1c06ba 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -58,7 +58,7 @@ async function runMigration(tree: Tree, context: SchematicContext) {
   logger.info('With Angular version 8, developers need to');
   logger.info('explicitly specify the timing of ViewChild and');
   logger.info('ContentChild queries. Read more about this here:');
-  logger.info('https://angular.io/guide/static-query-migration');
+  logger.info('https://v8.angular.io/guide/static-query-migration');
 
   if (!buildPaths.length && !testPaths.length) {
     throw new SchematicsException(
@@ -101,7 +101,7 @@ async function runMigration(tree: Tree, context: SchematicContext) {
     logger.info('Some queries could not be migrated automatically. Please go');
     logger.info('through these manually and apply the appropriate timing.');
     logger.info('For more info on how to choose a flag, please see: ');
-    logger.info('https://angular.io/guide/static-query-migration');
+    logger.info('https://v8.angular.io/guide/static-query-migration');
     failures.forEach(failure => logger.warn(`⮑   ${failure}`));
   }
 

From 0d23cedab86240fe10c52ff748cf09add65a6438 Mon Sep 17 00:00:00 2001
From: Michael Hladky <michael@hladky.at>
Date: Tue, 21 May 2019 20:57:48 +0200
Subject: [PATCH 189/275] docs: add Michael Hladky to GDE resources (#30596)

PR Close #30596
---
 aio/content/images/bios/michael-hladky.jpg | Bin 0 -> 20186 bytes
 aio/content/marketing/contributors.json    |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 aio/content/images/bios/michael-hladky.jpg

diff --git a/aio/content/images/bios/michael-hladky.jpg b/aio/content/images/bios/michael-hladky.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8ff1fb09415e5e363c063b6826e2fc88f5960e58
GIT binary patch
literal 20186
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

literal 0
HcmV?d00001

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index ec7ad7a6f0..27dce186e8 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -327,6 +327,14 @@
     "bio": "Owner and trainer at Ultimate Angular. Lives in England, UK. Has a love for teaching, OSS and speaking at conferences. Google Developer Expert for Web Technologies and Angular.",
     "groups": ["GDE"]
   },
+  "michaelhladky": {
+    "name": "Michael Hladky",
+    "picture": "michael-hladky.jpg",
+    "twitter": "Michael_Hladky",
+    "website": "https://github.com/BioPhoton",
+    "bio": "Michael is a self employed trainer, consultant and developer with the focus on Angular, and located in Vienna, Austria. He gives workshops on Angular, RxJS and Ionic. As Google Developer Expert, founder of Angular-Austria-Association and Angular-Vienna meetup, and speaker he is an active part of the community.",
+    "groups": ["GDE"]
+  },
   "michaelprentice": {
     "name": "Michael Prentice",
     "picture": "michaelprentice.jpg",

From be0bc799f3fa99582238f29cb575e0705ce0c10f Mon Sep 17 00:00:00 2001
From: Kapunahele Wong <kapunahelewong@gmail.com>
Date: Wed, 8 May 2019 11:40:46 -0400
Subject: [PATCH 190/275] docs: drop coding conventions from style guide
 (#30334)

PR Close #30334
---
 aio/content/guide/styleguide.md | 390 --------------------------------
 1 file changed, 390 deletions(-)

diff --git a/aio/content/guide/styleguide.md b/aio/content/guide/styleguide.md
index e1fb6ef661..385190266a 100644
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@@ -1618,396 +1618,6 @@ A consistent class and file name convention make these modules easy to spot and
 </table>
 
 
-
-<a href="#toc">Back to top</a>
-
-
-## Coding conventions
-
-Have a consistent set of coding, naming, and whitespace conventions.
-
-{@a 03-01}
-
-### Classes
-
-#### Style 03-01
-
-<div class="s-rule do">
-
-**Do** use upper camel case, also known as PascalCase, when naming classes.
-
-</div>
-
-<div class="s-why">
-
-**Why?** Follows conventional thinking for class names.
-
-</div>
-
-<div class="s-why-last">
-
-**Why?** Classes can be instantiated and construct an instance.
-By convention, upper camel case indicates a constructable asset.
-
-</div>
-
-<code-example path="styleguide/src/03-01/app/core/exception.service.avoid.ts" region="example" header="app/shared/exception.service.ts">
-
-</code-example>
-
-
-<code-example path="styleguide/src/03-01/app/core/exception.service.ts" region="example" header="app/shared/exception.service.ts">
-
-</code-example>
-
-
-<a href="#toc">Back to top</a>
-
-
-{@a 03-02}
-
-### Constants
-
-#### Style 03-02
-
-<div class="s-rule do">
-
-**Do** declare variables with `const` if their values should not change during the application lifetime.
-
-</div>
-
-<div class="s-why">
-
-**Why?** Conveys to readers that the value is invariant.
-
-</div>
-
-
-
-<div class="s-why-last">
-
-**Why?** TypeScript helps enforce that intent by requiring immediate initialization and by
-preventing subsequent re-assignment.
-
-</div>
-
-
-
-<div class="s-rule consider">
-
-**Consider** spelling `const` variables in lower camel case.
-
-</div>
-
-
-
-<div class="s-why">
-
-**Why?** Lower camel case variable names (`heroRoutes`) are easier to read and understand
-than the traditional UPPER_SNAKE_CASE names (`HERO_ROUTES`).
-
-</div>
-
-
-
-<div class="s-why-last">
-
-**Why?** The tradition of naming constants in UPPER_SNAKE_CASE reflects
-an era before the modern IDEs that quickly reveal the `const` declaration.
-TypeScript prevents accidental reassignment.
-
-</div>
-
-
-
-<div class="s-rule do">
-
-**Do** tolerate _existing_ `const` variables that are spelled in UPPER_SNAKE_CASE.
-
-</div>
-
-<div class="s-why-last">
-
-**Why?** The tradition of UPPER_SNAKE_CASE remains popular and pervasive,
-especially in third party modules.
-It is rarely worth the effort to change them at the risk of breaking existing code and documentation.
-
-</div>
-
-<code-example path="styleguide/src/03-02/app/core/data.service.ts" header="app/shared/data.service.ts">
-
-</code-example>
-
-
-
-<a href="#toc">Back to top</a>
-
-
-{@a 03-03}
-
-### Interfaces
-
-#### Style 03-03
-
-<div class="s-rule do">
-
-
-
-**Do** name an interface using upper camel case.
-
-
-</div>
-
-
-
-<div class="s-rule consider">
-
-
-
-**Consider** naming an interface without an `I` prefix.
-
-
-</div>
-
-
-
-<div class="s-rule consider">
-
-
-
-**Consider** using a class instead of an interface for services and declarables (components, directives, and pipes).
-
-
-</div>
-
-
-
-<div class="s-rule consider">
-
-
-
-**Consider** using an interface for data models.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** <a href="https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines">TypeScript guidelines</a>
-discourage the `I` prefix.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** A class alone is less code than a _class-plus-interface_.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** A class can act as an interface (use `implements` instead of `extends`).
-
-
-</div>
-
-
-
-<div class="s-why-last">
-
-
-
-**Why?** An interface-class can be a provider lookup token in Angular dependency injection.
-
-
-</div>
-
-
-
-<code-example path="styleguide/src/03-03/app/core/hero-collector.service.avoid.ts" region="example" header="app/shared/hero-collector.service.ts">
-
-</code-example>
-
-
-
-
-
-<code-example path="styleguide/src/03-03/app/core/hero-collector.service.ts" region="example" header="app/shared/hero-collector.service.ts">
-
-</code-example>
-
-
-
-<a href="#toc">Back to top</a>
-
-{@a 03-04}
-
-### Properties and methods
-
-#### Style 03-04
-
-
-<div class="s-rule do">
-
-
-
-**Do** use lower camel case to name properties and methods.
-
-
-</div>
-
-
-
-<div class="s-rule avoid">
-
-
-
-**Avoid** prefixing private properties and methods with an underscore.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** Follows conventional thinking for properties and methods.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** JavaScript lacks a true private property or method.
-
-
-</div>
-
-
-
-<div class="s-why-last">
-
-
-
-**Why?** TypeScript tooling makes it easy to identify private vs. public properties and methods.
-
-
-</div>
-
-
-
-<code-example path="styleguide/src/03-04/app/core/toast.service.avoid.ts" region="example" header="app/shared/toast.service.ts">
-
-</code-example>
-
-
-
-
-
-<code-example path="styleguide/src/03-04/app/core/toast.service.ts" region="example" header="app/shared/toast.service.ts">
-
-</code-example>
-
-
-
-<a href="#toc">Back to top</a>
-
-{@a 03-06}
-
-### Import line spacing
-
-#### Style 03-06
-
-
-<div class="s-rule consider">
-
-
-
-**Consider** leaving one empty line between third party imports and application imports.
-
-
-</div>
-
-
-
-<div class="s-rule consider">
-
-
-
-**Consider** listing import lines alphabetized by the module.
-
-
-</div>
-
-
-
-<div class="s-rule consider">
-
-
-
-**Consider** listing destructured imported symbols alphabetically.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** The empty line separates _your_ stuff from _their_ stuff.
-
-
-</div>
-
-
-
-<div class="s-why-last">
-
-
-
-**Why?** Alphabetizing makes it easier to read and locate symbols.
-
-
-</div>
-
-
-
-<code-example path="styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts" region="example" header="app/heroes/shared/hero.service.ts">
-
-</code-example>
-
-
-
-
-
-<code-example path="styleguide/src/03-06/app/heroes/shared/hero.service.ts" region="example" header="app/heroes/shared/hero.service.ts">
-
-</code-example>
-
-
-
 <a href="#toc">Back to top</a>
 
 

From 9b3af1468d9934408e4db0b1dbef4034487e399b Mon Sep 17 00:00:00 2001
From: Michael Prentice <splaktar@gmail.com>
Date: Fri, 24 May 2019 02:43:49 -0400
Subject: [PATCH 191/275] docs(bazel): remove out of date known issue with
 Webstorm (#30650)

https://github.com/bazelbuild/intellij/issues/246 was resolved in 2018

PR Close #30650
---
 docs/BAZEL.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/BAZEL.md b/docs/BAZEL.md
index c381cf2d81..2a7cf4f4e7 100644
--- a/docs/BAZEL.md
+++ b/docs/BAZEL.md
@@ -248,11 +248,6 @@ Usually there is a single item (or multiple items of the same kind) where the ov
 
 ## Known issues
 
-### Webstorm
-
-The autocompletion in WebStorm can be added via a Bazel plugin intended for IntelliJ IDEA, but the plugin needs to be installed in a special way.
-See [bazelbuild/intellij#246](https://github.com/bazelbuild/intellij/issues/246) for more info.
-
 ### Xcode
 
 If you see the following error:

From 68cd0cab8c7177c70cce1df5ac94eaaa38edff8c Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Thu, 23 May 2019 15:17:42 +0200
Subject: [PATCH 192/275] fix(ivy): don't throw on unmatched placeholder
 replacements in `i18nPostprocess` (#30632)

Depending on which placeholders the translation uses, there are some legitimate cases where we might not use all placeholder replacements in `i18nPostprocess`. For example if some of the placeholders of the original messages have been removed in the translation.

FW-1312 #resolve
PR Close #30632
---
 packages/core/src/render3/i18n.ts          | 15 +++++----------
 packages/core/test/acceptance/i18n_spec.ts |  3 +--
 packages/core/test/render3/i18n_spec.ts    | 20 ++++----------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 5cfb37f14e..0d921754c9 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -556,8 +556,8 @@ export function ɵɵi18nPostprocess(
     const templateIdsStack: number[] = [ROOT_TEMPLATE_ID];
     result = result.replace(PP_PLACEHOLDERS_REGEXP, (m: any, phs: string, tmpl: string): string => {
       const content = phs || tmpl;
-      if (!matches[content]) {
-        const placeholders: PostprocessPlaceholder[] = [];
+      const placeholders: PostprocessPlaceholder[] = matches[content] || [];
+      if (!placeholders.length) {
         content.split('|').forEach((placeholder: string) => {
           const match = placeholder.match(PP_TEMPLATE_ID_REGEXP);
           const templateId = match ? parseInt(match[1], 10) : ROOT_TEMPLATE_ID;
@@ -566,11 +566,12 @@ export function ɵɵi18nPostprocess(
         });
         matches[content] = placeholders;
       }
-      if (!matches[content].length) {
+
+      if (!placeholders.length) {
         throw new Error(`i18n postprocess: unmatched placeholder - ${content}`);
       }
+
       const currentTemplateId = templateIdsStack[templateIdsStack.length - 1];
-      const placeholders = matches[content];
       let idx = 0;
       // find placeholder index that matches current template id
       for (let i = 0; i < placeholders.length; i++) {
@@ -590,12 +591,6 @@ export function ɵɵi18nPostprocess(
       placeholders.splice(idx, 1);
       return placeholder;
     });
-
-    // verify that we injected all values
-    const hasUnmatchedValues = Object.keys(matches).some(key => !!matches[key].length);
-    if (hasUnmatchedValues) {
-      throw new Error(`i18n postprocess: unmatched values - ${JSON.stringify(matches)}`);
-    }
   }
 
   // return current result if no replacements specified
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index 046aad5755..51f615d830 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -847,8 +847,7 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
           .toEqual('<child><grand-child><div>Bonjour monde!</div></grand-child></child>');
     });
 
-    // FW-1312: Wrong i18n code generated by the compiler when the template has 2 empty `span`
-    xit('should project translations with selectors', () => {
+    it('should project translations with selectors', () => {
       @Component({selector: 'child', template: `<ng-content select="span"></ng-content>`})
       class Child {
       }
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index 10df144f31..154e974cde 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -780,22 +780,10 @@ describe('Runtime i18n', () => {
     });
 
     it('should throw in case we have invalid string', () => {
-      const arr = ['�*1:1��#2:1�', '�#4:2�', '�6:4�', '�/#2:1��/*1:1�'];
-      const str = `[${arr.join('|')}]`;
-
-      const cases = [
-        // less placeholders than we have
-        [`Start: ${str}, ${str} and ${str} end.`, {}],
-
-        // more placeholders than we have
-        [`Start: ${str}, ${str} and ${str}, ${str} ${str} end.`, {}],
-
-        // not enough ICU replacements
-        ['My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�', {ICU: ['ICU_VALUE_1']}]
-      ];
-      cases.forEach(([input, replacements, output]) => {
-        expect(() => ɵɵi18nPostprocess(input as string, replacements as any)).toThrowError();
-      });
+      expect(
+          () => ɵɵi18nPostprocess(
+              'My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�', {ICU: ['ICU_VALUE_1']}))
+          .toThrowError();
     });
   });
 });

From d5f96a887d86652d1809c0de2cefd56736dc1c34 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Wed, 22 May 2019 16:41:35 +0200
Subject: [PATCH 193/275] refactor(ivy): refactor getBeforeNodeForView for
 readability (#30614)

PR Close #30614
---
 packages/core/src/render3/node_manipulation.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 2392393567..8a586c5fd7 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -729,15 +729,14 @@ function getHighestElementOrICUContainer(tNode: TNode): TNode {
   return tNode;
 }
 
-export function getBeforeNodeForView(index: number, lContainer: LContainer) {
-  const containerNative = lContainer[NATIVE];
-
-  if (index + 1 < lContainer.length - CONTAINER_HEADER_OFFSET) {
-    const view = lContainer[CONTAINER_HEADER_OFFSET + index + 1] as LView;
-    const viewTNode = view[T_HOST] as TViewNode;
-    return viewTNode.child ? getNativeByTNode(viewTNode.child, view) : containerNative;
+export function getBeforeNodeForView(viewIndexInContainer: number, lContainer: LContainer): RNode {
+  const nextViewIndex = CONTAINER_HEADER_OFFSET + viewIndexInContainer + 1;
+  if (nextViewIndex < lContainer.length) {
+    const lView = lContainer[nextViewIndex] as LView;
+    const tViewNodeChild = (lView[T_HOST] as TViewNode).child;
+    return tViewNodeChild !== null ? getNativeByTNode(tViewNodeChild, lView) : lContainer[NATIVE];
   } else {
-    return containerNative;
+    return lContainer[NATIVE];
   }
 }
 

From deb77bd3df2300eb8ed46f5015e730afd8dc5c78 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Mon, 20 May 2019 16:49:20 -0700
Subject: [PATCH 194/275] feat(ivy): TestBed support for reusing non-exported
 components (#30578)

This is a new feature of the Ivy TestBed.

A common user pattern is to test one component with another. This is
commonly done by creating a `TestFixture` component which exercises the
main component under test.

This pattern is more difficult if the component under test is declared in an
NgModule but not exported. In this case, overriding the module is necessary.

In g3 (and View Engine), it's possible to use an NgSummary to override the
recompilation of a component, and depend on its AOT compiled factory. The
way this is implemented, however, specifying a summary for a module
effectively overrides much of the TestBed's other behavior. For example, the
following is legal:

```typescript
TestBed.configureTestingModule({
  declarations: [FooCmp, TestFixture],
  imports: [FooModule],
  aotSummaries: [FooModuleNgSummary],
});
```

Here, `FooCmp` is declared in both the testing module and in the imported
`FooModule`. However, because the summary is provided, `FooCmp` is not
compiled within the context of the testing module, but _is_ made available
for `TestFixture` to use, even if it wasn't originally exported from
`FooModule`.

This pattern breaks in Ivy - because summaries are a no-op, this amounts
to a true double declaration of `FooCmp` which raises an error.

Fixing this in user code is possible, but is difficult to do in an
automated or backwards compatible way. An alternative solution is
implemented in this PR.

This PR attempts to capture the user intent of the following previously
unsupported configuration:

```typescript
TestBed.configureTestingModule({
  declarations: [FooCmp, TestFixture],
  imports: [FooModule],
});
```

Note that this is the same as the configuration above in Ivy, as the
`aotSummaries` value provided has no effect.

The user intent here is interpreted as follows:

1) `FooCmp` is a pre-existing component that's being used in the test
   (via import of `FooModule`). It may or may not be exported by this
   module.

2) `FooCmp` should be part of the testing module's scope. That is, it
   should be visible to `TestFixture`. This is because it's listed in
   `declarations`.

This feature effectively makes the `TestBed` testing module special. It's
able to declare components without compiling them, if they're already
compiled (or configured to be compiled) in the imports. And crucially, the
behavior matches the first example with the summary, making Ivy backwards
compatible with View Engine for tests that use summaries.

PR Close #30578
---
 packages/core/src/render3/jit/module.ts       | 37 +++++---
 packages/core/test/test_bed_spec.ts           | 94 ++++++++++++++++++-
 .../core/testing/src/r3_test_bed_compiler.ts  | 59 ++++++++----
 3 files changed, 157 insertions(+), 33 deletions(-)

diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index fe41493869..e639c9b25b 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -94,8 +94,13 @@ export function compileNgModule(moduleType: Type<any>, ngModule: NgModule = {}):
 
 /**
  * Compiles and adds the `ngModuleDef` and `ngInjectorDef` properties to the module class.
+ *
+ * It's possible to compile a module via this API which will allow duplicate declarations in its
+ * root.
  */
-export function compileNgModuleDefs(moduleType: NgModuleType, ngModule: NgModule): void {
+export function compileNgModuleDefs(
+    moduleType: NgModuleType, ngModule: NgModule,
+    allowDuplicateDeclarationsInRoot: boolean = false): void {
   ngDevMode && assertDefined(moduleType, 'Required value moduleType');
   ngDevMode && assertDefined(ngModule, 'Required value ngModule');
   const declarations: Type<any>[] = flatten(ngModule.declarations || EMPTY_ARRAY);
@@ -129,7 +134,8 @@ export function compileNgModuleDefs(moduleType: NgModuleType, ngModule: NgModule
   Object.defineProperty(moduleType, NG_INJECTOR_DEF, {
     get: () => {
       if (ngInjectorDef === null) {
-        ngDevMode && verifySemanticsOfNgModuleDef(moduleType as any as NgModuleType);
+        ngDevMode && verifySemanticsOfNgModuleDef(
+                         moduleType as any as NgModuleType, allowDuplicateDeclarationsInRoot);
         const meta: R3InjectorMetadataFacade = {
           name: moduleType.name,
           type: moduleType,
@@ -150,7 +156,8 @@ export function compileNgModuleDefs(moduleType: NgModuleType, ngModule: NgModule
   });
 }
 
-function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
+function verifySemanticsOfNgModuleDef(
+    moduleType: NgModuleType, allowDuplicateDeclarationsInRoot: boolean): void {
   if (verifiedNgModule.get(moduleType)) return;
   verifiedNgModule.set(moduleType, true);
   moduleType = resolveForwardRef(moduleType);
@@ -158,7 +165,9 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
   const errors: string[] = [];
   const declarations = maybeUnwrapFn(ngModuleDef.declarations);
   const imports = maybeUnwrapFn(ngModuleDef.imports);
-  flatten(imports).map(unwrapModuleWithProvidersImports).forEach(verifySemanticsOfNgModuleDef);
+  flatten(imports)
+      .map(unwrapModuleWithProvidersImports)
+      .forEach(mod => verifySemanticsOfNgModuleDef(mod, false));
   const exports = maybeUnwrapFn(ngModuleDef.exports);
   declarations.forEach(verifyDeclarationsHaveDefinitions);
   const combinedDeclarations: Type<any>[] = [
@@ -166,7 +175,7 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
     ...flatten(imports.map(computeCombinedExports)).map(resolveForwardRef),
   ];
   exports.forEach(verifyExportsAreDeclaredOrReExported);
-  declarations.forEach(verifyDeclarationIsUnique);
+  declarations.forEach(decl => verifyDeclarationIsUnique(decl, allowDuplicateDeclarationsInRoot));
   declarations.forEach(verifyComponentEntryComponentsIsPartOfNgModule);
 
   const ngModule = getAnnotation<NgModule>(moduleType, 'NgModule');
@@ -174,7 +183,7 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
     ngModule.imports &&
         flatten(ngModule.imports)
             .map(unwrapModuleWithProvidersImports)
-            .forEach(verifySemanticsOfNgModuleDef);
+            .forEach(mod => verifySemanticsOfNgModuleDef(mod, false));
     ngModule.bootstrap && ngModule.bootstrap.forEach(verifyCorrectBootstrapType);
     ngModule.bootstrap && ngModule.bootstrap.forEach(verifyComponentIsPartOfNgModule);
     ngModule.entryComponents && ngModule.entryComponents.forEach(verifyComponentIsPartOfNgModule);
@@ -209,15 +218,17 @@ function verifySemanticsOfNgModuleDef(moduleType: NgModuleType): void {
     }
   }
 
-  function verifyDeclarationIsUnique(type: Type<any>) {
+  function verifyDeclarationIsUnique(type: Type<any>, suppressErrors: boolean) {
     type = resolveForwardRef(type);
     const existingModule = ownerNgModule.get(type);
     if (existingModule && existingModule !== moduleType) {
-      const modules = [existingModule, moduleType].map(stringifyForError).sort();
-      errors.push(
-          `Type ${stringifyForError(type)} is part of the declarations of 2 modules: ${modules[0]} and ${modules[1]}! ` +
-          `Please consider moving ${stringifyForError(type)} to a higher module that imports ${modules[0]} and ${modules[1]}. ` +
-          `You can also create a new NgModule that exports and includes ${stringifyForError(type)} then import that NgModule in ${modules[0]} and ${modules[1]}.`);
+      if (!suppressErrors) {
+        const modules = [existingModule, moduleType].map(stringifyForError).sort();
+        errors.push(
+            `Type ${stringifyForError(type)} is part of the declarations of 2 modules: ${modules[0]} and ${modules[1]}! ` +
+            `Please consider moving ${stringifyForError(type)} to a higher module that imports ${modules[0]} and ${modules[1]}. ` +
+            `You can also create a new NgModule that exports and includes ${stringifyForError(type)} then import that NgModule in ${modules[0]} and ${modules[1]}.`);
+      }
     } else {
       // Mark type as having owner.
       ownerNgModule.set(type, moduleType);
@@ -312,7 +323,7 @@ function computeCombinedExports(type: Type<any>): Type<any>[] {
   return [...flatten(maybeUnwrapFn(ngModuleDef.exports).map((type) => {
     const ngModuleDef = getNgModuleDef(type);
     if (ngModuleDef) {
-      verifySemanticsOfNgModuleDef(type as any as NgModuleType);
+      verifySemanticsOfNgModuleDef(type as any as NgModuleType, false);
       return computeCombinedExports(type);
     } else {
       return type;
diff --git a/packages/core/test/test_bed_spec.ts b/packages/core/test/test_bed_spec.ts
index 56dfc65ea0..61b809e2e3 100644
--- a/packages/core/test/test_bed_spec.ts
+++ b/packages/core/test/test_bed_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, ErrorHandler, Inject, Injectable, InjectionToken, Input, NgModule, Optional, Pipe, ɵsetClassMetadata as setClassMetadata, ɵɵdefineComponent as defineComponent, ɵɵtext as text} from '@angular/core';
+import {Component, Directive, ErrorHandler, Inject, Injectable, InjectionToken, Input, NgModule, Optional, Pipe, ɵsetClassMetadata as setClassMetadata, ɵɵdefineComponent as defineComponent, ɵɵdefineNgModule as defineNgModule, ɵɵtext as text} from '@angular/core';
 import {TestBed, getTestBed} from '@angular/core/testing/src/test_bed';
 import {By} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
@@ -371,6 +371,62 @@ describe('TestBed', () => {
     }).toThrowError();
   });
 
+  onlyInIvy('TestBed new feature to allow declaration and import of component')
+      .it('should allow both the declaration and import of a component into the testing module',
+          () => {
+            // This test validates that a component (Outer) which is both declared and imported
+            // (via its module) in the testing module behaves correctly. That is:
+            //
+            // 1) the component should be compiled in the scope of its original module.
+            //
+            // This condition is tested by having the component (Outer) use another component
+            // (Inner) within its template. Thus, if it's compiled in the correct scope then the
+            // text 'Inner' from the template of (Inner) should appear in the result.
+            //
+            // 2) the component should be available in the TestingModule scope.
+            //
+            // This condition is tested by attempting to use the component (Outer) inside a test
+            // fixture component (Fixture) which is declared in the testing module only.
+
+            @Component({
+              selector: 'inner',
+              template: 'Inner',
+            })
+            class Inner {
+            }
+
+            @Component({
+              selector: 'outer',
+              template: '<inner></inner>',
+            })
+            class Outer {
+            }
+
+            @NgModule({
+              declarations: [Inner, Outer],
+            })
+            class Module {
+            }
+
+            @Component({
+              template: '<outer></outer>',
+              selector: 'fixture',
+            })
+            class Fixture {
+            }
+
+            TestBed.configureTestingModule({
+              declarations: [Outer, Fixture],
+              imports: [Module],
+            });
+
+            const fixture = TestBed.createComponent(Fixture);
+            // The Outer component should have its template stamped out, and that template should
+            // include a correct instance of the Inner component with the 'Inner' text from its
+            // template.
+            expect(fixture.nativeElement.innerHTML).toEqual('<outer><inner>Inner</inner></outer>');
+          });
+
   onlyInIvy('TestBed should handle AOT pre-compiled Components')
       .describe('AOT pre-compiled components', () => {
         /**
@@ -431,6 +487,42 @@ describe('TestBed', () => {
           const fixture = TestBed.createComponent(SomeComponent);
           expect(fixture.nativeElement.innerHTML).toBe('');
         });
+
+        it('should allow component in both in declarations and imports', () => {
+          const SomeComponent = getAOTCompiledComponent();
+
+          // This is an AOT compiled module which declares (but does not export) SomeComponent.
+          class ModuleClass {
+            static ngModuleDef = defineNgModule({
+              type: ModuleClass,
+              declarations: [SomeComponent],
+            });
+          }
+
+          @Component({
+            template: '<comp></comp>',
+
+            selector: 'fixture',
+          })
+          class TestFixture {
+          }
+
+          TestBed.configureTestingModule({
+            // Here, SomeComponent is both declared, and then the module which declares it is
+            // also imported. This used to be a duplicate declaration error, but is now interpreted
+            // to mean:
+            // 1) Compile (or reuse) SomeComponent in the context of its original NgModule
+            // 2) Make SomeComponent available in the scope of the testing module, even if it wasn't
+            //    originally exported from its NgModule.
+            //
+            // This allows TestFixture to use SomeComponent, which is asserted below.
+            declarations: [SomeComponent, TestFixture],
+            imports: [ModuleClass],
+          });
+          const fixture = TestBed.createComponent(TestFixture);
+          // The regex avoids any issues with styling attributes.
+          expect(fixture.nativeElement.innerHTML).toMatch(/<comp[^>]*>Some template<\/comp>/);
+        });
       });
 
   onlyInIvy('patched ng defs should be removed after resetting TestingModule')
diff --git a/packages/core/testing/src/r3_test_bed_compiler.ts b/packages/core/testing/src/r3_test_bed_compiler.ts
index e18e7f81fa..3c53f11ad5 100644
--- a/packages/core/testing/src/r3_test_bed_compiler.ts
+++ b/packages/core/testing/src/r3_test_bed_compiler.ts
@@ -15,8 +15,15 @@ import {MetadataOverride} from './metadata_override';
 import {ComponentResolver, DirectiveResolver, NgModuleResolver, PipeResolver, Resolver} from './resolvers';
 import {TestModuleMetadata} from './test_bed_common';
 
-const TESTING_MODULE = 'TestingModule';
-type TESTING_MODULE = typeof TESTING_MODULE;
+enum TestingModuleOverride {
+  DECLARATION,
+  OVERRIDE_TEMPLATE,
+}
+
+function isTestingModuleOverride(value: unknown): value is TestingModuleOverride {
+  return value === TestingModuleOverride.DECLARATION ||
+      value === TestingModuleOverride.OVERRIDE_TEMPLATE;
+}
 
 // Resolvers for Angular decorators
 type Resolvers = {
@@ -56,7 +63,7 @@ export class R3TestBedCompiler {
 
   private resolvers: Resolvers = initResolvers();
 
-  private componentToModuleScope = new Map<Type<any>, Type<any>|TESTING_MODULE>();
+  private componentToModuleScope = new Map<Type<any>, Type<any>|TestingModuleOverride>();
 
   // Map that keeps initial version of component/directive/pipe defs in case
   // we compile a Type again, thus overriding respective static fields. This is
@@ -92,7 +99,7 @@ export class R3TestBedCompiler {
   configureTestingModule(moduleDef: TestModuleMetadata): void {
     // Enqueue any compilation tasks for the directly declared component.
     if (moduleDef.declarations !== undefined) {
-      this.queueTypeArray(moduleDef.declarations, TESTING_MODULE);
+      this.queueTypeArray(moduleDef.declarations, TestingModuleOverride.DECLARATION);
       this.declarations.push(...moduleDef.declarations);
     }
 
@@ -188,7 +195,7 @@ export class R3TestBedCompiler {
     }
 
     // Set the component's scope to be the testing module.
-    this.componentToModuleScope.set(type, TESTING_MODULE);
+    this.componentToModuleScope.set(type, TestingModuleOverride.OVERRIDE_TEMPLATE);
   }
 
   async compileComponents(): Promise<void> {
@@ -306,14 +313,15 @@ export class R3TestBedCompiler {
   }
 
   private applyTransitiveScopes(): void {
-    const moduleToScope = new Map<Type<any>|TESTING_MODULE, NgModuleTransitiveScopes>();
-    const getScopeOfModule = (moduleType: Type<any>| TESTING_MODULE): NgModuleTransitiveScopes => {
-      if (!moduleToScope.has(moduleType)) {
-        const realType = moduleType === TESTING_MODULE ? this.testModuleType : moduleType;
-        moduleToScope.set(moduleType, transitiveScopesFor(realType));
-      }
-      return moduleToScope.get(moduleType) !;
-    };
+    const moduleToScope = new Map<Type<any>|TestingModuleOverride, NgModuleTransitiveScopes>();
+    const getScopeOfModule =
+        (moduleType: Type<any>| TestingModuleOverride): NgModuleTransitiveScopes => {
+          if (!moduleToScope.has(moduleType)) {
+            const realType = isTestingModuleOverride(moduleType) ? this.testModuleType : moduleType;
+            moduleToScope.set(moduleType, transitiveScopesFor(realType));
+          }
+          return moduleToScope.get(moduleType) !;
+        };
 
     this.componentToModuleScope.forEach((moduleType, componentType) => {
       const moduleScope = getScopeOfModule(moduleType);
@@ -370,7 +378,7 @@ export class R3TestBedCompiler {
     this.existingComponentStyles.clear();
   }
 
-  private queueTypeArray(arr: any[], moduleType: Type<any>|TESTING_MODULE): void {
+  private queueTypeArray(arr: any[], moduleType: Type<any>|TestingModuleOverride): void {
     for (const value of arr) {
       if (Array.isArray(value)) {
         this.queueTypeArray(value, moduleType);
@@ -392,7 +400,7 @@ export class R3TestBedCompiler {
     compileNgModuleDefs(ngModule as NgModuleType<any>, metadata);
   }
 
-  private queueType(type: Type<any>, moduleType: Type<any>|TESTING_MODULE): void {
+  private queueType(type: Type<any>, moduleType: Type<any>|TestingModuleOverride): void {
     const component = this.resolvers.component.resolve(type);
     if (component) {
       // Check whether a give Type has respective NG def (ngComponentDef) and compile if def is
@@ -404,9 +412,22 @@ export class R3TestBedCompiler {
       this.seenComponents.add(type);
 
       // Keep track of the module which declares this component, so later the component's scope
-      // can be set correctly. Only record this the first time, because it might be overridden by
-      // overrideTemplateUsingTestingModule.
-      if (!this.componentToModuleScope.has(type)) {
+      // can be set correctly. If the component has already been recorded here, then one of several
+      // cases is true:
+      // * the module containing the component was imported multiple times (common).
+      // * the component is declared in multiple modules (which is an error).
+      // * the component was in 'declarations' of the testing module, and also in an imported module
+      //   in which case the module scope will be TestingModuleOverride.DECLARATION.
+      // * overrideTemplateUsingTestingModule was called for the component in which case the module
+      //   scope will be TestingModuleOverride.OVERRIDE_TEMPLATE.
+      //
+      // If the component was previously in the testing module's 'declarations' (meaning the
+      // current value is TestingModuleOverride.DECLARATION), then `moduleType` is the component's
+      // real module, which was imported. This pattern is understood to mean that the component
+      // should use its original scope, but that the testing module should also contain the
+      // component in its scope.
+      if (!this.componentToModuleScope.has(type) ||
+          this.componentToModuleScope.get(type) === TestingModuleOverride.DECLARATION) {
         this.componentToModuleScope.set(type, moduleType);
       }
       return;
@@ -525,7 +546,7 @@ export class R3TestBedCompiler {
       imports,
       schemas: this.schemas,
       providers,
-    });
+    }, /* allowDuplicateDeclarationsInRoot */ true);
     // clang-format on
 
     this.applyProviderOverridesToModule(this.testModuleType);

From dc6406e5e825bd527852903f2f8a6f8005f57a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 16 May 2019 16:25:52 -0700
Subject: [PATCH 195/275] refactor(ivy): evaluate map-based styling bindings
 with a new algorithm (#30543)

This patch in the second runtime change which refactors how styling
bindings work in Angular. This patch refactors how map-based
`[style]` and `[class]` bindings work using a new algorithm which
is faster and less complex than the former one.

This patch is a follow-up to an earlier refactor which enabled
support for prop-based `[style.name]` and `[class.name]`
bindings (see f03475cac8bbc79aaf13caf94b099b0c234028bc).

PR Close #30543
---
 .../src/render3/view/styling_builder.ts       |   5 +
 .../core/src/render3/instructions/styling.ts  |  10 +-
 .../core/src/render3/styling_next/bindings.ts | 328 ++++++++++-----
 .../src/render3/styling_next/instructions.ts  | 131 ++++--
 .../src/render3/styling_next/interfaces.ts    | 167 +++++++-
 .../styling_next/map_based_bindings.ts        | 375 ++++++++++++++++++
 .../src/render3/styling_next/styling_debug.ts | 107 +++--
 .../core/src/render3/styling_next/util.ts     |  43 +-
 .../core/test/acceptance/styling_next_spec.ts | 273 ++++++++++++-
 .../cyclic_import/bundle.golden_symbols.json  |   8 +-
 .../bundling/todo/bundle.golden_symbols.json  |  49 ++-
 .../styling_next/map_based_bindings_spec.ts   |  79 ++++
 .../styling_next/styling_context_spec.ts      |  23 +-
 .../styling_next/styling_debug_spec.ts        |  13 -
 14 files changed, 1361 insertions(+), 250 deletions(-)
 create mode 100644 packages/core/src/render3/styling_next/map_based_bindings.ts
 create mode 100644 packages/core/test/render3/styling_next/map_based_bindings_spec.ts

diff --git a/packages/compiler/src/render3/view/styling_builder.ts b/packages/compiler/src/render3/view/styling_builder.ts
index b355d20cb7..f9510aaac7 100644
--- a/packages/compiler/src/render3/view/styling_builder.ts
+++ b/packages/compiler/src/render3/view/styling_builder.ts
@@ -364,6 +364,11 @@ export class StylingBuilder {
   private _buildMapBasedInstruction(
       valueConverter: ValueConverter, isClassBased: boolean, stylingInput: BoundStylingEntry) {
     let totalBindingSlotsRequired = 0;
+    if (compilerIsNewStylingInUse()) {
+      // the old implementation does not reserve slot values for
+      // binding entries. The new one does.
+      totalBindingSlotsRequired++;
+    }
 
     // these values must be outside of the update block so that they can
     // be evaluated (the AST visit call) during creation time so that any
diff --git a/packages/core/src/render3/instructions/styling.ts b/packages/core/src/render3/instructions/styling.ts
index f607d90a62..9fc8aec6b1 100644
--- a/packages/core/src/render3/instructions/styling.ts
+++ b/packages/core/src/render3/instructions/styling.ts
@@ -17,7 +17,7 @@ import {BoundPlayerFactory} from '../styling/player_factory';
 import {DEFAULT_TEMPLATE_DIRECTIVE_INDEX} from '../styling/shared';
 import {getCachedStylingContext, setCachedStylingContext} from '../styling/state';
 import {allocateOrUpdateDirectiveIntoContext, createEmptyStylingContext, forceClassesAsString, forceStylesAsString, getStylingContextFromLView, hasClassInput, hasStyleInput} from '../styling/util';
-import {classProp as newClassProp, styleProp as newStyleProp, stylingApply as newStylingApply, stylingInit as newStylingInit} from '../styling_next/instructions';
+import {classMap as newClassMap, classProp as newClassProp, styleMap as newStyleMap, styleProp as newStyleProp, stylingApply as newStylingApply, stylingInit as newStylingInit} from '../styling_next/instructions';
 import {runtimeAllowOldStyling, runtimeIsNewStylingInUse} from '../styling_next/state';
 import {getBindingNameFromIndex} from '../styling_next/util';
 import {NO_CHANGE} from '../tokens';
@@ -285,6 +285,10 @@ export function ɵɵstyleMap(styles: {[styleName: string]: any} | NO_CHANGE | nu
     }
     updateStyleMap(stylingContext, styles);
   }
+
+  if (runtimeIsNewStylingInUse()) {
+    newStyleMap(styles);
+  }
 }
 
 
@@ -328,6 +332,10 @@ export function ɵɵclassMap(classes: {[styleName: string]: any} | NO_CHANGE | s
     }
     updateClassMap(stylingContext, classes);
   }
+
+  if (runtimeIsNewStylingInUse()) {
+    newClassMap(classes);
+  }
 }
 
 /**
diff --git a/packages/core/src/render3/styling_next/bindings.ts b/packages/core/src/render3/styling_next/bindings.ts
index d3ef4c9c7e..ab69e63da8 100644
--- a/packages/core/src/render3/styling_next/bindings.ts
+++ b/packages/core/src/render3/styling_next/bindings.ts
@@ -6,11 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */
 import {ProceduralRenderer3, RElement, Renderer3, RendererStyleFlags3, isProceduralRenderer} from '../interfaces/renderer';
-import {ApplyStylingFn, StylingBindingData, TStylingContext, TStylingContextIndex} from './interfaces';
-import {allowStylingFlush, getGuardMask, getProp, getValue, getValuesCount, isContextLocked, lockContext} from './util';
+
+import {ApplyStylingFn, LStylingData, LStylingMap, StylingMapsSyncMode, SyncStylingMapsFn, TStylingContext, TStylingContextIndex} from './interfaces';
+import {allowStylingFlush, getBindingValue, getGuardMask, getProp, getPropValuesStartPosition, getValuesCount, hasValueChanged, isContextLocked, isStylingValueDefined, lockContext} from './util';
 
 
 /**
+ * --------
+ *
  * This file contains the core logic for styling in Angular.
  *
  * All styling bindings (i.e. `[style]`, `[style.prop]`, `[class]` and `[class.name]`)
@@ -23,24 +26,31 @@ import {allowStylingFlush, getGuardMask, getProp, getValue, getValuesCount, isCo
  * context.
  *
  * To learn more about the algorithm see `TStylingContext`.
+ *
+ * --------
  */
 
+const DEFAULT_BINDING_VALUE = null;
+const DEFAULT_SIZE_VALUE = 1;
+
+// The first bit value reflects a map-based binding value's bit.
+// The reason why it's always activated for every entry in the map
+// is so that if any map-binding values update then all other prop
+// based bindings will pass the guard check automatically without
+// any extra code or flags.
+export const DEFAULT_GUARD_MASK_VALUE = 0b1;
+const STYLING_INDEX_FOR_MAP_BINDING = 0;
+const STYLING_INDEX_START_VALUE = 1;
+
 // the values below are global to all styling code below. Each value
 // will either increment or mutate each time a styling instruction is
 // executed. Do not modify the values below.
-let currentStyleIndex = 0;
-let currentClassIndex = 0;
+let currentStyleIndex = STYLING_INDEX_START_VALUE;
+let currentClassIndex = STYLING_INDEX_START_VALUE;
 let stylesBitMask = 0;
 let classesBitMask = 0;
 let deferredBindingQueue: (TStylingContext | number | string | null)[] = [];
 
-const DEFAULT_BINDING_VALUE = null;
-const DEFAULT_SIZE_VALUE = 1;
-const DEFAULT_MASK_VALUE = 0;
-export const DEFAULT_BINDING_INDEX_VALUE = -1;
-export const BIT_MASK_APPLY_ALL = -1;
-
-
 /**
  * Visits a class-based binding and updates the new value (if changed).
  *
@@ -48,14 +58,18 @@ export const BIT_MASK_APPLY_ALL = -1;
  * is executed. It's important that it's always called (even if the value
  * has not changed) so that the inner counter index value is incremented.
  * This way, each instruction is always guaranteed to get the same counter
- * state each time its called (which then allows the `TStylingContext`
+ * state each time it's called (which then allows the `TStylingContext`
  * and the bit mask values to be in sync).
  */
 export function updateClassBinding(
-    context: TStylingContext, data: StylingBindingData, prop: string, bindingIndex: number,
-    value: boolean | null | undefined, deferRegistration: boolean): void {
-  const index = currentClassIndex++;
-  if (updateBindingData(context, data, index, prop, bindingIndex, value, deferRegistration)) {
+    context: TStylingContext, data: LStylingData, prop: string | null, bindingIndex: number,
+    value: boolean | string | null | undefined | LStylingMap, deferRegistration: boolean,
+    forceUpdate?: boolean): void {
+  const isMapBased = !prop;
+  const index = isMapBased ? STYLING_INDEX_FOR_MAP_BINDING : currentClassIndex++;
+  const updated = updateBindingData(
+      context, data, index, prop, bindingIndex, value, deferRegistration, forceUpdate);
+  if (updated || forceUpdate) {
     classesBitMask |= 1 << index;
   }
 }
@@ -67,22 +81,40 @@ export function updateClassBinding(
  * is executed. It's important that it's always called (even if the value
  * has not changed) so that the inner counter index value is incremented.
  * This way, each instruction is always guaranteed to get the same counter
- * state each time its called (which then allows the `TStylingContext`
+ * state each time it's called (which then allows the `TStylingContext`
  * and the bit mask values to be in sync).
  */
 export function updateStyleBinding(
-    context: TStylingContext, data: StylingBindingData, prop: string, bindingIndex: number,
-    value: String | string | number | null | undefined, deferRegistration: boolean): void {
-  const index = currentStyleIndex++;
-  if (updateBindingData(context, data, index, prop, bindingIndex, value, deferRegistration)) {
+    context: TStylingContext, data: LStylingData, prop: string | null, bindingIndex: number,
+    value: String | string | number | null | undefined | LStylingMap, deferRegistration: boolean,
+    forceUpdate?: boolean): void {
+  const isMapBased = !prop;
+  const index = isMapBased ? STYLING_INDEX_FOR_MAP_BINDING : currentStyleIndex++;
+  const updated = updateBindingData(
+      context, data, index, prop, bindingIndex, value, deferRegistration, forceUpdate);
+  if (updated || forceUpdate) {
     stylesBitMask |= 1 << index;
   }
 }
 
+/**
+ * Called each time a binding value has changed within the provided `TStylingContext`.
+ *
+ * This function is designed to be called from `updateStyleBinding` and `updateClassBinding`.
+ * If called during the first update pass, the binding will be registered in the context.
+ * If the binding does get registered and the `deferRegistration` flag is true then the
+ * binding data will be queued up until the context is later flushed in `applyStyling`.
+ *
+ * This function will also update binding slot in the provided `LStylingData` with the
+ * new binding entry (if it has changed).
+ *
+ * @returns whether or not the binding value was updated in the `LStylingData`.
+ */
 function updateBindingData(
-    context: TStylingContext, data: StylingBindingData, counterIndex: number, prop: string,
-    bindingIndex: number, value: string | String | number | boolean | null | undefined,
-    deferRegistration?: boolean): boolean {
+    context: TStylingContext, data: LStylingData, counterIndex: number, prop: string | null,
+    bindingIndex: number,
+    value: string | String | number | boolean | null | undefined | LStylingMap,
+    deferRegistration?: boolean, forceUpdate?: boolean): boolean {
   if (!isContextLocked(context)) {
     if (deferRegistration) {
       deferBindingRegistration(context, counterIndex, prop, bindingIndex);
@@ -99,11 +131,11 @@ function updateBindingData(
     }
   }
 
-  if (data[bindingIndex] !== value) {
+  const changed = forceUpdate || hasValueChanged(data[bindingIndex], value);
+  if (changed) {
     data[bindingIndex] = value;
-    return true;
   }
-  return false;
+  return changed;
 }
 
 /**
@@ -118,7 +150,7 @@ function updateBindingData(
  * after the inheritance chain exits.
  */
 function deferBindingRegistration(
-    context: TStylingContext, counterIndex: number, prop: string, bindingIndex: number) {
+    context: TStylingContext, counterIndex: number, prop: string | null, bindingIndex: number) {
   deferredBindingQueue.splice(0, 0, context, counterIndex, prop, bindingIndex);
 }
 
@@ -168,35 +200,56 @@ function flushDeferredBindings() {
  *    as the default value for the binding. If the bindingValue property is inserted
  *    and it is either a string, number or null value then that will replace the default
  *    value.
+ *
+ * Note that this function is also used for map-based styling bindings. They are treated
+ * much the same as prop-based bindings, but, because they do not have a property value
+ * (since it's a map), all map-based entries are stored in an already populated area of
+ * the context at the top (which is reserved for map-based entries).
  */
 export function registerBinding(
-    context: TStylingContext, countId: number, prop: string,
+    context: TStylingContext, countId: number, prop: string | null,
     bindingValue: number | null | string | boolean) {
-  let i = TStylingContextIndex.ValuesStartPosition;
-  let found = false;
-  while (i < context.length) {
-    const valuesCount = getValuesCount(context, i);
-    const p = getProp(context, i);
-    found = prop <= p;
-    if (found) {
-      // all style/class bindings are sorted by property name
-      if (prop < p) {
-        allocateNewContextEntry(context, i, prop);
+  // prop-based bindings (e.g `<div [style.width]="w" [class.foo]="f">`)
+  if (prop) {
+    let found = false;
+    let i = getPropValuesStartPosition(context);
+    while (i < context.length) {
+      const valuesCount = getValuesCount(context, i);
+      const p = getProp(context, i);
+      found = prop <= p;
+      if (found) {
+        // all style/class bindings are sorted by property name
+        if (prop < p) {
+          allocateNewContextEntry(context, i, prop);
+        }
+        addBindingIntoContext(context, false, i, bindingValue, countId);
+        break;
       }
-      addBindingIntoContext(context, i, bindingValue, countId);
-      break;
+      i += TStylingContextIndex.BindingsStartOffset + valuesCount;
     }
-    i += TStylingContextIndex.BindingsStartOffset + valuesCount;
-  }
 
-  if (!found) {
-    allocateNewContextEntry(context, context.length, prop);
-    addBindingIntoContext(context, i, bindingValue, countId);
+    if (!found) {
+      allocateNewContextEntry(context, context.length, prop);
+      addBindingIntoContext(context, false, i, bindingValue, countId);
+    }
+  } else {
+    // map-based bindings (e.g `<div [style]="s" [class]="{className:true}">`)
+    // there is no need to allocate the map-based binding region into the context
+    // since it is already there when the context is first created.
+    addBindingIntoContext(
+        context, true, TStylingContextIndex.MapBindingsPosition, bindingValue, countId);
   }
 }
 
 function allocateNewContextEntry(context: TStylingContext, index: number, prop: string) {
-  context.splice(index, 0, DEFAULT_MASK_VALUE, DEFAULT_SIZE_VALUE, prop, DEFAULT_BINDING_VALUE);
+  // 1,2: splice index locations
+  // 3: each entry gets a guard mask value that is used to check against updates
+  // 4. each entry gets a size value (which is always one because there is always a default binding
+  // value)
+  // 5. the property that is getting allocated into the context
+  // 6. the default binding value (usually `null`)
+  context.splice(
+      index, 0, DEFAULT_GUARD_MASK_VALUE, DEFAULT_SIZE_VALUE, prop, DEFAULT_BINDING_VALUE);
 }
 
 /**
@@ -212,51 +265,65 @@ function allocateNewContextEntry(context: TStylingContext, index: number, prop:
  *
  * - Otherwise the binding value will update the default value for the property
  *   and this will only happen if the default value is `null`.
+ *
+ * Note that this function also handles map-based bindings and will insert them
+ * at the top of the context.
  */
 function addBindingIntoContext(
-    context: TStylingContext, index: number, bindingValue: number | string | boolean | null,
-    countId: number) {
+    context: TStylingContext, isMapBased: boolean, index: number,
+    bindingValue: number | string | boolean | null, countId: number) {
   const valuesCount = getValuesCount(context, index);
 
-  // -1 is used because we want the last value that's in the list (not the next slot)
-  const lastValueIndex = index + TStylingContextIndex.BindingsStartOffset + valuesCount - 1;
+  let lastValueIndex = index + TStylingContextIndex.BindingsStartOffset + valuesCount;
+  if (!isMapBased) {
+    // prop-based values all have default values, but map-based entries do not.
+    // we want to access the index for the default value in this case and not just
+    // the bindings...
+    lastValueIndex--;
+  }
 
   if (typeof bindingValue === 'number') {
     context.splice(lastValueIndex, 0, bindingValue);
     (context[index + TStylingContextIndex.ValuesCountOffset] as number)++;
-    (context[index + TStylingContextIndex.MaskOffset] as number) |= 1 << countId;
+    (context[index + TStylingContextIndex.GuardOffset] as number) |= 1 << countId;
   } else if (typeof bindingValue === 'string' && context[lastValueIndex] == null) {
     context[lastValueIndex] = bindingValue;
   }
 }
 
 /**
- * Applies all class entries in the provided context to the provided element.
+ * Applies all class entries in the provided context to the provided element and resets
+ * any counter and/or bitMask values associated with class bindings.
  */
 export function applyClasses(
-    renderer: Renderer3 | ProceduralRenderer3 | null, data: StylingBindingData,
-    context: TStylingContext, element: RElement, directiveIndex: number) {
+    renderer: Renderer3 | ProceduralRenderer3 | null, data: LStylingData, context: TStylingContext,
+    element: RElement, directiveIndex: number) {
   if (allowStylingFlush(context, directiveIndex)) {
-    const isFirstPass = isContextLocked(context);
+    const isFirstPass = !isContextLocked(context);
     isFirstPass && lockContext(context);
-    applyStyling(context, renderer, element, data, classesBitMask, setClass, isFirstPass);
-    currentClassIndex = 0;
-    classesBitMask = 0;
+    if (classesBitMask) {
+      applyStyling(context, renderer, element, data, classesBitMask, setClass);
+      classesBitMask = 0;
+    }
+    currentClassIndex = STYLING_INDEX_START_VALUE;
   }
 }
 
 /**
- * Applies all style entries in the provided context to the provided element.
+ * Applies all style entries in the provided context to the provided element and resets
+ * any counter and/or bitMask values associated with style bindings.
  */
 export function applyStyles(
-    renderer: Renderer3 | ProceduralRenderer3 | null, data: StylingBindingData,
-    context: TStylingContext, element: RElement, directiveIndex: number) {
+    renderer: Renderer3 | ProceduralRenderer3 | null, data: LStylingData, context: TStylingContext,
+    element: RElement, directiveIndex: number) {
   if (allowStylingFlush(context, directiveIndex)) {
-    const isFirstPass = isContextLocked(context);
+    const isFirstPass = !isContextLocked(context);
     isFirstPass && lockContext(context);
-    applyStyling(context, renderer, element, data, stylesBitMask, setStyle, isFirstPass);
-    currentStyleIndex = 0;
-    stylesBitMask = 0;
+    if (stylesBitMask) {
+      applyStyling(context, renderer, element, data, stylesBitMask, setStyle);
+      stylesBitMask = 0;
+    }
+    currentStyleIndex = STYLING_INDEX_START_VALUE;
   }
 }
 
@@ -264,55 +331,114 @@ export function applyStyles(
  * Runs through the provided styling context and applies each value to
  * the provided element (via the renderer) if one or more values are present.
  *
+ * This function will iterate over all entries present in the provided
+ * `TStylingContext` array (both prop-based and map-based bindings).-
+ *
+ * Each entry, within the `TStylingContext` array, is stored alphabetically
+ * and this means that each prop/value entry will be applied in order
+ * (so long as it is marked dirty in the provided `bitMask` value).
+ *
+ * If there are any map-based entries present (which are applied to the
+ * element via the `[style]` and `[class]` bindings) then those entries
+ * will be applied as well. However, the code for that is not apart of
+ * this function. Instead, each time a property is visited, then the
+ * code below will call an external function called `stylingMapsSyncFn`
+ * and, if present, it will keep the application of styling values in
+ * map-based bindings up to sync with the application of prop-based
+ * bindings.
+ *
+ * Visit `styling_next/map_based_bindings.ts` to learn more about how the
+ * algorithm works for map-based styling bindings.
+ *
  * Note that this function is not designed to be called in isolation (use
  * `applyClasses` and `applyStyles` to actually apply styling values).
  */
 export function applyStyling(
     context: TStylingContext, renderer: Renderer3 | ProceduralRenderer3 | null, element: RElement,
-    bindingData: StylingBindingData, bitMask: number, applyStylingFn: ApplyStylingFn,
-    forceApplyDefaultValues?: boolean) {
+    bindingData: LStylingData, bitMaskValue: number | boolean, applyStylingFn: ApplyStylingFn) {
   deferredBindingQueue.length && flushDeferredBindings();
 
-  if (bitMask) {
-    let processAllEntries = bitMask === BIT_MASK_APPLY_ALL;
-    let i = TStylingContextIndex.ValuesStartPosition;
-    while (i < context.length) {
-      const valuesCount = getValuesCount(context, i);
-      const guardMask = getGuardMask(context, i);
+  const bitMask = normalizeBitMaskValue(bitMaskValue);
+  const stylingMapsSyncFn = getStylingMapsSyncFn();
+  const mapsGuardMask = getGuardMask(context, TStylingContextIndex.MapBindingsPosition);
+  const applyAllValues = (bitMask & mapsGuardMask) > 0;
+  const mapsMode =
+      applyAllValues ? StylingMapsSyncMode.ApplyAllValues : StylingMapsSyncMode.TraverseValues;
 
-      // the guard mask value is non-zero if and when
-      // there are binding values present for the property.
-      // If there are ONLY static values (i.e. `style="prop:val")
-      // then the guard value will stay as zero.
-      const processEntry =
-          processAllEntries || (guardMask ? (bitMask & guardMask) : forceApplyDefaultValues);
-      if (processEntry) {
-        const prop = getProp(context, i);
-        const limit = valuesCount - 1;
-        for (let j = 0; j <= limit; j++) {
-          const isFinalValue = j === limit;
-          const bindingValue = getValue(context, i, j);
-          const bindingIndex =
-              isFinalValue ? DEFAULT_BINDING_INDEX_VALUE : (bindingValue as number);
-          const valueToApply: string|null = isFinalValue ? bindingValue : bindingData[bindingIndex];
-          if (isValueDefined(valueToApply) || isFinalValue) {
-            applyStylingFn(renderer, element, prop, valueToApply, bindingIndex);
-            break;
-          }
+  let i = getPropValuesStartPosition(context);
+  while (i < context.length) {
+    const valuesCount = getValuesCount(context, i);
+    const guardMask = getGuardMask(context, i);
+    if (bitMask & guardMask) {
+      let valueApplied = false;
+      const prop = getProp(context, i);
+      const valuesCountUpToDefault = valuesCount - 1;
+      const defaultValue = getBindingValue(context, i, valuesCountUpToDefault) as string | null;
+
+      // case 1: apply prop-based values
+      // try to apply the binding values and see if a non-null
+      // value gets set for the styling binding
+      for (let j = 0; j < valuesCountUpToDefault; j++) {
+        const bindingIndex = getBindingValue(context, i, j) as number;
+        const valueToApply = bindingData[bindingIndex];
+        if (isStylingValueDefined(valueToApply)) {
+          applyStylingFn(renderer, element, prop, valueToApply, bindingIndex);
+          valueApplied = true;
+          break;
         }
       }
-      i += TStylingContextIndex.BindingsStartOffset + valuesCount;
+
+      // case 2: apply map-based values
+      // traverse through each map-based styling binding and update all values up to
+      // the provided `prop` value. If the property was not applied in the loop above
+      // then it will be attempted to be applied in the maps sync code below.
+      if (stylingMapsSyncFn) {
+        // determine whether or not to apply the target property or to skip it
+        const mode = mapsMode | (valueApplied ? StylingMapsSyncMode.SkipTargetProp :
+                                                StylingMapsSyncMode.ApplyTargetProp);
+        const valueAppliedWithinMap = stylingMapsSyncFn(
+            context, renderer, element, bindingData, applyStylingFn, mode, prop, defaultValue);
+        valueApplied = valueApplied || valueAppliedWithinMap;
+      }
+
+      // case 3: apply the default value
+      // if the value has not yet been applied then a truthy value does not exist in the
+      // prop-based or map-based bindings code. If and when this happens, just apply the
+      // default value (even if the default value is `null`).
+      if (!valueApplied) {
+        applyStylingFn(renderer, element, prop, defaultValue);
+      }
     }
+
+    i += TStylingContextIndex.BindingsStartOffset + valuesCount;
+  }
+
+  // the map-based styling entries may have not applied all their
+  // values. For this reason, one more call to the sync function
+  // needs to be issued at the end.
+  if (stylingMapsSyncFn) {
+    stylingMapsSyncFn(context, renderer, element, bindingData, applyStylingFn, mapsMode);
   }
 }
 
-function isValueDefined(value: any) {
-  // the reason why null is compared against is because
-  // a CSS class value that is set to `false` must be
-  // respected (otherwise it would be treated as falsy).
-  // Empty string values are because developers usually
-  // set a value to an empty string to remove it.
-  return value != null && value !== '';
+function normalizeBitMaskValue(value: number | boolean): number {
+  // if pass => apply all values (-1 implies that all bits are flipped to true)
+  if (value === true) return -1;
+
+  // if pass => skip all values
+  if (value === false) return 0;
+
+  // return the bit mask value as is
+  return value;
+}
+
+let _activeStylingMapApplyFn: SyncStylingMapsFn|null = null;
+export function getStylingMapsSyncFn() {
+  return _activeStylingMapApplyFn;
+}
+
+export function setStylingMapsSyncFn(fn: SyncStylingMapsFn) {
+  _activeStylingMapApplyFn = fn;
 }
 
 /**
diff --git a/packages/core/src/render3/styling_next/instructions.ts b/packages/core/src/render3/styling_next/instructions.ts
index 81b8b33d4b..902a71a661 100644
--- a/packages/core/src/render3/styling_next/instructions.ts
+++ b/packages/core/src/render3/styling_next/instructions.ts
@@ -11,18 +11,25 @@ import {RElement} from '../interfaces/renderer';
 import {StylingContext as OldStylingContext, StylingIndex as OldStylingIndex} from '../interfaces/styling';
 import {BINDING_INDEX, HEADER_OFFSET, HOST, LView, RENDERER} from '../interfaces/view';
 import {getActiveDirectiveId, getActiveDirectiveSuperClassDepth, getActiveDirectiveSuperClassHeight, getLView, getSelectedIndex} from '../state';
+import {NO_CHANGE} from '../tokens';
 import {getTNode, isStylingContext as isOldStylingContext} from '../util/view_utils';
 
 import {applyClasses, applyStyles, registerBinding, updateClassBinding, updateStyleBinding} from './bindings';
 import {TStylingContext} from './interfaces';
+import {activeStylingMapFeature, normalizeIntoStylingMap} from './map_based_bindings';
 import {attachStylingDebugObject} from './styling_debug';
-import {allocStylingContext, updateContextDirectiveIndex} from './util';
+import {allocStylingContext, hasValueChanged, updateContextDirectiveIndex} from './util';
+
 
 
 /**
+ * --------
+ *
  * This file contains the core logic for how styling instructions are processed in Angular.
  *
  * To learn more about the algorithm see `TStylingContext`.
+ *
+ * --------
  */
 
 /**
@@ -49,26 +56,76 @@ export function stylingInit() {
  */
 export function styleProp(
     prop: string, value: string | number | String | null, suffix?: string | null): void {
-  const index = getSelectedIndex();
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX]++;
-  const tNode = getTNode(index, lView);
-  const tContext = getStylesContext(tNode);
-  const defer = getActiveDirectiveSuperClassHeight() > 0;
-  updateStyleBinding(tContext, lView, prop, bindingIndex, value, defer);
+  _stylingProp(prop, value, false);
 }
 
 /**
  * Mirror implementation of the `classProp()` instruction (found in `instructions/styling.ts`).
  */
 export function classProp(className: string, value: boolean | null): void {
+  _stylingProp(className, value, true);
+}
+
+/**
+ * Shared function used to update a prop-based styling binding for an element.
+ */
+function _stylingProp(
+    prop: string, value: boolean | number | String | string | null, isClassBased: boolean) {
   const index = getSelectedIndex();
   const lView = getLView();
   const bindingIndex = lView[BINDING_INDEX]++;
   const tNode = getTNode(index, lView);
-  const tContext = getClassesContext(tNode);
   const defer = getActiveDirectiveSuperClassHeight() > 0;
-  updateClassBinding(tContext, lView, className, bindingIndex, value, defer);
+  if (isClassBased) {
+    updateClassBinding(
+        getClassesContext(tNode), lView, prop, bindingIndex, value as string | boolean | null,
+        defer);
+  } else {
+    updateStyleBinding(
+        getStylesContext(tNode), lView, prop, bindingIndex, value as string | null, defer);
+  }
+}
+
+/**
+ * Mirror implementation of the `styleMap()` instruction (found in `instructions/styling.ts`).
+ */
+export function styleMap(styles: {[styleName: string]: any} | NO_CHANGE | null): void {
+  _stylingMap(styles, false);
+}
+
+/**
+ * Mirror implementation of the `classMap()` instruction (found in `instructions/styling.ts`).
+ */
+export function classMap(classes: {[className: string]: any} | NO_CHANGE | string | null): void {
+  _stylingMap(classes, true);
+}
+
+/**
+ * Shared function used to update a map-based styling binding for an element.
+ *
+ * When this function is called it will activate support for `[style]` and
+ * `[class]` bindings in Angular.
+ */
+function _stylingMap(value: {[key: string]: any} | string | null, isClassBased: boolean) {
+  activeStylingMapFeature();
+  const index = getSelectedIndex();
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX]++;
+
+  if (value !== NO_CHANGE) {
+    const tNode = getTNode(index, lView);
+    const defer = getActiveDirectiveSuperClassHeight() > 0;
+    const oldValue = lView[bindingIndex];
+    const valueHasChanged = hasValueChanged(oldValue, value);
+    const lStylingMap = normalizeIntoStylingMap(oldValue, value);
+    if (isClassBased) {
+      updateClassBinding(
+          getClassesContext(tNode), lView, null, bindingIndex, lStylingMap, defer, valueHasChanged);
+    } else {
+      updateStyleBinding(
+          getStylesContext(tNode), lView, null, bindingIndex, lStylingMap, defer, valueHasChanged);
+    }
+  }
 }
 
 /**
@@ -97,33 +154,6 @@ export function stylingApply() {
   applyStyles(renderer, lView, getStylesContext(tNode), native, directiveIndex);
 }
 
-function getStylesContext(tNode: TNode): TStylingContext {
-  return getContext(tNode, false);
-}
-
-function getClassesContext(tNode: TNode): TStylingContext {
-  return getContext(tNode, true);
-}
-
-/**
- * Returns/instantiates a styling context from/to a `tNode` instance.
- */
-function getContext(tNode: TNode, isClassBased: boolean) {
-  let context = isClassBased ? tNode.newClasses : tNode.newStyles;
-  if (!context) {
-    context = allocStylingContext();
-    if (ngDevMode) {
-      attachStylingDebugObject(context);
-    }
-    if (isClassBased) {
-      tNode.newClasses = context;
-    } else {
-      tNode.newStyles = context;
-    }
-  }
-  return context;
-}
-
 /**
  * Temporary function to bridge styling functionality between this new
  * refactor (which is here inside of `styling_next/`) and the old
@@ -209,3 +239,30 @@ function updateLastDirectiveIndex(tNode: TNode, directiveIndex: number) {
   updateContextDirectiveIndex(getClassesContext(tNode), directiveIndex);
   updateContextDirectiveIndex(getStylesContext(tNode), directiveIndex);
 }
+
+function getStylesContext(tNode: TNode): TStylingContext {
+  return getContext(tNode, false);
+}
+
+function getClassesContext(tNode: TNode): TStylingContext {
+  return getContext(tNode, true);
+}
+
+/**
+ * Returns/instantiates a styling context from/to a `tNode` instance.
+ */
+function getContext(tNode: TNode, isClassBased: boolean) {
+  let context = isClassBased ? tNode.newClasses : tNode.newStyles;
+  if (!context) {
+    context = allocStylingContext();
+    if (ngDevMode) {
+      attachStylingDebugObject(context);
+    }
+    if (isClassBased) {
+      tNode.newClasses = context;
+    } else {
+      tNode.newStyles = context;
+    }
+  }
+  return context;
+}
diff --git a/packages/core/src/render3/styling_next/interfaces.ts b/packages/core/src/render3/styling_next/interfaces.ts
index 3ccdcf1142..3887474f23 100644
--- a/packages/core/src/render3/styling_next/interfaces.ts
+++ b/packages/core/src/render3/styling_next/interfaces.ts
@@ -8,6 +8,16 @@
 import {ProceduralRenderer3, RElement, Renderer3} from '../interfaces/renderer';
 import {LView} from '../interfaces/view';
 
+/**
+ * --------
+ *
+ * This file contains the core interfaces for styling in Angular.
+ *
+ * To learn more about the algorithm see `TStylingContext`.
+ *
+ * --------
+ */
+
 /**
  * A static-level representation of all style or class bindings/values
  * associated with a `TNode`.
@@ -143,7 +153,7 @@ import {LView} from '../interfaces/view';
  * styling apply call has been called (this is triggered by the
  * `stylingApply()` instruction for the active element).
  *
- * # How Styles/Classes are Applied
+ * # How Styles/Classes are Rendered
  * Each time a styling instruction (e.g. `[class.name]`, `[style.prop]`,
  * etc...) is executed, the associated `lView` for the view is updated
  * at the current binding location. Also, when this happens, a local
@@ -166,20 +176,78 @@ import {LView} from '../interfaces/view';
  * }
  * ```
  *
+ * ## The Apply Algorithm
+ * As explained above, each time a binding updates its value, the resulting
+ * value is stored in the `lView` array. These styling values have yet to
+ * be flushed to the element.
+ *
  * Once all the styling instructions have been evaluated, then the styling
  * context(s) are flushed to the element. When this happens, the context will
  * be iterated over (property by property) and each binding source will be
  * examined and the first non-null value will be applied to the element.
  *
+ * Let's say that we the following template code:
+ *
+ * ```html
+ * <div [style.width]="w1" dir-that-set-width="w2"></div>
+ * ```
+ *
+ * There are two styling bindings in the code above and they both write
+ * to the `width` property. When styling is flushed on the element, the
+ * algorithm will try and figure out which one of these values to write
+ * to the element.
+ *
+ * In order to figure out which value to apply, the following
+ * binding prioritization is adhered to:
+ *
+ * 1. First template-level styling bindings are applied (if present).
+ *    This includes things like `[style.width]` and `[class.active]`.
+ *
+ * 2. Second are styling-level host bindings present in directives.
+ *    (if there are sub/super directives present then the sub directives
+ *    are applied first).
+ *
+ * 3. Third are styling-level host bindings present in components.
+ *    (if there are sub/super components present then the sub directives
+ *    are applied first).
+ *
+ * This means that in the code above the styling binding present in the
+ * template is applied first and, only if its falsy, then the directive
+ * styling binding for width will be applied.
+ *
+ * ### What about map-based styling bindings?
+ * Map-based styling bindings are activated when there are one or more
+ * `[style]` and/or `[class]` bindings present on an element. When this
+ * code is activated, the apply algorithm will iterate over each map
+ * entry and apply each styling value to the element with the same
+ * prioritization rules as above.
+ *
+ * For the algorithm to apply styling values efficiently, the
+ * styling map entries must be applied in sync (property by property)
+ * with prop-based bindings. (The map-based algorithm is described
+ * more inside of the `render3/stlying_next/map_based_bindings.ts` file.)
  */
-export interface TStylingContext extends Array<number|string|number|boolean|null> {
+export interface TStylingContext extends Array<number|string|number|boolean|null|LStylingMap> {
+  /** Configuration data for the context */
   [TStylingContextIndex.ConfigPosition]: TStylingConfigFlags;
 
-  /* Temporary value used to track directive index entries until
+  /** Temporary value used to track directive index entries until
      the old styling code is fully removed. The reason why this
      is required is to figure out which directive is last and,
      when encountered, trigger a styling flush to happen */
   [TStylingContextIndex.MaxDirectiveIndexPosition]: number;
+
+  /** The bit guard value for all map-based bindings on an element */
+  [TStylingContextIndex.MapBindingsBitGuardPosition]: number;
+
+  /** The total amount of map-based bindings present on an element */
+  [TStylingContextIndex.MapBindingsValuesCountPosition]: number;
+
+  /** The prop value for map-based bindings (there actually isn't a
+   * value at all, but this is just used in the context to avoid
+   * having any special code to update the binding information for
+   * map-based entries). */
+  [TStylingContextIndex.MapBindingsPropPosition]: string;
 }
 
 /**
@@ -210,11 +278,18 @@ export const enum TStylingConfigFlags {
 export const enum TStylingContextIndex {
   ConfigPosition = 0,
   MaxDirectiveIndexPosition = 1,
-  ValuesStartPosition = 2,
+
+  // index/offset values for map-based entries (i.e. `[style]`
+  // and `[class] bindings).
+  MapBindingsPosition = 2,
+  MapBindingsBitGuardPosition = 2,
+  MapBindingsValuesCountPosition = 3,
+  MapBindingsPropPosition = 4,
+  MapBindingsBindingsStartPosition = 5,
 
   // each tuple entry in the context
   // (mask, count, prop, ...bindings||default-value)
-  MaskOffset = 0,
+  GuardOffset = 0,
   ValuesCountOffset = 1,
   PropOffset = 2,
   BindingsStartOffset = 3,
@@ -225,7 +300,7 @@ export const enum TStylingContextIndex {
  */
 export interface ApplyStylingFn {
   (renderer: Renderer3|ProceduralRenderer3|null, element: RElement, prop: string,
-   value: string|null, bindingIndex: number): void;
+   value: string|null, bindingIndex?: number|null): void;
 }
 
 /**
@@ -236,4 +311,82 @@ export interface ApplyStylingFn {
  * this data type to be an array that contains various scalar data types,
  * an instance of `LView` doesn't need to be constructed for tests.
  */
-export type StylingBindingData = LView | (string | number | boolean)[];
+export type LStylingData = LView | (string | number | boolean | null)[];
+
+/**
+ * Array-based representation of a key/value array.
+ *
+ * The format of the array is "property", "value", "property2",
+ * "value2", etc...
+ *
+ * The first value in the array is reserved to store the instance
+ * of the key/value array that was used to populate the property/
+ * value entries that take place in the remainder of the array.
+ */
+export interface LStylingMap extends Array<{}|string|number|null> {
+  [LStylingMapIndex.RawValuePosition]: {}|string|null;
+}
+
+/**
+ * An index of position and offset points for any data stored within a `LStylingMap` instance.
+ */
+export const enum LStylingMapIndex {
+  /** The location of the raw key/value map instance used last to populate the array entries */
+  RawValuePosition = 0,
+
+  /** Where the values start in the array */
+  ValuesStartPosition = 1,
+
+  /** The size of each property/value entry */
+  TupleSize = 2,
+
+  /** The offset for the property entry in the tuple */
+  PropOffset = 0,
+
+  /** The offset for the value entry in the tuple */
+  ValueOffset = 1,
+}
+
+/**
+ * Used to apply/traverse across all map-based styling entries up to the provided `targetProp`
+ * value.
+ *
+ * When called, each of the map-based `LStylingMap` entries (which are stored in
+ * the provided `LStylingData` array) will be iterated over. Depending on the provided
+ * `mode` value, each prop/value entry may be applied or skipped over.
+ *
+ * If `targetProp` value is provided the iteration code will stop once it reaches
+ * the property (if found). Otherwise if the target property is not encountered then
+ * it will stop once it reaches the next value that appears alphabetically after it.
+ *
+ * If a `defaultValue` is provided then it will be applied to the element only if the
+ * `targetProp` property value is encountered and the value associated with the target
+ * property is `null`. The reason why the `defaultValue` is needed is to avoid having the
+ * algorithm apply a `null` value and then apply a default value afterwards (this would
+ * end up being two style property writes).
+ *
+ * @returns whether or not the target property was reached and its value was
+ *  applied to the element.
+ */
+export interface SyncStylingMapsFn {
+  (context: TStylingContext, renderer: Renderer3|ProceduralRenderer3|null, element: RElement,
+   data: LStylingData, applyStylingFn: ApplyStylingFn, mode: StylingMapsSyncMode,
+   targetProp?: string|null, defaultValue?: string|null): boolean;
+}
+
+/**
+ * Used to direct how map-based values are applied/traversed when styling is flushed.
+ */
+export const enum StylingMapsSyncMode {
+  /** Only traverse values (no prop/value styling entries get applied) */
+  TraverseValues = 0b000,
+
+  /** Apply every prop/value styling entry to the element */
+  ApplyAllValues = 0b001,
+
+  /** Only apply the target prop/value entry */
+  ApplyTargetProp = 0b010,
+
+  /** Skip applying the target prop/value entry */
+  SkipTargetProp = 0b100,
+}
diff --git a/packages/core/src/render3/styling_next/map_based_bindings.ts b/packages/core/src/render3/styling_next/map_based_bindings.ts
new file mode 100644
index 0000000000..b0c5573abd
--- /dev/null
+++ b/packages/core/src/render3/styling_next/map_based_bindings.ts
@@ -0,0 +1,375 @@
+/**
+* @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 {ProceduralRenderer3, RElement, Renderer3} from '../interfaces/renderer';
+
+import {setStylingMapsSyncFn} from './bindings';
+import {ApplyStylingFn, LStylingData, LStylingMap, LStylingMapIndex, StylingMapsSyncMode, SyncStylingMapsFn, TStylingContext, TStylingContextIndex} from './interfaces';
+import {getBindingValue, getValuesCount, isStylingValueDefined} from './util';
+
+
+/**
+ * --------
+ *
+ * This file contains the algorithm logic for applying map-based bindings
+ * such as `[style]` and `[class]`.
+ *
+ * --------
+ */
+
+/**
+ * Used to apply styling values presently within any map-based bindings on an element.
+ *
+ * Angular supports map-based styling bindings which can be applied via the
+ * `[style]` and `[class]` bindings which can be placed on any HTML element.
+ * These bindings can work independently, together or alongside prop-based
+ * styling bindings (e.g. `<div [style]="x" [style.width]="w">`).
+ *
+ * If a map-based styling binding is detected by the compiler, the following
+ * AOT code is produced:
+ *
+ * ```typescript
+ * styleMap(ctx.styles); // styles = {key:value}
+ * classMap(ctx.classes); // classes = {key:value}|string
+ * ```
+ *
+ * If and when either of the instructions above are evaluated, then the code
+ * present in this file is included into the bundle. The mechanism used, to
+ * activate support for map-based bindings at runtime is possible via the
+ * `activeStylingMapFeature` function (which is also present in this file).
+ *
+ * # The Algorithm
+ * Whenever a map-based binding updates (which is when the identity of the
+ * map-value changes) then the map is iterated over and a `LStylingMap` array
+ * is produced. The `LStylingMap` instance is stored in the binding location
+ * where the `BINDING_INDEX` is situated when the `styleMap()` or `classMap()`
+ * instruction were called. Once the binding changes, then the internal `bitMask`
+ * value is marked as dirty.
+ *
+ * Styling values are applied once CD exits the element (which happens when
+ * the `select(n)` instruction is called or the template function exits). When
+ * this occurs, all prop-based bindings are applied. If a map-based binding is
+ * present then a special flushing function (called a sync function) is made
+ * available and it will be called each time a styling property is flushed.
+ *
+ * The flushing algorithm is designed to apply styling for a property (which is
+ * a CSS property or a className value) one by one. If map-based bindings
+ * are present, then the flushing algorithm will keep calling the maps styling
+ * sync function each time a property is visited. This way, the flushing
+ * behavior of map-based bindings will always be at the same property level
+ * as the current prop-based property being iterated over (because everything
+ * is alphabetically sorted).
+ *
+ * Let's imagine we have the following HTML template code:
+ *
+ * ```html
+ * <div [style]="{width:'100px', height:'200px', 'z-index':'10'}"
+ *      [style.width.px]="200">...</div>
+ * ```
+ *
+ * When CD occurs, both the `[style]` and `[style.width]` bindings
+ * are evaluated. Then when the styles are flushed on screen, the
+ * following operations happen:
+ *
+ * 1. `[style.width]` is attempted to be written to the element.
+ *
+ * 2.  Once that happens, the algorithm instructs the map-based
+ *     entries (`[style]` in this case) to "catch up" and apply
+ *     all values up to the `width` value. When this happens the
+ *     `height` value is applied to the element (since it is
+ *     alphabetically situated before the `width` property).
+ *
+ * 3. Since there are no more prop-based entries anymore, the
+ *    loop exits and then, just before the flushing ends, it
+ *    instructs all map-based bindings to "finish up" applying
+ *    their values.
+ *
+ * 4. The only remaining value within the map-based entries is
+ *    the `z-index` value (`width` got skipped because it was
+ *    successfully applied via the prop-based `[style.width]`
+ *    binding). Since all map-based entries are told to "finish up",
+ *    the `z-index` value is iterated over and it is then applied
+ *    to the element.
+ *
+ * The most important thing to take note of here is that prop-based
+ * bindings are evaluated in order alongside map-based bindings.
+ * This allows all styling across an element to be applied in O(n)
+ * time (a similar algorithm is that of the array merge algorithm
+ * in merge sort).
+ */
+export const syncStylingMap: SyncStylingMapsFn =
+    (context: TStylingContext, renderer: Renderer3 | ProceduralRenderer3 | null, element: RElement,
+     data: LStylingData, applyStylingFn: ApplyStylingFn, mode: StylingMapsSyncMode,
+     targetProp?: string | null, defaultValue?: string | null): boolean => {
+      let targetPropValueWasApplied = false;
+
+      // once the map-based styling code is activate it is never deactivated. For this reason a
+      // check to see if the current styling context has any map based bindings is required.
+      const totalMaps = getValuesCount(context, TStylingContextIndex.MapBindingsPosition);
+      if (totalMaps) {
+        let runTheSyncAlgorithm = true;
+        const loopUntilEnd = !targetProp;
+
+        // If the code is told to finish up (run until the end), but the mode
+        // hasn't been flagged to apply values (it only traverses values) then
+        // there is no point in iterating over the array because nothing will
+        // be applied to the element.
+        if (loopUntilEnd && (mode & ~StylingMapsSyncMode.ApplyAllValues)) {
+          runTheSyncAlgorithm = false;
+          targetPropValueWasApplied = true;
+        }
+
+        if (runTheSyncAlgorithm) {
+          targetPropValueWasApplied = innerSyncStylingMap(
+              context, renderer, element, data, applyStylingFn, mode, targetProp || null, 0,
+              defaultValue || null);
+        }
+
+        if (loopUntilEnd) {
+          resetSyncCursors();
+        }
+      }
+
+      return targetPropValueWasApplied;
+    };
+
+/**
+ * Recursive function designed to apply map-based styling to an element one map at a time.
+ *
+ * This function is designed to be called from the `syncStylingMap` function and will
+ * apply map-based styling data one map at a time to the provided `element`.
+ *
+ * This function is recursive and it will call itself if a follow-up map value is to be
+ * processed. To learn more about how the algorithm works, see `syncStylingMap`.
+ */
+function innerSyncStylingMap(
+    context: TStylingContext, renderer: Renderer3 | ProceduralRenderer3 | null, element: RElement,
+    data: LStylingData, applyStylingFn: ApplyStylingFn, mode: StylingMapsSyncMode,
+    targetProp: string | null, currentMapIndex: number, defaultValue: string | null): boolean {
+  let targetPropValueWasApplied = false;
+
+  const totalMaps = getValuesCount(context, TStylingContextIndex.MapBindingsPosition);
+  if (currentMapIndex < totalMaps) {
+    const bindingIndex = getBindingValue(
+        context, TStylingContextIndex.MapBindingsPosition, currentMapIndex) as number;
+    const lStylingMap = data[bindingIndex] as LStylingMap;
+
+    let cursor = getCurrentSyncCursor(currentMapIndex);
+    while (cursor < lStylingMap.length) {
+      const prop = getMapProp(lStylingMap, cursor);
+      const iteratedTooFar = targetProp && prop > targetProp;
+      const isTargetPropMatched = !iteratedTooFar && prop === targetProp;
+      const value = getMapValue(lStylingMap, cursor);
+      const valueIsDefined = isStylingValueDefined(value);
+
+      // the recursive code is designed to keep applying until
+      // it reaches or goes past the target prop. If and when
+      // this happens then it will stop processing values, but
+      // all other map values must also catch up to the same
+      // point. This is why a recursive call is still issued
+      // even if the code has iterated too far.
+      const innerMode =
+          iteratedTooFar ? mode : resolveInnerMapMode(mode, valueIsDefined, isTargetPropMatched);
+      const innerProp = iteratedTooFar ? targetProp : prop;
+      let valueApplied = innerSyncStylingMap(
+          context, renderer, element, data, applyStylingFn, innerMode, innerProp,
+          currentMapIndex + 1, defaultValue);
+
+      if (iteratedTooFar) {
+        break;
+      }
+
+      if (!valueApplied && isValueAllowedToBeApplied(mode, isTargetPropMatched)) {
+        const useDefault = isTargetPropMatched && !valueIsDefined;
+        const valueToApply = useDefault ? defaultValue : value;
+        const bindingIndexToApply = useDefault ? bindingIndex : null;
+        applyStylingFn(renderer, element, prop, valueToApply, bindingIndexToApply);
+        valueApplied = true;
+      }
+
+      targetPropValueWasApplied = valueApplied && isTargetPropMatched;
+      cursor += LStylingMapIndex.TupleSize;
+    }
+    setCurrentSyncCursor(currentMapIndex, cursor);
+  }
+
+  return targetPropValueWasApplied;
+}
+
+
+/**
+ * Enables support for map-based styling bindings (e.g. `[style]` and `[class]` bindings).
+ */
+export function activeStylingMapFeature() {
+  setStylingMapsSyncFn(syncStylingMap);
+}
+
+/**
+ * Used to determine the mode for the inner recursive call.
+ *
+ * If an inner map is iterated on then this is done so for one
+ * of two reasons:
+ *
+ * - The target property was detected and the inner map
+ *   must now "catch up" (pointer-wise) up to where the current
+ *   map's cursor is situated.
+ *
+ * - The target property was not detected in the current map
+ *   and must be found in an inner map. This can only be allowed
+ *   if the current map iteration is not set to skip the target
+ *   property.
+ */
+function resolveInnerMapMode(
+    currentMode: number, valueIsDefined: boolean, isExactMatch: boolean): number {
+  let innerMode = currentMode;
+  if (!valueIsDefined && isExactMatch && !(currentMode & StylingMapsSyncMode.SkipTargetProp)) {
+    // case 1: set the mode to apply the targeted prop value if it
+    // ends up being encountered in another map value
+    innerMode |= StylingMapsSyncMode.ApplyTargetProp;
+    innerMode &= ~StylingMapsSyncMode.SkipTargetProp;
+  } else {
+    // case 2: set the mode to skip the targeted prop value if it
+    // ends up being encountered in another map value
+    innerMode |= StylingMapsSyncMode.SkipTargetProp;
+    innerMode &= ~StylingMapsSyncMode.ApplyTargetProp;
+  }
+  return innerMode;
+}
+
+/**
+ * Decides whether or not a prop/value entry will be applied to an element.
+ *
+ * To determine whether or not a value is to be applied,
+ * the following procedure is evaluated:
+ *
+ * First check to see the current `mode` status:
+ *  1. If the mode value permits all props to be applied then allow.
+ *    - But do not allow if the current prop is set to be skipped.
+ *  2. Otherwise if the current prop is permitted then allow.
+ */
+function isValueAllowedToBeApplied(mode: number, isTargetPropMatched: boolean) {
+  let doApplyValue = (mode & StylingMapsSyncMode.ApplyAllValues) > 0;
+  if (!doApplyValue) {
+    if (mode & StylingMapsSyncMode.ApplyTargetProp) {
+      doApplyValue = isTargetPropMatched;
+    }
+  } else if ((mode & StylingMapsSyncMode.SkipTargetProp) && isTargetPropMatched) {
+    doApplyValue = false;
+  }
+  return doApplyValue;
+}
+
+/**
+ * Used to keep track of concurrent cursor values for multiple map-based styling bindings present on
+ * an element.
+ */
+const MAP_CURSORS: number[] = [];
+
+/**
+ * Used to reset the state of each cursor value being used to iterate over map-based styling
+ * bindings.
+ */
+function resetSyncCursors() {
+  for (let i = 0; i < MAP_CURSORS.length; i++) {
+    MAP_CURSORS[i] = LStylingMapIndex.ValuesStartPosition;
+  }
+}
+
+/**
+ * Returns an active cursor value at a given mapIndex location.
+ */
+function getCurrentSyncCursor(mapIndex: number) {
+  if (mapIndex >= MAP_CURSORS.length) {
+    MAP_CURSORS.push(LStylingMapIndex.ValuesStartPosition);
+  }
+  return MAP_CURSORS[mapIndex];
+}
+
+/**
+ * Sets a cursor value at a given mapIndex location.
+ */
+function setCurrentSyncCursor(mapIndex: number, indexValue: number) {
+  MAP_CURSORS[mapIndex] = indexValue;
+}
+
+/**
+ * Used to convert a {key:value} map into a `LStylingMap` array.
+ *
+ * This function will either generate a new `LStylingMap` instance
+ * or it will patch the provided `newValues` map value into an
+ * existing `LStylingMap` value (this only happens if `bindingValue`
+ * is an instance of `LStylingMap`).
+ *
+ * If a new key/value map is provided with an old `LStylingMap`
+ * value then all properties will be overwritten with their new
+ * values or with `null`. This means that the array will never
+ * shrink in size (but it will also not be created and thrown
+ * away whenever the {key:value} map entries change).
+ */
+export function normalizeIntoStylingMap(
+    bindingValue: null | LStylingMap,
+    newValues: {[key: string]: any} | string | null | undefined): LStylingMap {
+  const lStylingMap: LStylingMap = Array.isArray(bindingValue) ? bindingValue : [null];
+  lStylingMap[LStylingMapIndex.RawValuePosition] = newValues || null;
+
+  // because the new values may not include all the properties
+  // that the old ones had, all values are set to `null` before
+  // the new values are applied. This way, when flushed, the
+  // styling algorithm knows exactly what style/class values
+  // to remove from the element (since they are `null`).
+  for (let j = LStylingMapIndex.ValuesStartPosition; j < lStylingMap.length;
+       j += LStylingMapIndex.TupleSize) {
+    setMapValue(lStylingMap, j, null);
+  }
+
+  let props: string[]|null = null;
+  let map: {[key: string]: any}|undefined|null;
+  let allValuesTrue = false;
+  if (typeof newValues === 'string') {  // [class] bindings allow string values
+    if (newValues.length) {
+      props = newValues.split(/\s+/);
+      allValuesTrue = true;
+    }
+  } else {
+    props = newValues ? Object.keys(newValues) : null;
+    map = newValues;
+  }
+
+  if (props) {
+    outer: for (let i = 0; i < props.length; i++) {
+      const prop = props[i] as string;
+      const value = allValuesTrue ? true : map ![prop];
+      for (let j = LStylingMapIndex.ValuesStartPosition; j < lStylingMap.length;
+           j += LStylingMapIndex.TupleSize) {
+        const propAtIndex = getMapProp(lStylingMap, j);
+        if (prop <= propAtIndex) {
+          if (propAtIndex === prop) {
+            setMapValue(lStylingMap, j, value);
+          } else {
+            lStylingMap.splice(j, 0, prop, value);
+          }
+          continue outer;
+        }
+      }
+      lStylingMap.push(prop, value);
+    }
+  }
+
+  return lStylingMap;
+}
+
+export function getMapProp(map: LStylingMap, index: number): string {
+  return map[index + LStylingMapIndex.PropOffset] as string;
+}
+
+export function setMapValue(map: LStylingMap, index: number, value: string | null): void {
+  map[index + LStylingMapIndex.ValueOffset] = value;
+}
+
+export function getMapValue(map: LStylingMap, index: number): string|null {
+  return map[index + LStylingMapIndex.ValueOffset] as string | null;
+}
diff --git a/packages/core/src/render3/styling_next/styling_debug.ts b/packages/core/src/render3/styling_next/styling_debug.ts
index 5dda787365..ac54022e93 100644
--- a/packages/core/src/render3/styling_next/styling_debug.ts
+++ b/packages/core/src/render3/styling_next/styling_debug.ts
@@ -8,9 +8,20 @@
 import {RElement} from '../interfaces/renderer';
 import {attachDebugObject} from '../util/debug_utils';
 
-import {BIT_MASK_APPLY_ALL, DEFAULT_BINDING_INDEX_VALUE, applyStyling} from './bindings';
-import {StylingBindingData, TStylingContext, TStylingContextIndex} from './interfaces';
-import {getDefaultValue, getGuardMask, getProp, getValuesCount, isContextLocked} from './util';
+import {applyStyling} from './bindings';
+import {ApplyStylingFn, LStylingData, TStylingContext, TStylingContextIndex} from './interfaces';
+import {activeStylingMapFeature} from './map_based_bindings';
+import {getDefaultValue, getGuardMask, getProp, getValuesCount, isContextLocked, isMapBased} from './util';
+
+/**
+ * --------
+ *
+ * This file contains the core debug functionality for styling in Angular.
+ *
+ * To learn more about the algorithm see `TStylingContext`.
+ *
+ * --------
+ */
 
 
 /**
@@ -19,18 +30,15 @@ import {getDefaultValue, getGuardMask, getProp, getValuesCount, isContextLocked}
  * A value such as this is generated as an artifact of the `DebugStyling`
  * summary.
  */
-export interface StylingSummary {
+export interface LStylingSummary {
   /** The style/class property that the summary is attached to */
   prop: string;
 
   /** The last applied value for the style/class property */
-  value: string|null;
+  value: string|boolean|null;
 
   /** The binding index of the last applied style/class property */
   bindingIndex: number|null;
-
-  /** Every binding source that is writing the style/class property represented in this tuple */
-  sourceValues: {value: string | number | null, bindingIndex: number|null}[];
 }
 
 /**
@@ -44,7 +52,7 @@ export interface DebugStyling {
    * A summarization of each style/class property
    * present in the context.
    */
-  summary: {[key: string]: StylingSummary}|null;
+  summary: {[key: string]: LStylingSummary};
 
   /**
    * A key/value map of all styling properties and their
@@ -108,23 +116,27 @@ class TStylingContextDebug {
   get entries(): {[prop: string]: TStylingTupleSummary} {
     const context = this.context;
     const entries: {[prop: string]: TStylingTupleSummary} = {};
-    const start = TStylingContextIndex.ValuesStartPosition;
+    const start = TStylingContextIndex.MapBindingsPosition;
     let i = start;
     while (i < context.length) {
-      const prop = getProp(context, i);
-      const guardMask = getGuardMask(context, i);
       const valuesCount = getValuesCount(context, i);
-      const defaultValue = getDefaultValue(context, i);
+      // the context may contain placeholder values which are populated ahead of time,
+      // but contain no actual binding values. In this situation there is no point in
+      // classifying this as an "entry" since no real data is stored here yet.
+      if (valuesCount) {
+        const prop = getProp(context, i);
+        const guardMask = getGuardMask(context, i);
+        const defaultValue = getDefaultValue(context, i);
+        const bindingsStartPosition = i + TStylingContextIndex.BindingsStartOffset;
 
-      const bindingsStartPosition = i + TStylingContextIndex.BindingsStartOffset;
-      const sources: (number | string | null)[] = [];
+        const sources: (number | string | null)[] = [];
+        for (let j = 0; j < valuesCount; j++) {
+          sources.push(context[bindingsStartPosition + j] as number | string | null);
+        }
 
-      for (let j = 0; j < valuesCount; j++) {
-        sources.push(context[bindingsStartPosition + j] as number | string | null);
+        entries[prop] = {prop, guardMask, valuesCount, defaultValue, sources};
       }
 
-      entries[prop] = {prop, guardMask, valuesCount, defaultValue, sources};
-
       i += TStylingContextIndex.BindingsStartOffset + valuesCount;
     }
     return entries;
@@ -138,51 +150,19 @@ class TStylingContextDebug {
  * application has `ngDevMode` activated.
  */
 export class NodeStylingDebug implements DebugStyling {
-  private _contextDebug: TStylingContextDebug;
-
-  constructor(public context: TStylingContext, private _data: StylingBindingData) {
-    this._contextDebug = (this.context as any).debug as any;
-  }
+  constructor(public context: TStylingContext, private _data: LStylingData) {}
 
   /**
    * Returns a detailed summary of each styling entry in the context and
    * what their runtime representation is.
    *
-   * See `StylingSummary`.
+   * See `LStylingSummary`.
    */
-  get summary(): {[key: string]: StylingSummary} {
-    const contextEntries = this._contextDebug.entries;
-    const finalValues: {[key: string]: {value: string, bindingIndex: number}} = {};
-    this._mapValues((prop: string, value: any, bindingIndex: number) => {
-      finalValues[prop] = {value, bindingIndex};
+  get summary(): {[key: string]: LStylingSummary} {
+    const entries: {[key: string]: LStylingSummary} = {};
+    this._mapValues((prop: string, value: any, bindingIndex: number | null) => {
+      entries[prop] = {prop, value, bindingIndex};
     });
-
-    const entries: {[key: string]: StylingSummary} = {};
-    const values = this.values;
-    const props = Object.keys(values);
-    for (let i = 0; i < props.length; i++) {
-      const prop = props[i];
-      const contextEntry = contextEntries[prop];
-      const sourceValues = contextEntry.sources.map(v => {
-        let value: string|number|null;
-        let bindingIndex: number|null;
-        if (typeof v === 'number') {
-          value = this._data[v];
-          bindingIndex = v;
-        } else {
-          value = v;
-          bindingIndex = null;
-        }
-        return {bindingIndex, value};
-      });
-
-      const finalValue = finalValues[prop] !;
-      let bindingIndex: number|null = finalValue.bindingIndex;
-      bindingIndex = bindingIndex === DEFAULT_BINDING_INDEX_VALUE ? null : bindingIndex;
-
-      entries[prop] = {prop, value: finalValue.value, bindingIndex, sourceValues};
-    }
-
     return entries;
   }
 
@@ -195,16 +175,21 @@ export class NodeStylingDebug implements DebugStyling {
     return entries;
   }
 
-  private _mapValues(fn: (prop: string, value: any, bindingIndex: number) => any) {
+  private _mapValues(fn: (prop: string, value: any, bindingIndex: number|null) => any) {
     // there is no need to store/track an element instance. The
     // element is only used when the styling algorithm attempts to
     // style the value (and we mock out the stylingApplyFn anyway).
     const mockElement = {} as any;
+    const hasMaps = getValuesCount(this.context, TStylingContextIndex.MapBindingsPosition) > 0;
+    if (hasMaps) {
+      activeStylingMapFeature();
+    }
 
-    const mapFn =
+    const mapFn: ApplyStylingFn =
         (renderer: any, element: RElement, prop: string, value: any, bindingIndex: number) => {
-          fn(prop, value, bindingIndex);
+          fn(prop, value, bindingIndex || null);
         };
-    applyStyling(this.context, null, mockElement, this._data, BIT_MASK_APPLY_ALL, mapFn);
+
+    applyStyling(this.context, null, mockElement, this._data, true, mapFn);
   }
 }
diff --git a/packages/core/src/render3/styling_next/util.ts b/packages/core/src/render3/styling_next/util.ts
index 13a76aa3f3..3a21ba5fbb 100644
--- a/packages/core/src/render3/styling_next/util.ts
+++ b/packages/core/src/render3/styling_next/util.ts
@@ -7,13 +7,19 @@
 */
 import {StylingContext} from '../interfaces/styling';
 import {getProp as getOldProp, getSinglePropIndexValue as getOldSinglePropIndexValue} from '../styling/class_and_style_bindings';
-import {TStylingConfigFlags, TStylingContext, TStylingContextIndex} from './interfaces';
+
+import {LStylingMap, LStylingMapIndex, TStylingConfigFlags, TStylingContext, TStylingContextIndex} from './interfaces';
+
+const MAP_BASED_ENTRY_PROP_NAME = '--MAP--';
 
 /**
  * Creates a new instance of the `TStylingContext`.
+ *
+ * This function will also pre-fill the context with data
+ * for map-based bindings.
  */
 export function allocStylingContext(): TStylingContext {
-  return [TStylingConfigFlags.Initial, 0];
+  return [TStylingConfigFlags.Initial, 0, 0, 0, MAP_BASED_ENTRY_PROP_NAME];
 }
 
 /**
@@ -48,14 +54,14 @@ export function getProp(context: TStylingContext, index: number) {
 }
 
 export function getGuardMask(context: TStylingContext, index: number) {
-  return context[index + TStylingContextIndex.MaskOffset] as number;
+  return context[index + TStylingContextIndex.GuardOffset] as number;
 }
 
 export function getValuesCount(context: TStylingContext, index: number) {
   return context[index + TStylingContextIndex.ValuesCountOffset] as number;
 }
 
-export function getValue(context: TStylingContext, index: number, offset: number) {
+export function getBindingValue(context: TStylingContext, index: number, offset: number) {
   return context[index + TStylingContextIndex.BindingsStartOffset + offset] as number | string;
 }
 
@@ -80,3 +86,32 @@ export function lockContext(context: TStylingContext) {
 export function isContextLocked(context: TStylingContext): boolean {
   return (getConfig(context) & TStylingConfigFlags.Locked) > 0;
 }
+
+export function getPropValuesStartPosition(context: TStylingContext) {
+  return TStylingContextIndex.MapBindingsBindingsStartPosition +
+      context[TStylingContextIndex.MapBindingsValuesCountPosition];
+}
+
+export function isMapBased(prop: string) {
+  return prop === MAP_BASED_ENTRY_PROP_NAME;
+}
+
+export function hasValueChanged(
+    a: LStylingMap | number | String | string | null | boolean | undefined | {},
+    b: LStylingMap | number | String | string | null | boolean | undefined | {}): boolean {
+  const compareValueA = Array.isArray(a) ? a[LStylingMapIndex.RawValuePosition] : a;
+  const compareValueB = Array.isArray(b) ? b[LStylingMapIndex.RawValuePosition] : b;
+  return compareValueA !== compareValueB;
+}
+
+/**
+ * Determines whether the provided styling value is truthy or falsy.
+ */
+export function isStylingValueDefined(value: any) {
+  // the reason why null is compared against is because
+  // a CSS class value that is set to `false` must be
+  // respected (otherwise it would be treated as falsy).
+  // Empty string values are because developers usually
+  // set a value to an empty string to remove it.
+  return value != null && value !== '';
+}
diff --git a/packages/core/test/acceptance/styling_next_spec.ts b/packages/core/test/acceptance/styling_next_spec.ts
index 8ca9277a45..a8385e1808 100644
--- a/packages/core/test/acceptance/styling_next_spec.ts
+++ b/packages/core/test/acceptance/styling_next_spec.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {CompilerStylingMode, compilerSetStylingMode} from '@angular/compiler/src/render3/view/styling_state';
-import {Component, Directive, HostBinding, Input} from '@angular/core';
+import {Component, Directive, HostBinding, Input, ViewChild} from '@angular/core';
 import {DebugNode, LViewDebug, toDebug} from '@angular/core/src/render3/debug';
 import {RuntimeStylingMode, runtimeSetStylingMode} from '@angular/core/src/render3/styling_next/state';
 import {loadLContextFromNode} from '@angular/core/src/render3/util/discovery_utils';
+import {ngDevModeResetPerfCounters as resetStylingCounters} from '@angular/core/src/util/ng_dev_mode';
 import {TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {onlyInIvy} from '@angular/private/testing';
@@ -255,7 +256,7 @@ describe('new styling integration', () => {
             });
           });
 
-  onlyInIvy('only ivy has style debugging support')
+  onlyInIvy('only ivy has style/class bindings debugging support')
       .it('should support situations where there are more than 32 bindings', () => {
         const TOTAL_BINDINGS = 34;
 
@@ -314,8 +315,276 @@ describe('new styling integration', () => {
           expect(value).toEqual(`final${num}`);
         }
       });
+
+  onlyInIvy('only ivy has style debugging support')
+      .it('should apply map-based style and class entries', () => {
+        @Component({template: '<div [style]="s" [class]="c"></div>'})
+        class Cmp {
+          public c !: {[key: string]: any};
+          updateClasses(prop: string) {
+            this.c = {...this.c || {}};
+            this.c[prop] = true;
+          }
+
+          public s !: {[key: string]: any};
+          updateStyles(prop: string, value: string|number|null) {
+            this.s = {...this.s || {}};
+            this.s[prop] = value;
+          }
+        }
+
+        TestBed.configureTestingModule({declarations: [Cmp]});
+        const fixture = TestBed.createComponent(Cmp);
+        const comp = fixture.componentInstance;
+        comp.updateStyles('width', '100px');
+        comp.updateStyles('height', '200px');
+        comp.updateClasses('abc');
+        fixture.detectChanges();
+
+        const element = fixture.nativeElement.querySelector('div');
+        const node = getDebugNode(element) !;
+        const styles = node.styles !;
+        const classes = node.classes !;
+
+        const stylesSummary = styles.summary;
+        const widthSummary = stylesSummary['width'];
+        expect(widthSummary.prop).toEqual('width');
+        expect(widthSummary.value).toEqual('100px');
+
+        const heightSummary = stylesSummary['height'];
+        expect(heightSummary.prop).toEqual('height');
+        expect(heightSummary.value).toEqual('200px');
+
+        const classesSummary = classes.summary;
+        const abcSummary = classesSummary['abc'];
+        expect(abcSummary.prop).toEqual('abc');
+        expect(abcSummary.value as any).toEqual(true);
+      });
+
+  onlyInIvy('ivy resolves styling across directives, components and templates in unison')
+      .it('should resolve styling collisions across templates, directives and components for prop and map-based entries',
+          () => {
+            @Directive({selector: '[dir-that-sets-styling]'})
+            class DirThatSetsStyling {
+              @HostBinding('style') public map: any = {color: 'red', width: '777px'};
+            }
+
+            @Component({
+              template: `
+        <div [style.width]="width"
+             [style]="map"
+             style="width:200px; font-size:99px"
+             dir-that-sets-styling
+             #dir
+             [class.xyz]="xyz"></div>
+      `
+            })
+            class Cmp {
+              map: any = {width: '111px', opacity: '0.5'};
+              width: string|null = '555px';
+
+              @ViewChild('dir', {read: DirThatSetsStyling})
+              dir !: DirThatSetsStyling;
+            }
+
+            TestBed.configureTestingModule({declarations: [Cmp, DirThatSetsStyling]});
+            const fixture = TestBed.createComponent(Cmp);
+            const comp = fixture.componentInstance;
+            fixture.detectChanges();
+
+            const element = fixture.nativeElement.querySelector('div');
+            const node = getDebugNode(element) !;
+
+            const styles = node.styles !;
+            expect(styles.values).toEqual({
+              'width': '555px',
+              'color': 'red',
+              'font-size': '99px',
+              'opacity': '0.5',
+            });
+
+            comp.width = null;
+            fixture.detectChanges();
+
+            expect(styles.values).toEqual({
+              'width': '111px',
+              'color': 'red',
+              'font-size': '99px',
+              'opacity': '0.5',
+            });
+
+            comp.map = null;
+            fixture.detectChanges();
+
+            expect(styles.values).toEqual({
+              'width': '777px',
+              'color': 'red',
+              'font-size': '99px',
+              'opacity': null,
+            });
+
+            comp.dir.map = null;
+            fixture.detectChanges();
+
+            expect(styles.values).toEqual({
+              'width': '200px',
+              'color': null,
+              'font-size': '99px',
+              'opacity': null,
+            });
+          });
+
+  onlyInIvy('ivy resolves styling across directives, components and templates in unison')
+      .it('should only apply each styling property once per CD across templates, components, directives',
+          () => {
+            @Directive({selector: '[dir-that-sets-styling]'})
+            class DirThatSetsStyling {
+              @HostBinding('style') public map: any = {width: '999px', height: '999px'};
+            }
+
+            @Component({
+              template: `
+                <div #dir
+                  style="width:0px; height:0px"
+                  [style.width]="width"
+                  [style.height]="height"
+                  [style]="map"
+                  dir-that-sets-styling></div>
+              `
+            })
+            class Cmp {
+              width: string|null = '111px';
+              height: string|null = '111px';
+
+              map: any = {width: '555px', height: '555px'};
+
+              @ViewChild('dir', {read: DirThatSetsStyling})
+              dir !: DirThatSetsStyling;
+            }
+
+            TestBed.configureTestingModule({declarations: [Cmp, DirThatSetsStyling]});
+            const fixture = TestBed.createComponent(Cmp);
+            const comp = fixture.componentInstance;
+
+            resetStylingCounters();
+            fixture.detectChanges();
+            const element = fixture.nativeElement.querySelector('div');
+
+            // both are applied because this is the first pass
+            assertStyleCounters(2, 0);
+            assertStyle(element, 'width', '111px');
+            assertStyle(element, 'height', '111px');
+
+            comp.width = '222px';
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            assertStyleCounters(1, 0);
+            assertStyle(element, 'width', '222px');
+            assertStyle(element, 'height', '111px');
+
+            comp.height = '222px';
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            assertStyleCounters(1, 0);
+            assertStyle(element, 'width', '222px');
+            assertStyle(element, 'height', '222px');
+
+            comp.width = null;
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            assertStyleCounters(1, 0);
+            assertStyle(element, 'width', '555px');
+            assertStyle(element, 'height', '222px');
+
+            comp.width = '123px';
+            comp.height = '123px';
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            assertStyle(element, 'width', '123px');
+            assertStyle(element, 'height', '123px');
+
+            comp.map = {};
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            // both are applied because the map was altered
+            assertStyleCounters(2, 0);
+            assertStyle(element, 'width', '123px');
+            assertStyle(element, 'height', '123px');
+
+            comp.width = null;
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            assertStyleCounters(1, 0);
+            assertStyle(element, 'width', '999px');
+            assertStyle(element, 'height', '123px');
+
+            comp.dir.map = null;
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            // both are applied because the map was altered
+            assertStyleCounters(2, 0);
+            assertStyle(element, 'width', '0px');
+            assertStyle(element, 'height', '123px');
+
+            comp.dir.map = {width: '1000px', height: '1000px', color: 'red'};
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            // all three are applied because the map was altered
+            assertStyleCounters(3, 0);
+            assertStyle(element, 'width', '1000px');
+            assertStyle(element, 'height', '123px');
+            assertStyle(element, 'color', 'red');
+
+            comp.height = null;
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            assertStyleCounters(1, 0);
+            assertStyle(element, 'width', '1000px');
+            assertStyle(element, 'height', '1000px');
+            assertStyle(element, 'color', 'red');
+
+            comp.map = {color: 'blue', width: '2000px', opacity: '0.5'};
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            // all four are applied because the map was altered
+            assertStyleCounters(4, 0);
+            assertStyle(element, 'width', '2000px');
+            assertStyle(element, 'height', '1000px');
+            assertStyle(element, 'color', 'blue');
+            assertStyle(element, 'opacity', '0.5');
+
+            comp.map = {color: 'blue', width: '2000px'};
+            resetStylingCounters();
+            fixture.detectChanges();
+
+            // all four are applied because the map was altered
+            assertStyleCounters(3, 1);
+            assertStyle(element, 'width', '2000px');
+            assertStyle(element, 'height', '1000px');
+            assertStyle(element, 'color', 'blue');
+            assertStyle(element, 'opacity', '');
+          });
 });
 
+function assertStyleCounters(countForSet: number, countForRemove: number) {
+  expect(ngDevMode !.rendererSetStyle).toEqual(countForSet);
+  expect(ngDevMode !.rendererRemoveStyle).toEqual(countForRemove);
+}
+
+function assertStyle(element: HTMLElement, prop: string, value: any) {
+  expect((element.style as any)[prop]).toEqual(value);
+}
+
 function getDebugNode(element: Node): DebugNode|null {
   const lContext = loadLContextFromNode(element);
   const lViewDebug = toDebug(lContext.lView) as LViewDebug;
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index 191b915e60..0488845316 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -36,7 +36,7 @@
     "name": "DEFAULT_BINDING_VALUE"
   },
   {
-    "name": "DEFAULT_MASK_VALUE"
+    "name": "DEFAULT_GUARD_MASK_VALUE"
   },
   {
     "name": "DEFAULT_SIZE_VALUE"
@@ -71,6 +71,9 @@
   {
     "name": "INJECTOR_BLOOM_PARENT_SIZE"
   },
+  {
+    "name": "MAP_BASED_ENTRY_PROP_NAME"
+  },
   {
     "name": "MONKEY_PATCH_KEY_NAME"
   },
@@ -431,6 +434,9 @@
   {
     "name": "getProp"
   },
+  {
+    "name": "getPropValuesStartPosition"
+  },
   {
     "name": "getRenderFlags"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 6fd35afd5c..d804c23fa1 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -11,9 +11,6 @@
   {
     "name": "BINDING_INDEX"
   },
-  {
-    "name": "BIT_MASK_APPLY_ALL"
-  },
   {
     "name": "BLOOM_MASK"
   },
@@ -50,14 +47,11 @@
   {
     "name": "DECLARATION_VIEW"
   },
-  {
-    "name": "DEFAULT_BINDING_INDEX_VALUE"
-  },
   {
     "name": "DEFAULT_BINDING_VALUE"
   },
   {
-    "name": "DEFAULT_MASK_VALUE"
+    "name": "DEFAULT_GUARD_MASK_VALUE"
   },
   {
     "name": "DEFAULT_SIZE_VALUE"
@@ -122,6 +116,9 @@
   {
     "name": "IterableDiffers"
   },
+  {
+    "name": "MAP_BASED_ENTRY_PROP_NAME"
+  },
   {
     "name": "MIN_DIRECTIVE_ID"
   },
@@ -218,6 +215,12 @@
   {
     "name": "SANITIZER"
   },
+  {
+    "name": "STYLING_INDEX_FOR_MAP_BINDING"
+  },
+  {
+    "name": "STYLING_INDEX_START_VALUE"
+  },
   {
     "name": "SWITCH_ELEMENT_REF_FACTORY"
   },
@@ -305,6 +308,9 @@
   {
     "name": "__values"
   },
+  {
+    "name": "_activeStylingMapApplyFn"
+  },
   {
     "name": "_c0"
   },
@@ -395,6 +401,9 @@
   {
     "name": "_stylingMode"
   },
+  {
+    "name": "_stylingProp"
+  },
   {
     "name": "_symbolIterator"
   },
@@ -590,6 +599,9 @@
   {
     "name": "currentClassIndex"
   },
+  {
+    "name": "currentStyleIndex"
+  },
   {
     "name": "decreaseElementDepthCount"
   },
@@ -731,6 +743,9 @@
   {
     "name": "getBindingNameFromIndex"
   },
+  {
+    "name": "getBindingValue"
+  },
   {
     "name": "getBindingsEnabled"
   },
@@ -920,6 +935,9 @@
   {
     "name": "getProp"
   },
+  {
+    "name": "getPropValuesStartPosition"
+  },
   {
     "name": "getRenderFlags"
   },
@@ -953,6 +971,9 @@
   {
     "name": "getStylingContextFromLView"
   },
+  {
+    "name": "getStylingMapsSyncFn"
+  },
   {
     "name": "getSymbolIterator"
   },
@@ -971,9 +992,6 @@
   {
     "name": "getValue"
   },
-  {
-    "name": "getValue"
-  },
   {
     "name": "getValuesCount"
   },
@@ -1001,6 +1019,9 @@
   {
     "name": "hasValueChanged"
   },
+  {
+    "name": "hasValueChanged"
+  },
   {
     "name": "hyphenate"
   },
@@ -1134,7 +1155,7 @@
     "name": "isStylingContext"
   },
   {
-    "name": "isValueDefined"
+    "name": "isStylingValueDefined"
   },
   {
     "name": "iterateListLike"
@@ -1208,6 +1229,9 @@
   {
     "name": "noSideEffects"
   },
+  {
+    "name": "normalizeBitMaskValue"
+  },
   {
     "name": "patchContextWithStaticAttrs"
   },
@@ -1490,6 +1514,9 @@
   {
     "name": "updateSingleStylingValue"
   },
+  {
+    "name": "updateStyleBinding"
+  },
   {
     "name": "valueExists"
   },
diff --git a/packages/core/test/render3/styling_next/map_based_bindings_spec.ts b/packages/core/test/render3/styling_next/map_based_bindings_spec.ts
new file mode 100644
index 0000000000..a6ebd1e439
--- /dev/null
+++ b/packages/core/test/render3/styling_next/map_based_bindings_spec.ts
@@ -0,0 +1,79 @@
+/**
+ * @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 {normalizeIntoStylingMap as createMap} from '../../../src/render3/styling_next/map_based_bindings';
+
+describe('map-based bindings', () => {
+  describe('LStylingMap construction', () => {
+    it('should create a new LStylingMap instance from a given value', () => {
+      createAndAssertValues(null, []);
+      createAndAssertValues(undefined, []);
+      createAndAssertValues({}, []);
+      createAndAssertValues({foo: 'bar'}, ['foo', 'bar']);
+      createAndAssertValues({bar: null}, ['bar', null]);
+      createAndAssertValues('', []);
+      createAndAssertValues('abc xyz', ['abc', true, 'xyz', true]);
+      createAndAssertValues([], []);
+    });
+
+    it('should list each entry in the context in alphabetical order', () => {
+      const value1 = {width: '200px', color: 'red', zIndex: -1};
+      const map1 = createMap(null, value1);
+      expect(map1).toEqual([value1, 'color', 'red', 'width', '200px', 'zIndex', -1]);
+
+      const value2 = 'yes no maybe';
+      const map2 = createMap(null, value2);
+      expect(map2).toEqual([value2, 'maybe', true, 'no', true, 'yes', true]);
+    });
+
+    it('should patch an existing LStylingMap entry with new values and retain the alphabetical order',
+       () => {
+         const value1 = {color: 'red'};
+         const map1 = createMap(null, value1);
+         expect(map1).toEqual([value1, 'color', 'red']);
+
+         const value2 = {backgroundColor: 'red', color: 'blue', opacity: '0.5'};
+         const map2 = createMap(map1, value2);
+         expect(map1).toBe(map2);
+         expect(map1).toEqual(
+             [value2, 'backgroundColor', 'red', 'color', 'blue', 'opacity', '0.5']);
+
+         const value3 = 'myClass';
+         const map3 = createMap(null, value3);
+         expect(map3).toEqual([value3, 'myClass', true]);
+
+         const value4 = 'yourClass everyonesClass myClass';
+         const map4 = createMap(map3, value4);
+         expect(map3).toBe(map4);
+         expect(map4).toEqual([value4, 'everyonesClass', true, 'myClass', true, 'yourClass', true]);
+       });
+
+    it('should nullify old values that are not apart of the new set of values', () => {
+      const value1 = {color: 'red', fontSize: '20px'};
+      const map1 = createMap(null, value1);
+      expect(map1).toEqual([value1, 'color', 'red', 'fontSize', '20px']);
+
+      const value2 = {color: 'blue', borderColor: 'purple', opacity: '0.5'};
+      const map2 = createMap(map1, value2);
+      expect(map2).toEqual(
+          [value2, 'borderColor', 'purple', 'color', 'blue', 'fontSize', null, 'opacity', '0.5']);
+
+      const value3 = 'orange';
+      const map3 = createMap(null, value3);
+      expect(map3).toEqual([value3, 'orange', true]);
+
+      const value4 = 'apple banana';
+      const map4 = createMap(map3, value4);
+      expect(map4).toEqual([value4, 'apple', true, 'banana', true, 'orange', null]);
+    });
+  });
+});
+
+function createAndAssertValues(newValue: any, entries: any[]) {
+  const result = createMap(null, newValue);
+  expect(result).toEqual([newValue || null, ...entries]);
+}
diff --git a/packages/core/test/render3/styling_next/styling_context_spec.ts b/packages/core/test/render3/styling_next/styling_context_spec.ts
index ff21327acd..f3788528c1 100644
--- a/packages/core/test/render3/styling_next/styling_context_spec.ts
+++ b/packages/core/test/render3/styling_next/styling_context_spec.ts
@@ -5,7 +5,7 @@
  * 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 {registerBinding} from '@angular/core/src/render3/styling_next/bindings';
+import {DEFAULT_GUARD_MASK_VALUE, registerBinding} from '@angular/core/src/render3/styling_next/bindings';
 import {attachStylingDebugObject} from '@angular/core/src/render3/styling_next/styling_debug';
 
 import {allocStylingContext} from '../../../src/render3/styling_next/util';
@@ -16,7 +16,7 @@ describe('styling context', () => {
     const context = debug.context;
     expect(debug.entries).toEqual({});
 
-    registerBinding(context, 0, 'width', '100px');
+    registerBinding(context, 1, 'width', '100px');
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
@@ -25,21 +25,21 @@ describe('styling context', () => {
       sources: ['100px'],
     });
 
-    registerBinding(context, 1, 'width', 20);
+    registerBinding(context, 2, 'width', 20);
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 2,
-      guardMask: buildGuardMask(1),
+      guardMask: buildGuardMask(2),
       defaultValue: '100px',
       sources: [20, '100px'],
     });
 
-    registerBinding(context, 2, 'height', 10);
-    registerBinding(context, 3, 'height', 15);
+    registerBinding(context, 3, 'height', 10);
+    registerBinding(context, 4, 'height', 15);
     expect(debug.entries['height']).toEqual({
       prop: 'height',
       valuesCount: 3,
-      guardMask: buildGuardMask(2, 3),
+      guardMask: buildGuardMask(3, 4),
       defaultValue: null,
       sources: [10, 15, null],
     });
@@ -48,9 +48,8 @@ describe('styling context', () => {
   it('should overwrite a default value for an entry only if it is non-null', () => {
     const debug = makeContextWithDebug();
     const context = debug.context;
-    expect(debug.entries).toEqual({});
 
-    registerBinding(context, 0, 'width', null);
+    registerBinding(context, 1, 'width', null);
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
@@ -59,7 +58,7 @@ describe('styling context', () => {
       sources: [null]
     });
 
-    registerBinding(context, 0, 'width', '100px');
+    registerBinding(context, 1, 'width', '100px');
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
@@ -68,7 +67,7 @@ describe('styling context', () => {
       sources: ['100px']
     });
 
-    registerBinding(context, 0, 'width', '200px');
+    registerBinding(context, 1, 'width', '200px');
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
@@ -85,7 +84,7 @@ function makeContextWithDebug() {
 }
 
 function buildGuardMask(...bindingIndices: number[]) {
-  let mask = 0;
+  let mask = DEFAULT_GUARD_MASK_VALUE;
   for (let i = 0; i < bindingIndices.length; i++) {
     mask |= 1 << bindingIndices[i];
   }
diff --git a/packages/core/test/render3/styling_next/styling_debug_spec.ts b/packages/core/test/render3/styling_next/styling_debug_spec.ts
index a43e1fd107..499685974e 100644
--- a/packages/core/test/render3/styling_next/styling_debug_spec.ts
+++ b/packages/core/test/render3/styling_next/styling_debug_spec.ts
@@ -24,7 +24,6 @@ describe('styling debugging tools', () => {
              prop: 'width',
              value: null,
              bindingIndex: null,
-             sourceValues: [{value: null, bindingIndex: null}],
            },
          });
 
@@ -34,9 +33,6 @@ describe('styling debugging tools', () => {
              prop: 'width',
              value: '100px',
              bindingIndex: null,
-             sourceValues: [
-               {bindingIndex: null, value: '100px'},
-             ],
            },
          });
 
@@ -49,10 +45,6 @@ describe('styling debugging tools', () => {
              prop: 'width',
              value: '200px',
              bindingIndex: someBindingIndex1,
-             sourceValues: [
-               {bindingIndex: someBindingIndex1, value: '200px'},
-               {bindingIndex: null, value: '100px'},
-             ],
            },
          });
 
@@ -65,11 +57,6 @@ describe('styling debugging tools', () => {
              prop: 'width',
              value: '200px',
              bindingIndex: someBindingIndex1,
-             sourceValues: [
-               {bindingIndex: someBindingIndex1, value: '200px'},
-               {bindingIndex: someBindingIndex2, value: '500px'},
-               {bindingIndex: null, value: '100px'},
-             ],
            },
          });
        });

From 84dd2679a93f10208c078bc0588c1fad26122633 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 23 May 2019 11:31:10 -0700
Subject: [PATCH 196/275] fix(core): require 'static' flag on queries in
 typings (#30639)

This commit makes the static flag on @ViewChild and @ContentChild required.

BREAKING CHANGE:

In Angular version 8, it's required that all @ViewChild and @ContentChild
queries have a 'static' flag specifying whether the query is 'static' or
'dynamic'. The compiler previously sorted queries automatically, but in
8.0 developers are required to explicitly specify which behavior is wanted.
This is a temporary requirement as part of a migration; see
https://angular.io/guide/static-query-migration for more details.

@ViewChildren and @ContentChildren queries are always dynamic, and so are
unaffected.

PR Close #30639
---
 .../src/app/countdown-parent.component.ts      |  2 +-
 .../src/app/ad-banner.component.ts             |  2 +-
 .../src/app/after-content.component.ts         |  2 +-
 .../src/app/after-view.component.ts            |  2 +-
 .../src/app/do-check.component.ts              |  2 +-
 .../src/app/on-changes.component.ts            |  2 +-
 .../src/app/hero-form.component.ts             |  2 +-
 .../testing/src/app/shared/canvas.component.ts |  2 +-
 .../code/code-example.component.spec.ts        |  2 +-
 .../code/code-tabs.component.spec.ts           |  2 +-
 .../code/code.component.spec.ts                |  2 +-
 aio/src/testing/doc-viewer-utils.ts            |  2 +-
 .../dynamic-compiler/src/app.component.ts      | 14 ++++++--------
 .../integrationtest/src/queries.ts             |  2 +-
 packages/compiler/src/core.ts                  |  2 +-
 packages/core/src/metadata/di.ts               | 10 +++++-----
 .../core/test/render3/jit/directive_spec.ts    |  6 ++++--
 .../animations/test/animation_renderer_spec.ts |  8 ++++----
 .../test/browser_animation_builder_spec.ts     |  2 +-
 .../router/test/regression_integration.spec.ts |  5 +++--
 tools/public_api_guard/core/core.d.ts          | 18 +++++++++---------
 21 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/aio/content/examples/component-interaction/src/app/countdown-parent.component.ts b/aio/content/examples/component-interaction/src/app/countdown-parent.component.ts
index 9f4e5bd4df..57f7230d89 100644
--- a/aio/content/examples/component-interaction/src/app/countdown-parent.component.ts
+++ b/aio/content/examples/component-interaction/src/app/countdown-parent.component.ts
@@ -39,7 +39,7 @@ export class CountdownLocalVarParentComponent { }
 })
 export class CountdownViewChildParentComponent implements AfterViewInit {
 
-  @ViewChild(CountdownTimerComponent)
+  @ViewChild(CountdownTimerComponent, {static: false})
   private timerComponent: CountdownTimerComponent;
 
   seconds() { return 0; }
diff --git a/aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts b/aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts
index 0bb04a8590..a802371a30 100644
--- a/aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts
+++ b/aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts
@@ -20,7 +20,7 @@ import { AdComponent } from './ad.component';
 export class AdBannerComponent implements OnInit, OnDestroy {
   @Input() ads: AdItem[];
   currentAdIndex = -1;
-  @ViewChild(AdDirective) adHost: AdDirective;
+  @ViewChild(AdDirective, {static: true}) adHost: AdDirective;
   interval: any;
 
   constructor(private componentFactoryResolver: ComponentFactoryResolver) { }
diff --git a/aio/content/examples/lifecycle-hooks/src/app/after-content.component.ts b/aio/content/examples/lifecycle-hooks/src/app/after-content.component.ts
index 36d2cff20f..858ea12c59 100644
--- a/aio/content/examples/lifecycle-hooks/src/app/after-content.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/after-content.component.ts
@@ -34,7 +34,7 @@ export class AfterContentComponent implements AfterContentChecked, AfterContentI
   comment = '';
 
   // Query for a CONTENT child of type `ChildComponent`
-  @ContentChild(ChildComponent) contentChild: ChildComponent;
+  @ContentChild(ChildComponent, {static: false}) contentChild: ChildComponent;
 
 // #enddocregion hooks
   constructor(private logger: LoggerService) {
diff --git a/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts b/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts
index fd09962406..59c472b37a 100644
--- a/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts
@@ -35,7 +35,7 @@ export class AfterViewComponent implements  AfterViewChecked, AfterViewInit {
   private prevHero = '';
 
   // Query for a VIEW child of type `ChildViewComponent`
-  @ViewChild(ChildViewComponent) viewChild: ChildViewComponent;
+  @ViewChild(ChildViewComponent, {static: false}) viewChild: ChildViewComponent;
 
 // #enddocregion hooks
   constructor(private logger: LoggerService) {
diff --git a/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts b/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
index 4b8a088b9a..098ee941d2 100644
--- a/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
@@ -81,7 +81,7 @@ export class DoCheckParentComponent {
   hero: Hero;
   power: string;
   title = 'DoCheck';
-  @ViewChild(DoCheckComponent) childView: DoCheckComponent;
+  @ViewChild(DoCheckComponent, {static: false}) childView: DoCheckComponent;
 
   constructor() { this.reset(); }
 
diff --git a/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts b/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
index 7b9cda05ef..09f3169cc2 100644
--- a/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
@@ -55,7 +55,7 @@ export class OnChangesParentComponent {
   hero: Hero;
   power: string;
   title = 'OnChanges';
-  @ViewChild(OnChangesComponent) childView: OnChangesComponent;
+  @ViewChild(OnChangesComponent, {static: false}) childView: OnChangesComponent;
 
   constructor() {
     this.reset();
diff --git a/aio/content/examples/template-syntax/src/app/hero-form.component.ts b/aio/content/examples/template-syntax/src/app/hero-form.component.ts
index 63040131ff..173cc137de 100644
--- a/aio/content/examples/template-syntax/src/app/hero-form.component.ts
+++ b/aio/content/examples/template-syntax/src/app/hero-form.component.ts
@@ -13,7 +13,7 @@ import { Hero } from './hero';
 })
 export class HeroFormComponent {
   @Input() hero: Hero;
-  @ViewChild('heroForm') form: NgForm;
+  @ViewChild('heroForm', {static: false}) form: NgForm;
 
   private _submitMessage = '';
 
diff --git a/aio/content/examples/testing/src/app/shared/canvas.component.ts b/aio/content/examples/testing/src/app/shared/canvas.component.ts
index 0f32dbeeb6..584607963e 100644
--- a/aio/content/examples/testing/src/app/shared/canvas.component.ts
+++ b/aio/content/examples/testing/src/app/shared/canvas.component.ts
@@ -6,7 +6,7 @@ import { Component, AfterViewInit, ViewChild } from '@angular/core';
 })
 export class CanvasComponent implements AfterViewInit {
   blobSize: number;
-  @ViewChild('sampleCanvas') sampleCanvas;
+  @ViewChild('sampleCanvas', {static: false}) sampleCanvas;
 
   constructor() { }
 
diff --git a/aio/src/app/custom-elements/code/code-example.component.spec.ts b/aio/src/app/custom-elements/code/code-example.component.spec.ts
index ace165ed76..54431dad80 100644
--- a/aio/src/app/custom-elements/code/code-example.component.spec.ts
+++ b/aio/src/app/custom-elements/code/code-example.component.spec.ts
@@ -96,5 +96,5 @@ class HostComponent {
   path = 'code-path';
   hidecopy: boolean | string = false;
 
-  @ViewChild(CodeExampleComponent) codeExampleComponent: CodeExampleComponent;
+  @ViewChild(CodeExampleComponent, {static: true}) codeExampleComponent: CodeExampleComponent;
 }
diff --git a/aio/src/app/custom-elements/code/code-tabs.component.spec.ts b/aio/src/app/custom-elements/code/code-tabs.component.spec.ts
index 1d9dc2b36d..a7be5e8f4c 100644
--- a/aio/src/app/custom-elements/code/code-tabs.component.spec.ts
+++ b/aio/src/app/custom-elements/code/code-tabs.component.spec.ts
@@ -92,5 +92,5 @@ describe('CodeTabsComponent', () => {
   `
 })
 class HostComponent {
-  @ViewChild(CodeTabsComponent) codeTabsComponent: CodeTabsComponent;
+  @ViewChild(CodeTabsComponent, {static: true}) codeTabsComponent: CodeTabsComponent;
 }
diff --git a/aio/src/app/custom-elements/code/code.component.spec.ts b/aio/src/app/custom-elements/code/code.component.spec.ts
index a814754ab7..320542fbe0 100644
--- a/aio/src/app/custom-elements/code/code.component.spec.ts
+++ b/aio/src/app/custom-elements/code/code.component.spec.ts
@@ -284,7 +284,7 @@ class HostComponent implements AfterViewInit {
   region: string;
   header: string;
 
-  @ViewChild(CodeComponent) codeComponent: CodeComponent;
+  @ViewChild(CodeComponent, {static: false}) codeComponent: CodeComponent;
 
   ngAfterViewInit() {
     this.setCode(oneLineCode);
diff --git a/aio/src/testing/doc-viewer-utils.ts b/aio/src/testing/doc-viewer-utils.ts
index a078e492ec..6a3ca95137 100644
--- a/aio/src/testing/doc-viewer-utils.ts
+++ b/aio/src/testing/doc-viewer-utils.ts
@@ -37,7 +37,7 @@ export class TestDocViewerComponent extends DocViewerComponent {
 })
 export class TestParentComponent {
   currentDoc?: DocumentContents|null;
-  @ViewChild(DocViewerComponent) docViewer: DocViewerComponent;
+  @ViewChild(DocViewerComponent, {static: true}) docViewer: DocViewerComponent;
 }
 
 // Mock services.
diff --git a/integration/dynamic-compiler/src/app.component.ts b/integration/dynamic-compiler/src/app.component.ts
index e54316da9b..16ec786eb7 100644
--- a/integration/dynamic-compiler/src/app.component.ts
+++ b/integration/dynamic-compiler/src/app.component.ts
@@ -10,18 +10,16 @@ declare var System: any;
   `,
 })
 export class AppComponent implements AfterViewInit {
-  @ViewChild('vc', {read: ViewContainerRef}) container: ViewContainerRef;
+  @ViewChild('vc', {read: ViewContainerRef, static: false}) container: ViewContainerRef;
 
-  constructor(private compiler: Compiler) {
-  }
+  constructor(private compiler: Compiler) {}
 
   ngAfterViewInit() {
     System.import('./dist/lazy.bundle.js').then((module: any) => {
-      this.compiler.compileModuleAndAllComponentsAsync(module.LazyModule)
-        .then((compiled) => {
-          const factory = compiled.componentFactories[0];
-          this.container.createComponent(factory);
-        });
+      this.compiler.compileModuleAndAllComponentsAsync(module.LazyModule).then((compiled) => {
+        const factory = compiled.componentFactories[0];
+        this.container.createComponent(factory);
+      });
     });
   }
 }
diff --git a/packages/compiler-cli/integrationtest/src/queries.ts b/packages/compiler-cli/integrationtest/src/queries.ts
index 8b85bfd9fa..e3d9a0840e 100644
--- a/packages/compiler-cli/integrationtest/src/queries.ts
+++ b/packages/compiler-cli/integrationtest/src/queries.ts
@@ -15,7 +15,7 @@ export class CompForChildQuery {
 @Component(
     {selector: 'comp-with-child-query', template: '<comp-for-child-query></comp-for-child-query>'})
 export class CompWithChildQuery {
-  @ViewChild(CompForChildQuery) child: CompForChildQuery;
+  @ViewChild(CompForChildQuery, {static: true}) child: CompForChildQuery;
   @ViewChildren(CompForChildQuery) children: QueryList<CompForChildQuery>;
 }
 
diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts
index b3424ddfbf..18bc01d523 100644
--- a/packages/compiler/src/core.ts
+++ b/packages/compiler/src/core.ts
@@ -29,7 +29,7 @@ export interface Query {
   read: any;
   isViewQuery: boolean;
   selector: any;
-  static?: boolean;
+  static: boolean;
 }
 
 export const createContentChildren = makeMetadataFactory<Query>(
diff --git a/packages/core/src/metadata/di.ts b/packages/core/src/metadata/di.ts
index 1267296c1f..eec9b89bc6 100644
--- a/packages/core/src/metadata/di.ts
+++ b/packages/core/src/metadata/di.ts
@@ -102,7 +102,7 @@ export interface Query {
   read: any;
   isViewQuery: boolean;
   selector: any;
-  static?: boolean;
+  static: boolean;
 }
 
 /**
@@ -218,8 +218,8 @@ export interface ContentChildDecorator {
    *
    * @Annotation
    */
-  (selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): any;
-  new (selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): ContentChild;
+  (selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): any;
+  new (selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): ContentChild;
 }
 
 /**
@@ -350,8 +350,8 @@ export interface ViewChildDecorator {
    *
    * @Annotation
    */
-  (selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): any;
-  new (selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): ViewChild;
+  (selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): any;
+  new (selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): ViewChild;
 }
 
 /**
diff --git a/packages/core/test/render3/jit/directive_spec.ts b/packages/core/test/render3/jit/directive_spec.ts
index 92e214afb7..3013e05a80 100644
--- a/packages/core/test/render3/jit/directive_spec.ts
+++ b/packages/core/test/render3/jit/directive_spec.ts
@@ -52,7 +52,8 @@ describe('jit directive helper functions', () => {
         descendants: false,
         first: false,
         isViewQuery: false,
-        read: undefined
+        read: undefined,
+        static: false,
       })).toEqual({
         propertyName: 'propName',
         predicate: ['localRef'],
@@ -69,7 +70,8 @@ describe('jit directive helper functions', () => {
         descendants: true,
         first: true,
         isViewQuery: true,
-        read: undefined
+        read: undefined,
+        static: false,
       })).toEqual({
         propertyName: 'propName',
         predicate: ['foo', 'bar', 'baz'],
diff --git a/packages/platform-browser/animations/test/animation_renderer_spec.ts b/packages/platform-browser/animations/test/animation_renderer_spec.ts
index 83f0b08d4f..67bdd84724 100644
--- a/packages/platform-browser/animations/test/animation_renderer_spec.ts
+++ b/packages/platform-browser/animations/test/animation_renderer_spec.ts
@@ -168,7 +168,7 @@ import {el} from '../../testing/src/browser_util';
            })
            class Cmp {
              exp: any;
-             @ViewChild('elm') public element: any;
+             @ViewChild('elm', {static: false}) public element: any;
            }
 
            TestBed.configureTestingModule({
@@ -213,11 +213,11 @@ import {el} from '../../testing/src/browser_util';
              exp2: any = true;
              exp3: any = true;
 
-             @ViewChild('elm1') public elm1: any;
+             @ViewChild('elm1', {static: false}) public elm1: any;
 
-             @ViewChild('elm2') public elm2: any;
+             @ViewChild('elm2', {static: false}) public elm2: any;
 
-             @ViewChild('elm3') public elm3: any;
+             @ViewChild('elm3', {static: false}) public elm3: any;
            }
 
            TestBed.configureTestingModule({
diff --git a/packages/platform-browser/animations/test/browser_animation_builder_spec.ts b/packages/platform-browser/animations/test/browser_animation_builder_spec.ts
index 38535fcda5..72cbfb10cd 100644
--- a/packages/platform-browser/animations/test/browser_animation_builder_spec.ts
+++ b/packages/platform-browser/animations/test/browser_animation_builder_spec.ts
@@ -51,7 +51,7 @@ import {el} from '../../testing/src/browser_util';
            template: '...',
          })
          class Cmp {
-           @ViewChild('target') public target: any;
+           @ViewChild('target', {static: false}) public target: any;
 
            constructor(public builder: AnimationBuilder) {}
 
diff --git a/packages/router/test/regression_integration.spec.ts b/packages/router/test/regression_integration.spec.ts
index 686a79b55e..e5e11d7ae3 100644
--- a/packages/router/test/regression_integration.spec.ts
+++ b/packages/router/test/regression_integration.spec.ts
@@ -73,9 +73,10 @@ describe('Integration', () => {
          })
          class ComponentWithRouterLink {
            // TODO(issue/24571): remove '!'.
-           @ViewChild(TemplateRef) templateRef !: TemplateRef<any>;
+           @ViewChild(TemplateRef, {static: true}) templateRef !: TemplateRef<any>;
            // TODO(issue/24571): remove '!'.
-           @ViewChild('container', {read: ViewContainerRef}) container !: ViewContainerRef;
+           @ViewChild('container', {read: ViewContainerRef, static: true})
+           container !: ViewContainerRef;
 
            addLink() {
              this.container.createEmbeddedView(this.templateRef, {$implicit: '/simple'});
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 9147efb09d..fa1423a027 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -168,13 +168,13 @@ export interface ConstructorSansProvider {
 export declare type ContentChild = Query;
 
 export interface ContentChildDecorator {
-    (selector: Type<any> | Function | string, opts?: {
+    (selector: Type<any> | Function | string, opts: {
         read?: any;
-        static?: boolean;
+        static: boolean;
     }): any;
-    new (selector: Type<any> | Function | string, opts?: {
+    new (selector: Type<any> | Function | string, opts: {
         read?: any;
-        static?: boolean;
+        static: boolean;
     }): ContentChild;
 }
 
@@ -1104,7 +1104,7 @@ export interface Query {
     isViewQuery: boolean;
     read: any;
     selector: any;
-    static?: boolean;
+    static: boolean;
 }
 
 export declare abstract class Query {
@@ -1382,13 +1382,13 @@ export declare const VERSION: Version;
 export declare type ViewChild = Query;
 
 export interface ViewChildDecorator {
-    (selector: Type<any> | Function | string, opts?: {
+    (selector: Type<any> | Function | string, opts: {
         read?: any;
-        static?: boolean;
+        static: boolean;
     }): any;
-    new (selector: Type<any> | Function | string, opts?: {
+    new (selector: Type<any> | Function | string, opts: {
         read?: any;
-        static?: boolean;
+        static: boolean;
     }): ViewChild;
 }
 

From 661c6e6f10a490fccba129404279e43746851042 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 24 May 2019 14:41:46 -0700
Subject: [PATCH 197/275] fix(ivy): fix PR collision with static: true and new
 test (#30666)

This fixes a collision between #30639 and #30543 where the latter added
usages of @ViewChild without the static flag present, but the former
made the flag required.

PR Close #30666
---
 packages/core/test/acceptance/styling_next_spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/test/acceptance/styling_next_spec.ts b/packages/core/test/acceptance/styling_next_spec.ts
index a8385e1808..73bd958a35 100644
--- a/packages/core/test/acceptance/styling_next_spec.ts
+++ b/packages/core/test/acceptance/styling_next_spec.ts
@@ -383,7 +383,7 @@ describe('new styling integration', () => {
               map: any = {width: '111px', opacity: '0.5'};
               width: string|null = '555px';
 
-              @ViewChild('dir', {read: DirThatSetsStyling})
+              @ViewChild('dir', {read: DirThatSetsStyling, static: true})
               dir !: DirThatSetsStyling;
             }
 
@@ -458,7 +458,7 @@ describe('new styling integration', () => {
 
               map: any = {width: '555px', height: '555px'};
 
-              @ViewChild('dir', {read: DirThatSetsStyling})
+              @ViewChild('dir', {read: DirThatSetsStyling, static: true})
               dir !: DirThatSetsStyling;
             }
 

From 41cf066906742cb218cc56b6497fc3efef7f6644 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Wed, 22 May 2019 08:26:05 +0200
Subject: [PATCH 198/275] test: improve language service tests performance
 (#30585)

With this change we reduce the amount of IO operations. This is especially a huge factor in windows since IO ops are slower.

With this change mainly we cache `existsSync` and `readFileSync` calls

Here's the results

Before
```
//packages/language-service/test:test
INFO: Elapsed time: 258.755s, Critical Path: 253.91s
```

After
```
//packages/language-service/test:test
INFO: Elapsed time: 66.403s, Critical Path: 63.13s
```

PR Close #30585
---
 .../test/reflector_host_spec.ts               | 11 +++--
 packages/language-service/test/test_utils.ts  | 47 ++++++++++++-------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/packages/language-service/test/reflector_host_spec.ts b/packages/language-service/test/reflector_host_spec.ts
index 8e706dc3eb..59eb3918ba 100644
--- a/packages/language-service/test/reflector_host_spec.ts
+++ b/packages/language-service/test/reflector_host_spec.ts
@@ -18,9 +18,14 @@ describe('reflector_host_spec', () => {
   // Regression #21811
   it('should be able to find angular under windows', () => {
     const originalJoin = path.join;
-    let mockHost = new MockTypescriptHost(
-        ['/app/main.ts', '/app/parsing-cases.ts'], toh, 'app/node_modules',
-        {...path, join: (...args: string[]) => originalJoin.apply(path, args)});
+    const originalPosixJoin = path.posix.join;
+    let mockHost =
+        new MockTypescriptHost(['/app/main.ts', '/app/parsing-cases.ts'], toh, 'app/node_modules', {
+          ...path,
+          join: (...args: string[]) => originalJoin.apply(path, args),
+          posix:
+              {...path.posix, join: (...args: string[]) => originalPosixJoin.apply(path, args)}
+        });
     const reflectorHost = new ReflectorHost(() => undefined as any, mockHost, {basePath: '\\app'});
 
     if (process.platform !== 'win32') {
diff --git a/packages/language-service/test/test_utils.ts b/packages/language-service/test/test_utils.ts
index 350a039084..ea8f67824e 100644
--- a/packages/language-service/test/test_utils.ts
+++ b/packages/language-service/test/test_utils.ts
@@ -72,13 +72,15 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
   private projectVersion = 0;
   private options: ts.CompilerOptions;
   private overrideDirectory = new Set<string>();
+  private existsCache = new Map<string, boolean>();
+  private fileCache = new Map<string, string|undefined>();
 
   constructor(
       private scriptNames: string[], private data: MockData,
       private node_modules: string = 'node_modules', private myPath: typeof path = path) {
     const support = setup();
-    this.nodeModulesPath = path.join(support.basePath, 'node_modules');
-    this.angularPath = path.join(this.nodeModulesPath, '@angular');
+    this.nodeModulesPath = path.posix.join(support.basePath, 'node_modules');
+    this.angularPath = path.posix.join(this.nodeModulesPath, '@angular');
     this.options = {
       target: ts.ScriptTarget.ES5,
       module: ts.ModuleKind.CommonJS,
@@ -146,7 +148,7 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
     } else if (effectiveName == '/' + this.node_modules) {
       return true;
     } else {
-      return fs.existsSync(effectiveName);
+      return this.pathExists(effectiveName);
     }
   }
 
@@ -186,14 +188,19 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
         cacheUsed.add(fileName);
         return undefined;
       }
-      let effectiveName = this.getEffectiveName(fileName);
-      if (effectiveName === fileName)
+
+      const effectiveName = this.getEffectiveName(fileName);
+      if (effectiveName === fileName) {
         return open(fileName, this.data);
-      else if (
+      } else if (
           !fileName.match(angularts) && !fileName.match(rxjsts) && !fileName.match(rxjsmetadata) &&
           !fileName.match(tsxfile)) {
-        if (fs.existsSync(effectiveName)) {
-          return fs.readFileSync(effectiveName, 'utf8');
+        if (this.fileCache.has(effectiveName)) {
+          return this.fileCache.get(effectiveName);
+        } else if (this.pathExists(effectiveName)) {
+          const content = fs.readFileSync(effectiveName, 'utf8');
+          this.fileCache.set(effectiveName, content);
+          return content;
         } else {
           missingCache.set(fileName, true);
           reportedMissing.add(fileName);
@@ -203,19 +210,29 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
     }
   }
 
+  private pathExists(path: string): boolean {
+    if (this.existsCache.has(path)) {
+      return this.existsCache.get(path) !;
+    }
+
+    const exists = fs.existsSync(path);
+    this.existsCache.set(path, exists);
+    return exists;
+  }
+
   private getEffectiveName(name: string): string {
     const node_modules = this.node_modules;
     const at_angular = '/@angular';
     if (name.startsWith('/' + node_modules)) {
       if (this.nodeModulesPath && !name.startsWith('/' + node_modules + at_angular)) {
-        let result = this.myPath.join(this.nodeModulesPath, name.substr(node_modules.length + 1));
-        if (!name.match(rxjsts))
-          if (fs.existsSync(result)) {
-            return result;
-          }
+        const result =
+            this.myPath.posix.join(this.nodeModulesPath, name.substr(node_modules.length + 1));
+        if (!name.match(rxjsts) && this.pathExists(result)) {
+          return result;
+        }
       }
       if (this.angularPath && name.startsWith('/' + node_modules + at_angular)) {
-        return this.myPath.join(
+        return this.myPath.posix.join(
             this.angularPath, name.substr(node_modules.length + at_angular.length + 1));
       }
     }
@@ -279,8 +296,6 @@ function getLocationMarkers(value: string): {[name: string]: number} {
 }
 
 const referenceMarker = /«(((\w|\-)+)|([^ᐱ]*ᐱ(\w+)ᐱ.[^»]*))»/g;
-const definitionMarkerGroup = 1;
-const nameMarkerGroup = 2;
 
 export type ReferenceMarkers = {
   [name: string]: Span[]

From 573f57ac90ce262da4b45ff21f19d0ac32518550 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Wed, 22 May 2019 09:59:06 +0000
Subject: [PATCH 199/275] build(docs-infra): upgrade cli command docs sources
 to 30036352e (#30608)

Updating [angular#master](https://github.com/angular/angular/tree/master) from [cli-builds#master](https://github.com/angular/cli-builds/tree/master).

##
Relevant changes in [commit range](https://github.com/angular/cli-builds/compare/f960a8e4a...30036352e):

**Modified**
- help/analytics.json
- help/build.json
- help/e2e.json
- help/serve.json
- help/test.json
- help/xi18n.json

##

PR Close #30608
---
 aio/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/package.json b/aio/package.json
index e8c9588be1..be0bdc24d6 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -19,7 +19,7 @@
     "build-local": "yarn ~~build",
     "prebuild-with-ivy": "yarn setup-local && node scripts/switch-to-ivy",
     "build-with-ivy": "yarn ~~build",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js f960a8e4a",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 30036352e",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",

From 6363db89d0c1201e59008d480deae3c6fa564165 Mon Sep 17 00:00:00 2001
From: mgechev <mgechev@gmail.com>
Date: Fri, 17 May 2019 18:30:43 -0400
Subject: [PATCH 200/275] docs: add dynamic import allowed syntax to the
 deprecation guide (#30545)

PR Close #30545
---
 aio/content/guide/deprecations.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index e6dc264347..13949b9c10 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -289,6 +289,12 @@ const routes: Routes = [{
 
 </div>
 
+<div class="alert is-helpful">
+
+**Declaration syntax**: It's important to follow the route declaration syntax `loadChildren: () => import('...').then(m => m.ModuleName)` to allow `ngc` to discover the lazy-loaded module and the associated `NgModule`. You can find the complete list of allowed syntax constructs [here](https://github.com/angular/angular-cli/blob/a491b09800b493fe01301387fa9a025f7c7d4808/packages/ngtools/webpack/src/transformers/import_factory.ts#L104-L113). These restrictions will be relaxed with the release if Ivy since it'll no longer use `NgFactories`.
+
+</div>
+
 
 
 {@a activatedroute-props}

From 75cdda5f0ae3fea4cbf90dec718edeb0d63c5243 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@gmail.com>
Date: Sun, 19 May 2019 17:55:16 -0400
Subject: [PATCH 201/275] docs: fix typo in a declaration alert (#30545)

Co-Authored-By: CaerusKaru <caerus.karu@gmail.com>
PR Close #30545
---
 aio/content/guide/deprecations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index 13949b9c10..d3c743e5e3 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -291,7 +291,7 @@ const routes: Routes = [{
 
 <div class="alert is-helpful">
 
-**Declaration syntax**: It's important to follow the route declaration syntax `loadChildren: () => import('...').then(m => m.ModuleName)` to allow `ngc` to discover the lazy-loaded module and the associated `NgModule`. You can find the complete list of allowed syntax constructs [here](https://github.com/angular/angular-cli/blob/a491b09800b493fe01301387fa9a025f7c7d4808/packages/ngtools/webpack/src/transformers/import_factory.ts#L104-L113). These restrictions will be relaxed with the release if Ivy since it'll no longer use `NgFactories`.
+**Declaration syntax**: It's important to follow the route declaration syntax `loadChildren: () => import('...').then(m => m.ModuleName)` to allow `ngc` to discover the lazy-loaded module and the associated `NgModule`. You can find the complete list of allowed syntax constructs [here](https://github.com/angular/angular-cli/blob/a491b09800b493fe01301387fa9a025f7c7d4808/packages/ngtools/webpack/src/transformers/import_factory.ts#L104-L113). These restrictions will be relaxed with the release of Ivy since it'll no longer use `NgFactories`.
 
 </div>
 

From 875eedbfb07d64b0b318cca184fe98c764c0bb14 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 28 May 2019 15:32:42 +0100
Subject: [PATCH 202/275] docs: add default AOT to migrating projects to Ivy
 (#30697)

Followup to https://github.com/angular/angular/pull/29380, https://github.com/angular/angular/pull/30238, https://github.com/angular/angular-cli/pull/14537.

PR Close #30697
---
 aio/content/guide/ivy.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/aio/content/guide/ivy.md b/aio/content/guide/ivy.md
index 28c5a7ab7f..260952faf4 100644
--- a/aio/content/guide/ivy.md
+++ b/aio/content/guide/ivy.md
@@ -32,4 +32,24 @@ To update an existing project to use Ivy, set the `enableIvy` option in the `ang
 }
 ```
 
-To stop using the Ivy compiler, set `enableIvy` to `false` in `tsconfig.app.json`, or remove it completely.
+AOT compilation with Ivy is faster and should be used by default. In the `angular.json` workspace configuration file, set the default build options for your project to always use AOT compilation.
+
+```json
+{
+  "projects": {
+    "my-existing-project": {
+      "architect": {
+        "build": {
+          "options": {
+            ...
+            "aot": true,
+          }
+        }
+      }
+    }
+  }
+}
+
+
+To stop using the Ivy compiler, set `enableIvy` to `false` in `tsconfig.app.json`, or remove it completely. Also remove `"aot": true` from your default build options if you didn't have it there before.
+ 
\ No newline at end of file

From 1b5096d5a9e59b04d9cd198b0a289a062ebbd8f3 Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Mon, 27 May 2019 21:20:30 +0200
Subject: [PATCH 203/275] docs: add missing preposition (#30691)

You need do nothing -> You need to do nothing
PR Close #30691
---
 aio/content/guide/typescript-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/typescript-configuration.md b/aio/content/guide/typescript-configuration.md
index 1cfb5fcc72..61f5c3d0dd 100644
--- a/aio/content/guide/typescript-configuration.md
+++ b/aio/content/guide/typescript-configuration.md
@@ -106,7 +106,7 @@ Many libraries include definition files in their npm packages where both the Typ
 can find them. Angular is one such library.
 The `node_modules/@angular/core/` folder of any Angular application contains several `d.ts` files that describe parts of Angular.
 
-**You need do nothing to get *typings* files for library packages that include `d.ts` files.
+**You need to do nothing to get *typings* files for library packages that include `d.ts` files.
 Angular packages include them already.**
 
 ### lib.d.ts

From a36cacae79adaf96f778b8ec3cfecfaa0f2353c1 Mon Sep 17 00:00:00 2001
From: Suguru Inatomi <suguru.inatomi@gmail.com>
Date: Mon, 27 May 2019 14:13:37 +0900
Subject: [PATCH 204/275] docs: remove core.module.ts from file tree in style
 guide (#30679)

PR Close #30679
---
 aio/content/guide/styleguide.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/aio/content/guide/styleguide.md b/aio/content/guide/styleguide.md
index 385190266a..b80d68949e 100644
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@@ -1985,10 +1985,6 @@ Here is a compliant folder and file structure:
 
         <div class='children'>
 
-          <div class='file'>
-            core.module.ts
-          </div>
-
           <div class='file'>
             exception.service.ts|spec.ts
           </div>

From 51cb5925c57e8e2c30f29f3d3a94f6b5b383e883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Tue, 28 May 2019 10:14:07 -0700
Subject: [PATCH 205/275] release: cut the v8.0.0 release

---
 CHANGELOG.md | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |   4 +-
 2 files changed, 201 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c018d4cfce..61b45a21bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,202 @@
+<a name="8.0.0"></a>
+# [8.0.0](https://github.com/angular/angular/compare/8.0.0-rc.5...8.0.0) (2019-05-28)
+
+
+### Features
+
+* add support for TypeScript 3.3 (and drop older versions) ([#29004](https://github.com/angular/angular/issues/29004)) ([75748d6](https://github.com/angular/angular/commit/75748d6))
+* **common:** add ability to watch for AngularJS URL updates through `onUrlChange` hook ([#30466](https://github.com/angular/angular/issues/30466)) ([8022d36](https://github.com/angular/angular/commit/8022d36))
+* **common:** stricter types for SlicePipe ([#30156](https://github.com/angular/angular/issues/30156)) ([722b2fa](https://github.com/angular/angular/commit/722b2fa))
+* **bazel:** use rbe_autoconfig() and new container. ([#29336](https://github.com/angular/angular/issues/29336)) ([e562acc](https://github.com/angular/angular/commit/e562acc))
+* **common:** add [@angular](https://github.com/angular)/common/upgrade package for $location-related APIs ([#30055](https://github.com/angular/angular/issues/30055)) ([152d99e](https://github.com/angular/angular/commit/152d99e))
+* **common:** add ability to retrieve the state from Location service ([#30055](https://github.com/angular/angular/issues/30055)) ([b44b143](https://github.com/angular/angular/commit/b44b143))
+* **common:** add ability to track all location changes ([#30055](https://github.com/angular/angular/issues/30055)) ([3a9cf3f](https://github.com/angular/angular/commit/3a9cf3f))
+* **common:** add APIs to read component pieces of URL ([#30055](https://github.com/angular/angular/issues/30055)) ([b635fe8](https://github.com/angular/angular/commit/b635fe8))
+* **common:** add MockPlatformLocation to enable more robust testing of Location services ([#30055](https://github.com/angular/angular/issues/30055)) ([d0672c2](https://github.com/angular/angular/commit/d0672c2))
+* **common:** add UrlCodec type for use with upgrade applications ([#30055](https://github.com/angular/angular/issues/30055)) ([ec455e1](https://github.com/angular/angular/commit/ec455e1))
+* **common:** provide replacement for AngularJS $location service ([#30055](https://github.com/angular/angular/issues/30055)) ([4277600](https://github.com/angular/angular/commit/4277600))
+* remove deprecated DOCUMENT token from platform-browser ([#28117](https://github.com/angular/angular/issues/28117)) ([3a9d247](https://github.com/angular/angular/commit/3a9d247))
+* **compiler:** support skipping leading trivia in template source-maps ([#30095](https://github.com/angular/angular/issues/30095)) ([304a12f](https://github.com/angular/angular/commit/304a12f))
+* **core:** add missing ARIA attributes to html sanitizer ([#29685](https://github.com/angular/angular/issues/29685)) ([909557d](https://github.com/angular/angular/commit/909557d)), closes [#26815](https://github.com/angular/angular/issues/26815)
+* **router:** deprecate loadChildren:string ([#30073](https://github.com/angular/angular/issues/30073)) ([c61df39](https://github.com/angular/angular/commit/c61df39))
+* **service-worker:** allow configuring when the SW is registered ([#21842](https://github.com/angular/angular/issues/21842)) ([4cfba58](https://github.com/angular/angular/commit/4cfba58)), closes [#20970](https://github.com/angular/angular/issues/20970)
+* **service-worker:** expose `SwRegistrationOptions` token to allow runtime config ([#21842](https://github.com/angular/angular/issues/21842)) ([39c0152](https://github.com/angular/angular/commit/39c0152))
+* **service-worker:** support bypassing SW with specific header/query param ([#30010](https://github.com/angular/angular/issues/30010)) ([6200732](https://github.com/angular/angular/commit/6200732)), closes [#21191](https://github.com/angular/angular/issues/21191)
+* **compiler-cli:** export tooling definitions ([#29929](https://github.com/angular/angular/issues/29929)) ([e1f51ea](https://github.com/angular/angular/commit/e1f51ea))
+* **compiler-cli:** lower some exported expressions ([#30038](https://github.com/angular/angular/issues/30038)) ([8e73f9b](https://github.com/angular/angular/commit/8e73f9b))
+* **core:** add schematics to move deprecated DOCUMENT import ([#29950](https://github.com/angular/angular/issues/29950)) ([645e305](https://github.com/angular/angular/commit/645e305))
+* **bazel:** update the build to use the new architect api ([#29720](https://github.com/angular/angular/issues/29720)) ([902a53a](https://github.com/angular/angular/commit/902a53a))
+* remove [@angular](https://github.com/angular)/http dependency from [@angular](https://github.com/angular)/platform-server ([#29408](https://github.com/angular/angular/issues/29408)) ([9745f55](https://github.com/angular/angular/commit/9745f55))
+* **compiler-cli:** ngcc - make logging more configurable ([#29591](https://github.com/angular/angular/issues/29591)) ([8d3d75e](https://github.com/angular/angular/commit/8d3d75e))
+* **core:** Add "AbstractType<T>" interface ([#29295](https://github.com/angular/angular/issues/29295)) ([afd4a4e](https://github.com/angular/angular/commit/afd4a4e)), closes [#26491](https://github.com/angular/angular/issues/26491)
+* **core:** template-var-assignment update schematic ([#29608](https://github.com/angular/angular/issues/29608)) ([7c8f4e3](https://github.com/angular/angular/commit/7c8f4e3))
+* **bazel:** Upgrade rules_nodejs and rules_sass ([#29388](https://github.com/angular/angular/issues/29388)) ([d6d081e](https://github.com/angular/angular/commit/d6d081e))
+* **service-worker:** support multiple apps on different subpaths of a domain ([#27080](https://github.com/angular/angular/issues/27080)) ([e721c08](https://github.com/angular/angular/commit/e721c08)), closes [#21388](https://github.com/angular/angular/issues/21388)
+* **bazel:** Eject Bazel ([#29167](https://github.com/angular/angular/issues/29167)) ([36a1550](https://github.com/angular/angular/commit/36a1550))
+* **bazel:** Hide Bazel files in Bazel builder ([#29110](https://github.com/angular/angular/issues/29110)) ([7060d90](https://github.com/angular/angular/commit/7060d90))
+* **forms:** clear (remove all) components from a FormArray ([#28918](https://github.com/angular/angular/issues/28918)) ([a68b1a1](https://github.com/angular/angular/commit/a68b1a1)), closes [#18531](https://github.com/angular/angular/issues/18531)
+* **platform-server:** wait on returned BEFORE_APP_SERIALIZED promises ([#29120](https://github.com/angular/angular/issues/29120)) ([7102ea8](https://github.com/angular/angular/commit/7102ea8))
+
+
+### Bug Fixes
+
+* **bazel:** allow ts_library interop with list-typed inputs ([#30600](https://github.com/angular/angular/issues/30600)) ([bf38df4](https://github.com/angular/angular/commit/bf38df4))
+* **bazel:** Disable sandbox on Mac OS ([#30460](https://github.com/angular/angular/issues/30460)) ([3de26a8](https://github.com/angular/angular/commit/3de26a8))
+* **bazel:** ng test should run specific ts_web_test_suite ([#30526](https://github.com/angular/angular/issues/30526)) ([8bc4da8](https://github.com/angular/angular/commit/8bc4da8))
+* **core:** remove deprecated `TestBed.deprecatedOverrideProvider` API ([#30576](https://github.com/angular/angular/issues/30576)) ([5a46f94](https://github.com/angular/angular/commit/5a46f94))
+* **core:** require 'static' flag on queries in typings ([#30641](https://github.com/angular/angular/issues/30641)) ([c8af830](https://github.com/angular/angular/commit/c8af830))
+* **core:** temporarily remove [@deprecated](https://github.com/deprecated) jsdoc tag for a TextBed.get overload ([#30514](https://github.com/angular/angular/issues/30514)) ([561e01d](https://github.com/angular/angular/commit/561e01d)), closes [#29290](https://github.com/angular/angular/issues/29290) [#29905](https://github.com/angular/angular/issues/29905)
+* **router:** type cast correctly for IE 11 bug breaking URL Unification when comparing objects ([#30464](https://github.com/angular/angular/issues/30464)) ([32daa93](https://github.com/angular/angular/commit/32daa93))
+* **bazel:** Directly spawn native Bazel binary ([#30306](https://github.com/angular/angular/issues/30306)) ([d1fcc2b](https://github.com/angular/angular/commit/d1fcc2b))
+* **bazel:** pass correct arguments to http_server in Windows ([#30346](https://github.com/angular/angular/issues/30346)) ([71eba45](https://github.com/angular/angular/commit/71eba45)), closes [#29785](https://github.com/angular/angular/issues/29785)
+* **bazel:** Use existing npm/yarn lock files ([#30438](https://github.com/angular/angular/issues/30438)) ([3136d9f](https://github.com/angular/angular/commit/3136d9f))
+* **compiler:** ensure strict mode when evaluating in JIT ([#30122](https://github.com/angular/angular/issues/30122)) ([192f108](https://github.com/angular/angular/commit/192f108))
+* **core:** migrations not always migrating all files ([#30269](https://github.com/angular/angular/issues/30269)) ([e8ceae1](https://github.com/angular/angular/commit/e8ceae1))
+* **core:** static-query migration errors not printed properly ([#30458](https://github.com/angular/angular/issues/30458)) ([fde3f46](https://github.com/angular/angular/commit/fde3f46))
+* **core:** static-query migration fails with default parameter values ([#30269](https://github.com/angular/angular/issues/30269)) ([c3246e6](https://github.com/angular/angular/commit/c3246e6))
+* **core:** static-query migration should gracefully exit if AOT compiler throws ([#30269](https://github.com/angular/angular/issues/30269)) ([a71d8a8](https://github.com/angular/angular/commit/a71d8a8))
+* **core:** static-query migration should handle queries on accessors ([#30327](https://github.com/angular/angular/issues/30327)) ([dd299f9](https://github.com/angular/angular/commit/dd299f9))
+* **core:** static-query migration should not fallback to test strategy ([#30458](https://github.com/angular/angular/issues/30458)) ([0fa48e8](https://github.com/angular/angular/commit/0fa48e8))
+* **core:** static-query migration should not prompt if no queries are used ([#30254](https://github.com/angular/angular/issues/30254)) ([12fb639](https://github.com/angular/angular/commit/12fb639))
+* **core:** static-query usage migration strategy should detect ambiguous query usage ([#30215](https://github.com/angular/angular/issues/30215)) ([e295c6a](https://github.com/angular/angular/commit/e295c6a))
+* **router:** ensure navigations start with the current URL value incase redirect is skipped ([#30344](https://github.com/angular/angular/issues/30344)) ([9b88920](https://github.com/angular/angular/commit/9b88920)), closes [#30340](https://github.com/angular/angular/issues/30340) [#30160](https://github.com/angular/angular/issues/30160)
+* **router:** IE 11 bug can break URL unification when comparing objects ([#30393](https://github.com/angular/angular/issues/30393)) ([c383491](https://github.com/angular/angular/commit/c383491))
+* **bazel:** Bump ibazel to 0.10.1 for windows fixes ([#30196](https://github.com/angular/angular/issues/30196)) ([9f68c35](https://github.com/angular/angular/commit/9f68c35))
+* **compiler-cli:** log ngcc skipping messages as debug instead of info ([#30232](https://github.com/angular/angular/issues/30232)) ([548b003](https://github.com/angular/angular/commit/548b003))
+* **core:** fix interpolate identifier in AOT ([#30243](https://github.com/angular/angular/issues/30243)) ([3fe3a84](https://github.com/angular/angular/commit/3fe3a84))
+* **router:** ensure `history.state` is set in `eager` update mode ([#30154](https://github.com/angular/angular/issues/30154)) ([9720227](https://github.com/angular/angular/commit/9720227))
+* **router:** fix a problem with router not responding to back button ([#30160](https://github.com/angular/angular/issues/30160)) ([132f01c](https://github.com/angular/angular/commit/132f01c))
+* **language-service:** Remove tsserverlibrary from rollup globals ([#30123](https://github.com/angular/angular/issues/30123)) ([b706800](https://github.com/angular/angular/commit/b706800))
+* disable injectable-pipe migration ([#30180](https://github.com/angular/angular/issues/30180)) ([4b2fcfd](https://github.com/angular/angular/commit/4b2fcfd))
+* **bazel:** Exclude common/upgrade* in metadata.tsconfig.json ([#30133](https://github.com/angular/angular/issues/30133)) ([6711f22](https://github.com/angular/angular/commit/6711f22))
+* **bazel:** update peerDep ranges ([#30155](https://github.com/angular/angular/issues/30155)) ([6067583](https://github.com/angular/angular/commit/6067583))
+* **bazel:** make name param in ng add optional ([#30074](https://github.com/angular/angular/issues/30074)) ([0b5f480](https://github.com/angular/angular/commit/0b5f480))
+* **bazel:** Make sure only single copy of `[@angular](https://github.com/angular)/bazel` is installed ([#30072](https://github.com/angular/angular/issues/30072)) ([2905bf5](https://github.com/angular/angular/commit/2905bf5))
+* **bazel:** transitive npm deps in ng_module ([#30065](https://github.com/angular/angular/issues/30065)) ([61365a9](https://github.com/angular/angular/commit/61365a9))
+* **common:** add upgrade sub-package to ng_package rule for [@angular](https://github.com/angular)/common ([#30117](https://github.com/angular/angular/issues/30117)) ([6de4cbd](https://github.com/angular/angular/commit/6de4cbd)), closes [#30055](https://github.com/angular/angular/issues/30055) [#30116](https://github.com/angular/angular/issues/30116)
+* **common:** adjust MockPlatformLocation to set state to new object ([#30055](https://github.com/angular/angular/issues/30055)) ([825efa8](https://github.com/angular/angular/commit/825efa8))
+* **compiler:** Fix compiler crash due to isSkipSelf of null ([#30075](https://github.com/angular/angular/issues/30075)) ([28fd5ab](https://github.com/angular/angular/commit/28fd5ab))
+* **upgrade:** do not break if `onMicrotaskEmpty` emits while a `$digest` is in progress ([#29794](https://github.com/angular/angular/issues/29794)) ([0ddf2e7](https://github.com/angular/angular/commit/0ddf2e7)), closes [#24680](https://github.com/angular/angular/issues/24680) [/github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts#L12](https://github.com//github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts/issues/L12) [#24680](https://github.com/angular/angular/issues/24680)
+* **bazel:** do not typecheck core schematic files ([#29876](https://github.com/angular/angular/issues/29876)) ([2ba799d](https://github.com/angular/angular/commit/2ba799d))
+* **bazel:** restore ng build --prod ([#30005](https://github.com/angular/angular/issues/30005)) ([96a8289](https://github.com/angular/angular/commit/96a8289))
+* **common:** prevent repeated application of HttpParams mutations ([#29045](https://github.com/angular/angular/issues/29045)) ([8e8e89a](https://github.com/angular/angular/commit/8e8e89a)), closes [#20430](https://github.com/angular/angular/issues/20430)
+* **common:** async pipe will properly check when it recieves an NaN value from an observable ([#22305](https://github.com/angular/angular/issues/22305)) ([3f6bf6d](https://github.com/angular/angular/commit/3f6bf6d)), closes [#15721](https://github.com/angular/angular/issues/15721)
+* **core:** don't include a local `EventListener` in typings ([#29809](https://github.com/angular/angular/issues/29809)) ([4bde40f](https://github.com/angular/angular/commit/4bde40f)), closes [/github.com/angular/angular/blob/303eae918d997070a36b523ddc97e018f622c258/packages/core/src/debug/debug_node.ts#L32](https://github.com//github.com/angular/angular/blob/303eae918d997070a36b523ddc97e018f622c258/packages/core/src/debug/debug_node.ts/issues/L32) [#29806](https://github.com/angular/angular/issues/29806)
+* **core:** use shakeable global definitions ([#29929](https://github.com/angular/angular/issues/29929)) ([e5905bb](https://github.com/angular/angular/commit/e5905bb)), closes [/github.com/angular/angular-cli/blob/5fc1f2499cbe57f9a95e4b0dfced130eb3a8046d/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts#L279-L282](https://github.com//github.com/angular/angular-cli/blob/5fc1f2499cbe57f9a95e4b0dfced130eb3a8046d/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts/issues/L279-L282)
+* **language-service:** Use proper types instead of any ([#29942](https://github.com/angular/angular/issues/29942)) ([1a56cd5](https://github.com/angular/angular/commit/1a56cd5))
+* **bazel:** Install packages after `ng add` when invoked independently ([#29852](https://github.com/angular/angular/issues/29852)) ([bd2ce9c](https://github.com/angular/angular/commit/bd2ce9c))
+* **compiler-cli:** pass config path to ts.parseJsonConfigFileContent ([#29872](https://github.com/angular/angular/issues/29872)) ([86a3f90](https://github.com/angular/angular/commit/86a3f90)), closes [/github.com/Microsoft/TypeScript/blob/025d82633915b67003ea38ba40b9239a19721c13/src/compiler/emitter.ts#L56-L57](https://github.com//github.com/Microsoft/TypeScript/blob/025d82633915b67003ea38ba40b9239a19721c13/src/compiler/emitter.ts/issues/L56-L57)
+* **router:** support non-NgFactory promise in loadChildren typings ([#29832](https://github.com/angular/angular/issues/29832)) ([2bfb6a0](https://github.com/angular/angular/commit/2bfb6a0))
+* **bazel:** add configuration_env_vars = ["compile"] to generated [@npm](https://github.com/npm)//[@angular](https://github.com/angular)/bazel/bin:ngc-wrapped nodejs_binary ([#29694](https://github.com/angular/angular/issues/29694)) ([2e66ddf](https://github.com/angular/angular/commit/2e66ddf))
+* **bazel:** docs formatting ([#29817](https://github.com/angular/angular/issues/29817)) ([cc2e4b6](https://github.com/angular/angular/commit/cc2e4b6))
+* **bazel:** remove karma-jasmine from ts_web_test_suite ([#29695](https://github.com/angular/angular/issues/29695)) ([2bd9214](https://github.com/angular/angular/commit/2bd9214))
+* **bazel:** support running ng-add on minimal applications ([#29681](https://github.com/angular/angular/issues/29681)) ([9810c6c](https://github.com/angular/angular/commit/9810c6c)), closes [#29680](https://github.com/angular/angular/issues/29680)
+* **common:** add `@Injectable()` to common pipes ([#29834](https://github.com/angular/angular/issues/29834)) ([387fbb8](https://github.com/angular/angular/commit/387fbb8))
+* **compiler-cli:** ensure LogicalProjectPaths always start with a slash ([#29627](https://github.com/angular/angular/issues/29627)) ([e02684e](https://github.com/angular/angular/commit/e02684e))
+* **core:** add missing migration to npm package ([#29705](https://github.com/angular/angular/issues/29705)) ([96b76dc](https://github.com/angular/angular/commit/96b76dc))
+* **core:** call ngOnDestroy for tree-shakeable providers ([#28943](https://github.com/angular/angular/issues/28943)) ([30b0442](https://github.com/angular/angular/commit/30b0442)), closes [#28927](https://github.com/angular/angular/issues/28927)
+* **core:** Deprecate TestBed.get(...):any ([#29290](https://github.com/angular/angular/issues/29290)) ([609024f](https://github.com/angular/angular/commit/609024f)), closes [#13785](https://github.com/angular/angular/issues/13785) [#26491](https://github.com/angular/angular/issues/26491)
+* **core:** resolve ts compile issues due to lenient tsconfig ([#29843](https://github.com/angular/angular/issues/29843)) ([54058ba](https://github.com/angular/angular/commit/54058ba))
+* **platform-browser:** insert APP_ID in styles, contentAttr and hostAttr ([#17745](https://github.com/angular/angular/issues/17745)) ([712d60e](https://github.com/angular/angular/commit/712d60e))
+* **bazel:** use //:tsconfig.json as the default for ng_module ([#29670](https://github.com/angular/angular/issues/29670)) ([#29711](https://github.com/angular/angular/issues/29711)) ([9e33dc3](https://github.com/angular/angular/commit/9e33dc3))
+* **platform-browser:** insert APP_ID in styles, contentAttr and hostAttr ([#17745](https://github.com/angular/angular/issues/17745)) ([ca14509](https://github.com/angular/angular/commit/ca14509))
+* **bazel:** Update schematics to support routing ([#29548](https://github.com/angular/angular/issues/29548)) ([401b8ee](https://github.com/angular/angular/commit/401b8ee))
+* **bazel:** use //:tsconfig.json as the default for ng_module ([#29670](https://github.com/angular/angular/issues/29670)) ([b14537a](https://github.com/angular/angular/commit/b14537a))
+* **compiler-cli:** ngcc - cope with processing entry-points multiple times ([#29657](https://github.com/angular/angular/issues/29657)) ([6b39c9c](https://github.com/angular/angular/commit/6b39c9c))
+* **core:** static-query schematic should detect static queries in getters. ([#29609](https://github.com/angular/angular/issues/29609)) ([33016b8](https://github.com/angular/angular/commit/33016b8))
+* **common:** escape query selector used when anchor scrolling ([#29577](https://github.com/angular/angular/issues/29577)) ([7671c73](https://github.com/angular/angular/commit/7671c73)), closes [#28193](https://github.com/angular/angular/issues/28193)
+* **router:** adjust setting navigationTransition when a new navigation cancels an existing one ([#29636](https://github.com/angular/angular/issues/29636)) ([e884c0c](https://github.com/angular/angular/commit/e884c0c)), closes [#29389](https://github.com/angular/angular/issues/29389) [#29590](https://github.com/angular/angular/issues/29590)
+* **bazel:** allow ng_module users to set createExternalSymbolFactoryReexports ([#29459](https://github.com/angular/angular/issues/29459)) ([21be0fb](https://github.com/angular/angular/commit/21be0fb))
+* **bazel:** workaround problem reading summary files from node_modules ([#29459](https://github.com/angular/angular/issues/29459)) ([769d960](https://github.com/angular/angular/commit/769d960))
+* **compiler:** inherit param types when class has a constructor which takes no declared parameters and delegates up ([#29232](https://github.com/angular/angular/issues/29232)) ([0007564](https://github.com/angular/angular/commit/0007564))
+* **core:** parse incorrect ML open tag as text ([#29328](https://github.com/angular/angular/issues/29328)) ([dafbbf8](https://github.com/angular/angular/commit/dafbbf8)), closes [#29231](https://github.com/angular/angular/issues/29231)
+* **core:** static-query schematic should detect queries in "ngDoCheck" and "ngOnChanges" ([#29492](https://github.com/angular/angular/issues/29492)) ([09fab58](https://github.com/angular/angular/commit/09fab58))
+* **router:** support NgFactory promise in loadChildren typings ([#29392](https://github.com/angular/angular/issues/29392)) ([26a8c59](https://github.com/angular/angular/commit/26a8c59))
+* **bazel:** correct regexp test for self-references in metadata ([#29346](https://github.com/angular/angular/issues/29346)) ([9d090cb](https://github.com/angular/angular/commit/9d090cb))
+* **bazel:** don't produce self-references in metadata ([#29317](https://github.com/angular/angular/issues/29317)) ([3facdeb](https://github.com/angular/angular/commit/3facdeb)), closes [#29315](https://github.com/angular/angular/issues/29315)
+* **bazel:** fix strict null checks compile error in packages/bazel/src/schematics/ng-add/index.ts ([#29282](https://github.com/angular/angular/issues/29282)) ([9a7f560](https://github.com/angular/angular/commit/9a7f560))
+* **bazel:** Remove [@angular](https://github.com/angular)/upgrade from dev dependencies ([#29319](https://github.com/angular/angular/issues/29319)) ([1db8bf3](https://github.com/angular/angular/commit/1db8bf3))
+* **bazel:** Support new e2e project layout ([#29318](https://github.com/angular/angular/issues/29318)) ([8ef690c](https://github.com/angular/angular/commit/8ef690c))
+* **bazel:** turn off pure call tree shaking for ng_package ([#29210](https://github.com/angular/angular/issues/29210)) ([4990b93](https://github.com/angular/angular/commit/4990b93))
+* **compiler-cli:** incorrect metadata bundle for multiple unnamed re-exports ([#29360](https://github.com/angular/angular/issues/29360)) ([105cfaf](https://github.com/angular/angular/commit/105cfaf)), closes [/github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85](https://github.com//github.com/angular/material2/blob/master/tools/package-tools/build-release.ts/issues/L78-L85)
+* **core:** don't wrap `<tr>` and `<col>` elements into a required parent ([#29219](https://github.com/angular/angular/issues/29219)) ([f2dc32e](https://github.com/angular/angular/commit/f2dc32e))
+* **core:** parse incorrect ML open tag as text ([#29328](https://github.com/angular/angular/issues/29328)) ([4605df8](https://github.com/angular/angular/commit/4605df8)), closes [#29231](https://github.com/angular/angular/issues/29231)
+* **compiler-cli:** incorrect metadata bundle for multiple unnamed re-exports ([#29360](https://github.com/angular/angular/issues/29360)) ([cf8d934](https://github.com/angular/angular/commit/cf8d934)), closes [github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85](https://github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85)
+* **bazel:** add missing binary path for api-extractor ([#29202](https://github.com/angular/angular/issues/29202)) ([df354d1](https://github.com/angular/angular/commit/df354d1))
+* **bazel:** ng build should produce prod bundle ([#29136](https://github.com/angular/angular/issues/29136)) ([14ce8a9](https://github.com/angular/angular/commit/14ce8a9))
+* **compiler:** ensure template is updated if an output is transformed ([#29041](https://github.com/angular/angular/issues/29041)) ([c7e4931](https://github.com/angular/angular/commit/c7e4931))
+
+
+### DEPRECATIONS
+
+* **core:** deprecate integration with the Web Tracing Framework (WTF) ([#30642](https://github.com/angular/angular/issues/30642)) ([b408445](https://github.com/angular/angular/commit/b408445))
+* **platform-webworker:** deprecate platform-webworker ([#30642](https://github.com/angular/angular/issues/30642)) ([361f181](https://github.com/angular/angular/commit/361f181))
+
+
+### BREAKING CHANGES
+
+* **bazel:** @bazel/typescript is now a peerDependency of @angular/bazel so user's of @angular/bazel must add @bazel/typescript to their package.json
+* **bazel:** ng_module now depends on a minimum of build_bazel_rules_nodejs 0.27.12
+* **core:** In Angular version 8, it's required that all @ViewChild and @ContentChild
+queries have a 'static' flag specifying whether the query is 'static' or
+'dynamic'. The compiler previously sorted queries automatically, but in
+8.0 developers are required to explicitly specify which behavior is wanted.
+This is a temporary requirement as part of a migration; see
+https://v8.angular.io/guide/static-query-migration for more details.
+
+  @ViewChildren and @ContentChildren queries are always dynamic, and so are
+  unaffected.
+
+* `TestBed.get()` has two signatures, one which is typed and another which accepts and returns `any`. The signature for `any` is deprecated; all usage of `TestBed.get()` should go through the typed API. This mainly affects string tokens
+(which aren't supported) and abstract class tokens.
+
+  Before:
+
+  ```ts
+  TestBed.configureTestingModule({
+    providers: [{provide: "stringToken", useValue: new Service()}],
+  });
+
+  let service = TestBed.get("stringToken"); // type any
+  ```
+
+  After:
+
+  ```ts
+  const SERVICE_TOKEN = new InjectionToken<Service>("SERVICE_TOKEN");
+
+  TestBed.configureTestingModule({
+    providers: [{provide: SERVICE_TOKEN, useValue: new Service()}],
+  });
+
+  let service = TestBed.get(SERVICE_TOKEN); // type Service
+  ```
+
+* **core:** Certain elements (like `<tr>` or `<col>`) require parent elements to be of a certain type by the HTML specification
+(ex. `<tr>` can only be inside `<tbody>` / `<thead>`). Before this change Angular template parser was auto-correcting
+"invalid" HTML using the following rules:
+  - `<tr>` would be wrapped in `<tbody>` if not inside `<tbody>`, `<tfoot>` or `<thead>`;
+  - `<col>` would be wrapped in `<colgroup>` if not inside `<colgroup>`.
+
+  This meachanism of automatic wrapping / auto-correcting was problematic for several reasons:
+  - it is non-obvious and arbitrary (ex. there are more HTML elements that has rules for parent type);
+  - it is incorrect for cases where `<tr>` / `<col>` are at the root of a component's content, ex.:
+
+  ```html
+  <projecting-tr-inside-tbody>
+    <tr>...</tr>
+  </projecting-tr-inside-tbody>
+  ```
+
+  In the above example the `<projecting-tr-inside-tbody>` component could be "surprised" to see additional
+  `<tbody>` elements inserted by Angular HTML parser.
+
+
+* TypeScript 3.1 and 3.2 are no longer supported.
+
+  Please update your TypeScript version to 3.3
+
+
   <a name="8.0.0-rc.5"></a>
 # [8.0.0-rc.5](https://github.com/angular/angular/compare/8.0.0-rc.4...8.0.0-rc.5) (2019-05-24)
 
diff --git a/package.json b/package.json
index c53d4fb0f4..c02e09c1bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "8.0.0-rc.4",
+  "version": "8.0.0",
   "private": true,
   "description": "Angular - a web framework for modern web apps",
   "homepage": "https://github.com/angular/angular",
@@ -165,4 +165,4 @@
   "resolutions": {
     "natives": "1.1.6"
   }
-}
+}
\ No newline at end of file

From 48093823cb21af4fa05e1ac0d28abc2af62c4ef4 Mon Sep 17 00:00:00 2001
From: Rob Wormald <robwormald@gmail.com>
Date: Tue, 28 May 2019 14:39:15 -0700
Subject: [PATCH 206/275] docs: add note to platform-webworker deprecation
 (#30705)

PR Close #30705
---
 aio/content/guide/deprecations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index d3c743e5e3..cf1c5ba1ff 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -376,7 +376,7 @@ The `@angular/platform-*` packages enable Angular to be run in different context
 
 Though web worker is useful to offload things requiring lots of processing, pushing whole apps to run in the web worker isn't a winning strategy due to many unresolved issues.
 
-Angular CLI doesn't allow use of these APIs because the build system and bundling doesn't support them. This whole package is deprecated in Angular version 8 and will be removed in the future.
+Angular CLI doesn't allow use of these APIs because the build system and bundling doesn't support them. This whole package is deprecated in Angular version 8 and will be removed in the future. If you're currently using the `@angular/platform-webworker` APIs in production, please reach out to devrel@angular.io and let us know - we're interested in hearing your use cases.
 
 Instead, use web workers primarily for offloading CPU intensive, but functionally not critical, work needed for initial rendering (for example, in memory search, image processing, and so on).
 

From dd0815095f1e4ee0f4b73883470a31fcafea632c Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Tue, 23 Apr 2019 20:40:05 -0700
Subject: [PATCH 207/275] =?UTF-8?q?feat(ivy):=20add=20=C9=B5=C9=B5textInte?=
 =?UTF-8?q?rpolateX=20instructions=20(#30011)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- `ɵɵtextBinding(..., ɵɵinterpolationX())` instructions will now just be `ɵɵtextInterpolate(...)` instructions

PR Close #30011
---
 .../ngcc/test/rendering/renderer_spec.ts      |   2 +-
 .../compliance/r3_compiler_compliance_spec.ts |  28 +-
 .../r3_view_compiler_binding_spec.ts          |   4 +-
 .../test/compliance/r3_view_compiler_spec.ts  |  19 +-
 .../r3_view_compiler_styling_spec.ts          |   2 +-
 .../r3_view_compiler_template_spec.ts         |   8 +-
 .../compiler-cli/test/ngtsc/ngtsc_spec.ts     |   2 +-
 .../test/ngtsc/template_mapping_spec.ts       |  21 +-
 packages/compiler/src/output/output_jit.ts    |   2 +-
 .../compiler/src/render3/r3_identifiers.ts    |  11 +
 .../compiler/src/render3/view/template.ts     |  43 ++-
 .../core/src/core_render3_private_export.ts   |  10 +
 packages/core/src/render3/index.ts            |  13 +-
 packages/core/src/render3/instructions/all.ts |   2 +
 .../instructions/attribute_interpolation.ts   |   2 +-
 .../src/render3/instructions/interpolation.ts | 289 +++++++++++++++++
 .../instructions/property_interpolation.ts    | 285 +----------------
 .../instructions/text_interpolation.ts        | 298 ++++++++++++++++++
 packages/core/src/render3/jit/environment.ts  |  10 +
 packages/core/test/acceptance/text_spec.ts    | 115 +++++++
 .../bundling/todo/bundle.golden_symbols.json  |   6 +
 tools/public_api_guard/core/core.d.ts         |  20 ++
 22 files changed, 864 insertions(+), 328 deletions(-)
 create mode 100644 packages/core/src/render3/instructions/interpolation.ts
 create mode 100644 packages/core/src/render3/instructions/text_interpolation.ts
 create mode 100644 packages/core/test/acceptance/text_spec.ts

diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index 58ee02eecd..a20e13174b 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -168,7 +168,7 @@ describe('Renderer', () => {
         ɵngcc0.ɵɵtext(0);
     } if (rf & 2) {
         ɵngcc0.ɵɵselect(0);
-        ɵngcc0.ɵɵtextBinding(0, ɵngcc0.ɵɵinterpolation1("", ctx.person.name, ""));
+        ɵngcc0.ɵɵtextInterpolate(ctx.person.name);
     } }, encapsulation: 2 });
 /*@__PURE__*/ ɵngcc0.ɵsetClassMetadata(A, [{
         type: Component,
diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 998a42e2b1..705b619340 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -810,7 +810,7 @@ describe('compiler compliance', () => {
             const $myComp$ = $r3$.ɵɵnextContext();
             const $foo$ = $r3$.ɵɵreference(1);
             $r3$.ɵɵselect(1);
-            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2("", $myComp$.salutation, " ", $foo$, ""));
+            $r3$.ɵɵtextInterpolate2("", $myComp$.salutation, " ", $foo$, "");
           }
         }
         …
@@ -2074,9 +2074,9 @@ describe('compiler compliance', () => {
                 }
                 if (rf & 2) {
                   $r3$.ɵɵselect(0);
-                  $r3$.ɵɵtextBinding(0, $r3$.ɵɵinterpolation1("", $r3$.ɵɵpipeBind2(1, 3, $r3$.ɵɵpipeBind2(2, 6, ctx.name, ctx.size), ctx.size), ""));
+                  $r3$.ɵɵtextInterpolate($r3$.ɵɵpipeBind2(1, 3, $r3$.ɵɵpipeBind2(2, 6, ctx.name, ctx.size), ctx.size));
                   $r3$.ɵɵselect(4);
-                  $r3$.ɵɵtextBinding(4, $r3$.ɵɵinterpolation2("", $r3$.ɵɵpipeBindV(5, 9, $r3$.ɵɵpureFunction1(18, $c0$, ctx.name)), " ", ctx.name ? 1 : $r3$.ɵɵpipeBind1(6, 16, 2), ""));
+                  $r3$.ɵɵtextInterpolate2("", $r3$.ɵɵpipeBindV(5, 9, $r3$.ɵɵpureFunction1(18, $c0$, ctx.name)), " ", ctx.name ? 1 : $r3$.ɵɵpipeBind1(6, 16, 2), "");
                 }
               },
               pipes: [MyPurePipe, MyPipe],
@@ -2139,14 +2139,14 @@ describe('compiler compliance', () => {
                 }
                 if (rf & 2) {
                   $r3$.ɵɵselect(0);
-                  $r3$.ɵɵtextBinding(0, $r3$.ɵɵinterpolation5(
+                  $r3$.ɵɵtextInterpolate5(
                     "0:", i0.ɵɵpipeBind1(1, 5, ctx.name),
                     "1:", i0.ɵɵpipeBind2(2, 7, ctx.name, 1),
                     "2:", i0.ɵɵpipeBind3(3, 10, ctx.name, 1, 2),
                     "3:", i0.ɵɵpipeBind4(4, 14, ctx.name, 1, 2, 3),
                     "4:", i0.ɵɵpipeBindV(5, 19, $r3$.ɵɵpureFunction1(25, $c0$, ctx.name)),
                     ""
-                  ));
+                  );
                 }
               },
               pipes: [MyPipe],
@@ -2192,7 +2192,7 @@ describe('compiler compliance', () => {
             if (rf & 2) {
               const $user$ = $r3$.ɵɵreference(1);
               $r3$.ɵɵselect(2);
-              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1("Hello ", $user$.value, "!"));
+              $r3$.ɵɵtextInterpolate1("Hello ", $user$.value, "!");
             }
           },
           encapsulation: 2
@@ -2255,7 +2255,7 @@ describe('compiler compliance', () => {
             const $foo$ = $r3$.ɵɵreference(1);
             const $baz$ = $r3$.ɵɵreference(5);
             $r3$.ɵɵselect(1);
-            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation3("", $foo$, "-", $bar$, "-", $baz$, ""));
+            $r3$.ɵɵtextInterpolate3("", $foo$, "-", $bar$, "-", $baz$, "");
           }
         }
         function MyComponent_div_3_Template(rf, ctx) {
@@ -2271,7 +2271,7 @@ describe('compiler compliance', () => {
             $r3$.ɵɵnextContext();
             const $foo$ = $r3$.ɵɵreference(1);
             $r3$.ɵɵselect(1);
-            $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2(" ", $foo$, "-", $bar$, " "));
+            $r3$.ɵɵtextInterpolate2(" ", $foo$, "-", $bar$, " ");
           }
         }
         …
@@ -2291,7 +2291,7 @@ describe('compiler compliance', () => {
             if (rf & 2) {
               const $foo$ = $r3$.ɵɵreference(1);
               $r3$.ɵɵselect(2);
-              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1(" ", $foo$, " "));
+              $r3$.ɵɵtextInterpolate1(" ", $foo$, " ");
             }
           },
           directives:[IfDirective],
@@ -2300,9 +2300,7 @@ describe('compiler compliance', () => {
 
       const result = compile(files, angularFiles);
       const source = result.source;
-
       expectEmit(source, MyComponentDefinition, 'Incorrect MyComponent.ngComponentDef');
-
     });
 
     it('should support local refs mixed with context assignments', () => {
@@ -2344,7 +2342,7 @@ describe('compiler compliance', () => {
           const $item$ = $i0$.ɵɵnextContext().$implicit;
           const $foo$ = $i0$.ɵɵreference(2);
           $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $foo$, " - ", $item$, " "));
+          $i0$.ɵɵtextInterpolate2(" ", $foo$, " - ", $item$, " ");
         }
       }
 
@@ -2648,7 +2646,7 @@ describe('compiler compliance', () => {
             if (rf & 2) {
               const $item$ = ctx.$implicit;
               $r3$.ɵɵselect(1);
-              $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation1("", $item$.name, ""));
+              $r3$.ɵɵtextInterpolate($item$.name);
             }
           }
           …
@@ -2731,7 +2729,7 @@ describe('compiler compliance', () => {
               const $info$ = ctx.$implicit;
               const $item$ = $r3$.ɵɵnextContext().$implicit;
               $r3$.ɵɵselect(1);
-              $r3$.ɵɵtextBinding(1, $r3$.ɵɵinterpolation2(" ", $item$.name, ": ", $info$.description, " "));
+              $r3$.ɵɵtextInterpolate2(" ", $item$.name, ": ", $info$.description, " ");
             }
           }
 
@@ -2749,7 +2747,7 @@ describe('compiler compliance', () => {
             if (rf & 2) {
               const $item$ = ctx.$implicit;
               $r3$.ɵɵselect(2);
-              $r3$.ɵɵtextBinding(2, $r3$.ɵɵinterpolation1("", IDENT.name, ""));
+              $r3$.ɵɵtextInterpolate(IDENT.name);
               $r3$.ɵɵselect(4);
               $r3$.ɵɵproperty("forOf", IDENT.infos);
             }
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index 93a4a36e0c..025eaada28 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -45,7 +45,7 @@ describe('compiler compliance: bindings', () => {
         }
         if (rf & 2) {
           $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation1("Hello ", $ctx$.name, ""));
+          $i0$.ɵɵtextInterpolate1("Hello ", $ctx$.name, "");
         }
       }`;
       const result = compile(files, angularFiles);
@@ -567,7 +567,7 @@ describe('compiler compliance: bindings', () => {
           if (rf & 2) {
             const $_r0$ = $i0$.ɵɵreference(1);
             $r3$.ɵɵselect(4);
-            $i0$.ɵɵtextBinding(4, $i0$.ɵɵinterpolation1(" ", $_r0$.id, " "));
+            $i0$.ɵɵtextInterpolate1(" ", $_r0$.id, " ");
           }
         }
       `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
index 10dbc48055..57b0e0b71e 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_spec.ts
@@ -93,7 +93,7 @@ describe('r3_view_compiler', () => {
 
   describe('interpolations', () => {
     // Regression #21927
-    it('should generate a correct call to bV with more than 8 interpolations', () => {
+    it('should generate a correct call to textInterpolateV with more than 8 interpolations', () => {
       const files: MockDirectory = {
         app: {
           'example.ts': `
@@ -112,10 +112,19 @@ describe('r3_view_compiler', () => {
         }
       };
 
-      const bV_call =
-          `$r3$.ɵɵinterpolationV([" ",ctx.list[0]," ",ctx.list[1]," ",ctx.list[2]," ",ctx.list[3],
-        " ",ctx.list[4]," ",ctx.list[5]," ",ctx.list[6]," ",ctx.list[7]," ",ctx.list[8],
-        " "])`;
+      const bV_call = `
+      …
+      function MyApp_Template(rf, ctx) {
+        if (rf & 1) {
+          $i0$.ɵɵtext(0);
+        }
+        if (rf & 2) {
+          $i0$.ɵɵselect(0);
+          $i0$.ɵɵtextInterpolateV([" ", ctx.list[0], " ", ctx.list[1], " ", ctx.list[2], " ", ctx.list[3], " ", ctx.list[4], " ", ctx.list[5], " ", ctx.list[6], " ", ctx.list[7], " ", ctx.list[8], " "]);
+        }
+      }
+      …
+      `;
       const result = compile(files, angularFiles);
       expectEmit(result.source, bV_call, 'Incorrect bV call');
     });
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index 29691ad60f..4a9580256c 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -999,7 +999,7 @@ describe('compiler compliance: styling', () => {
               $r3$.ɵɵclassProp(0, $r3$.ɵɵpipeBind2(4, 10, $ctx$.fooExp, 2000));
               $r3$.ɵɵstylingApply();
               $r3$.ɵɵselect(5);
-              $r3$.ɵɵtextBinding(5, $r3$.ɵɵinterpolation1(" ", $ctx$.item, ""));
+              $r3$.ɵɵtextInterpolate1(" ", $ctx$.item, "");
             }
           }
           `;
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
index 0ab46c841b..0f54733b7f 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_template_spec.ts
@@ -78,7 +78,7 @@ describe('compiler compliance: template', () => {
           $i0$.ɵɵselect(0);
           $i0$.ɵɵproperty("title", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component));
           $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation1(" ", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component), " "));
+          $i0$.ɵɵtextInterpolate1(" ", $myComp1$.format($outer1$, $middle1$, $inner1$, $myComp1$.component), " ");
         }
       }
 
@@ -215,7 +215,7 @@ describe('compiler compliance: template', () => {
           const $item$ = ctx.$implicit;
           const $i$ = ctx.index;
           $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $i$, " - ", $item$, " "));
+          $i0$.ɵɵtextInterpolate2(" ", $i$, " - ", $item$, " ");
         }
       }
       // ...
@@ -272,7 +272,7 @@ describe('compiler compliance: template', () => {
           const $i$ = $div$.index;
           const $item$ = $div$.$implicit;
           $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $i$, " - ", $item$, " "));
+          $i0$.ɵɵtextInterpolate2(" ", $i$, " - ", $item$, " ");
         }
       }
 
@@ -343,7 +343,7 @@ describe('compiler compliance: template', () => {
           const $middle$ = $i0$.ɵɵnextContext().$implicit;
           const $myComp$ = $i0$.ɵɵnextContext(2);
           $r3$.ɵɵselect(1);
-          $i0$.ɵɵtextBinding(1, $i0$.ɵɵinterpolation2(" ", $middle$.value, " - ", $myComp$.name, " "));
+          $i0$.ɵɵtextInterpolate2(" ", $middle$.value, " - ", $myComp$.name, " ");
         }
       }
 
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 1bbcc200f6..a8046c9539 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -1961,7 +1961,7 @@ describe('ngtsc behavioral tests', () => {
 
     env.driveMain();
     const jsContents = env.getContents('test.js');
-    expect(jsContents).toContain('interpolation1("", ctx.text, "")');
+    expect(jsContents).toContain('ɵɵtextInterpolate(ctx.text)');
   });
 
   it('should handle `encapsulation` field', () => {
diff --git a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
index 135311857d..f8899c36da 100644
--- a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
@@ -44,7 +44,7 @@ describe('template source-mapping', () => {
             {source: '<h3>', generated: 'i0.ɵɵelementStart(0, "h3")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: 'Hello {{ name }}',
-          generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("Hello ", ctx.name, ""))',
+          generated: 'i0.ɵɵtextInterpolate1("Hello ", ctx.name, "")',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
@@ -57,8 +57,7 @@ describe('template source-mapping', () => {
             {source: '<h2>', generated: 'i0.ɵɵelementStart(0, "h2")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '{{ greeting + " " + name }}',
-          generated:
-              'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx.greeting + " " + ctx.name, ""))',
+          generated: 'i0.ɵɵtextInterpolate(ctx.greeting + " " + ctx.name)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
@@ -85,8 +84,7 @@ describe('template source-mapping', () => {
             {source: '<div>', generated: 'i0.ɵɵelementStart(0, "div")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '{{200.3 | percent : 2 }}',
-          generated:
-              'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", i0.ɵɵpipeBind2(2, 1, 200.3, 2), ""))',
+          generated: 'i0.ɵɵtextInterpolate(i0.ɵɵpipeBind2(2, 1, 200.3, 2))',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
@@ -270,7 +268,7 @@ describe('template source-mapping', () => {
 
         // expect(mappings).toContain({
         //   source: '{{ name }}',
-        //   generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx_r0.name, ""))',
+        //   generated: 'i0.ɵɵtextInterpolate(ctx_r0.name)',
         //   sourceUrl: '../test.ts'
         // });
       });
@@ -294,7 +292,7 @@ describe('template source-mapping', () => {
 
         // expect(mappings).toContain({
         //   source: '{{ name }}',
-        //   generated: 'i0.ɵɵtextBinding(1, i0.ɵɵinterpolation1("", ctx_r0.name, ""))',
+        //   generated: 'i0.ɵɵtextInterpolate(ctx_r0.name)',
         //   sourceUrl: '../test.ts'
         // });
       });
@@ -370,7 +368,7 @@ describe('template source-mapping', () => {
 
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
+        generated: 'i0.ɵɵtextInterpolate(1 + 2)',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -396,9 +394,10 @@ describe('template source-mapping', () => {
       expect(mappings).toContain(
           {generated: 'i0.ɵɵelementEnd()', source: '</div>', sourceUrl: '../test.ts'});
 
+      // TODO(benlesh): We need to circle back and prevent the extra parens from being generated.
       // Update mode
       expect(mappings).toContain({
-        generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
+        generated: 'i0.ɵɵtextInterpolate(1 + 2)',
         source: '{{ 1 + 2 }}',
         sourceUrl: '../test.ts'
       });
@@ -452,7 +451,7 @@ describe('template source-mapping', () => {
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
+          generated: 'i0.ɵɵtextInterpolate(1 + 2)',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../dir/test.html'
         });
@@ -496,7 +495,7 @@ describe('template source-mapping', () => {
 
         // Update mode
         expect(mappings).toContain({
-          generated: 'i0.ɵɵtextBinding(3, i0.ɵɵinterpolation1("", 1 + 2, ""))',
+          generated: 'i0.ɵɵtextInterpolate(1 + 2)',
           source: '{{ 1 + 2 }}',
           sourceUrl: '../extraRootDir/test.html'
         });
diff --git a/packages/compiler/src/output/output_jit.ts b/packages/compiler/src/output/output_jit.ts
index 1d3d2670b0..e446a1351b 100644
--- a/packages/compiler/src/output/output_jit.ts
+++ b/packages/compiler/src/output/output_jit.ts
@@ -56,7 +56,7 @@ export class JitEvaluator {
   evaluateCode(
       sourceUrl: string, ctx: EmitterVisitorContext, vars: {[key: string]: any},
       createSourceMap: boolean): any {
-    let fnBody = `${ctx.toSource()}\n//# sourceURL=${sourceUrl}`;
+    let fnBody = `"use strict";${ctx.toSource()}\n//# sourceURL=${sourceUrl}`;
     const fnArgNames: string[] = [];
     const fnArgValues: any[] = [];
     for (const argName in vars) {
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 2c8e1547f3..7c8b0a061d 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -102,6 +102,17 @@ export class Identifiers {
 
   static getCurrentView: o.ExternalReference = {name: 'ɵɵgetCurrentView', moduleName: CORE};
 
+  static textInterpolate: o.ExternalReference = {name: 'ɵɵtextInterpolate', moduleName: CORE};
+  static textInterpolate1: o.ExternalReference = {name: 'ɵɵtextInterpolate1', moduleName: CORE};
+  static textInterpolate2: o.ExternalReference = {name: 'ɵɵtextInterpolate2', moduleName: CORE};
+  static textInterpolate3: o.ExternalReference = {name: 'ɵɵtextInterpolate3', moduleName: CORE};
+  static textInterpolate4: o.ExternalReference = {name: 'ɵɵtextInterpolate4', moduleName: CORE};
+  static textInterpolate5: o.ExternalReference = {name: 'ɵɵtextInterpolate5', moduleName: CORE};
+  static textInterpolate6: o.ExternalReference = {name: 'ɵɵtextInterpolate6', moduleName: CORE};
+  static textInterpolate7: o.ExternalReference = {name: 'ɵɵtextInterpolate7', moduleName: CORE};
+  static textInterpolate8: o.ExternalReference = {name: 'ɵɵtextInterpolate8', moduleName: CORE};
+  static textInterpolateV: o.ExternalReference = {name: 'ɵɵtextInterpolateV', moduleName: CORE};
+
   static restoreView: o.ExternalReference = {name: 'ɵɵrestoreView', moduleName: CORE};
 
   static interpolation1: o.ExternalReference = {name: 'ɵɵinterpolation1', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 5714c819fa..783ac4ab65 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -941,9 +941,17 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     const value = text.value.visit(this._valueConverter);
     this.allocateBindingSlots(value);
-    this.updateInstruction(
-        nodeIndex, text.sourceSpan, R3.textBinding,
-        () => [o.literal(nodeIndex), this.convertPropertyBinding(o.variable(CONTEXT_NAME), value)]);
+
+    if (value instanceof Interpolation) {
+      this.updateInstruction(
+          nodeIndex, text.sourceSpan, getTextInterpolationExpression(value),
+          () => this.getUpdateInstructionArguments(o.variable(CONTEXT_NAME), value));
+    } else {
+      this.updateInstruction(
+          nodeIndex, text.sourceSpan, R3.textBinding,
+          () =>
+              [o.literal(nodeIndex), this.convertPropertyBinding(o.variable(CONTEXT_NAME), value)]);
+    }
   }
 
   visitText(text: t.Text) {
@@ -1736,6 +1744,35 @@ function getAttributeInterpolationExpression(interpolation: Interpolation) {
   }
 }
 
+/**
+ * Gets the instruction to generate for interpolated text.
+ * @param interpolation An Interpolation AST
+ */
+function getTextInterpolationExpression(interpolation: Interpolation): o.ExternalReference {
+  switch (getInterpolationArgsLength(interpolation)) {
+    case 1:
+      return R3.textInterpolate;
+    case 3:
+      return R3.textInterpolate1;
+    case 5:
+      return R3.textInterpolate2;
+    case 7:
+      return R3.textInterpolate3;
+    case 9:
+      return R3.textInterpolate4;
+    case 11:
+      return R3.textInterpolate5;
+    case 13:
+      return R3.textInterpolate6;
+    case 15:
+      return R3.textInterpolate7;
+    case 17:
+      return R3.textInterpolate8;
+    default:
+      return R3.textInterpolateV;
+  }
+}
+
 /**
  * Gets the number of arguments expected to be passed to a generated instruction in the case of
  * interpolation instructions.
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 324ea277be..6a9e57fb18 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -57,6 +57,16 @@ export {
   ɵɵelement,
   ɵɵlistener,
   ɵɵtext,
+  ɵɵtextInterpolate,
+  ɵɵtextInterpolate1,
+  ɵɵtextInterpolate2,
+  ɵɵtextInterpolate3,
+  ɵɵtextInterpolate4,
+  ɵɵtextInterpolate5,
+  ɵɵtextInterpolate6,
+  ɵɵtextInterpolate7,
+  ɵɵtextInterpolate8,
+  ɵɵtextInterpolateV,
   ɵɵembeddedViewStart,
   ɵɵprojection,
   ɵɵbind,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index cc6f99edfb..61c5c0daf7 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -107,7 +107,18 @@ export {
   ɵɵtemplate,
 
   ɵɵtext,
-  ɵɵtextBinding} from './instructions/all';
+  ɵɵtextBinding,
+  ɵɵtextInterpolate,
+  ɵɵtextInterpolate1,
+  ɵɵtextInterpolate2,
+  ɵɵtextInterpolate3,
+  ɵɵtextInterpolate4,
+  ɵɵtextInterpolate5,
+  ɵɵtextInterpolate6,
+  ɵɵtextInterpolate7,
+  ɵɵtextInterpolate8,
+  ɵɵtextInterpolateV,
+} from './instructions/all';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList} from './interfaces/projection';
 
diff --git a/packages/core/src/render3/instructions/all.ts b/packages/core/src/render3/instructions/all.ts
index 4ae084f172..b876f4980c 100644
--- a/packages/core/src/render3/instructions/all.ts
+++ b/packages/core/src/render3/instructions/all.ts
@@ -36,6 +36,7 @@ export * from './element';
 export * from './element_container';
 export * from './embedded_view';
 export * from './get_current_view';
+export * from './interpolation';
 export * from './listener';
 export * from './namespace';
 export * from './next_context';
@@ -45,3 +46,4 @@ export * from './property_interpolation';
 export * from './select';
 export * from './styling';
 export * from './text';
+export * from './text_interpolation';
diff --git a/packages/core/src/render3/instructions/attribute_interpolation.ts b/packages/core/src/render3/instructions/attribute_interpolation.ts
index 5214208994..c0505532e9 100644
--- a/packages/core/src/render3/instructions/attribute_interpolation.ts
+++ b/packages/core/src/render3/instructions/attribute_interpolation.ts
@@ -8,7 +8,7 @@
 import {SanitizerFn} from '../interfaces/sanitization';
 import {getSelectedIndex} from '../state';
 import {ɵɵelementAttribute} from './element';
-import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './property_interpolation';
+import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
 import {TsickleIssue1009} from './shared';
 
 
diff --git a/packages/core/src/render3/instructions/interpolation.ts b/packages/core/src/render3/instructions/interpolation.ts
new file mode 100644
index 0000000000..284bb5c143
--- /dev/null
+++ b/packages/core/src/render3/instructions/interpolation.ts
@@ -0,0 +1,289 @@
+/**
+ * @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 {assertEqual, assertLessThan} from '../../util/assert';
+import {bindingUpdated, bindingUpdated2, bindingUpdated3, bindingUpdated4} from '../bindings';
+import {BINDING_INDEX, TVIEW} from '../interfaces/view';
+import {getLView} from '../state';
+import {NO_CHANGE} from '../tokens';
+import {renderStringify} from '../util/misc_utils';
+
+import {storeBindingMetadata} from './shared';
+
+
+
+/**
+ * Create interpolation bindings with a variable number of expressions.
+ *
+ * If there are 1 to 8 expressions `interpolation1()` to `interpolation8()` should be used instead.
+ * Those are faster because there is no need to create an array of expressions and iterate over it.
+ *
+ * `values`:
+ * - has static text at even indexes,
+ * - has evaluated expressions at odd indexes.
+ *
+ * Returns the concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolationV(values: any[]): string|NO_CHANGE {
+  ngDevMode && assertLessThan(2, values.length, 'should have at least 3 values');
+  ngDevMode && assertEqual(values.length % 2, 1, 'should have an odd number of values');
+  let isBindingUpdated = false;
+  const lView = getLView();
+  const tData = lView[TVIEW].data;
+  let bindingIndex = lView[BINDING_INDEX];
+
+  if (tData[bindingIndex] == null) {
+    // 2 is the index of the first static interstitial value (ie. not prefix)
+    for (let i = 2; i < values.length; i += 2) {
+      tData[bindingIndex++] = values[i];
+    }
+    bindingIndex = lView[BINDING_INDEX];
+  }
+
+  for (let i = 1; i < values.length; i += 2) {
+    // Check if bindings (odd indexes) have changed
+    isBindingUpdated = bindingUpdated(lView, bindingIndex++, values[i]) || isBindingUpdated;
+  }
+  lView[BINDING_INDEX] = bindingIndex;
+  storeBindingMetadata(lView, values[0], values[values.length - 1]);
+
+  if (!isBindingUpdated) {
+    return NO_CHANGE;
+  }
+
+  // Build the updated content
+  let content = values[0];
+  for (let i = 1; i < values.length; i += 2) {
+    content += renderStringify(values[i]) + values[i + 1];
+  }
+
+  return content;
+}
+
+/**
+ * Creates an interpolation binding with 1 expression.
+ *
+ * @param prefix static value used for concatenation only.
+ * @param v0 value checked for change.
+ * @param suffix static value used for concatenation only.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string|NO_CHANGE {
+  const lView = getLView();
+  const different = bindingUpdated(lView, lView[BINDING_INDEX]++, v0);
+  storeBindingMetadata(lView, prefix, suffix);
+  return different ? prefix + renderStringify(v0) + suffix : NO_CHANGE;
+}
+
+/**
+ * Creates an interpolation binding with 2 expressions.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation2(
+    prefix: string, v0: any, i0: string, v1: any, suffix: string): string|NO_CHANGE {
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX];
+  const different = bindingUpdated2(lView, bindingIndex, v0, v1);
+  lView[BINDING_INDEX] += 2;
+
+  // Only set static strings the first time (data will be null subsequent runs).
+  const data = storeBindingMetadata(lView, prefix, suffix);
+  if (data) {
+    lView[TVIEW].data[bindingIndex] = i0;
+  }
+
+  return different ? prefix + renderStringify(v0) + i0 + renderStringify(v1) + suffix : NO_CHANGE;
+}
+
+/**
+ * Creates an interpolation binding with 3 expressions.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation3(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string|
+    NO_CHANGE {
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX];
+  const different = bindingUpdated3(lView, bindingIndex, v0, v1, v2);
+  lView[BINDING_INDEX] += 3;
+
+  // Only set static strings the first time (data will be null subsequent runs).
+  const data = storeBindingMetadata(lView, prefix, suffix);
+  if (data) {
+    const tData = lView[TVIEW].data;
+    tData[bindingIndex] = i0;
+    tData[bindingIndex + 1] = i1;
+  }
+
+  return different ?
+      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + suffix :
+      NO_CHANGE;
+}
+
+/**
+ * Create an interpolation binding with 4 expressions.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation4(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    suffix: string): string|NO_CHANGE {
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX];
+  const different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
+  lView[BINDING_INDEX] += 4;
+
+  // Only set static strings the first time (data will be null subsequent runs).
+  const data = storeBindingMetadata(lView, prefix, suffix);
+  if (data) {
+    const tData = lView[TVIEW].data;
+    tData[bindingIndex] = i0;
+    tData[bindingIndex + 1] = i1;
+    tData[bindingIndex + 2] = i2;
+  }
+
+  return different ?
+      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
+          renderStringify(v3) + suffix :
+      NO_CHANGE;
+}
+
+/**
+ * Creates an interpolation binding with 5 expressions.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation5(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, suffix: string): string|NO_CHANGE {
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX];
+  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
+  different = bindingUpdated(lView, bindingIndex + 4, v4) || different;
+  lView[BINDING_INDEX] += 5;
+
+  // Only set static strings the first time (data will be null subsequent runs).
+  const data = storeBindingMetadata(lView, prefix, suffix);
+  if (data) {
+    const tData = lView[TVIEW].data;
+    tData[bindingIndex] = i0;
+    tData[bindingIndex + 1] = i1;
+    tData[bindingIndex + 2] = i2;
+    tData[bindingIndex + 3] = i3;
+  }
+
+  return different ?
+      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
+          renderStringify(v3) + i3 + renderStringify(v4) + suffix :
+      NO_CHANGE;
+}
+
+/**
+ * Creates an interpolation binding with 6 expressions.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation6(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, i4: string, v5: any, suffix: string): string|NO_CHANGE {
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX];
+  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
+  different = bindingUpdated2(lView, bindingIndex + 4, v4, v5) || different;
+  lView[BINDING_INDEX] += 6;
+
+  // Only set static strings the first time (data will be null subsequent runs).
+  const data = storeBindingMetadata(lView, prefix, suffix);
+  if (data) {
+    const tData = lView[TVIEW].data;
+    tData[bindingIndex] = i0;
+    tData[bindingIndex + 1] = i1;
+    tData[bindingIndex + 2] = i2;
+    tData[bindingIndex + 3] = i3;
+    tData[bindingIndex + 4] = i4;
+  }
+
+  return different ?
+      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
+          renderStringify(v3) + i3 + renderStringify(v4) + i4 + renderStringify(v5) + suffix :
+      NO_CHANGE;
+}
+
+/**
+ * Creates an interpolation binding with 7 expressions.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation7(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string|
+    NO_CHANGE {
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX];
+  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
+  different = bindingUpdated3(lView, bindingIndex + 4, v4, v5, v6) || different;
+  lView[BINDING_INDEX] += 7;
+
+  // Only set static strings the first time (data will be null subsequent runs).
+  const data = storeBindingMetadata(lView, prefix, suffix);
+  if (data) {
+    const tData = lView[TVIEW].data;
+    tData[bindingIndex] = i0;
+    tData[bindingIndex + 1] = i1;
+    tData[bindingIndex + 2] = i2;
+    tData[bindingIndex + 3] = i3;
+    tData[bindingIndex + 4] = i4;
+    tData[bindingIndex + 5] = i5;
+  }
+
+  return different ?
+      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
+          renderStringify(v3) + i3 + renderStringify(v4) + i4 + renderStringify(v5) + i5 +
+          renderStringify(v6) + suffix :
+      NO_CHANGE;
+}
+
+/**
+ * Creates an interpolation binding with 8 expressions.
+ *
+ * @codeGenApi
+ */
+export function ɵɵinterpolation8(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
+    suffix: string): string|NO_CHANGE {
+  const lView = getLView();
+  const bindingIndex = lView[BINDING_INDEX];
+  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
+  different = bindingUpdated4(lView, bindingIndex + 4, v4, v5, v6, v7) || different;
+  lView[BINDING_INDEX] += 8;
+
+  // Only set static strings the first time (data will be null subsequent runs).
+  const data = storeBindingMetadata(lView, prefix, suffix);
+  if (data) {
+    const tData = lView[TVIEW].data;
+    tData[bindingIndex] = i0;
+    tData[bindingIndex + 1] = i1;
+    tData[bindingIndex + 2] = i2;
+    tData[bindingIndex + 3] = i3;
+    tData[bindingIndex + 4] = i4;
+    tData[bindingIndex + 5] = i5;
+    tData[bindingIndex + 6] = i6;
+  }
+
+  return different ?
+      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
+          renderStringify(v3) + i3 + renderStringify(v4) + i4 + renderStringify(v5) + i5 +
+          renderStringify(v6) + i6 + renderStringify(v7) + suffix :
+      NO_CHANGE;
+}
diff --git a/packages/core/src/render3/instructions/property_interpolation.ts b/packages/core/src/render3/instructions/property_interpolation.ts
index 044d7d2b18..9d92cd853d 100644
--- a/packages/core/src/render3/instructions/property_interpolation.ts
+++ b/packages/core/src/render3/instructions/property_interpolation.ts
@@ -5,293 +5,14 @@
  * 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 {assertEqual, assertLessThan} from '../../util/assert';
-import {bindingUpdated, bindingUpdated2, bindingUpdated3, bindingUpdated4} from '../bindings';
 import {SanitizerFn} from '../interfaces/sanitization';
-import {BINDING_INDEX, TVIEW} from '../interfaces/view';
-import {getLView, getSelectedIndex} from '../state';
+import {getSelectedIndex} from '../state';
 import {NO_CHANGE} from '../tokens';
-import {renderStringify} from '../util/misc_utils';
 
-import {TsickleIssue1009, elementPropertyInternal, storeBindingMetadata} from './shared';
+import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
+import {TsickleIssue1009, elementPropertyInternal} from './shared';
 
 
-
-/**
- * Create interpolation bindings with a variable number of expressions.
- *
- * If there are 1 to 8 expressions `interpolation1()` to `interpolation8()` should be used instead.
- * Those are faster because there is no need to create an array of expressions and iterate over it.
- *
- * `values`:
- * - has static text at even indexes,
- * - has evaluated expressions at odd indexes.
- *
- * Returns the concatenated string when any of the arguments changes, `NO_CHANGE` otherwise.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolationV(values: any[]): string|NO_CHANGE {
-  ngDevMode && assertLessThan(2, values.length, 'should have at least 3 values');
-  ngDevMode && assertEqual(values.length % 2, 1, 'should have an odd number of values');
-  let different = false;
-  const lView = getLView();
-  const tData = lView[TVIEW].data;
-  let bindingIndex = lView[BINDING_INDEX];
-
-  if (tData[bindingIndex] == null) {
-    // 2 is the index of the first static interstitial value (ie. not prefix)
-    for (let i = 2; i < values.length; i += 2) {
-      tData[bindingIndex++] = values[i];
-    }
-    bindingIndex = lView[BINDING_INDEX];
-  }
-
-  for (let i = 1; i < values.length; i += 2) {
-    // Check if bindings (odd indexes) have changed
-    bindingUpdated(lView, bindingIndex++, values[i]) && (different = true);
-  }
-  lView[BINDING_INDEX] = bindingIndex;
-  storeBindingMetadata(lView, values[0], values[values.length - 1]);
-
-  if (!different) {
-    return NO_CHANGE;
-  }
-
-  // Build the updated content
-  let content = values[0];
-  for (let i = 1; i < values.length; i += 2) {
-    content += renderStringify(values[i]) + values[i + 1];
-  }
-
-  return content;
-}
-
-/**
- * Creates an interpolation binding with 1 expression.
- *
- * @param prefix static value used for concatenation only.
- * @param v0 value checked for change.
- * @param suffix static value used for concatenation only.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation1(prefix: string, v0: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
-  const different = bindingUpdated(lView, lView[BINDING_INDEX]++, v0);
-  storeBindingMetadata(lView, prefix, suffix);
-  return different ? prefix + renderStringify(v0) + suffix : NO_CHANGE;
-}
-
-/**
- * Creates an interpolation binding with 2 expressions.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation2(
-    prefix: string, v0: any, i0: string, v1: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX];
-  const different = bindingUpdated2(lView, bindingIndex, v0, v1);
-  lView[BINDING_INDEX] += 2;
-
-  // Only set static strings the first time (data will be null subsequent runs).
-  const data = storeBindingMetadata(lView, prefix, suffix);
-  if (data) {
-    lView[TVIEW].data[bindingIndex] = i0;
-  }
-
-  return different ? prefix + renderStringify(v0) + i0 + renderStringify(v1) + suffix : NO_CHANGE;
-}
-
-/**
- * Creates an interpolation binding with 3 expressions.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation3(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): string|
-    NO_CHANGE {
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX];
-  const different = bindingUpdated3(lView, bindingIndex, v0, v1, v2);
-  lView[BINDING_INDEX] += 3;
-
-  // Only set static strings the first time (data will be null subsequent runs).
-  const data = storeBindingMetadata(lView, prefix, suffix);
-  if (data) {
-    const tData = lView[TVIEW].data;
-    tData[bindingIndex] = i0;
-    tData[bindingIndex + 1] = i1;
-  }
-
-  return different ?
-      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + suffix :
-      NO_CHANGE;
-}
-
-/**
- * Create an interpolation binding with 4 expressions.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation4(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    suffix: string): string|NO_CHANGE {
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX];
-  const different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
-  lView[BINDING_INDEX] += 4;
-
-  // Only set static strings the first time (data will be null subsequent runs).
-  const data = storeBindingMetadata(lView, prefix, suffix);
-  if (data) {
-    const tData = lView[TVIEW].data;
-    tData[bindingIndex] = i0;
-    tData[bindingIndex + 1] = i1;
-    tData[bindingIndex + 2] = i2;
-  }
-
-  return different ?
-      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
-          renderStringify(v3) + suffix :
-      NO_CHANGE;
-}
-
-/**
- * Creates an interpolation binding with 5 expressions.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation5(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX];
-  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
-  different = bindingUpdated(lView, bindingIndex + 4, v4) || different;
-  lView[BINDING_INDEX] += 5;
-
-  // Only set static strings the first time (data will be null subsequent runs).
-  const data = storeBindingMetadata(lView, prefix, suffix);
-  if (data) {
-    const tData = lView[TVIEW].data;
-    tData[bindingIndex] = i0;
-    tData[bindingIndex + 1] = i1;
-    tData[bindingIndex + 2] = i2;
-    tData[bindingIndex + 3] = i3;
-  }
-
-  return different ?
-      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
-          renderStringify(v3) + i3 + renderStringify(v4) + suffix :
-      NO_CHANGE;
-}
-
-/**
- * Creates an interpolation binding with 6 expressions.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation6(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, i4: string, v5: any, suffix: string): string|NO_CHANGE {
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX];
-  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
-  different = bindingUpdated2(lView, bindingIndex + 4, v4, v5) || different;
-  lView[BINDING_INDEX] += 6;
-
-  // Only set static strings the first time (data will be null subsequent runs).
-  const data = storeBindingMetadata(lView, prefix, suffix);
-  if (data) {
-    const tData = lView[TVIEW].data;
-    tData[bindingIndex] = i0;
-    tData[bindingIndex + 1] = i1;
-    tData[bindingIndex + 2] = i2;
-    tData[bindingIndex + 3] = i3;
-    tData[bindingIndex + 4] = i4;
-  }
-
-  return different ?
-      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
-          renderStringify(v3) + i3 + renderStringify(v4) + i4 + renderStringify(v5) + suffix :
-      NO_CHANGE;
-}
-
-/**
- * Creates an interpolation binding with 7 expressions.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation7(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): string|
-    NO_CHANGE {
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX];
-  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
-  different = bindingUpdated3(lView, bindingIndex + 4, v4, v5, v6) || different;
-  lView[BINDING_INDEX] += 7;
-
-  // Only set static strings the first time (data will be null subsequent runs).
-  const data = storeBindingMetadata(lView, prefix, suffix);
-  if (data) {
-    const tData = lView[TVIEW].data;
-    tData[bindingIndex] = i0;
-    tData[bindingIndex + 1] = i1;
-    tData[bindingIndex + 2] = i2;
-    tData[bindingIndex + 3] = i3;
-    tData[bindingIndex + 4] = i4;
-    tData[bindingIndex + 5] = i5;
-  }
-
-  return different ?
-      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
-          renderStringify(v3) + i3 + renderStringify(v4) + i4 + renderStringify(v5) + i5 +
-          renderStringify(v6) + suffix :
-      NO_CHANGE;
-}
-
-/**
- * Creates an interpolation binding with 8 expressions.
- *
- * @codeGenApi
- */
-export function ɵɵinterpolation8(
-    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
-    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
-    suffix: string): string|NO_CHANGE {
-  const lView = getLView();
-  const bindingIndex = lView[BINDING_INDEX];
-  let different = bindingUpdated4(lView, bindingIndex, v0, v1, v2, v3);
-  different = bindingUpdated4(lView, bindingIndex + 4, v4, v5, v6, v7) || different;
-  lView[BINDING_INDEX] += 8;
-
-  // Only set static strings the first time (data will be null subsequent runs).
-  const data = storeBindingMetadata(lView, prefix, suffix);
-  if (data) {
-    const tData = lView[TVIEW].data;
-    tData[bindingIndex] = i0;
-    tData[bindingIndex + 1] = i1;
-    tData[bindingIndex + 2] = i2;
-    tData[bindingIndex + 3] = i3;
-    tData[bindingIndex + 4] = i4;
-    tData[bindingIndex + 5] = i5;
-    tData[bindingIndex + 6] = i6;
-  }
-
-  return different ?
-      prefix + renderStringify(v0) + i0 + renderStringify(v1) + i1 + renderStringify(v2) + i2 +
-          renderStringify(v3) + i3 + renderStringify(v4) + i4 + renderStringify(v5) + i5 +
-          renderStringify(v6) + i6 + renderStringify(v7) + suffix :
-      NO_CHANGE;
-}
-
-/////////////////////////////////////////////////////////////////////
-/// NEW INSTRUCTIONS
-/////////////////////////////////////////////////////////////////////
-
 /**
  *
  * Update an interpolated property on an element with a lone bound value
diff --git a/packages/core/src/render3/instructions/text_interpolation.ts b/packages/core/src/render3/instructions/text_interpolation.ts
new file mode 100644
index 0000000000..827338249d
--- /dev/null
+++ b/packages/core/src/render3/instructions/text_interpolation.ts
@@ -0,0 +1,298 @@
+/**
+ * @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 {getSelectedIndex} from '../state';
+
+import {ɵɵinterpolation1, ɵɵinterpolation2, ɵɵinterpolation3, ɵɵinterpolation4, ɵɵinterpolation5, ɵɵinterpolation6, ɵɵinterpolation7, ɵɵinterpolation8, ɵɵinterpolationV} from './interpolation';
+import {TsickleIssue1009} from './shared';
+import {ɵɵtextBinding} from './text';
+
+
+
+/**
+ *
+ * Update text content with a lone bound value
+ *
+ * Used when a text node has 1 interpolated value in it, an no additional text
+ * surrounds that interpolated value:
+ *
+ * ```html
+ * <div>{{v0}}</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate(v0);
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate(v0: any): TsickleIssue1009 {
+  ɵɵtextInterpolate1('', v0, '');
+  return ɵɵtextInterpolate;
+}
+
+
+/**
+ *
+ * Update text content with single bound value surrounded by other text.
+ *
+ * Used when a text node has 1 interpolated value in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate1('prefix', v0, 'suffix');
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate1(prefix: string, v0: any, suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(index, ɵɵinterpolation1(prefix, v0, suffix));
+  return ɵɵtextInterpolate1;
+}
+
+/**
+ *
+ * Update text content with 2 bound values surrounded by other text.
+ *
+ * Used when a text node has 2 interpolated values in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate2('prefix', v0, '-', v1, 'suffix');
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate2(
+    prefix: string, v0: any, i0: string, v1: any, suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(index, ɵɵinterpolation2(prefix, v0, i0, v1, suffix));
+  return ɵɵtextInterpolate2;
+}
+
+/**
+ *
+ * Update text content with 3 bound values surrounded by other text.
+ *
+ * Used when a text node has 3 interpolated values in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}-{{v2}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate3(
+ * 'prefix', v0, '-', v1, '-', v2, 'suffix');
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate3(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
+    suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(index, ɵɵinterpolation3(prefix, v0, i0, v1, i1, v2, suffix));
+  return ɵɵtextInterpolate3;
+}
+
+/**
+ *
+ * Update text content with 4 bound values surrounded by other text.
+ *
+ * Used when a text node has 4 interpolated values in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate4(
+ * 'prefix', v0, '-', v1, '-', v2, '-', v3, 'suffix');
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see ɵɵtextInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate4(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(index, ɵɵinterpolation4(prefix, v0, i0, v1, i1, v2, i2, v3, suffix));
+  return ɵɵtextInterpolate4;
+}
+
+/**
+ *
+ * Update text content with 5 bound values surrounded by other text.
+ *
+ * Used when a text node has 5 interpolated values in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate5(
+ * 'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, 'suffix');
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate5(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(index, ɵɵinterpolation5(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix));
+  return ɵɵtextInterpolate5;
+}
+
+/**
+ *
+ * Update text content with 6 bound values surrounded by other text.
+ *
+ * Used when a text node has 6 interpolated values in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate6(
+ *    'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, 'suffix');
+ * ```
+ *
+ * @param i4 Static value used for concatenation only.
+ * @param v5 Value checked for change. @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate6(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, i4: string, v5: any, suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(
+      index, ɵɵinterpolation6(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix));
+  return ɵɵtextInterpolate6;
+}
+
+/**
+ *
+ * Update text content with 7 bound values surrounded by other text.
+ *
+ * Used when a text node has 7 interpolated values in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}-{{v6}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate7(
+ *    'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, 'suffix');
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate7(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any,
+    suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(
+      index, ɵɵinterpolation7(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix));
+  return ɵɵtextInterpolate7;
+}
+
+/**
+ *
+ * Update text content with 8 bound values surrounded by other text.
+ *
+ * Used when a text node has 8 interpolated values in it:
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}-{{v6}}-{{v7}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolate8(
+ *  'prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, 'suffix');
+ * ```
+ * @returns itself, so that it may be chained.
+ * @see textInterpolateV
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolate8(
+    prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
+    i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
+    suffix: string): TsickleIssue1009 {
+  const index = getSelectedIndex();
+  ɵɵtextBinding(
+      index,
+      ɵɵinterpolation8(prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix));
+  return ɵɵtextInterpolate8;
+}
+
+/**
+ * Update text content with 9 or more bound values other surrounded by text.
+ *
+ * Used when the number of interpolated values exceeds 8.
+ *
+ * ```html
+ * <div>prefix{{v0}}-{{v1}}-{{v2}}-{{v3}}-{{v4}}-{{v5}}-{{v6}}-{{v7}}-{{v8}}-{{v9}}suffix</div>
+ * ```
+ *
+ * Its compiled representation is:
+ *
+ * ```ts
+ * ɵɵtextInterpolateV(
+ *  ['prefix', v0, '-', v1, '-', v2, '-', v3, '-', v4, '-', v5, '-', v6, '-', v7, '-', v9,
+ *  'suffix']);
+ * ```
+ *.
+ * @param values The a collection of values and the strings in between those values, beginning with
+ * a string prefix and ending with a string suffix.
+ * (e.g. `['prefix', value0, '-', value1, '-', value2, ..., value99, 'suffix']`)
+ *
+ * @returns itself, so that it may be chained.
+ * @codeGenApi
+ */
+export function ɵɵtextInterpolateV(values: any[]): TsickleIssue1009 {
+  const index = getSelectedIndex();
+
+  ɵɵtextBinding(index, ɵɵinterpolationV(values));
+  return ɵɵtextInterpolateV;
+}
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 1f1f1eb018..b40dff1843 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -127,6 +127,16 @@ export const angularCoreEnv: {[name: string]: Function} =
        'ɵɵtemplate': r3.ɵɵtemplate,
        'ɵɵtext': r3.ɵɵtext,
        'ɵɵtextBinding': r3.ɵɵtextBinding,
+       'ɵɵtextInterpolate': r3.ɵɵtextInterpolate,
+       'ɵɵtextInterpolate1': r3.ɵɵtextInterpolate1,
+       'ɵɵtextInterpolate2': r3.ɵɵtextInterpolate2,
+       'ɵɵtextInterpolate3': r3.ɵɵtextInterpolate3,
+       'ɵɵtextInterpolate4': r3.ɵɵtextInterpolate4,
+       'ɵɵtextInterpolate5': r3.ɵɵtextInterpolate5,
+       'ɵɵtextInterpolate6': r3.ɵɵtextInterpolate6,
+       'ɵɵtextInterpolate7': r3.ɵɵtextInterpolate7,
+       'ɵɵtextInterpolate8': r3.ɵɵtextInterpolate8,
+       'ɵɵtextInterpolateV': r3.ɵɵtextInterpolateV,
        'ɵɵembeddedViewStart': r3.ɵɵembeddedViewStart,
        'ɵɵembeddedViewEnd': r3.ɵɵembeddedViewEnd,
        'ɵɵi18n': r3.ɵɵi18n,
diff --git a/packages/core/test/acceptance/text_spec.ts b/packages/core/test/acceptance/text_spec.ts
new file mode 100644
index 0000000000..3f3e665f06
--- /dev/null
+++ b/packages/core/test/acceptance/text_spec.ts
@@ -0,0 +1,115 @@
+/**
+ * @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 {Component} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {of } from 'rxjs';
+
+describe('text instructions', () => {
+  it('should handle all flavors of interpolated text', () => {
+    @Component({
+      template: `
+        <div>a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g{{seven}}h{{eight}}i{{nine}}j</div>
+        <div>a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g{{seven}}h{{eight}}i</div>
+        <div>a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g{{seven}}h</div>
+        <div>a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f{{six}}g</div>
+        <div>a{{one}}b{{two}}c{{three}}d{{four}}e{{five}}f</div>
+        <div>a{{one}}b{{two}}c{{three}}d{{four}}e</div>
+        <div>a{{one}}b{{two}}c{{three}}d</div>
+        <div>a{{one}}b{{two}}c</div>
+        <div>a{{one}}b</div>
+        <div>{{one}}</div>
+      `
+    })
+    class App {
+      one = 1;
+      two = 2;
+      three = 3;
+      four = 4;
+      five = 5;
+      six = 6;
+      seven = 7;
+      eight = 8;
+      nine = 9;
+    }
+
+    TestBed.configureTestingModule({declarations: [App]});
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    const allTextContent = Array.from(fixture.nativeElement.querySelectorAll('div'))
+                               .map((div: HTMLDivElement) => div.textContent);
+
+    expect(allTextContent).toEqual([
+      'a1b2c3d4e5f6g7h8i9j',
+      'a1b2c3d4e5f6g7h8i',
+      'a1b2c3d4e5f6g7h',
+      'a1b2c3d4e5f6g',
+      'a1b2c3d4e5f',
+      'a1b2c3d4e',
+      'a1b2c3d',
+      'a1b2c',
+      'a1b',
+      '1',
+    ]);
+  });
+
+  it('should handle piped values in interpolated text', () => {
+    @Component({
+      template: `
+        <p>{{who | async}} sells {{(item | async)?.what}} down by the {{(item | async)?.where}}.</p>
+      `
+    })
+    class App {
+      who = of ('Sally');
+      item = of ({
+        what: 'seashells',
+        where: 'seashore',
+      });
+    }
+
+    TestBed.configureTestingModule({declarations: [App]});
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+
+    const p = fixture.nativeElement.querySelector('p') as HTMLDivElement;
+    expect(p.textContent).toBe('Sally sells seashells down by the seashore.');
+  });
+
+  it('should not sanitize urls in interpolated text', () => {
+    @Component({
+      template: '<p>{{thisisfine}}</p>',
+    })
+    class App {
+      thisisfine = 'javascript:alert("image_of_dog_with_coffee_in_burning_building.gif")';
+    }
+
+    TestBed.configureTestingModule({declarations: [App]});
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+    const p = fixture.nativeElement.querySelector('p');
+
+    expect(p.textContent)
+        .toBe('javascript:alert("image_of_dog_with_coffee_in_burning_building.gif")');
+  });
+
+  it('should not allow writing HTML in interpolated text', () => {
+    @Component({
+      template: '<div>{{test}}</div>',
+    })
+    class App {
+      test = '<h1>LOL, big text</h1>';
+    }
+
+    TestBed.configureTestingModule({declarations: [App]});
+    const fixture = TestBed.createComponent(App);
+    fixture.detectChanges();
+    const div = fixture.nativeElement.querySelector('div');
+
+    expect(div.innerHTML).toBe('&lt;h1&gt;LOL, big text&lt;/h1&gt;');
+  });
+});
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index d804c23fa1..216119ff48 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -1603,5 +1603,11 @@
   },
   {
     "name": "ɵɵtextBinding"
+  },
+  {
+    "name": "ɵɵtextInterpolate"
+  },
+  {
+    "name": "ɵɵtextInterpolate1"
   }
 ]
\ No newline at end of file
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index fa1423a027..d72f29d65e 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -1057,6 +1057,26 @@ export declare function ɵɵtext(index: number, value?: any): void;
 
 export declare function ɵɵtextBinding<T>(index: number, value: T | NO_CHANGE): void;
 
+export declare function ɵɵtextInterpolate(v0: any): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate1(prefix: string, v0: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate2(prefix: string, v0: any, i0: string, v1: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate3(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate4(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate5(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate6(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate7(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolate8(prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any, suffix: string): TsickleIssue1009;
+
+export declare function ɵɵtextInterpolateV(values: any[]): TsickleIssue1009;
+
 export declare function ɵɵviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
 
 export declare const PACKAGE_ROOT_URL: InjectionToken<string>;

From d72479b628bddd1fb5364dc116ccb1fb9094e1e4 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 May 2019 20:30:33 +0200
Subject: [PATCH 208/275] docs(core): template-var-assignment schematic should
 link to deprecation guide (#30702)

Instead of linking to a markdown file explaining what the migration warnings
are about, we should link to the deprecation guide which now also contains
an entry for that schematic. This makes the deprecation explanations
consistent and more centralized.

PR Close #30702
---
 .../schematics/migrations/template-var-assignment/index.ts     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/schematics/migrations/template-var-assignment/index.ts b/packages/core/schematics/migrations/template-var-assignment/index.ts
index 16cbf4b056..e6b0ddef48 100644
--- a/packages/core/schematics/migrations/template-var-assignment/index.ts
+++ b/packages/core/schematics/migrations/template-var-assignment/index.ts
@@ -19,8 +19,7 @@ import {analyzeResolvedTemplate} from './analyze_template';
 
 type Logger = logging.LoggerApi;
 
-const README_URL =
-    'https://github.com/angular/angular/tree/master/packages/core/schematics/migrations/template-var-assignment/README.md';
+const README_URL = 'https://v8.angular.io/guide/deprecations#cannot-assign-to-template-variables';
 const FAILURE_MESSAGE = `Found assignment to template variable.`;
 
 /** Entry point for the V8 template variable assignment schematic. */

From 82682bb93f1884076de24a8220e068a6126624ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Fri, 24 May 2019 13:49:57 -0700
Subject: [PATCH 209/275] refactor(ivy): enable sanitization support for the
 new styling algorithm (#30667)

This patch is one of the final patches to refactor the styling algorithm
to be more efficient, performant and less complex.

This patch enables sanitization support for map-based and prop-based
style bindings.

PR Close #30667
---
 .../r3_view_compiler_styling_spec.ts          | 120 +++++++++++++
 .../compiler/src/render3/r3_identifiers.ts    |   2 +
 .../src/render3/view/styling_builder.ts       |  15 ++
 packages/core/src/render3/debug.ts            |   4 +-
 packages/core/src/render3/index.ts            |   1 +
 packages/core/src/render3/instructions/all.ts |   1 +
 packages/core/src/render3/jit/environment.ts  |   1 +
 .../styling/class_and_style_bindings.ts       |  13 +-
 .../core/src/render3/styling_next/bindings.ts |  96 ++++++----
 .../src/render3/styling_next/instructions.ts  |  71 ++++++--
 .../src/render3/styling_next/interfaces.ts    |  67 +++++--
 .../styling_next/map_based_bindings.ts        |  22 ++-
 .../core/src/render3/styling_next/state.ts    |  24 +++
 .../src/render3/styling_next/styling_debug.ts |  36 +++-
 .../core/src/render3/styling_next/util.ts     |  67 ++++++-
 .../core/src/sanitization/sanitization.ts     |  25 ++-
 .../core/src/sanitization/style_sanitizer.ts  |  30 +++-
 .../core/test/acceptance/styling_next_spec.ts | 164 ++++++++++++++++++
 .../cyclic_import/bundle.golden_symbols.json  |  11 +-
 .../bundling/todo/bundle.golden_symbols.json  |  26 ++-
 .../styling/class_and_style_bindings_spec.ts  |  15 +-
 .../styling_next/styling_context_spec.ts      |  12 +-
 .../styling_next/styling_debug_spec.ts        |   4 +-
 23 files changed, 725 insertions(+), 102 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index 4a9580256c..bb506bd473 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -7,7 +7,9 @@
  */
 
 import {AttributeMarker, ViewEncapsulation} from '@angular/compiler/src/core';
+import {CompilerStylingMode, compilerSetStylingMode} from '@angular/compiler/src/render3/view/styling_state';
 import {setup} from '@angular/compiler/test/aot/test_util';
+
 import {compile, expectEmit} from './mock_compile';
 
 describe('compiler compliance: styling', () => {
@@ -1463,4 +1465,122 @@ describe('compiler compliance: styling', () => {
     const result = compile(files, angularFiles);
     expectEmit(result.source, template, 'Incorrect template');
   });
+
+  describe('new styling refactor', () => {
+    beforeEach(() => { compilerSetStylingMode(CompilerStylingMode.UseNew); });
+
+    afterEach(() => { compilerSetStylingMode(CompilerStylingMode.UseOld); });
+
+    it('should generate a `styleSanitizer` instruction when one or more sanitizable style properties are statically detected',
+       () => {
+         const files = {
+           app: {
+             'spec.ts': `
+            import {Component, NgModule} from '@angular/core';
+
+            @Component({
+              selector: 'my-app',
+              template: \`
+                <div [style.background-image]="bgExp"></div>
+              \`
+            })
+            export class MyAppComp {
+              bgExp = '';
+            }
+          `
+           }
+         };
+
+         const template = `
+        template: function MyAppComp_Template(rf, ctx) {
+          …
+          if (rf & 2) {
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵstyleSanitizer($r3$.ɵɵdefaultStyleSanitizer);
+            $r3$.ɵɵstyleProp(0, ctx.bgExp);
+            $r3$.ɵɵstylingApply();
+          }
+          …
+        }
+      `;
+
+         const result = compile(files, angularFiles);
+         expectEmit(result.source, template, 'Incorrect template');
+       });
+
+    it('should generate a `styleSanitizer` instruction when a `styleMap` instruction is used',
+       () => {
+         const files = {
+           app: {
+             'spec.ts': `
+            import {Component, NgModule} from '@angular/core';
+
+            @Component({
+              selector: 'my-app',
+              template: \`
+                <div [style]="mapExp"></div>
+              \`
+            })
+            export class MyAppComp {
+              mapExp = {};
+            }
+          `
+           }
+         };
+
+         const template = `
+        template: function MyAppComp_Template(rf, ctx) {
+          …
+          if (rf & 2) {
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵstyleSanitizer($r3$.ɵɵdefaultStyleSanitizer);
+            $r3$.ɵɵstyleMap(ctx.mapExp);
+            $r3$.ɵɵstylingApply();
+          }
+          …
+        }
+      `;
+
+         const result = compile(files, angularFiles);
+         expectEmit(result.source, template, 'Incorrect template');
+       });
+
+    it('shouldn\'t generate a `styleSanitizer` instruction when class-based instructions are used',
+       () => {
+         const files = {
+           app: {
+             'spec.ts': `
+            import {Component, NgModule} from '@angular/core';
+
+            @Component({
+              selector: 'my-app',
+              template: \`
+                <div [class]="mapExp" [class.name]="nameExp"></div>
+              \`
+            })
+            export class MyAppComp {
+              mapExp = {};
+              nameExp = true;
+            }
+          `
+           }
+         };
+
+         const template = `
+        template: function MyAppComp_Template(rf, ctx) {
+          …
+          if (rf & 2) {
+            $r3$.ɵɵselect(0);
+            $r3$.ɵɵclassMap(ctx.mapExp);
+            $r3$.ɵɵclassProp(0, ctx.nameExp);
+            $r3$.ɵɵstylingApply();
+          }
+          …
+        }
+      `;
+
+         const result = compile(files, angularFiles);
+         expectEmit(result.source, template, 'Incorrect template');
+       });
+  });
 });
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 7c8b0a061d..6979c3e140 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -80,6 +80,8 @@ export class Identifiers {
 
   static stylingApply: o.ExternalReference = {name: 'ɵɵstylingApply', moduleName: CORE};
 
+  static styleSanitizer: o.ExternalReference = {name: 'ɵɵstyleSanitizer', moduleName: CORE};
+
   static elementHostAttrs: o.ExternalReference = {name: 'ɵɵelementHostAttrs', moduleName: CORE};
 
   static containerCreate: o.ExternalReference = {name: 'ɵɵcontainer', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/styling_builder.ts b/packages/compiler/src/render3/view/styling_builder.ts
index f9510aaac7..3ca675ecaf 100644
--- a/packages/compiler/src/render3/view/styling_builder.ts
+++ b/packages/compiler/src/render3/view/styling_builder.ts
@@ -89,6 +89,7 @@ export class StylingBuilder {
   /** an array of each [class.name] input */
   private _singleClassInputs: BoundStylingEntry[]|null = null;
   private _lastStylingInput: BoundStylingEntry|null = null;
+  private _firstStylingInput: BoundStylingEntry|null = null;
 
   // maps are used instead of hash maps because a Map will
   // retain the ordering of the keys
@@ -181,6 +182,7 @@ export class StylingBuilder {
       registerIntoMap(this._stylesIndex, property);
     }
     this._lastStylingInput = entry;
+    this._firstStylingInput = this._firstStylingInput || entry;
     this.hasBindings = true;
     return entry;
   }
@@ -200,6 +202,7 @@ export class StylingBuilder {
       registerIntoMap(this._classesIndex, property);
     }
     this._lastStylingInput = entry;
+    this._firstStylingInput = this._firstStylingInput || entry;
     this.hasBindings = true;
     return entry;
   }
@@ -453,6 +456,15 @@ export class StylingBuilder {
     };
   }
 
+  private _buildSanitizerFn() {
+    return {
+      sourceSpan: this._firstStylingInput ? this._firstStylingInput.sourceSpan : null,
+      reference: R3.styleSanitizer,
+      allocateBindingSlots: 0,
+      buildParams: () => [o.importExpr(R3.defaultStyleSanitizer)]
+    };
+  }
+
   /**
    * Constructs all instructions which contain the expressions that will be placed
    * into the update block of a template function or a directive hostBindings function.
@@ -460,6 +472,9 @@ export class StylingBuilder {
   buildUpdateLevelInstructions(valueConverter: ValueConverter) {
     const instructions: Instruction[] = [];
     if (this.hasBindings) {
+      if (compilerIsNewStylingInUse() && this._useDefaultSanitizer) {
+        instructions.push(this._buildSanitizerFn());
+      }
       const styleMapInstruction = this.buildStyleMapInstruction(valueConverter);
       if (styleMapInstruction) {
         instructions.push(styleMapInstruction);
diff --git a/packages/core/src/render3/debug.ts b/packages/core/src/render3/debug.ts
index e8d9997b76..0d186a5568 100644
--- a/packages/core/src/render3/debug.ts
+++ b/packages/core/src/render3/debug.ts
@@ -195,8 +195,8 @@ export function toDebugNodes(tNode: TNode | null, lView: LView): DebugNode[]|nul
       let styles: DebugNewStyling|null = null;
       let classes: DebugNewStyling|null = null;
       if (runtimeIsNewStylingInUse()) {
-        styles = tNode.newStyles ? new NodeStylingDebug(tNode.newStyles, lView) : null;
-        classes = tNode.newClasses ? new NodeStylingDebug(tNode.newClasses, lView) : null;
+        styles = tNode.newStyles ? new NodeStylingDebug(tNode.newStyles, lView, false) : null;
+        classes = tNode.newClasses ? new NodeStylingDebug(tNode.newClasses, lView, true) : null;
       }
 
       debugNodes.push({
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 61c5c0daf7..a85c4255e2 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -102,6 +102,7 @@ export {
   ɵɵselect,
   ɵɵstyleMap,
   ɵɵstyleProp,
+  ɵɵstyleSanitizer,
   ɵɵstyling,
   ɵɵstylingApply,
   ɵɵtemplate,
diff --git a/packages/core/src/render3/instructions/all.ts b/packages/core/src/render3/instructions/all.ts
index b876f4980c..ab291b1cb4 100644
--- a/packages/core/src/render3/instructions/all.ts
+++ b/packages/core/src/render3/instructions/all.ts
@@ -45,5 +45,6 @@ export * from './property';
 export * from './property_interpolation';
 export * from './select';
 export * from './styling';
+export {styleSanitizer as ɵɵstyleSanitizer} from '../styling_next/instructions';
 export * from './text';
 export * from './text_interpolation';
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index b40dff1843..c48a3a02ae 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -121,6 +121,7 @@ export const angularCoreEnv: {[name: string]: Function} =
        'ɵɵstyling': r3.ɵɵstyling,
        'ɵɵstyleMap': r3.ɵɵstyleMap,
        'ɵɵstyleProp': r3.ɵɵstyleProp,
+       'ɵɵstyleSanitizer': r3.ɵɵstyleSanitizer,
        'ɵɵstylingApply': r3.ɵɵstylingApply,
        'ɵɵclassProp': r3.ɵɵclassProp,
        'ɵɵselect': r3.ɵɵselect,
diff --git a/packages/core/src/render3/styling/class_and_style_bindings.ts b/packages/core/src/render3/styling/class_and_style_bindings.ts
index 4a30e99837..f90b1ca6f2 100644
--- a/packages/core/src/render3/styling/class_and_style_bindings.ts
+++ b/packages/core/src/render3/styling/class_and_style_bindings.ts
@@ -5,7 +5,7 @@
 * 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 {StyleSanitizeFn} from '../../sanitization/style_sanitizer';
+import {StyleSanitizeFn, StyleSanitizeMode} from '../../sanitization/style_sanitizer';
 import {EMPTY_ARRAY, EMPTY_OBJ} from '../empty';
 import {AttributeMarker, TAttributes} from '../interfaces/node';
 import {BindingStore, BindingType, Player, PlayerBuilder, PlayerFactory, PlayerIndex} from '../interfaces/player';
@@ -943,7 +943,9 @@ function updateSingleStylingValue(
     if (currDirective !== directiveIndex) {
       const prop = getProp(context, singleIndex);
       const sanitizer = getStyleSanitizer(context, directiveIndex);
-      setSanitizeFlag(context, singleIndex, (sanitizer && sanitizer(prop)) ? true : false);
+      setSanitizeFlag(
+          context, singleIndex,
+          (sanitizer && sanitizer(prop, null, StyleSanitizeMode.ValidateProperty)) ? true : false);
     }
 
     // the value will always get updated (even if the dirty flag is skipped)
@@ -1141,7 +1143,8 @@ export function setStyle(
     native: any, prop: string, value: string | null, renderer: Renderer3,
     sanitizer: StyleSanitizeFn | null, store?: BindingStore | null,
     playerBuilder?: ClassAndStylePlayerBuilder<any>| null) {
-  value = sanitizer && value ? sanitizer(prop, value) : value;
+  value =
+      sanitizer && value ? sanitizer(prop, value, StyleSanitizeMode.ValidateAndSanitize) : value;
   if (store || playerBuilder) {
     if (store) {
       store.setValue(prop, value);
@@ -1461,7 +1464,9 @@ function valueExists(value: string | null | boolean, isClassBased?: boolean) {
 function prepareInitialFlag(
     context: StylingContext, prop: string, entryIsClassBased: boolean,
     sanitizer?: StyleSanitizeFn | null) {
-  let flag = (sanitizer && sanitizer(prop)) ? StylingFlags.Sanitize : StylingFlags.None;
+  let flag = (sanitizer && sanitizer(prop, null, StyleSanitizeMode.ValidateProperty)) ?
+      StylingFlags.Sanitize :
+      StylingFlags.None;
 
   let initialIndex: number;
   if (entryIsClassBased) {
diff --git a/packages/core/src/render3/styling_next/bindings.ts b/packages/core/src/render3/styling_next/bindings.ts
index ab69e63da8..728a64f2d3 100644
--- a/packages/core/src/render3/styling_next/bindings.ts
+++ b/packages/core/src/render3/styling_next/bindings.ts
@@ -5,10 +5,11 @@
 * 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 {StyleSanitizeFn, StyleSanitizeMode} from '../../sanitization/style_sanitizer';
 import {ProceduralRenderer3, RElement, Renderer3, RendererStyleFlags3, isProceduralRenderer} from '../interfaces/renderer';
 
-import {ApplyStylingFn, LStylingData, LStylingMap, StylingMapsSyncMode, SyncStylingMapsFn, TStylingContext, TStylingContextIndex} from './interfaces';
-import {allowStylingFlush, getBindingValue, getGuardMask, getProp, getPropValuesStartPosition, getValuesCount, hasValueChanged, isContextLocked, isStylingValueDefined, lockContext} from './util';
+import {ApplyStylingFn, LStylingData, LStylingMap, StylingMapsSyncMode, SyncStylingMapsFn, TStylingContext, TStylingContextIndex, TStylingContextPropConfigFlags} from './interfaces';
+import {allowStylingFlush, getBindingValue, getGuardMask, getProp, getPropValuesStartPosition, getValuesCount, hasValueChanged, isContextLocked, isSanitizationRequired, isStylingValueDefined, lockContext, setGuardMask} from './util';
 
 
 /**
@@ -49,7 +50,7 @@ let currentStyleIndex = STYLING_INDEX_START_VALUE;
 let currentClassIndex = STYLING_INDEX_START_VALUE;
 let stylesBitMask = 0;
 let classesBitMask = 0;
-let deferredBindingQueue: (TStylingContext | number | string | null)[] = [];
+let deferredBindingQueue: (TStylingContext | number | string | null | boolean)[] = [];
 
 /**
  * Visits a class-based binding and updates the new value (if changed).
@@ -64,11 +65,11 @@ let deferredBindingQueue: (TStylingContext | number | string | null)[] = [];
 export function updateClassBinding(
     context: TStylingContext, data: LStylingData, prop: string | null, bindingIndex: number,
     value: boolean | string | null | undefined | LStylingMap, deferRegistration: boolean,
-    forceUpdate?: boolean): void {
+    forceUpdate: boolean): void {
   const isMapBased = !prop;
   const index = isMapBased ? STYLING_INDEX_FOR_MAP_BINDING : currentClassIndex++;
   const updated = updateBindingData(
-      context, data, index, prop, bindingIndex, value, deferRegistration, forceUpdate);
+      context, data, index, prop, bindingIndex, value, deferRegistration, forceUpdate, false);
   if (updated || forceUpdate) {
     classesBitMask |= 1 << index;
   }
@@ -86,12 +87,16 @@ export function updateClassBinding(
  */
 export function updateStyleBinding(
     context: TStylingContext, data: LStylingData, prop: string | null, bindingIndex: number,
-    value: String | string | number | null | undefined | LStylingMap, deferRegistration: boolean,
-    forceUpdate?: boolean): void {
+    value: String | string | number | null | undefined | LStylingMap,
+    sanitizer: StyleSanitizeFn | null, deferRegistration: boolean, forceUpdate: boolean): void {
   const isMapBased = !prop;
   const index = isMapBased ? STYLING_INDEX_FOR_MAP_BINDING : currentStyleIndex++;
+  const sanitizationRequired = isMapBased ?
+      true :
+      (sanitizer ? sanitizer(prop !, null, StyleSanitizeMode.ValidateProperty) : false);
   const updated = updateBindingData(
-      context, data, index, prop, bindingIndex, value, deferRegistration, forceUpdate);
+      context, data, index, prop, bindingIndex, value, deferRegistration, forceUpdate,
+      sanitizationRequired);
   if (updated || forceUpdate) {
     stylesBitMask |= 1 << index;
   }
@@ -114,10 +119,10 @@ function updateBindingData(
     context: TStylingContext, data: LStylingData, counterIndex: number, prop: string | null,
     bindingIndex: number,
     value: string | String | number | boolean | null | undefined | LStylingMap,
-    deferRegistration?: boolean, forceUpdate?: boolean): boolean {
+    deferRegistration: boolean, forceUpdate: boolean, sanitizationRequired: boolean): boolean {
   if (!isContextLocked(context)) {
     if (deferRegistration) {
-      deferBindingRegistration(context, counterIndex, prop, bindingIndex);
+      deferBindingRegistration(context, counterIndex, prop, bindingIndex, sanitizationRequired);
     } else {
       deferredBindingQueue.length && flushDeferredBindings();
 
@@ -127,7 +132,7 @@ function updateBindingData(
       // update pass is executed (remember that all styling instructions
       // are run in the update phase, and, as a result, are no more
       // styling instructions that are run in the creation phase).
-      registerBinding(context, counterIndex, prop, bindingIndex);
+      registerBinding(context, counterIndex, prop, bindingIndex, sanitizationRequired);
     }
   }
 
@@ -150,8 +155,9 @@ function updateBindingData(
  * after the inheritance chain exits.
  */
 function deferBindingRegistration(
-    context: TStylingContext, counterIndex: number, prop: string | null, bindingIndex: number) {
-  deferredBindingQueue.splice(0, 0, context, counterIndex, prop, bindingIndex);
+    context: TStylingContext, counterIndex: number, prop: string | null, bindingIndex: number,
+    sanitizationRequired: boolean) {
+  deferredBindingQueue.unshift(context, counterIndex, prop, bindingIndex, sanitizationRequired);
 }
 
 /**
@@ -165,7 +171,8 @@ function flushDeferredBindings() {
     const count = deferredBindingQueue[i++] as number;
     const prop = deferredBindingQueue[i++] as string;
     const bindingIndex = deferredBindingQueue[i++] as number | null;
-    registerBinding(context, count, prop, bindingIndex);
+    const sanitizationRequired = deferredBindingQueue[i++] as boolean;
+    registerBinding(context, count, prop, bindingIndex, sanitizationRequired);
   }
   deferredBindingQueue.length = 0;
 }
@@ -208,7 +215,7 @@ function flushDeferredBindings() {
  */
 export function registerBinding(
     context: TStylingContext, countId: number, prop: string | null,
-    bindingValue: number | null | string | boolean) {
+    bindingValue: number | null | string | boolean, sanitizationRequired?: boolean) {
   // prop-based bindings (e.g `<div [style.width]="w" [class.foo]="f">`)
   if (prop) {
     let found = false;
@@ -220,7 +227,7 @@ export function registerBinding(
       if (found) {
         // all style/class bindings are sorted by property name
         if (prop < p) {
-          allocateNewContextEntry(context, i, prop);
+          allocateNewContextEntry(context, i, prop, sanitizationRequired);
         }
         addBindingIntoContext(context, false, i, bindingValue, countId);
         break;
@@ -229,7 +236,7 @@ export function registerBinding(
     }
 
     if (!found) {
-      allocateNewContextEntry(context, context.length, prop);
+      allocateNewContextEntry(context, context.length, prop, sanitizationRequired);
       addBindingIntoContext(context, false, i, bindingValue, countId);
     }
   } else {
@@ -241,15 +248,18 @@ export function registerBinding(
   }
 }
 
-function allocateNewContextEntry(context: TStylingContext, index: number, prop: string) {
+function allocateNewContextEntry(
+    context: TStylingContext, index: number, prop: string, sanitizationRequired?: boolean) {
   // 1,2: splice index locations
-  // 3: each entry gets a guard mask value that is used to check against updates
+  // 3: each entry gets a config value (guard mask + flags)
   // 4. each entry gets a size value (which is always one because there is always a default binding
   // value)
   // 5. the property that is getting allocated into the context
   // 6. the default binding value (usually `null`)
-  context.splice(
-      index, 0, DEFAULT_GUARD_MASK_VALUE, DEFAULT_SIZE_VALUE, prop, DEFAULT_BINDING_VALUE);
+  const config = sanitizationRequired ? TStylingContextPropConfigFlags.SanitizationRequired :
+                                        TStylingContextPropConfigFlags.Default;
+  context.splice(index, 0, config, DEFAULT_SIZE_VALUE, prop, DEFAULT_BINDING_VALUE);
+  setGuardMask(context, index, DEFAULT_GUARD_MASK_VALUE);
 }
 
 /**
@@ -285,7 +295,12 @@ function addBindingIntoContext(
   if (typeof bindingValue === 'number') {
     context.splice(lastValueIndex, 0, bindingValue);
     (context[index + TStylingContextIndex.ValuesCountOffset] as number)++;
-    (context[index + TStylingContextIndex.GuardOffset] as number) |= 1 << countId;
+
+    // now that a new binding index has been added to the property
+    // the guard mask bit value (at the `countId` position) needs
+    // to be included into the existing mask value.
+    const guardMask = getGuardMask(context, index) | (1 << countId);
+    setGuardMask(context, index, guardMask);
   } else if (typeof bindingValue === 'string' && context[lastValueIndex] == null) {
     context[lastValueIndex] = bindingValue;
   }
@@ -294,37 +309,49 @@ function addBindingIntoContext(
 /**
  * Applies all class entries in the provided context to the provided element and resets
  * any counter and/or bitMask values associated with class bindings.
+ *
+ * @returns whether or not the classes were flushed to the element.
  */
 export function applyClasses(
     renderer: Renderer3 | ProceduralRenderer3 | null, data: LStylingData, context: TStylingContext,
-    element: RElement, directiveIndex: number) {
+    element: RElement, directiveIndex: number): boolean {
+  let classesFlushed = false;
   if (allowStylingFlush(context, directiveIndex)) {
     const isFirstPass = !isContextLocked(context);
     isFirstPass && lockContext(context);
     if (classesBitMask) {
-      applyStyling(context, renderer, element, data, classesBitMask, setClass);
+      // there is no way to sanitize a class value therefore `sanitizer=null`
+      applyStyling(context, renderer, element, data, classesBitMask, setClass, null);
       classesBitMask = 0;
+      classesFlushed = true;
     }
     currentClassIndex = STYLING_INDEX_START_VALUE;
   }
+  return classesFlushed;
 }
 
 /**
  * Applies all style entries in the provided context to the provided element and resets
  * any counter and/or bitMask values associated with style bindings.
+ *
+ * @returns whether or not the styles were flushed to the element.
  */
 export function applyStyles(
     renderer: Renderer3 | ProceduralRenderer3 | null, data: LStylingData, context: TStylingContext,
-    element: RElement, directiveIndex: number) {
+    element: RElement, directiveIndex: number, sanitizer: StyleSanitizeFn | null): boolean {
+  let stylesFlushed = false;
   if (allowStylingFlush(context, directiveIndex)) {
     const isFirstPass = !isContextLocked(context);
     isFirstPass && lockContext(context);
     if (stylesBitMask) {
-      applyStyling(context, renderer, element, data, stylesBitMask, setStyle);
+      applyStyling(context, renderer, element, data, stylesBitMask, setStyle, sanitizer);
       stylesBitMask = 0;
+      stylesFlushed = true;
     }
     currentStyleIndex = STYLING_INDEX_START_VALUE;
+    return true;
   }
+  return stylesFlushed;
 }
 
 /**
@@ -355,7 +382,8 @@ export function applyStyles(
  */
 export function applyStyling(
     context: TStylingContext, renderer: Renderer3 | ProceduralRenderer3 | null, element: RElement,
-    bindingData: LStylingData, bitMaskValue: number | boolean, applyStylingFn: ApplyStylingFn) {
+    bindingData: LStylingData, bitMaskValue: number | boolean, applyStylingFn: ApplyStylingFn,
+    sanitizer: StyleSanitizeFn | null) {
   deferredBindingQueue.length && flushDeferredBindings();
 
   const bitMask = normalizeBitMaskValue(bitMaskValue);
@@ -380,9 +408,12 @@ export function applyStyling(
       // value gets set for the styling binding
       for (let j = 0; j < valuesCountUpToDefault; j++) {
         const bindingIndex = getBindingValue(context, i, j) as number;
-        const valueToApply = bindingData[bindingIndex];
-        if (isStylingValueDefined(valueToApply)) {
-          applyStylingFn(renderer, element, prop, valueToApply, bindingIndex);
+        const value = bindingData[bindingIndex];
+        if (isStylingValueDefined(value)) {
+          const finalValue = sanitizer && isSanitizationRequired(context, i) ?
+              sanitizer(prop, value, StyleSanitizeMode.SanitizeOnly) :
+              value;
+          applyStylingFn(renderer, element, prop, finalValue, bindingIndex);
           valueApplied = true;
           break;
         }
@@ -397,7 +428,8 @@ export function applyStyling(
         const mode = mapsMode | (valueApplied ? StylingMapsSyncMode.SkipTargetProp :
                                                 StylingMapsSyncMode.ApplyTargetProp);
         const valueAppliedWithinMap = stylingMapsSyncFn(
-            context, renderer, element, bindingData, applyStylingFn, mode, prop, defaultValue);
+            context, renderer, element, bindingData, applyStylingFn, sanitizer, mode, prop,
+            defaultValue);
         valueApplied = valueApplied || valueAppliedWithinMap;
       }
 
@@ -417,7 +449,7 @@ export function applyStyling(
   // values. For this reason, one more call to the sync function
   // needs to be issued at the end.
   if (stylingMapsSyncFn) {
-    stylingMapsSyncFn(context, renderer, element, bindingData, applyStylingFn, mapsMode);
+    stylingMapsSyncFn(context, renderer, element, bindingData, applyStylingFn, sanitizer, mapsMode);
   }
 }
 
diff --git a/packages/core/src/render3/styling_next/instructions.ts b/packages/core/src/render3/styling_next/instructions.ts
index 902a71a661..f565579a2b 100644
--- a/packages/core/src/render3/styling_next/instructions.ts
+++ b/packages/core/src/render3/styling_next/instructions.ts
@@ -5,20 +5,24 @@
 * 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 {Sanitizer} from '../../sanitization/security';
+import {StyleSanitizeFn} from '../../sanitization/style_sanitizer';
 import {LContainer} from '../interfaces/container';
 import {AttributeMarker, TAttributes, TNode, TNodeType} from '../interfaces/node';
 import {RElement} from '../interfaces/renderer';
 import {StylingContext as OldStylingContext, StylingIndex as OldStylingIndex} from '../interfaces/styling';
-import {BINDING_INDEX, HEADER_OFFSET, HOST, LView, RENDERER} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, HOST, LView, RENDERER, SANITIZER} from '../interfaces/view';
 import {getActiveDirectiveId, getActiveDirectiveSuperClassDepth, getActiveDirectiveSuperClassHeight, getLView, getSelectedIndex} from '../state';
 import {NO_CHANGE} from '../tokens';
+import {renderStringify} from '../util/misc_utils';
 import {getTNode, isStylingContext as isOldStylingContext} from '../util/view_utils';
 
 import {applyClasses, applyStyles, registerBinding, updateClassBinding, updateStyleBinding} from './bindings';
 import {TStylingContext} from './interfaces';
 import {activeStylingMapFeature, normalizeIntoStylingMap} from './map_based_bindings';
+import {getCurrentStyleSanitizer, setCurrentStyleSanitizer} from './state';
 import {attachStylingDebugObject} from './styling_debug';
-import {allocStylingContext, hasValueChanged, updateContextDirectiveIndex} from './util';
+import {allocTStylingContext, getCurrentOrLViewSanitizer, hasValueChanged, updateContextDirectiveIndex} from './util';
 
 
 
@@ -51,12 +55,32 @@ export function stylingInit() {
   updateLastDirectiveIndex(tNode, getActiveDirectiveStylingIndex());
 }
 
+/**
+ * Sets the current style sanitizer function which will then be used
+ * within all follow-up prop and map-based style binding instructions
+ * for the given element.
+ *
+ * Note that once styling has been applied to the element (i.e. once
+ * `select(n)` is executed or the hostBindings/template function exits)
+ * then the active `sanitizerFn` will be set to `null`. This means that
+ * once styling is applied to another element then a another call to
+ * `styleSanitizer` will need to be made.
+ *
+ * @param sanitizerFn The sanitization function that will be used to
+ *       process style prop/value entries.
+ *
+ * @codeGenApi
+ */
+export function styleSanitizer(sanitizer: Sanitizer | StyleSanitizeFn | null): void {
+  setCurrentStyleSanitizer(sanitizer);
+}
+
 /**
  * Mirror implementation of the `styleProp()` instruction (found in `instructions/styling.ts`).
  */
 export function styleProp(
     prop: string, value: string | number | String | null, suffix?: string | null): void {
-  _stylingProp(prop, value, false);
+  _stylingProp(prop, resolveStylePropValue(value, suffix), false);
 }
 
 /**
@@ -79,10 +103,12 @@ function _stylingProp(
   if (isClassBased) {
     updateClassBinding(
         getClassesContext(tNode), lView, prop, bindingIndex, value as string | boolean | null,
-        defer);
+        defer, false);
   } else {
+    const sanitizer = getCurrentOrLViewSanitizer(lView);
     updateStyleBinding(
-        getStylesContext(tNode), lView, prop, bindingIndex, value as string | null, defer);
+        getStylesContext(tNode), lView, prop, bindingIndex, value as string | null, sanitizer,
+        defer, false);
   }
 }
 
@@ -122,8 +148,10 @@ function _stylingMap(value: {[key: string]: any} | string | null, isClassBased:
       updateClassBinding(
           getClassesContext(tNode), lView, null, bindingIndex, lStylingMap, defer, valueHasChanged);
     } else {
+      const sanitizer = getCurrentOrLViewSanitizer(lView);
       updateStyleBinding(
-          getStylesContext(tNode), lView, null, bindingIndex, lStylingMap, defer, valueHasChanged);
+          getStylesContext(tNode), lView, null, bindingIndex, lStylingMap, sanitizer, defer,
+          valueHasChanged);
     }
   }
 }
@@ -151,7 +179,11 @@ export function stylingApply() {
   const native = getNativeFromLView(index, lView);
   const directiveIndex = getActiveDirectiveStylingIndex();
   applyClasses(renderer, lView, getClassesContext(tNode), native, directiveIndex);
-  applyStyles(renderer, lView, getStylesContext(tNode), native, directiveIndex);
+
+  const sanitizer = getCurrentOrLViewSanitizer(lView);
+  applyStyles(renderer, lView, getStylesContext(tNode), native, directiveIndex, sanitizer);
+
+  setCurrentStyleSanitizer(null);
 }
 
 /**
@@ -202,10 +234,10 @@ export function registerInitialStylingIntoContext(
       mode = attr;
     } else if (mode == AttributeMarker.Classes) {
       classesContext = classesContext || getClassesContext(tNode);
-      registerBinding(classesContext, -1, attr as string, true);
+      registerBinding(classesContext, -1, attr as string, true, false);
     } else if (mode == AttributeMarker.Styles) {
       stylesContext = stylesContext || getStylesContext(tNode);
-      registerBinding(stylesContext, -1, attr as string, attrs[++i] as string);
+      registerBinding(stylesContext, -1, attr as string, attrs[++i] as string, false);
     }
   }
 }
@@ -254,7 +286,7 @@ function getClassesContext(tNode: TNode): TStylingContext {
 function getContext(tNode: TNode, isClassBased: boolean) {
   let context = isClassBased ? tNode.newClasses : tNode.newStyles;
   if (!context) {
-    context = allocStylingContext();
+    context = allocTStylingContext();
     if (ngDevMode) {
       attachStylingDebugObject(context);
     }
@@ -266,3 +298,22 @@ function getContext(tNode: TNode, isClassBased: boolean) {
   }
   return context;
 }
+
+function resolveStylePropValue(
+    value: string | number | String | null, suffix: string | null | undefined) {
+  let resolvedValue: string|null = null;
+  if (value !== null) {
+    if (suffix) {
+      // when a suffix is applied then it will bypass
+      // sanitization entirely (b/c a new string is created)
+      resolvedValue = renderStringify(value) + suffix;
+    } else {
+      // sanitization happens by dealing with a String value
+      // this means that the string value will be passed through
+      // into the style rendering later (which is where the value
+      // will be sanitized before it is applied)
+      resolvedValue = value as any as string;
+    }
+  }
+  return resolvedValue;
+}
diff --git a/packages/core/src/render3/styling_next/interfaces.ts b/packages/core/src/render3/styling_next/interfaces.ts
index 3887474f23..3d99d9cbd5 100644
--- a/packages/core/src/render3/styling_next/interfaces.ts
+++ b/packages/core/src/render3/styling_next/interfaces.ts
@@ -5,6 +5,7 @@
 * 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 {StyleSanitizeFn} from '../../sanitization/style_sanitizer';
 import {ProceduralRenderer3, RElement, Renderer3} from '../interfaces/renderer';
 import {LView} from '../interfaces/view';
 
@@ -200,16 +201,16 @@ import {LView} from '../interfaces/view';
  * In order to figure out which value to apply, the following
  * binding prioritization is adhered to:
  *
- * 1. First template-level styling bindings are applied (if present).
- *    This includes things like `[style.width]` and `[class.active]`.
+ *   1. First template-level styling bindings are applied (if present).
+ *      This includes things like `[style.width]` and `[class.active]`.
  *
- * 2. Second are styling-level host bindings present in directives.
- *    (if there are sub/super directives present then the sub directives
- *    are applied first).
+ *   2. Second are styling-level host bindings present in directives.
+ *      (if there are sub/super directives present then the sub directives
+ *      are applied first).
  *
- * 3. Third are styling-level host bindings present in components.
- *    (if there are sub/super components present then the sub directives
- *    are applied first).
+ *   3. Third are styling-level host bindings present in components.
+ *      (if there are sub/super components present then the sub directives
+ *      are applied first).
  *
  * This means that in the code above the styling binding present in the
  * template is applied first and, only if its falsy, then the directive
@@ -225,7 +226,39 @@ import {LView} from '../interfaces/view';
  * For the algorithm to apply styling values efficiently, the
  * styling map entries must be applied in sync (property by property)
  * with prop-based bindings. (The map-based algorithm is described
- * more inside of the `render3/stlying_next/map_based_bindings.ts` file.)
+ * more inside of the `render3/styling_next/map_based_bindings.ts` file.)
+ *
+ * ## Sanitization
+ * Sanitization is used to prevent invalid style values from being applied to
+ * the element.
+ *
+ * It is enabled in two cases:
+ *
+ *   1. The `styleSanitizer(sanitizerFn)` instruction was called (just before any other
+ *      styling instructions are run).
+ *
+ *   2. The component/directive `LView` instance has a sanitizer object attached to it
+ *      (this happens when `renderComponent` is executed with a `sanitizer` value or
+ *      if the ngModule contains a sanitizer provider attached to it).
+ *
+ * If and when sanitization is active then all property/value entries will be evaluated
+ * through the active sanitizer before they are applied to the element (or the styling
+ * debug handler).
+ *
+ * If a `Sanitizer` object is used (via the `LView[SANITIZER]` value) then that object
+ * will be used for every property.
+ *
+ * If a `StyleSanitizerFn` function is used (via the `styleSanitizer`) then it will be
+ * called in two ways:
+ *
+ *   1. property validation mode: this will be called early to mark whether a property
+ *      should be sanitized or not at during the flushing stage.
+ *
+ *   2. value sanitization mode: this will be called during the flushing stage and will
+ *      run the sanitizer function against the value before applying it to the element.
+ *
+ * If sanitization returns an empty value then that empty value will be applied
+ * to the element.
  */
 export interface TStylingContext extends Array<number|string|number|boolean|null|LStylingMap> {
   /** Configuration data for the context */
@@ -289,12 +322,22 @@ export const enum TStylingContextIndex {
 
   // each tuple entry in the context
   // (mask, count, prop, ...bindings||default-value)
-  GuardOffset = 0,
+  ConfigAndGuardOffset = 0,
   ValuesCountOffset = 1,
   PropOffset = 2,
   BindingsStartOffset = 3,
 }
 
+/**
+ * A series of flags used for each property entry within the `TStylingContext`.
+ */
+export const enum TStylingContextPropConfigFlags {
+  Default = 0b0,
+  SanitizationRequired = 0b1,
+  TotalBits = 1,
+  Mask = 0b1,
+}
+
 /**
  * A function used to apply or remove styling from an element for a given property.
  */
@@ -370,8 +413,8 @@ export const enum LStylingMapIndex {
  */
 export interface SyncStylingMapsFn {
   (context: TStylingContext, renderer: Renderer3|ProceduralRenderer3|null, element: RElement,
-   data: LStylingData, applyStylingFn: ApplyStylingFn, mode: StylingMapsSyncMode,
-   targetProp?: string|null, defaultValue?: string|null): boolean;
+   data: LStylingData, applyStylingFn: ApplyStylingFn, sanitizer: StyleSanitizeFn|null,
+   mode: StylingMapsSyncMode, targetProp?: string|null, defaultValue?: string|null): boolean;
 }
 
 /**
diff --git a/packages/core/src/render3/styling_next/map_based_bindings.ts b/packages/core/src/render3/styling_next/map_based_bindings.ts
index b0c5573abd..d24f67eec4 100644
--- a/packages/core/src/render3/styling_next/map_based_bindings.ts
+++ b/packages/core/src/render3/styling_next/map_based_bindings.ts
@@ -5,6 +5,7 @@
 * 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 {StyleSanitizeFn, StyleSanitizeMode} from '../../sanitization/style_sanitizer';
 import {ProceduralRenderer3, RElement, Renderer3} from '../interfaces/renderer';
 
 import {setStylingMapsSyncFn} from './bindings';
@@ -103,8 +104,9 @@ import {getBindingValue, getValuesCount, isStylingValueDefined} from './util';
  */
 export const syncStylingMap: SyncStylingMapsFn =
     (context: TStylingContext, renderer: Renderer3 | ProceduralRenderer3 | null, element: RElement,
-     data: LStylingData, applyStylingFn: ApplyStylingFn, mode: StylingMapsSyncMode,
-     targetProp?: string | null, defaultValue?: string | null): boolean => {
+     data: LStylingData, applyStylingFn: ApplyStylingFn, sanitizer: StyleSanitizeFn | null,
+     mode: StylingMapsSyncMode, targetProp?: string | null,
+     defaultValue?: string | null): boolean => {
       let targetPropValueWasApplied = false;
 
       // once the map-based styling code is activate it is never deactivated. For this reason a
@@ -125,8 +127,8 @@ export const syncStylingMap: SyncStylingMapsFn =
 
         if (runTheSyncAlgorithm) {
           targetPropValueWasApplied = innerSyncStylingMap(
-              context, renderer, element, data, applyStylingFn, mode, targetProp || null, 0,
-              defaultValue || null);
+              context, renderer, element, data, applyStylingFn, sanitizer, mode, targetProp || null,
+              0, defaultValue || null);
         }
 
         if (loopUntilEnd) {
@@ -148,8 +150,9 @@ export const syncStylingMap: SyncStylingMapsFn =
  */
 function innerSyncStylingMap(
     context: TStylingContext, renderer: Renderer3 | ProceduralRenderer3 | null, element: RElement,
-    data: LStylingData, applyStylingFn: ApplyStylingFn, mode: StylingMapsSyncMode,
-    targetProp: string | null, currentMapIndex: number, defaultValue: string | null): boolean {
+    data: LStylingData, applyStylingFn: ApplyStylingFn, sanitizer: StyleSanitizeFn | null,
+    mode: StylingMapsSyncMode, targetProp: string | null, currentMapIndex: number,
+    defaultValue: string | null): boolean {
   let targetPropValueWasApplied = false;
 
   const totalMaps = getValuesCount(context, TStylingContextIndex.MapBindingsPosition);
@@ -176,7 +179,7 @@ function innerSyncStylingMap(
           iteratedTooFar ? mode : resolveInnerMapMode(mode, valueIsDefined, isTargetPropMatched);
       const innerProp = iteratedTooFar ? targetProp : prop;
       let valueApplied = innerSyncStylingMap(
-          context, renderer, element, data, applyStylingFn, innerMode, innerProp,
+          context, renderer, element, data, applyStylingFn, sanitizer, innerMode, innerProp,
           currentMapIndex + 1, defaultValue);
 
       if (iteratedTooFar) {
@@ -187,7 +190,10 @@ function innerSyncStylingMap(
         const useDefault = isTargetPropMatched && !valueIsDefined;
         const valueToApply = useDefault ? defaultValue : value;
         const bindingIndexToApply = useDefault ? bindingIndex : null;
-        applyStylingFn(renderer, element, prop, valueToApply, bindingIndexToApply);
+        const finalValue = sanitizer ?
+            sanitizer(prop, valueToApply, StyleSanitizeMode.ValidateAndSanitize) :
+            valueToApply;
+        applyStylingFn(renderer, element, prop, finalValue, bindingIndexToApply);
         valueApplied = true;
       }
 
diff --git a/packages/core/src/render3/styling_next/state.ts b/packages/core/src/render3/styling_next/state.ts
index d4c5d281e2..50e42c6807 100644
--- a/packages/core/src/render3/styling_next/state.ts
+++ b/packages/core/src/render3/styling_next/state.ts
@@ -5,6 +5,21 @@
 * 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 {Sanitizer} from '../../sanitization/security';
+import {StyleSanitizeFn} from '../../sanitization/style_sanitizer';
+
+/**
+ * --------
+ *
+ * This file contains temporary code to incorporate the new styling refactor
+ * code to work alongside the existing instruction set.
+ *
+ * This file will be removed once `select(n)` is fully functional (once
+ * it is able to evaluate host bindings in sync element-by-element
+ * with template code).
+ *
+ * --------
+ */
 
 /**
  * A temporary enum of states that inform the core whether or not
@@ -35,3 +50,12 @@ export function runtimeIsNewStylingInUse() {
 export function runtimeAllowOldStyling() {
   return _stylingMode < RuntimeStylingMode.UseNew;
 }
+
+let _currentSanitizer: Sanitizer|StyleSanitizeFn|null;
+export function setCurrentStyleSanitizer(sanitizer: Sanitizer | StyleSanitizeFn | null) {
+  _currentSanitizer = sanitizer;
+}
+
+export function getCurrentStyleSanitizer() {
+  return _currentSanitizer;
+}
diff --git a/packages/core/src/render3/styling_next/styling_debug.ts b/packages/core/src/render3/styling_next/styling_debug.ts
index ac54022e93..2f78274321 100644
--- a/packages/core/src/render3/styling_next/styling_debug.ts
+++ b/packages/core/src/render3/styling_next/styling_debug.ts
@@ -5,13 +5,19 @@
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://angular.io/license
 */
+import {Sanitizer} from '../../sanitization/security';
+import {StyleSanitizeFn} from '../../sanitization/style_sanitizer';
 import {RElement} from '../interfaces/renderer';
+import {LView, SANITIZER} from '../interfaces/view';
 import {attachDebugObject} from '../util/debug_utils';
 
 import {applyStyling} from './bindings';
 import {ApplyStylingFn, LStylingData, TStylingContext, TStylingContextIndex} from './interfaces';
 import {activeStylingMapFeature} from './map_based_bindings';
-import {getDefaultValue, getGuardMask, getProp, getValuesCount, isContextLocked, isMapBased} from './util';
+import {getCurrentStyleSanitizer} from './state';
+import {getCurrentOrLViewSanitizer, getDefaultValue, getGuardMask, getProp, getValuesCount, isContextLocked, isMapBased, isSanitizationRequired} from './util';
+
+
 
 /**
  * --------
@@ -59,6 +65,11 @@ export interface DebugStyling {
    * runtime values.
    */
   values: {[key: string]: string | number | null | boolean};
+
+  /**
+   * Overrides the sanitizer used to process styles.
+   */
+  overrideSanitizer(sanitizer: StyleSanitizeFn|null): void;
 }
 
 /**
@@ -77,6 +88,11 @@ export interface TStylingTupleSummary {
    */
   guardMask: number;
 
+  /**
+   * Whether or not the entry requires sanitization
+   */
+  sanitizationRequired: boolean;
+
   /**
    * The default value that will be applied if any bindings are falsy.
    */
@@ -127,6 +143,7 @@ class TStylingContextDebug {
         const prop = getProp(context, i);
         const guardMask = getGuardMask(context, i);
         const defaultValue = getDefaultValue(context, i);
+        const sanitizationRequired = isSanitizationRequired(context, i);
         const bindingsStartPosition = i + TStylingContextIndex.BindingsStartOffset;
 
         const sources: (number | string | null)[] = [];
@@ -134,7 +151,7 @@ class TStylingContextDebug {
           sources.push(context[bindingsStartPosition + j] as number | string | null);
         }
 
-        entries[prop] = {prop, guardMask, valuesCount, defaultValue, sources};
+        entries[prop] = {prop, guardMask, sanitizationRequired, valuesCount, defaultValue, sources};
       }
 
       i += TStylingContextIndex.BindingsStartOffset + valuesCount;
@@ -150,7 +167,16 @@ class TStylingContextDebug {
  * application has `ngDevMode` activated.
  */
 export class NodeStylingDebug implements DebugStyling {
-  constructor(public context: TStylingContext, private _data: LStylingData) {}
+  private _sanitizer: StyleSanitizeFn|null = null;
+
+  constructor(
+      public context: TStylingContext, private _data: LStylingData,
+      private _isClassBased?: boolean) {}
+
+  /**
+   * Overrides the sanitizer used to process styles.
+   */
+  overrideSanitizer(sanitizer: StyleSanitizeFn|null) { this._sanitizer = sanitizer; }
 
   /**
    * Returns a detailed summary of each styling entry in the context and
@@ -190,6 +216,8 @@ export class NodeStylingDebug implements DebugStyling {
           fn(prop, value, bindingIndex || null);
         };
 
-    applyStyling(this.context, null, mockElement, this._data, true, mapFn);
+    const sanitizer = this._isClassBased ? null : (this._sanitizer ||
+                                                   getCurrentOrLViewSanitizer(this._data as LView));
+    applyStyling(this.context, null, mockElement, this._data, true, mapFn, sanitizer);
   }
 }
diff --git a/packages/core/src/render3/styling_next/util.ts b/packages/core/src/render3/styling_next/util.ts
index 3a21ba5fbb..494738403a 100644
--- a/packages/core/src/render3/styling_next/util.ts
+++ b/packages/core/src/render3/styling_next/util.ts
@@ -5,10 +5,14 @@
 * 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 {Sanitizer, SecurityContext} from '../../sanitization/security';
+import {StyleSanitizeFn, StyleSanitizeMode} from '../../sanitization/style_sanitizer';
 import {StylingContext} from '../interfaces/styling';
+import {LView, SANITIZER} from '../interfaces/view';
 import {getProp as getOldProp, getSinglePropIndexValue as getOldSinglePropIndexValue} from '../styling/class_and_style_bindings';
 
-import {LStylingMap, LStylingMapIndex, TStylingConfigFlags, TStylingContext, TStylingContextIndex} from './interfaces';
+import {LStylingMap, LStylingMapIndex, TStylingConfigFlags, TStylingContext, TStylingContextIndex, TStylingContextPropConfigFlags} from './interfaces';
+import {getCurrentStyleSanitizer, setCurrentStyleSanitizer} from './state';
 
 const MAP_BASED_ENTRY_PROP_NAME = '--MAP--';
 
@@ -18,8 +22,14 @@ const MAP_BASED_ENTRY_PROP_NAME = '--MAP--';
  * This function will also pre-fill the context with data
  * for map-based bindings.
  */
-export function allocStylingContext(): TStylingContext {
-  return [TStylingConfigFlags.Initial, 0, 0, 0, MAP_BASED_ENTRY_PROP_NAME];
+export function allocTStylingContext(): TStylingContext {
+  // because map-based bindings deal with a dynamic set of values, there
+  // is no way to know ahead of time whether or not sanitization is required.
+  // For this reason the configuration will always mark sanitization as active
+  // (this means that when map-based values are applied then sanitization will
+  // be checked against each property).
+  const mapBasedConfig = TStylingContextPropConfigFlags.SanitizationRequired;
+  return [TStylingConfigFlags.Initial, 0, mapBasedConfig, 0, MAP_BASED_ENTRY_PROP_NAME];
 }
 
 /**
@@ -53,8 +63,24 @@ export function getProp(context: TStylingContext, index: number) {
   return context[index + TStylingContextIndex.PropOffset] as string;
 }
 
+function getPropConfig(context: TStylingContext, index: number): number {
+  return (context[index + TStylingContextIndex.ConfigAndGuardOffset] as number) &
+      TStylingContextPropConfigFlags.Mask;
+}
+
+export function isSanitizationRequired(context: TStylingContext, index: number) {
+  return (getPropConfig(context, index) & TStylingContextPropConfigFlags.SanitizationRequired) > 0;
+}
+
 export function getGuardMask(context: TStylingContext, index: number) {
-  return context[index + TStylingContextIndex.GuardOffset] as number;
+  const configGuardValue = context[index + TStylingContextIndex.ConfigAndGuardOffset] as number;
+  return configGuardValue >> TStylingContextPropConfigFlags.TotalBits;
+}
+
+export function setGuardMask(context: TStylingContext, index: number, maskValue: number) {
+  const config = getPropConfig(context, index);
+  const guardMask = maskValue << TStylingContextPropConfigFlags.TotalBits;
+  context[index + TStylingContextIndex.ConfigAndGuardOffset] = config | guardMask;
 }
 
 export function getValuesCount(context: TStylingContext, index: number) {
@@ -115,3 +141,36 @@ export function isStylingValueDefined(value: any) {
   // set a value to an empty string to remove it.
   return value != null && value !== '';
 }
+
+/**
+ * Returns the current style sanitizer function for the given view.
+ *
+ * The default style sanitizer (which lives inside of `LView`) will
+ * be returned depending on whether the `styleSanitizer` instruction
+ * was called or not prior to any styling instructions running.
+ */
+export function getCurrentOrLViewSanitizer(lView: LView): StyleSanitizeFn|null {
+  const sanitizer: StyleSanitizeFn|null = (getCurrentStyleSanitizer() || lView[SANITIZER]) as any;
+  if (sanitizer && typeof sanitizer !== 'function') {
+    setCurrentStyleSanitizer(sanitizer);
+    return sanitizeUsingSanitizerObject;
+  }
+  return sanitizer;
+}
+
+/**
+ * Style sanitization function that internally uses a `Sanitizer` instance to handle style
+ * sanitization.
+ */
+const sanitizeUsingSanitizerObject: StyleSanitizeFn =
+    (prop: string, value: string, mode: StyleSanitizeMode) => {
+      const sanitizer = getCurrentStyleSanitizer() as Sanitizer;
+      if (sanitizer) {
+        if (mode & StyleSanitizeMode.SanitizeOnly) {
+          return sanitizer.sanitize(SecurityContext.STYLE, value);
+        } else {
+          return true;
+        }
+      }
+      return value;
+    };
diff --git a/packages/core/src/sanitization/sanitization.ts b/packages/core/src/sanitization/sanitization.ts
index 1d05760c6d..92953d694a 100644
--- a/packages/core/src/sanitization/sanitization.ts
+++ b/packages/core/src/sanitization/sanitization.ts
@@ -13,7 +13,7 @@ import {renderStringify} from '../render3/util/misc_utils';
 import {BypassType, allowSanitizationBypass} from './bypass';
 import {_sanitizeHtml as _sanitizeHtml} from './html_sanitizer';
 import {Sanitizer, SecurityContext} from './security';
-import {StyleSanitizeFn, _sanitizeStyle as _sanitizeStyle} from './style_sanitizer';
+import {StyleSanitizeFn, StyleSanitizeMode, _sanitizeStyle as _sanitizeStyle} from './style_sanitizer';
 import {_sanitizeUrl as _sanitizeUrl} from './url_sanitizer';
 
 
@@ -183,15 +183,22 @@ export function ɵɵsanitizeUrlOrResourceUrl(unsafeUrl: any, tag: string, prop:
  *
  * @publicApi
  */
-export const ɵɵdefaultStyleSanitizer = (function(prop: string, value?: string): string | boolean {
-  if (value === undefined) {
-    return prop === 'background-image' || prop === 'background' || prop === 'border-image' ||
-        prop === 'filter' || prop === 'list-style' || prop === 'list-style-image' ||
-        prop === 'clip-path';
-  }
+export const ɵɵdefaultStyleSanitizer =
+    (function(prop: string, value: string|null, mode?: StyleSanitizeMode): string | boolean | null {
+      mode = mode || StyleSanitizeMode.ValidateAndSanitize;
+      let doSanitizeValue = true;
+      if (mode & StyleSanitizeMode.ValidateProperty) {
+        doSanitizeValue = prop === 'background-image' || prop === 'background' ||
+            prop === 'border-image' || prop === 'filter' || prop === 'list-style' ||
+            prop === 'list-style-image' || prop === 'clip-path';
+      }
 
-  return ɵɵsanitizeStyle(value);
-} as StyleSanitizeFn);
+      if (mode & StyleSanitizeMode.SanitizeOnly) {
+        return doSanitizeValue ? ɵɵsanitizeStyle(value) : value;
+      } else {
+        return doSanitizeValue;
+      }
+    } as StyleSanitizeFn);
 
 export function validateAgainstEventProperties(name: string) {
   if (name.toLowerCase().startsWith('on')) {
diff --git a/packages/core/src/sanitization/style_sanitizer.ts b/packages/core/src/sanitization/style_sanitizer.ts
index 62a6ecbe59..9303a167a1 100644
--- a/packages/core/src/sanitization/style_sanitizer.ts
+++ b/packages/core/src/sanitization/style_sanitizer.ts
@@ -103,6 +103,30 @@ export function _sanitizeStyle(value: string): string {
 }
 
 
+/**
+ * A series of flags to instruct a style sanitizer to either validate
+ * or sanitize a value.
+ *
+ * Because sanitization is dependent on the style property (i.e. style
+ * sanitization for `width` is much different than for `background-image`)
+ * the sanitization function (e.g. `StyleSanitizerFn`) needs to check a
+ * property value first before it actually sanitizes any values.
+ *
+ * This enum exist to allow a style sanitization function to either only
+ * do validation (check the property to see whether a value will be
+ * sanitized or not) or to sanitize the value (or both).
+ *
+ * @publicApi
+ */
+export const enum StyleSanitizeMode {
+  /** Just check to see if the property is required to be sanitized or not */
+  ValidateProperty = 0b01,
+  /** Skip checking the property; just sanitize the value */
+  SanitizeOnly = 0b10,
+  /** Check the property and (if true) then sanitize the value */
+  ValidateAndSanitize = 0b11,
+}
+
 /**
  * Used to intercept and sanitize style values before they are written to the renderer.
  *
@@ -111,9 +135,5 @@ export function _sanitizeStyle(value: string): string {
  * If a value is provided then the sanitized version of that will be returned.
  */
 export interface StyleSanitizeFn {
-  /** This mode is designed to instruct whether the property will be used for sanitization
-   * at a later point */
-  (prop: string): boolean;
-  /** This mode is designed to sanitize the provided value */
-  (prop: string, value: string): string;
+  (prop: string, value: string|null, mode?: StyleSanitizeMode): any;
 }
diff --git a/packages/core/test/acceptance/styling_next_spec.ts b/packages/core/test/acceptance/styling_next_spec.ts
index 73bd958a35..8186a241e8 100644
--- a/packages/core/test/acceptance/styling_next_spec.ts
+++ b/packages/core/test/acceptance/styling_next_spec.ts
@@ -7,11 +7,15 @@
  */
 import {CompilerStylingMode, compilerSetStylingMode} from '@angular/compiler/src/render3/view/styling_state';
 import {Component, Directive, HostBinding, Input, ViewChild} from '@angular/core';
+import {SecurityContext} from '@angular/core/src/core';
+import {getLContext} from '@angular/core/src/render3/context_discovery';
 import {DebugNode, LViewDebug, toDebug} from '@angular/core/src/render3/debug';
+import {SANITIZER} from '@angular/core/src/render3/interfaces/view';
 import {RuntimeStylingMode, runtimeSetStylingMode} from '@angular/core/src/render3/styling_next/state';
 import {loadLContextFromNode} from '@angular/core/src/render3/util/discovery_utils';
 import {ngDevModeResetPerfCounters as resetStylingCounters} from '@angular/core/src/util/ng_dev_mode';
 import {TestBed} from '@angular/core/testing';
+import {DomSanitizer, SafeStyle} from '@angular/platform-browser';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {onlyInIvy} from '@angular/private/testing';
 
@@ -574,6 +578,161 @@ describe('new styling integration', () => {
             assertStyle(element, 'color', 'blue');
             assertStyle(element, 'opacity', '');
           });
+
+  onlyInIvy('only ivy has style/class bindings debugging support')
+      .it('should sanitize style values before writing them', () => {
+        @Component({
+          template: `
+                <div [style.width]="widthExp"
+                     [style.background-image]="bgImageExp"
+                     [style]="styleMapExp"></div>
+              `
+        })
+        class Cmp {
+          widthExp = '';
+          bgImageExp = '';
+          styleMapExp: any = {};
+        }
+
+        TestBed.configureTestingModule({declarations: [Cmp]});
+        const fixture = TestBed.createComponent(Cmp);
+        const comp = fixture.componentInstance;
+        fixture.detectChanges();
+
+        const element = fixture.nativeElement.querySelector('div');
+        const node = getDebugNode(element) !;
+        const styles = node.styles !;
+
+        const lastSanitizedProps: any[] = [];
+        styles.overrideSanitizer((prop, value) => {
+          lastSanitizedProps.push(prop);
+          return value;
+        });
+
+        comp.bgImageExp = '123';
+        fixture.detectChanges();
+
+        expect(styles.values).toEqual({
+          'background-image': '123',
+          'width': null,
+        });
+
+        expect(lastSanitizedProps).toEqual(['background-image']);
+        lastSanitizedProps.length = 0;
+
+        comp.styleMapExp = {'clip-path': '456'};
+        fixture.detectChanges();
+
+        expect(styles.values).toEqual({
+          'background-image': '123',
+          'clip-path': '456',
+          'width': null,
+        });
+
+        expect(lastSanitizedProps).toEqual(['background-image', 'clip-path']);
+        lastSanitizedProps.length = 0;
+
+        comp.widthExp = '789px';
+        fixture.detectChanges();
+
+        expect(styles.values).toEqual({
+          'background-image': '123',
+          'clip-path': '456',
+          'width': '789px',
+        });
+
+        expect(lastSanitizedProps).toEqual(['background-image', 'clip-path']);
+        lastSanitizedProps.length = 0;
+      });
+
+  onlyInIvy('only ivy has style/class bindings debugging support')
+      .it('should apply a unit to a style before writing it', () => {
+        @Component({
+          template: `
+            <div [style.width.px]="widthExp"
+                 [style.height.em]="heightExp"></div>
+          `
+        })
+        class Cmp {
+          widthExp: string|number|null = '';
+          heightExp: string|number|null = '';
+        }
+
+        TestBed.configureTestingModule({declarations: [Cmp]});
+        const fixture = TestBed.createComponent(Cmp);
+        const comp = fixture.componentInstance;
+        fixture.detectChanges();
+
+        const element = fixture.nativeElement.querySelector('div');
+        const node = getDebugNode(element) !;
+        const styles = node.styles !;
+
+        comp.widthExp = '200';
+        comp.heightExp = 10;
+        fixture.detectChanges();
+
+        expect(styles.values).toEqual({
+          'width': '200px',
+          'height': '10em',
+        });
+
+        comp.widthExp = 0;
+        comp.heightExp = null;
+        fixture.detectChanges();
+
+        expect(styles.values).toEqual({
+          'width': '0px',
+          'height': null,
+        });
+      });
+
+  onlyInIvy('only ivy has style/class bindings debugging support')
+      .it('should pick up and use the sanitizer present in the lView', () => {
+        @Component({
+          template: `
+            <div [style.width]="w"></div>
+          `
+        })
+        class Cmp {
+          w = '100px';
+        }
+
+        TestBed.configureTestingModule({declarations: [Cmp]});
+        const fixture = TestBed.createComponent(Cmp);
+        const comp = fixture.componentInstance;
+        fixture.detectChanges();
+
+        const element = fixture.nativeElement.querySelector('div');
+        const lView = getLContext(element) !.lView;
+        lView[SANITIZER] = new MockSanitizer(value => { return `${value}-safe`; });
+
+        comp.w = '200px';
+        fixture.detectChanges();
+
+        const node = getDebugNode(element) !;
+        const styles = node.styles !;
+        expect(styles.values['width']).toEqual('200px-safe');
+      });
+
+  it('should be able to bind a SafeValue to clip-path', () => {
+    @Component({template: '<div [style.clip-path]="path"></div>'})
+    class Cmp {
+      path !: SafeStyle;
+    }
+
+    TestBed.configureTestingModule({declarations: [Cmp]});
+    const fixture = TestBed.createComponent(Cmp);
+    const sanitizer: DomSanitizer = TestBed.get(DomSanitizer);
+
+    fixture.componentInstance.path = sanitizer.bypassSecurityTrustStyle('url("#test")');
+    fixture.detectChanges();
+
+    const html = fixture.nativeElement.innerHTML;
+
+    // Note that check the raw HTML, because (at the time of writing) the Node-based renderer
+    // that we use to run tests doesn't support `clip-path` in `CSSStyleDeclaration`.
+    expect(html).toMatch(/style=["|']clip-path:\s*url\(.*#test.*\)/);
+  });
 });
 
 function assertStyleCounters(countForSet: number, countForRemove: number) {
@@ -597,3 +756,8 @@ function getDebugNode(element: Node): DebugNode|null {
   }
   return null;
 }
+
+class MockSanitizer {
+  constructor(private _interceptorFn: ((value: any) => any)) {}
+  sanitize(context: SecurityContext, value: any): string|null { return this._interceptorFn(value); }
+}
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index 0488845316..9fa46ba84c 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -192,7 +192,7 @@
     "name": "allocStylingContext"
   },
   {
-    "name": "allocStylingContext"
+    "name": "allocTStylingContext"
   },
   {
     "name": "allocateNewContextEntry"
@@ -362,6 +362,9 @@
   {
     "name": "getGlobal"
   },
+  {
+    "name": "getGuardMask"
+  },
   {
     "name": "getHighestElementOrICUContainer"
   },
@@ -434,6 +437,9 @@
   {
     "name": "getProp"
   },
+  {
+    "name": "getPropConfig"
+  },
   {
     "name": "getPropValuesStartPosition"
   },
@@ -686,6 +692,9 @@
   {
     "name": "setCurrentQueryIndex"
   },
+  {
+    "name": "setGuardMask"
+  },
   {
     "name": "setHostBindings"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 216119ff48..494d759a4f 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -230,6 +230,9 @@
   {
     "name": "SWITCH_VIEW_CONTAINER_REF_FACTORY"
   },
+  {
+    "name": "SecurityContext"
+  },
   {
     "name": "SkipSelf"
   },
@@ -444,7 +447,7 @@
     "name": "allocStylingContext"
   },
   {
-    "name": "allocStylingContext"
+    "name": "allocTStylingContext"
   },
   {
     "name": "allocateNewContextEntry"
@@ -785,6 +788,12 @@
   {
     "name": "getContextLView"
   },
+  {
+    "name": "getCurrentOrLViewSanitizer"
+  },
+  {
+    "name": "getCurrentStyleSanitizer"
+  },
   {
     "name": "getDebugContext"
   },
@@ -935,6 +944,9 @@
   {
     "name": "getProp"
   },
+  {
+    "name": "getPropConfig"
+  },
   {
     "name": "getPropValuesStartPosition"
   },
@@ -1151,6 +1163,9 @@
   {
     "name": "isRootView"
   },
+  {
+    "name": "isSanitizationRequired"
+  },
   {
     "name": "isStylingContext"
   },
@@ -1343,6 +1358,9 @@
   {
     "name": "runtimeIsNewStylingInUse"
   },
+  {
+    "name": "sanitizeUsingSanitizerObject"
+  },
   {
     "name": "saveNameToExportMap"
   },
@@ -1391,12 +1409,18 @@
   {
     "name": "setCurrentQueryIndex"
   },
+  {
+    "name": "setCurrentStyleSanitizer"
+  },
   {
     "name": "setDirty"
   },
   {
     "name": "setFlag"
   },
+  {
+    "name": "setGuardMask"
+  },
   {
     "name": "setHostBindings"
   },
diff --git a/packages/core/test/render3/styling/class_and_style_bindings_spec.ts b/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
index 3dfecb239f..4f6120edd2 100644
--- a/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
+++ b/packages/core/test/render3/styling/class_and_style_bindings_spec.ts
@@ -23,7 +23,7 @@ import {registerHostDirective} from '../../../src/render3/styling/host_instructi
 import {BoundPlayerFactory, bindPlayerFactory} from '../../../src/render3/styling/player_factory';
 import {allocStylingContext, createEmptyStylingContext} from '../../../src/render3/styling/util';
 import {ɵɵdefaultStyleSanitizer} from '../../../src/sanitization/sanitization';
-import {StyleSanitizeFn} from '../../../src/sanitization/style_sanitizer';
+import {StyleSanitizeFn, StyleSanitizeMode} from '../../../src/sanitization/style_sanitizer';
 import {ComponentFixture, renderToHtml} from '../render_util';
 
 import {MockPlayer} from './mock_player';
@@ -2991,11 +2991,16 @@ describe('style and class based bindings', () => {
     });
 
     it('should sanitize styles before they are passed into the player', () => {
-      const sanitizer = (function(prop: string, value?: string): string | boolean {
-        if (value === undefined) {
-          return prop === 'width' || prop === 'height';
+      const sanitizer = (function(prop: string, value: string, mode: StyleSanitizeMode): any {
+        let allow = true;
+        if (mode & StyleSanitizeMode.ValidateProperty) {
+          allow = prop === 'width' || prop === 'height';
+        }
+
+        if (mode & StyleSanitizeMode.SanitizeOnly) {
+          return allow ? `${value}-safe!` : value;
         } else {
-          return `${value}-safe!`;
+          return allow;
         }
       }) as StyleSanitizeFn;
 
diff --git a/packages/core/test/render3/styling_next/styling_context_spec.ts b/packages/core/test/render3/styling_next/styling_context_spec.ts
index f3788528c1..e84137ba6b 100644
--- a/packages/core/test/render3/styling_next/styling_context_spec.ts
+++ b/packages/core/test/render3/styling_next/styling_context_spec.ts
@@ -7,8 +7,7 @@
  */
 import {DEFAULT_GUARD_MASK_VALUE, registerBinding} from '@angular/core/src/render3/styling_next/bindings';
 import {attachStylingDebugObject} from '@angular/core/src/render3/styling_next/styling_debug';
-
-import {allocStylingContext} from '../../../src/render3/styling_next/util';
+import {allocTStylingContext} from '../../../src/render3/styling_next/util';
 
 describe('styling context', () => {
   it('should register a series of entries into the context', () => {
@@ -20,6 +19,7 @@ describe('styling context', () => {
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
+      sanitizationRequired: false,
       guardMask: buildGuardMask(),
       defaultValue: '100px',
       sources: ['100px'],
@@ -28,6 +28,7 @@ describe('styling context', () => {
     registerBinding(context, 2, 'width', 20);
     expect(debug.entries['width']).toEqual({
       prop: 'width',
+      sanitizationRequired: false,
       valuesCount: 2,
       guardMask: buildGuardMask(2),
       defaultValue: '100px',
@@ -39,6 +40,7 @@ describe('styling context', () => {
     expect(debug.entries['height']).toEqual({
       prop: 'height',
       valuesCount: 3,
+      sanitizationRequired: false,
       guardMask: buildGuardMask(3, 4),
       defaultValue: null,
       sources: [10, 15, null],
@@ -50,9 +52,11 @@ describe('styling context', () => {
     const context = debug.context;
 
     registerBinding(context, 1, 'width', null);
+    const x = debug.entries['width'];
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
+      sanitizationRequired: false,
       guardMask: buildGuardMask(),
       defaultValue: null,
       sources: [null]
@@ -62,6 +66,7 @@ describe('styling context', () => {
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
+      sanitizationRequired: false,
       guardMask: buildGuardMask(),
       defaultValue: '100px',
       sources: ['100px']
@@ -71,6 +76,7 @@ describe('styling context', () => {
     expect(debug.entries['width']).toEqual({
       prop: 'width',
       valuesCount: 1,
+      sanitizationRequired: false,
       guardMask: buildGuardMask(),
       defaultValue: '100px',
       sources: ['100px']
@@ -79,7 +85,7 @@ describe('styling context', () => {
 });
 
 function makeContextWithDebug() {
-  const ctx = allocStylingContext();
+  const ctx = allocTStylingContext();
   return attachStylingDebugObject(ctx);
 }
 
diff --git a/packages/core/test/render3/styling_next/styling_debug_spec.ts b/packages/core/test/render3/styling_next/styling_debug_spec.ts
index 499685974e..138def5d09 100644
--- a/packages/core/test/render3/styling_next/styling_debug_spec.ts
+++ b/packages/core/test/render3/styling_next/styling_debug_spec.ts
@@ -7,7 +7,7 @@
  */
 import {registerBinding} from '@angular/core/src/render3/styling_next/bindings';
 import {NodeStylingDebug, attachStylingDebugObject} from '@angular/core/src/render3/styling_next/styling_debug';
-import {allocStylingContext} from '@angular/core/src/render3/styling_next/util';
+import {allocTStylingContext} from '@angular/core/src/render3/styling_next/util';
 
 describe('styling debugging tools', () => {
   describe('NodeStylingDebug', () => {
@@ -64,6 +64,6 @@ describe('styling debugging tools', () => {
 });
 
 function makeContextWithDebug() {
-  const ctx = allocStylingContext();
+  const ctx = allocTStylingContext();
   return attachStylingDebugObject(ctx);
 }

From 1a98d51f98434a9758a911ccd389bae2c9b7605b Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Thu, 30 May 2019 13:37:54 +0200
Subject: [PATCH 210/275] docs: change wording for more clarity in TypeScript
 Configuration guide (#30748)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"You need to do nothing" indicates the presence of an action (the action of doing nothing) while the goal is to tell the user that no action is required from them. I think "You don’t need to do anything" is better suitable in this context.

PR Close #30748
---
 aio/content/guide/typescript-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/typescript-configuration.md b/aio/content/guide/typescript-configuration.md
index 61f5c3d0dd..172ab7248c 100644
--- a/aio/content/guide/typescript-configuration.md
+++ b/aio/content/guide/typescript-configuration.md
@@ -106,7 +106,7 @@ Many libraries include definition files in their npm packages where both the Typ
 can find them. Angular is one such library.
 The `node_modules/@angular/core/` folder of any Angular application contains several `d.ts` files that describe parts of Angular.
 
-**You need to do nothing to get *typings* files for library packages that include `d.ts` files.
+**You don't need to do anything to get *typings* files for library packages that include `d.ts` files.
 Angular packages include them already.**
 
 ### lib.d.ts

From 7bf7244ba37d1669dbea4b05df559c3be6c4fac4 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Wed, 29 May 2019 23:07:20 +0200
Subject: [PATCH 211/275] docs(changelog): cleanup 8.0.0 release notes (#30740)

The removal of @angular/http is now mentioned under breaking changes.

This removes several duplicate entries from the changelog and removes
long and incorrect "closes" links to sources on Github. Those links were
present in the commit message and are incorrectly seen as issue references.

Additionally, code references are wrapped in backticks for proper formatting.

PR Close #30740
---
 CHANGELOG.md | 144 +++++++++++++++++++++++++--------------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61b45a21bb..6f657180ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,18 +4,18 @@
 
 ### Features
 
-* add support for TypeScript 3.3 (and drop older versions) ([#29004](https://github.com/angular/angular/issues/29004)) ([75748d6](https://github.com/angular/angular/commit/75748d6))
+* add support for TypeScript 3.4 (and drop older versions) ([#29372](https://github.com/angular/angular/issues/29372)) ([ef85336](https://github.com/angular/angular/commit/ef85336))
 * **common:** add ability to watch for AngularJS URL updates through `onUrlChange` hook ([#30466](https://github.com/angular/angular/issues/30466)) ([8022d36](https://github.com/angular/angular/commit/8022d36))
-* **common:** stricter types for SlicePipe ([#30156](https://github.com/angular/angular/issues/30156)) ([722b2fa](https://github.com/angular/angular/commit/722b2fa))
-* **bazel:** use rbe_autoconfig() and new container. ([#29336](https://github.com/angular/angular/issues/29336)) ([e562acc](https://github.com/angular/angular/commit/e562acc))
-* **common:** add [@angular](https://github.com/angular)/common/upgrade package for $location-related APIs ([#30055](https://github.com/angular/angular/issues/30055)) ([152d99e](https://github.com/angular/angular/commit/152d99e))
-* **common:** add ability to retrieve the state from Location service ([#30055](https://github.com/angular/angular/issues/30055)) ([b44b143](https://github.com/angular/angular/commit/b44b143))
+* **common:** stricter types for `SlicePipe` ([#30156](https://github.com/angular/angular/issues/30156)) ([722b2fa](https://github.com/angular/angular/commit/722b2fa))
+* **bazel:** use `rbe_autoconfig()` and new container ([#29336](https://github.com/angular/angular/issues/29336)) ([e562acc](https://github.com/angular/angular/commit/e562acc))
+* **common:** add @angular/common/upgrade package for `$location`-related APIs ([#30055](https://github.com/angular/angular/issues/30055)) ([152d99e](https://github.com/angular/angular/commit/152d99e))
+* **common:** add ability to retrieve the state from `Location` service ([#30055](https://github.com/angular/angular/issues/30055)) ([b44b143](https://github.com/angular/angular/commit/b44b143))
 * **common:** add ability to track all location changes ([#30055](https://github.com/angular/angular/issues/30055)) ([3a9cf3f](https://github.com/angular/angular/commit/3a9cf3f))
 * **common:** add APIs to read component pieces of URL ([#30055](https://github.com/angular/angular/issues/30055)) ([b635fe8](https://github.com/angular/angular/commit/b635fe8))
-* **common:** add MockPlatformLocation to enable more robust testing of Location services ([#30055](https://github.com/angular/angular/issues/30055)) ([d0672c2](https://github.com/angular/angular/commit/d0672c2))
-* **common:** add UrlCodec type for use with upgrade applications ([#30055](https://github.com/angular/angular/issues/30055)) ([ec455e1](https://github.com/angular/angular/commit/ec455e1))
+* **common:** add `MockPlatformLocation` to enable more robust testing of `Location` services ([#30055](https://github.com/angular/angular/issues/30055)) ([d0672c2](https://github.com/angular/angular/commit/d0672c2))
+* **common:** add `UrlCodec` type for use with upgrade applications ([#30055](https://github.com/angular/angular/issues/30055)) ([ec455e1](https://github.com/angular/angular/commit/ec455e1))
 * **common:** provide replacement for AngularJS $location service ([#30055](https://github.com/angular/angular/issues/30055)) ([4277600](https://github.com/angular/angular/commit/4277600))
-* remove deprecated DOCUMENT token from platform-browser ([#28117](https://github.com/angular/angular/issues/28117)) ([3a9d247](https://github.com/angular/angular/commit/3a9d247))
+* remove deprecated `DOCUMENT` token from platform-browser ([#28117](https://github.com/angular/angular/issues/28117)) ([3a9d247](https://github.com/angular/angular/commit/3a9d247))
 * **compiler:** support skipping leading trivia in template source-maps ([#30095](https://github.com/angular/angular/issues/30095)) ([304a12f](https://github.com/angular/angular/commit/304a12f))
 * **core:** add missing ARIA attributes to html sanitizer ([#29685](https://github.com/angular/angular/issues/29685)) ([909557d](https://github.com/angular/angular/commit/909557d)), closes [#26815](https://github.com/angular/angular/issues/26815)
 * **router:** deprecate loadChildren:string ([#30073](https://github.com/angular/angular/issues/30073)) ([c61df39](https://github.com/angular/angular/commit/c61df39))
@@ -24,28 +24,28 @@
 * **service-worker:** support bypassing SW with specific header/query param ([#30010](https://github.com/angular/angular/issues/30010)) ([6200732](https://github.com/angular/angular/commit/6200732)), closes [#21191](https://github.com/angular/angular/issues/21191)
 * **compiler-cli:** export tooling definitions ([#29929](https://github.com/angular/angular/issues/29929)) ([e1f51ea](https://github.com/angular/angular/commit/e1f51ea))
 * **compiler-cli:** lower some exported expressions ([#30038](https://github.com/angular/angular/issues/30038)) ([8e73f9b](https://github.com/angular/angular/commit/8e73f9b))
-* **core:** add schematics to move deprecated DOCUMENT import ([#29950](https://github.com/angular/angular/issues/29950)) ([645e305](https://github.com/angular/angular/commit/645e305))
+* **core:** add schematics to move deprecated `DOCUMENT` import ([#29950](https://github.com/angular/angular/issues/29950)) ([645e305](https://github.com/angular/angular/commit/645e305))
 * **bazel:** update the build to use the new architect api ([#29720](https://github.com/angular/angular/issues/29720)) ([902a53a](https://github.com/angular/angular/commit/902a53a))
-* remove [@angular](https://github.com/angular)/http dependency from [@angular](https://github.com/angular)/platform-server ([#29408](https://github.com/angular/angular/issues/29408)) ([9745f55](https://github.com/angular/angular/commit/9745f55))
+* remove @angular/http dependency from @angular/platform-server ([#29408](https://github.com/angular/angular/issues/29408)) ([9745f55](https://github.com/angular/angular/commit/9745f55))
 * **compiler-cli:** ngcc - make logging more configurable ([#29591](https://github.com/angular/angular/issues/29591)) ([8d3d75e](https://github.com/angular/angular/commit/8d3d75e))
-* **core:** Add "AbstractType<T>" interface ([#29295](https://github.com/angular/angular/issues/29295)) ([afd4a4e](https://github.com/angular/angular/commit/afd4a4e)), closes [#26491](https://github.com/angular/angular/issues/26491)
+* **core:** Add `AbstractType<T>` interface ([#29295](https://github.com/angular/angular/issues/29295)) ([afd4a4e](https://github.com/angular/angular/commit/afd4a4e)), closes [#26491](https://github.com/angular/angular/issues/26491)
 * **core:** template-var-assignment update schematic ([#29608](https://github.com/angular/angular/issues/29608)) ([7c8f4e3](https://github.com/angular/angular/commit/7c8f4e3))
 * **bazel:** Upgrade rules_nodejs and rules_sass ([#29388](https://github.com/angular/angular/issues/29388)) ([d6d081e](https://github.com/angular/angular/commit/d6d081e))
 * **service-worker:** support multiple apps on different subpaths of a domain ([#27080](https://github.com/angular/angular/issues/27080)) ([e721c08](https://github.com/angular/angular/commit/e721c08)), closes [#21388](https://github.com/angular/angular/issues/21388)
 * **bazel:** Eject Bazel ([#29167](https://github.com/angular/angular/issues/29167)) ([36a1550](https://github.com/angular/angular/commit/36a1550))
 * **bazel:** Hide Bazel files in Bazel builder ([#29110](https://github.com/angular/angular/issues/29110)) ([7060d90](https://github.com/angular/angular/commit/7060d90))
 * **forms:** clear (remove all) components from a FormArray ([#28918](https://github.com/angular/angular/issues/28918)) ([a68b1a1](https://github.com/angular/angular/commit/a68b1a1)), closes [#18531](https://github.com/angular/angular/issues/18531)
-* **platform-server:** wait on returned BEFORE_APP_SERIALIZED promises ([#29120](https://github.com/angular/angular/issues/29120)) ([7102ea8](https://github.com/angular/angular/commit/7102ea8))
+* **platform-server:** wait on returned `BEFORE_APP_SERIALIZED` promises ([#29120](https://github.com/angular/angular/issues/29120)) ([7102ea8](https://github.com/angular/angular/commit/7102ea8))
 
 
 ### Bug Fixes
 
-* **bazel:** allow ts_library interop with list-typed inputs ([#30600](https://github.com/angular/angular/issues/30600)) ([bf38df4](https://github.com/angular/angular/commit/bf38df4))
+* **bazel:** allow `ts_library` interop with list-typed inputs ([#30600](https://github.com/angular/angular/issues/30600)) ([bf38df4](https://github.com/angular/angular/commit/bf38df4))
 * **bazel:** Disable sandbox on Mac OS ([#30460](https://github.com/angular/angular/issues/30460)) ([3de26a8](https://github.com/angular/angular/commit/3de26a8))
 * **bazel:** ng test should run specific ts_web_test_suite ([#30526](https://github.com/angular/angular/issues/30526)) ([8bc4da8](https://github.com/angular/angular/commit/8bc4da8))
 * **core:** remove deprecated `TestBed.deprecatedOverrideProvider` API ([#30576](https://github.com/angular/angular/issues/30576)) ([5a46f94](https://github.com/angular/angular/commit/5a46f94))
 * **core:** require 'static' flag on queries in typings ([#30641](https://github.com/angular/angular/issues/30641)) ([c8af830](https://github.com/angular/angular/commit/c8af830))
-* **core:** temporarily remove [@deprecated](https://github.com/deprecated) jsdoc tag for a TextBed.get overload ([#30514](https://github.com/angular/angular/issues/30514)) ([561e01d](https://github.com/angular/angular/commit/561e01d)), closes [#29290](https://github.com/angular/angular/issues/29290) [#29905](https://github.com/angular/angular/issues/29905)
+* **core:** temporarily remove [@deprecated](https://github.com/deprecated) jsdoc tag for a `TextBed.get` overload ([#30514](https://github.com/angular/angular/issues/30514)) ([561e01d](https://github.com/angular/angular/commit/561e01d)), closes [#29290](https://github.com/angular/angular/issues/29290) [#29905](https://github.com/angular/angular/issues/29905)
 * **router:** type cast correctly for IE 11 bug breaking URL Unification when comparing objects ([#30464](https://github.com/angular/angular/issues/30464)) ([32daa93](https://github.com/angular/angular/commit/32daa93))
 * **bazel:** Directly spawn native Bazel binary ([#30306](https://github.com/angular/angular/issues/30306)) ([d1fcc2b](https://github.com/angular/angular/commit/d1fcc2b))
 * **bazel:** pass correct arguments to http_server in Windows ([#30346](https://github.com/angular/angular/issues/30346)) ([71eba45](https://github.com/angular/angular/commit/71eba45)), closes [#29785](https://github.com/angular/angular/issues/29785)
@@ -61,7 +61,7 @@
 * **core:** static-query usage migration strategy should detect ambiguous query usage ([#30215](https://github.com/angular/angular/issues/30215)) ([e295c6a](https://github.com/angular/angular/commit/e295c6a))
 * **router:** ensure navigations start with the current URL value incase redirect is skipped ([#30344](https://github.com/angular/angular/issues/30344)) ([9b88920](https://github.com/angular/angular/commit/9b88920)), closes [#30340](https://github.com/angular/angular/issues/30340) [#30160](https://github.com/angular/angular/issues/30160)
 * **router:** IE 11 bug can break URL unification when comparing objects ([#30393](https://github.com/angular/angular/issues/30393)) ([c383491](https://github.com/angular/angular/commit/c383491))
-* **bazel:** Bump ibazel to 0.10.1 for windows fixes ([#30196](https://github.com/angular/angular/issues/30196)) ([9f68c35](https://github.com/angular/angular/commit/9f68c35))
+* **bazel:** Bump ibazel to 0.10.1 for Windows fixes ([#30196](https://github.com/angular/angular/issues/30196)) ([9f68c35](https://github.com/angular/angular/commit/9f68c35))
 * **compiler-cli:** log ngcc skipping messages as debug instead of info ([#30232](https://github.com/angular/angular/issues/30232)) ([548b003](https://github.com/angular/angular/commit/548b003))
 * **core:** fix interpolate identifier in AOT ([#30243](https://github.com/angular/angular/issues/30243)) ([3fe3a84](https://github.com/angular/angular/commit/3fe3a84))
 * **router:** ensure `history.state` is set in `eager` update mode ([#30154](https://github.com/angular/angular/issues/30154)) ([9720227](https://github.com/angular/angular/commit/9720227))
@@ -71,57 +71,54 @@
 * **bazel:** Exclude common/upgrade* in metadata.tsconfig.json ([#30133](https://github.com/angular/angular/issues/30133)) ([6711f22](https://github.com/angular/angular/commit/6711f22))
 * **bazel:** update peerDep ranges ([#30155](https://github.com/angular/angular/issues/30155)) ([6067583](https://github.com/angular/angular/commit/6067583))
 * **bazel:** make name param in ng add optional ([#30074](https://github.com/angular/angular/issues/30074)) ([0b5f480](https://github.com/angular/angular/commit/0b5f480))
-* **bazel:** Make sure only single copy of `[@angular](https://github.com/angular)/bazel` is installed ([#30072](https://github.com/angular/angular/issues/30072)) ([2905bf5](https://github.com/angular/angular/commit/2905bf5))
+* **bazel:** Make sure only single copy of @angular/bazel is installed ([#30072](https://github.com/angular/angular/issues/30072)) ([2905bf5](https://github.com/angular/angular/commit/2905bf5))
 * **bazel:** transitive npm deps in ng_module ([#30065](https://github.com/angular/angular/issues/30065)) ([61365a9](https://github.com/angular/angular/commit/61365a9))
-* **common:** add upgrade sub-package to ng_package rule for [@angular](https://github.com/angular)/common ([#30117](https://github.com/angular/angular/issues/30117)) ([6de4cbd](https://github.com/angular/angular/commit/6de4cbd)), closes [#30055](https://github.com/angular/angular/issues/30055) [#30116](https://github.com/angular/angular/issues/30116)
-* **common:** adjust MockPlatformLocation to set state to new object ([#30055](https://github.com/angular/angular/issues/30055)) ([825efa8](https://github.com/angular/angular/commit/825efa8))
+* **common:** add upgrade sub-package to `ng_package` rule for @angular/common ([#30117](https://github.com/angular/angular/issues/30117)) ([6de4cbd](https://github.com/angular/angular/commit/6de4cbd)), closes [#30055](https://github.com/angular/angular/issues/30055) [#30116](https://github.com/angular/angular/issues/30116)
+* **common:** adjust `MockPlatformLocation` to set state to new object ([#30055](https://github.com/angular/angular/issues/30055)) ([825efa8](https://github.com/angular/angular/commit/825efa8))
 * **compiler:** Fix compiler crash due to isSkipSelf of null ([#30075](https://github.com/angular/angular/issues/30075)) ([28fd5ab](https://github.com/angular/angular/commit/28fd5ab))
 * **upgrade:** do not break if `onMicrotaskEmpty` emits while a `$digest` is in progress ([#29794](https://github.com/angular/angular/issues/29794)) ([0ddf2e7](https://github.com/angular/angular/commit/0ddf2e7)), closes [#24680](https://github.com/angular/angular/issues/24680) [/github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts#L12](https://github.com//github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts/issues/L12) [#24680](https://github.com/angular/angular/issues/24680)
 * **bazel:** do not typecheck core schematic files ([#29876](https://github.com/angular/angular/issues/29876)) ([2ba799d](https://github.com/angular/angular/commit/2ba799d))
-* **bazel:** restore ng build --prod ([#30005](https://github.com/angular/angular/issues/30005)) ([96a8289](https://github.com/angular/angular/commit/96a8289))
-* **common:** prevent repeated application of HttpParams mutations ([#29045](https://github.com/angular/angular/issues/29045)) ([8e8e89a](https://github.com/angular/angular/commit/8e8e89a)), closes [#20430](https://github.com/angular/angular/issues/20430)
-* **common:** async pipe will properly check when it recieves an NaN value from an observable ([#22305](https://github.com/angular/angular/issues/22305)) ([3f6bf6d](https://github.com/angular/angular/commit/3f6bf6d)), closes [#15721](https://github.com/angular/angular/issues/15721)
-* **core:** don't include a local `EventListener` in typings ([#29809](https://github.com/angular/angular/issues/29809)) ([4bde40f](https://github.com/angular/angular/commit/4bde40f)), closes [/github.com/angular/angular/blob/303eae918d997070a36b523ddc97e018f622c258/packages/core/src/debug/debug_node.ts#L32](https://github.com//github.com/angular/angular/blob/303eae918d997070a36b523ddc97e018f622c258/packages/core/src/debug/debug_node.ts/issues/L32) [#29806](https://github.com/angular/angular/issues/29806)
-* **core:** use shakeable global definitions ([#29929](https://github.com/angular/angular/issues/29929)) ([e5905bb](https://github.com/angular/angular/commit/e5905bb)), closes [/github.com/angular/angular-cli/blob/5fc1f2499cbe57f9a95e4b0dfced130eb3a8046d/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts#L279-L282](https://github.com//github.com/angular/angular-cli/blob/5fc1f2499cbe57f9a95e4b0dfced130eb3a8046d/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts/issues/L279-L282)
+* **bazel:** restore `ng build --prod` ([#30005](https://github.com/angular/angular/issues/30005)) ([96a8289](https://github.com/angular/angular/commit/96a8289))
+* **common:** prevent repeated application of `HttpParams` mutations ([#29045](https://github.com/angular/angular/issues/29045)) ([8e8e89a](https://github.com/angular/angular/commit/8e8e89a)), closes [#20430](https://github.com/angular/angular/issues/20430)
+* **common:** async pipe will properly check when it receives an NaN value from an observable ([#22305](https://github.com/angular/angular/issues/22305)) ([3f6bf6d](https://github.com/angular/angular/commit/3f6bf6d)), closes [#15721](https://github.com/angular/angular/issues/15721)
+* **core:** don't include a local `EventListener` in typings ([#29809](https://github.com/angular/angular/issues/29809)) ([4bde40f](https://github.com/angular/angular/commit/4bde40f)), closes [#29806](https://github.com/angular/angular/issues/29806)
+* **core:** use shakeable global definitions ([#29929](https://github.com/angular/angular/issues/29929)) ([e5905bb](https://github.com/angular/angular/commit/e5905bb))
 * **language-service:** Use proper types instead of any ([#29942](https://github.com/angular/angular/issues/29942)) ([1a56cd5](https://github.com/angular/angular/commit/1a56cd5))
 * **bazel:** Install packages after `ng add` when invoked independently ([#29852](https://github.com/angular/angular/issues/29852)) ([bd2ce9c](https://github.com/angular/angular/commit/bd2ce9c))
-* **compiler-cli:** pass config path to ts.parseJsonConfigFileContent ([#29872](https://github.com/angular/angular/issues/29872)) ([86a3f90](https://github.com/angular/angular/commit/86a3f90)), closes [/github.com/Microsoft/TypeScript/blob/025d82633915b67003ea38ba40b9239a19721c13/src/compiler/emitter.ts#L56-L57](https://github.com//github.com/Microsoft/TypeScript/blob/025d82633915b67003ea38ba40b9239a19721c13/src/compiler/emitter.ts/issues/L56-L57)
+* **compiler-cli:** pass config path to `ts.parseJsonConfigFileContent` ([#29872](https://github.com/angular/angular/issues/29872)) ([86a3f90](https://github.com/angular/angular/commit/86a3f90))
 * **router:** support non-NgFactory promise in loadChildren typings ([#29832](https://github.com/angular/angular/issues/29832)) ([2bfb6a0](https://github.com/angular/angular/commit/2bfb6a0))
-* **bazel:** add configuration_env_vars = ["compile"] to generated [@npm](https://github.com/npm)//[@angular](https://github.com/angular)/bazel/bin:ngc-wrapped nodejs_binary ([#29694](https://github.com/angular/angular/issues/29694)) ([2e66ddf](https://github.com/angular/angular/commit/2e66ddf))
+* **bazel:** add `configuration_env_vars = ["compile"]` to generated `@npm//@angular/bazel/bin:ngc-wrapped` `nodejs_binary` ([#29694](https://github.com/angular/angular/issues/29694)) ([2e66ddf](https://github.com/angular/angular/commit/2e66ddf))
 * **bazel:** docs formatting ([#29817](https://github.com/angular/angular/issues/29817)) ([cc2e4b6](https://github.com/angular/angular/commit/cc2e4b6))
-* **bazel:** remove karma-jasmine from ts_web_test_suite ([#29695](https://github.com/angular/angular/issues/29695)) ([2bd9214](https://github.com/angular/angular/commit/2bd9214))
+* **bazel:** remove karma-jasmine from `ts_web_test_suite` ([#29695](https://github.com/angular/angular/issues/29695)) ([2bd9214](https://github.com/angular/angular/commit/2bd9214))
 * **bazel:** support running ng-add on minimal applications ([#29681](https://github.com/angular/angular/issues/29681)) ([9810c6c](https://github.com/angular/angular/commit/9810c6c)), closes [#29680](https://github.com/angular/angular/issues/29680)
 * **common:** add `@Injectable()` to common pipes ([#29834](https://github.com/angular/angular/issues/29834)) ([387fbb8](https://github.com/angular/angular/commit/387fbb8))
-* **compiler-cli:** ensure LogicalProjectPaths always start with a slash ([#29627](https://github.com/angular/angular/issues/29627)) ([e02684e](https://github.com/angular/angular/commit/e02684e))
+* **compiler-cli:** ensure `LogicalProjectPaths` always start with a slash ([#29627](https://github.com/angular/angular/issues/29627)) ([e02684e](https://github.com/angular/angular/commit/e02684e))
 * **core:** add missing migration to npm package ([#29705](https://github.com/angular/angular/issues/29705)) ([96b76dc](https://github.com/angular/angular/commit/96b76dc))
-* **core:** call ngOnDestroy for tree-shakeable providers ([#28943](https://github.com/angular/angular/issues/28943)) ([30b0442](https://github.com/angular/angular/commit/30b0442)), closes [#28927](https://github.com/angular/angular/issues/28927)
-* **core:** Deprecate TestBed.get(...):any ([#29290](https://github.com/angular/angular/issues/29290)) ([609024f](https://github.com/angular/angular/commit/609024f)), closes [#13785](https://github.com/angular/angular/issues/13785) [#26491](https://github.com/angular/angular/issues/26491)
+* **core:** call `ngOnDestroy` for tree-shakeable providers ([#28943](https://github.com/angular/angular/issues/28943)) ([30b0442](https://github.com/angular/angular/commit/30b0442)), closes [#28927](https://github.com/angular/angular/issues/28927)
+* **core:** Deprecate `TestBed.get(...):any` ([#29290](https://github.com/angular/angular/issues/29290)) ([609024f](https://github.com/angular/angular/commit/609024f)), closes [#13785](https://github.com/angular/angular/issues/13785) [#26491](https://github.com/angular/angular/issues/26491)
 * **core:** resolve ts compile issues due to lenient tsconfig ([#29843](https://github.com/angular/angular/issues/29843)) ([54058ba](https://github.com/angular/angular/commit/54058ba))
-* **platform-browser:** insert APP_ID in styles, contentAttr and hostAttr ([#17745](https://github.com/angular/angular/issues/17745)) ([712d60e](https://github.com/angular/angular/commit/712d60e))
-* **bazel:** use //:tsconfig.json as the default for ng_module ([#29670](https://github.com/angular/angular/issues/29670)) ([#29711](https://github.com/angular/angular/issues/29711)) ([9e33dc3](https://github.com/angular/angular/commit/9e33dc3))
-* **platform-browser:** insert APP_ID in styles, contentAttr and hostAttr ([#17745](https://github.com/angular/angular/issues/17745)) ([ca14509](https://github.com/angular/angular/commit/ca14509))
+* **platform-browser:** insert `APP_ID` in styles, contentAttr and hostAttr ([#17745](https://github.com/angular/angular/issues/17745)) ([712d60e](https://github.com/angular/angular/commit/712d60e))
 * **bazel:** Update schematics to support routing ([#29548](https://github.com/angular/angular/issues/29548)) ([401b8ee](https://github.com/angular/angular/commit/401b8ee))
-* **bazel:** use //:tsconfig.json as the default for ng_module ([#29670](https://github.com/angular/angular/issues/29670)) ([b14537a](https://github.com/angular/angular/commit/b14537a))
+* **bazel:** use `//:tsconfig.json` as the default for `ng_module` ([#29670](https://github.com/angular/angular/issues/29670)) ([b14537a](https://github.com/angular/angular/commit/b14537a))
 * **compiler-cli:** ngcc - cope with processing entry-points multiple times ([#29657](https://github.com/angular/angular/issues/29657)) ([6b39c9c](https://github.com/angular/angular/commit/6b39c9c))
 * **core:** static-query schematic should detect static queries in getters. ([#29609](https://github.com/angular/angular/issues/29609)) ([33016b8](https://github.com/angular/angular/commit/33016b8))
 * **common:** escape query selector used when anchor scrolling ([#29577](https://github.com/angular/angular/issues/29577)) ([7671c73](https://github.com/angular/angular/commit/7671c73)), closes [#28193](https://github.com/angular/angular/issues/28193)
 * **router:** adjust setting navigationTransition when a new navigation cancels an existing one ([#29636](https://github.com/angular/angular/issues/29636)) ([e884c0c](https://github.com/angular/angular/commit/e884c0c)), closes [#29389](https://github.com/angular/angular/issues/29389) [#29590](https://github.com/angular/angular/issues/29590)
-* **bazel:** allow ng_module users to set createExternalSymbolFactoryReexports ([#29459](https://github.com/angular/angular/issues/29459)) ([21be0fb](https://github.com/angular/angular/commit/21be0fb))
+* **bazel:** allow `ng_module` users to set `createExternalSymbolFactoryReexports` ([#29459](https://github.com/angular/angular/issues/29459)) ([21be0fb](https://github.com/angular/angular/commit/21be0fb))
 * **bazel:** workaround problem reading summary files from node_modules ([#29459](https://github.com/angular/angular/issues/29459)) ([769d960](https://github.com/angular/angular/commit/769d960))
 * **compiler:** inherit param types when class has a constructor which takes no declared parameters and delegates up ([#29232](https://github.com/angular/angular/issues/29232)) ([0007564](https://github.com/angular/angular/commit/0007564))
 * **core:** parse incorrect ML open tag as text ([#29328](https://github.com/angular/angular/issues/29328)) ([dafbbf8](https://github.com/angular/angular/commit/dafbbf8)), closes [#29231](https://github.com/angular/angular/issues/29231)
-* **core:** static-query schematic should detect queries in "ngDoCheck" and "ngOnChanges" ([#29492](https://github.com/angular/angular/issues/29492)) ([09fab58](https://github.com/angular/angular/commit/09fab58))
-* **router:** support NgFactory promise in loadChildren typings ([#29392](https://github.com/angular/angular/issues/29392)) ([26a8c59](https://github.com/angular/angular/commit/26a8c59))
+* **core:** static-query schematic should detect queries in `ngDoCheck` and `ngOnChanges` ([#29492](https://github.com/angular/angular/issues/29492)) ([09fab58](https://github.com/angular/angular/commit/09fab58))
+* **router:** support `NgFactory` promise in loadChildren typings ([#29392](https://github.com/angular/angular/issues/29392)) ([26a8c59](https://github.com/angular/angular/commit/26a8c59))
 * **bazel:** correct regexp test for self-references in metadata ([#29346](https://github.com/angular/angular/issues/29346)) ([9d090cb](https://github.com/angular/angular/commit/9d090cb))
 * **bazel:** don't produce self-references in metadata ([#29317](https://github.com/angular/angular/issues/29317)) ([3facdeb](https://github.com/angular/angular/commit/3facdeb)), closes [#29315](https://github.com/angular/angular/issues/29315)
-* **bazel:** fix strict null checks compile error in packages/bazel/src/schematics/ng-add/index.ts ([#29282](https://github.com/angular/angular/issues/29282)) ([9a7f560](https://github.com/angular/angular/commit/9a7f560))
-* **bazel:** Remove [@angular](https://github.com/angular)/upgrade from dev dependencies ([#29319](https://github.com/angular/angular/issues/29319)) ([1db8bf3](https://github.com/angular/angular/commit/1db8bf3))
+* **bazel:** fix strict null checks compile error in `packages/bazel/src/schematics/ng-add/index.ts` ([#29282](https://github.com/angular/angular/issues/29282)) ([9a7f560](https://github.com/angular/angular/commit/9a7f560))
+* **bazel:** Remove @angular/upgrade from dev dependencies ([#29319](https://github.com/angular/angular/issues/29319)) ([1db8bf3](https://github.com/angular/angular/commit/1db8bf3))
 * **bazel:** Support new e2e project layout ([#29318](https://github.com/angular/angular/issues/29318)) ([8ef690c](https://github.com/angular/angular/commit/8ef690c))
 * **bazel:** turn off pure call tree shaking for ng_package ([#29210](https://github.com/angular/angular/issues/29210)) ([4990b93](https://github.com/angular/angular/commit/4990b93))
-* **compiler-cli:** incorrect metadata bundle for multiple unnamed re-exports ([#29360](https://github.com/angular/angular/issues/29360)) ([105cfaf](https://github.com/angular/angular/commit/105cfaf)), closes [/github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85](https://github.com//github.com/angular/material2/blob/master/tools/package-tools/build-release.ts/issues/L78-L85)
+* **compiler-cli:** incorrect metadata bundle for multiple unnamed re-exports ([#29360](https://github.com/angular/angular/issues/29360)) ([105cfaf](https://github.com/angular/angular/commit/105cfaf))
 * **core:** don't wrap `<tr>` and `<col>` elements into a required parent ([#29219](https://github.com/angular/angular/issues/29219)) ([f2dc32e](https://github.com/angular/angular/commit/f2dc32e))
 * **core:** parse incorrect ML open tag as text ([#29328](https://github.com/angular/angular/issues/29328)) ([4605df8](https://github.com/angular/angular/commit/4605df8)), closes [#29231](https://github.com/angular/angular/issues/29231)
-* **compiler-cli:** incorrect metadata bundle for multiple unnamed re-exports ([#29360](https://github.com/angular/angular/issues/29360)) ([cf8d934](https://github.com/angular/angular/commit/cf8d934)), closes [github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85](https://github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85)
 * **bazel:** add missing binary path for api-extractor ([#29202](https://github.com/angular/angular/issues/29202)) ([df354d1](https://github.com/angular/angular/commit/df354d1))
 * **bazel:** ng build should produce prod bundle ([#29136](https://github.com/angular/angular/issues/29136)) ([14ce8a9](https://github.com/angular/angular/commit/14ce8a9))
 * **compiler:** ensure template is updated if an output is transformed ([#29041](https://github.com/angular/angular/issues/29041)) ([c7e4931](https://github.com/angular/angular/commit/c7e4931))
@@ -135,16 +132,16 @@
 
 ### BREAKING CHANGES
 
-* **bazel:** @bazel/typescript is now a peerDependency of @angular/bazel so user's of @angular/bazel must add @bazel/typescript to their package.json
-* **bazel:** ng_module now depends on a minimum of build_bazel_rules_nodejs 0.27.12
-* **core:** In Angular version 8, it's required that all @ViewChild and @ContentChild
-queries have a 'static' flag specifying whether the query is 'static' or
+* **bazel:** @bazel/typescript is now a peerDependency of @angular/bazel so users of @angular/bazel must add @bazel/typescript to their package.json
+* **bazel:** `ng_module` now depends on a minimum of build_bazel_rules_nodejs 0.27.12
+* **core:** In Angular version 8, it's required that all `@ViewChild` and `@ContentChild`
+queries have a `'static'` flag specifying whether the query is 'static' or
 'dynamic'. The compiler previously sorted queries automatically, but in
 8.0 developers are required to explicitly specify which behavior is wanted.
 This is a temporary requirement as part of a migration; see
-https://v8.angular.io/guide/static-query-migration for more details.
+[static query migration guide](https://v8.angular.io/guide/static-query-migration) for more details.
 
-  @ViewChildren and @ContentChildren queries are always dynamic, and so are
+  `@ViewChildren` and `@ContentChildren` queries are always dynamic, and so are
   unaffected.
 
 * `TestBed.get()` has two signatures, one which is typed and another which accepts and returns `any`. The signature for `any` is deprecated; all usage of `TestBed.get()` should go through the typed API. This mainly affects string tokens
@@ -178,8 +175,8 @@ https://v8.angular.io/guide/static-query-migration for more details.
   - `<tr>` would be wrapped in `<tbody>` if not inside `<tbody>`, `<tfoot>` or `<thead>`;
   - `<col>` would be wrapped in `<colgroup>` if not inside `<colgroup>`.
 
-  This meachanism of automatic wrapping / auto-correcting was problematic for several reasons:
-  - it is non-obvious and arbitrary (ex. there are more HTML elements that has rules for parent type);
+  This mechanism of automatic wrapping / auto-correcting was problematic for several reasons:
+  - it is non-obvious and arbitrary (ex. there are more HTML elements that have rules for parent type);
   - it is incorrect for cases where `<tr>` / `<col>` are at the root of a component's content, ex.:
 
   ```html
@@ -191,10 +188,13 @@ https://v8.angular.io/guide/static-query-migration for more details.
   In the above example the `<projecting-tr-inside-tbody>` component could be "surprised" to see additional
   `<tbody>` elements inserted by Angular HTML parser.
 
+* **http:** The deprecated @angular/http package has been removed, the @angular/common/http package should be used instead.
+For details on how to migrate, please refer to [the deprecations guide](https://angular.io/guide/deprecations#angularhttp).
+
 
 * TypeScript 3.1 and 3.2 are no longer supported.
 
-  Please update your TypeScript version to 3.3
+  Please update your TypeScript version to 3.4, as version 3.3 is also not supported.
 
 
   <a name="8.0.0-rc.5"></a>
@@ -320,9 +320,9 @@ unaffected.
 ### Bug Fixes
 
 * **bazel:** make name param in ng add optional ([#30074](https://github.com/angular/angular/issues/30074)) ([0b5f480](https://github.com/angular/angular/commit/0b5f480))
-* **bazel:** Make sure only single copy of `[@angular](https://github.com/angular)/bazel` is installed ([#30072](https://github.com/angular/angular/issues/30072)) ([2905bf5](https://github.com/angular/angular/commit/2905bf5))
+* **bazel:** Make sure only single copy of `@angular/bazel` is installed ([#30072](https://github.com/angular/angular/issues/30072)) ([2905bf5](https://github.com/angular/angular/commit/2905bf5))
 * **bazel:** transitive npm deps in ng_module ([#30065](https://github.com/angular/angular/issues/30065)) ([61365a9](https://github.com/angular/angular/commit/61365a9))
-* **common:** add upgrade sub-package to ng_package rule for [@angular](https://github.com/angular)/common ([#30117](https://github.com/angular/angular/issues/30117)) ([6de4cbd](https://github.com/angular/angular/commit/6de4cbd)), closes [#30055](https://github.com/angular/angular/issues/30055) [#30116](https://github.com/angular/angular/issues/30116)
+* **common:** add upgrade sub-package to ng_package rule for @angular/common ([#30117](https://github.com/angular/angular/issues/30117)) ([6de4cbd](https://github.com/angular/angular/commit/6de4cbd)), closes [#30055](https://github.com/angular/angular/issues/30055) [#30116](https://github.com/angular/angular/issues/30116)
 * **common:** adjust MockPlatformLocation to set state to new object ([#30055](https://github.com/angular/angular/issues/30055)) ([825efa8](https://github.com/angular/angular/commit/825efa8))
 * **compiler:** Fix compiler crash due to isSkipSelf of null ([#30075](https://github.com/angular/angular/issues/30075)) ([28fd5ab](https://github.com/angular/angular/commit/28fd5ab))
 * **upgrade:** do not break if `onMicrotaskEmpty` emits while a `$digest` is in progress ([#29794](https://github.com/angular/angular/issues/29794)) ([0ddf2e7](https://github.com/angular/angular/commit/0ddf2e7)), closes [#24680](https://github.com/angular/angular/issues/24680) [/github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts#L12](https://github.com//github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts/issues/L12) [#24680](https://github.com/angular/angular/issues/24680)
@@ -330,7 +330,7 @@ unaffected.
 
 ### Features
 
-* **common:** add [@angular](https://github.com/angular)/common/upgrade package for $location-related APIs ([#30055](https://github.com/angular/angular/issues/30055)) ([152d99e](https://github.com/angular/angular/commit/152d99e))
+* **common:** add @angular/common/upgrade package for $location-related APIs ([#30055](https://github.com/angular/angular/issues/30055)) ([152d99e](https://github.com/angular/angular/commit/152d99e))
 * **common:** add ability to retrieve the state from Location service ([#30055](https://github.com/angular/angular/issues/30055)) ([b44b143](https://github.com/angular/angular/commit/b44b143))
 * **common:** add ability to track all location changes ([#30055](https://github.com/angular/angular/issues/30055)) ([3a9cf3f](https://github.com/angular/angular/commit/3a9cf3f))
 * **common:** add APIs to read component pieces of URL ([#30055](https://github.com/angular/angular/issues/30055)) ([b635fe8](https://github.com/angular/angular/commit/b635fe8))
@@ -393,7 +393,7 @@ unaffected.
 
 ### Bug Fixes
 
-* **bazel:** add configuration_env_vars = ["compile"] to generated [@npm](https://github.com/npm)//[@angular](https://github.com/angular)/bazel/bin:ngc-wrapped nodejs_binary ([#29694](https://github.com/angular/angular/issues/29694)) ([2e66ddf](https://github.com/angular/angular/commit/2e66ddf))
+* **bazel:** add configuration_env_vars = ["compile"] to generated [@npm](https://github.com/npm)//@angular/bazel/bin:ngc-wrapped nodejs_binary ([#29694](https://github.com/angular/angular/issues/29694)) ([2e66ddf](https://github.com/angular/angular/commit/2e66ddf))
 * **bazel:** docs formatting ([#29817](https://github.com/angular/angular/issues/29817)) ([cc2e4b6](https://github.com/angular/angular/commit/cc2e4b6))
 * **bazel:** remove karma-jasmine from ts_web_test_suite ([#29695](https://github.com/angular/angular/issues/29695)) ([2bd9214](https://github.com/angular/angular/commit/2bd9214))
 * **bazel:** support running ng-add on minimal applications ([#29681](https://github.com/angular/angular/issues/29681)) ([9810c6c](https://github.com/angular/angular/commit/9810c6c)), closes [#29680](https://github.com/angular/angular/issues/29680)
@@ -468,7 +468,7 @@ let service = TestBed.get(SERVICE_TOKEN); // type Service
 
 ### Features
 
-* remove [@angular](https://github.com/angular)/http dependency from [@angular](https://github.com/angular)/platform-server ([#29408](https://github.com/angular/angular/issues/29408)) ([9745f55](https://github.com/angular/angular/commit/9745f55))
+* remove @angular/http dependency from @angular/platform-server ([#29408](https://github.com/angular/angular/issues/29408)) ([9745f55](https://github.com/angular/angular/commit/9745f55))
 * **compiler-cli:** ngcc - make logging more configurable ([#29591](https://github.com/angular/angular/issues/29591)) ([8d3d75e](https://github.com/angular/angular/commit/8d3d75e))
 * **core:** Add "AbstractType<T>" interface ([#29295](https://github.com/angular/angular/issues/29295)) ([afd4a4e](https://github.com/angular/angular/commit/afd4a4e)), closes [#26491](https://github.com/angular/angular/issues/26491)
 * **core:** template-var-assignment update schematic ([#29608](https://github.com/angular/angular/issues/29608)) ([7c8f4e3](https://github.com/angular/angular/commit/7c8f4e3))
@@ -528,7 +528,7 @@ This release contains various API docs improvements.
 * **bazel:** correct regexp test for self-references in metadata ([#29346](https://github.com/angular/angular/issues/29346)) ([9d090cb](https://github.com/angular/angular/commit/9d090cb))
 * **bazel:** don't produce self-references in metadata ([#29317](https://github.com/angular/angular/issues/29317)) ([3facdeb](https://github.com/angular/angular/commit/3facdeb)), closes [#29315](https://github.com/angular/angular/issues/29315)
 * **bazel:** fix strict null checks compile error in packages/bazel/src/schematics/ng-add/index.ts ([#29282](https://github.com/angular/angular/issues/29282)) ([9a7f560](https://github.com/angular/angular/commit/9a7f560))
-* **bazel:** Remove [@angular](https://github.com/angular)/upgrade from dev dependencies ([#29319](https://github.com/angular/angular/issues/29319)) ([1db8bf3](https://github.com/angular/angular/commit/1db8bf3))
+* **bazel:** Remove @angular/upgrade from dev dependencies ([#29319](https://github.com/angular/angular/issues/29319)) ([1db8bf3](https://github.com/angular/angular/commit/1db8bf3))
 * **bazel:** Support new e2e project layout ([#29318](https://github.com/angular/angular/issues/29318)) ([8ef690c](https://github.com/angular/angular/commit/8ef690c))
 * **bazel:** turn off pure call tree shaking for ng_package ([#29210](https://github.com/angular/angular/issues/29210)) ([4990b93](https://github.com/angular/angular/commit/4990b93))
 * **compiler-cli:** incorrect metadata bundle for multiple unnamed re-exports ([#29360](https://github.com/angular/angular/issues/29360)) ([105cfaf](https://github.com/angular/angular/commit/105cfaf)), closes [/github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85](https://github.com//github.com/angular/material2/blob/master/tools/package-tools/build-release.ts/issues/L78-L85)
@@ -951,7 +951,7 @@ This release contains various API docs improvements.
 * **bazel:** unable to launch protractor test on windows ([#27850](https://github.com/angular/angular/issues/27850)) ([1e6c9be](https://github.com/angular/angular/commit/1e6c9be))
 * **bazel:** devserver entry_module should have underscore name ([#27719](https://github.com/angular/angular/issues/27719)) ([f57916c](https://github.com/angular/angular/commit/f57916c))
 * **bazel:** emit full node stack traces when Angular compilation crashes ([#27678](https://github.com/angular/angular/issues/27678)) ([522919a](https://github.com/angular/angular/commit/522919a))
-* **bazel:** fix major/minor semver check between [@angular](https://github.com/angular)/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([1cc08b4](https://github.com/angular/angular/commit/1cc08b4))
+* **bazel:** fix major/minor semver check between @angular/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([1cc08b4](https://github.com/angular/angular/commit/1cc08b4))
 * **bazel:** Load http_archive and rules_nodejs dependencies ([#27609](https://github.com/angular/angular/issues/27609)) ([8313ffc](https://github.com/angular/angular/commit/8313ffc))
 * **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([44dfa60](https://github.com/angular/angular/commit/44dfa60)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com//github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
 * **bazel:** Set module_name and enable ng test ([#27715](https://github.com/angular/angular/issues/27715)) ([85866de](https://github.com/angular/angular/commit/85866de))
@@ -971,7 +971,7 @@ This release contains various API docs improvements.
 * **core:** export a value for InjectFlags ([#27279](https://github.com/angular/angular/issues/27279)) ([23b06af](https://github.com/angular/angular/commit/23b06af)), closes [#27251](https://github.com/angular/angular/issues/27251)
 * **core:** More precise return type for `InjectableDecorator` ([#27360](https://github.com/angular/angular/issues/27360)) ([4b9948c](https://github.com/angular/angular/commit/4b9948c)), closes [#26942](https://github.com/angular/angular/issues/26942)
 * **forms:** typed argument for FormBuilder group ([#26985](https://github.com/angular/angular/issues/26985)) ([b0c7561](https://github.com/angular/angular/commit/b0c7561))
-* **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([32c5be9](https://github.com/angular/angular/commit/32c5be9)), closes [#26154](https://github.com/angular/angular/issues/26154)
+* **platform-server:** add @angular/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([32c5be9](https://github.com/angular/angular/commit/32c5be9)), closes [#26154](https://github.com/angular/angular/issues/26154)
 * **router:** ensure URL is updated after second redirect with UrlUpdateStrategy="eager" ([#27523](https://github.com/angular/angular/issues/27523)) ([ad26cd6](https://github.com/angular/angular/commit/ad26cd6)), closes [#27116](https://github.com/angular/angular/issues/27116)
 * **router:** update URL after redirects when urlHandlingStrategy='eager' ([#27356](https://github.com/angular/angular/issues/27356)) ([11a8bd8](https://github.com/angular/angular/commit/11a8bd8)), closes [#27076](https://github.com/angular/angular/issues/27076)
 * **upgrade:** allow nesting components from different downgraded modules ([#27217](https://github.com/angular/angular/issues/27217)) ([bc0ee01](https://github.com/angular/angular/commit/bc0ee01))
@@ -991,7 +991,7 @@ This release contains various API docs improvements.
 * **animations:** mark actual descendant node as disabled ([#26180](https://github.com/angular/angular/issues/26180)) ([453589f](https://github.com/angular/angular/commit/453589f))
 * **bazel:** devserver entry_module should have underscore name ([#27719](https://github.com/angular/angular/issues/27719)) ([b108e9a](https://github.com/angular/angular/commit/b108e9a))
 * **bazel:** emit full node stack traces when Angular compilation crashes ([#27678](https://github.com/angular/angular/issues/27678)) ([0d8528b](https://github.com/angular/angular/commit/0d8528b))
-* **bazel:** fix major/minor semver check between [@angular](https://github.com/angular)/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([3ed1e84](https://github.com/angular/angular/commit/3ed1e84))
+* **bazel:** fix major/minor semver check between @angular/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([3ed1e84](https://github.com/angular/angular/commit/3ed1e84))
 * **bazel:** Load http_archive and rules_nodejs dependencies ([#27609](https://github.com/angular/angular/issues/27609)) ([89ace1a](https://github.com/angular/angular/commit/89ace1a))
 * **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([ef056c5](https://github.com/angular/angular/commit/ef056c5)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com//github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
 * **bazel:** Read latest versions from latest-versions.ts & use semver check ([#27591](https://github.com/angular/angular/issues/27591)) ([93078e3](https://github.com/angular/angular/commit/93078e3))
@@ -1023,7 +1023,7 @@ This release contains various API docs improvements.
 * **bazel:** ng_package should correctly map to source maps in secondary entry-points ([#27313](https://github.com/angular/angular/issues/27313)) ([fc2c23e](https://github.com/angular/angular/commit/fc2c23e)), closes [#25510](https://github.com/angular/angular/issues/25510)
 * **compiler-cli:** flatModuleIndex files not generated on windows with multiple input files ([#27200](https://github.com/angular/angular/issues/27200)) ([8087b6b](https://github.com/angular/angular/commit/8087b6b))
 * **compiler-cli:** ngtsc shim files not being generated on case-insensitive platforms ([#27466](https://github.com/angular/angular/issues/27466)) ([84f2928](https://github.com/angular/angular/commit/84f2928)), closes [/github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts#L681-L682](https://github.com//github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts/issues/L681-L682)
-* **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([236ac06](https://github.com/angular/angular/commit/236ac06)), closes [#26154](https://github.com/angular/angular/issues/26154)
+* **platform-server:** add @angular/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([236ac06](https://github.com/angular/angular/commit/236ac06)), closes [#26154](https://github.com/angular/angular/issues/26154)
 
 
 
@@ -1050,7 +1050,7 @@ This release contains various API docs improvements.
 * **compiler:** generate inputs with aliases properly ([#26774](https://github.com/angular/angular/issues/26774)) ([19fcfc3](https://github.com/angular/angular/commit/19fcfc3))
 * **compiler:** generate relative paths only in summary file errors ([#26759](https://github.com/angular/angular/issues/26759)) ([56f44be](https://github.com/angular/angular/commit/56f44be))
 * **core:** ignore comment nodes under unsafe elements ([#25879](https://github.com/angular/angular/issues/25879)) ([d5cbcef](https://github.com/angular/angular/commit/d5cbcef))
-* **core:** Remove static dependency from [@angular](https://github.com/angular)/core to [@angular](https://github.com/angular)/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([d042c4a](https://github.com/angular/angular/commit/d042c4a))
+* **core:** Remove static dependency from @angular/core to @angular/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([d042c4a](https://github.com/angular/angular/commit/d042c4a))
 * **core:** support computed base class in metadata inheritance ([#24014](https://github.com/angular/angular/issues/24014)) ([95743e3](https://github.com/angular/angular/commit/95743e3))
 * **bazel:** unknown replay compiler error in windows ([#26711](https://github.com/angular/angular/issues/26711)) ([aed95fd](https://github.com/angular/angular/commit/aed95fd))
 * **core:** ensure that `ɵdefineNgModule` is available in flat-file formats ([#26403](https://github.com/angular/angular/issues/26403)) ([a64859b](https://github.com/angular/angular/commit/a64859b))
@@ -1157,7 +1157,7 @@ This release contains various API docs improvements.
 * **compiler:** generate inputs with aliases properly ([#26774](https://github.com/angular/angular/issues/26774)) ([19fcfc3](https://github.com/angular/angular/commit/19fcfc3))
 * **compiler:** generate relative paths only in summary file errors ([#26759](https://github.com/angular/angular/issues/26759)) ([56f44be](https://github.com/angular/angular/commit/56f44be))
 * **core:** ignore comment nodes under unsafe elements ([#25879](https://github.com/angular/angular/issues/25879)) ([d5cbcef](https://github.com/angular/angular/commit/d5cbcef))
-* **core:** Remove static dependency from [@angular](https://github.com/angular)/core to [@angular](https://github.com/angular)/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([d042c4a](https://github.com/angular/angular/commit/d042c4a))
+* **core:** Remove static dependency from @angular/core to @angular/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([d042c4a](https://github.com/angular/angular/commit/d042c4a))
 * **core:** support computed base class in metadata inheritance ([#24014](https://github.com/angular/angular/issues/24014)) ([95743e3](https://github.com/angular/angular/commit/95743e3))
 
 
@@ -1169,7 +1169,7 @@ This release contains various API docs improvements.
 ### Bug Fixes
 
 * **compiler:** generate relative paths only in summary file errors ([#26759](https://github.com/angular/angular/issues/26759)) ([c01f340](https://github.com/angular/angular/commit/c01f340))
-* **core:** Remove static dependency from [@angular](https://github.com/angular)/core to [@angular](https://github.com/angular)/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([#26879](https://github.com/angular/angular/issues/26879)) ([257ac83](https://github.com/angular/angular/commit/257ac83))
+* **core:** Remove static dependency from @angular/core to @angular/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([#26879](https://github.com/angular/angular/issues/26879)) ([257ac83](https://github.com/angular/angular/commit/257ac83))
 * **core:** support computed base class in metadata inheritance ([#24014](https://github.com/angular/angular/issues/24014)) ([b3c6409](https://github.com/angular/angular/commit/b3c6409))
 
 
@@ -1246,7 +1246,7 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **compiler:** update compiler to flatten nested template fns ([#24943](https://github.com/angular/angular/issues/24943)) ([fe14f18](https://github.com/angular/angular/commit/fe14f18))
 * **compiler:** update compiler to generate new slot allocations ([#25607](https://github.com/angular/angular/issues/25607)) ([27e2039](https://github.com/angular/angular/commit/27e2039))
 * **core:** In Testability.whenStable update callback, pass more complete ([#25010](https://github.com/angular/angular/issues/25010)) ([16c03c0](https://github.com/angular/angular/commit/16c03c0))
-* **core:** add missing `peerDependency ` to `[@angular](https://github.com/angular)/compiler` ([#26033](https://github.com/angular/angular/issues/26033)) ([549de1e](https://github.com/angular/angular/commit/549de1e)), closes [/github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e#diff-58563046c4439699f2e6a89187099a54](https://github.com//github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e/issues/diff-58563046c4439699f2e6a89187099a54)
+* **core:** add missing `peerDependency ` to `@angular/compiler` ([#26033](https://github.com/angular/angular/issues/26033)) ([549de1e](https://github.com/angular/angular/commit/549de1e)), closes [/github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e#diff-58563046c4439699f2e6a89187099a54](https://github.com//github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e/issues/diff-58563046c4439699f2e6a89187099a54)
 * **core:** allow null value for renderer setElement(…) ([#17065](https://github.com/angular/angular/issues/17065)) ([ff15043](https://github.com/angular/angular/commit/ff15043)), closes [#13686](https://github.com/angular/angular/issues/13686)
 * **core:** do not clear element content when using shadow dom ([#24861](https://github.com/angular/angular/issues/24861)) ([6e828bb](https://github.com/angular/angular/commit/6e828bb))
 * **core:** size regression with closure compiler ([#25531](https://github.com/angular/angular/issues/25531)) ([1f59f2f](https://github.com/angular/angular/commit/1f59f2f))
@@ -1692,7 +1692,7 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **upgrade:** propagate return value of resumeBootstrap ([#22754](https://github.com/angular/angular/issues/22754)) ([a2330ff](https://github.com/angular/angular/commit/a2330ff)), closes [#22723](https://github.com/angular/angular/issues/22723)
 * **upgrade:** two-way binding and listening for event ([#22772](https://github.com/angular/angular/issues/22772)) ([2b3de63](https://github.com/angular/angular/commit/2b3de63)), closes [#22734](https://github.com/angular/angular/issues/22734)
 * **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([8a85888](https://github.com/angular/angular/commit/8a85888)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([f089bf5](https://github.com/angular/angular/commit/f089bf5))
+* **upgrade:** correctly handle `=` bindings in `@angular/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([f089bf5](https://github.com/angular/angular/commit/f089bf5))
 * **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([13ab91e](https://github.com/angular/angular/commit/13ab91e)), closes [#22175](https://github.com/angular/angular/issues/22175)
 
 
@@ -1827,7 +1827,7 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([8f0a064](https://github.com/angular/angular/commit/8f0a064)), closes [#22203](https://github.com/angular/angular/issues/22203)
 * **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([789a47e](https://github.com/angular/angular/commit/789a47e)), closes [#10280](https://github.com/angular/angular/issues/10280)
 * **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([4aef9de](https://github.com/angular/angular/commit/4aef9de)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
+* **upgrade:** correctly handle `=` bindings in `@angular/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
 * **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([a9a0e27](https://github.com/angular/angular/commit/a9a0e27)), closes [#22175](https://github.com/angular/angular/issues/22175)
 
 
@@ -1841,7 +1841,7 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **platform-server:** generate correct stylings for camel case names ([#22263](https://github.com/angular/angular/issues/22263)) ([de02a7a](https://github.com/angular/angular/commit/de02a7a)), closes [#19235](https://github.com/angular/angular/issues/19235)
 * **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([8f0a064](https://github.com/angular/angular/commit/8f0a064)), closes [#22203](https://github.com/angular/angular/issues/22203)
 * **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([4aef9de](https://github.com/angular/angular/commit/4aef9de)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
+* **upgrade:** correctly handle `=` bindings in `@angular/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
 * **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([a9a0e27](https://github.com/angular/angular/commit/a9a0e27)), closes [#22175](https://github.com/angular/angular/issues/22175)
 
 
@@ -2288,7 +2288,7 @@ Note: Due to an animation fix back in 5.1.1 ([c2b3792](https://github.com/angula
 * **platform-server:** provide a way to hook into renderModule* ([#19023](https://github.com/angular/angular/issues/19023)) ([8dfc3c3](https://github.com/angular/angular/commit/8dfc3c3))
 * **router:** add ActivationStart/End events ([8f79150](https://github.com/angular/angular/commit/8f79150))
 * **router:** add events tracking activation of individual routes ([49cd851](https://github.com/angular/angular/commit/49cd851))
-* **service-worker:** introduce the [@angular](https://github.com/angular)/service-worker package ([#19274](https://github.com/angular/angular/issues/19274)) ([d442b68](https://github.com/angular/angular/commit/d442b68))
+* **service-worker:** introduce the @angular/service-worker package ([#19274](https://github.com/angular/angular/issues/19274)) ([d442b68](https://github.com/angular/angular/commit/d442b68))
 * **upgrade:** propagate touched state of NgModelController ([59c23c7](https://github.com/angular/angular/commit/59c23c7))
 * **upgrade:** support lazy-loading Angular module into AngularJS app ([30e76fc](https://github.com/angular/angular/commit/30e76fc))
 * update angular to support TypeScript 2.4 ([ca5aeba](https://github.com/angular/angular/commit/ca5aeba))
@@ -2512,7 +2512,7 @@ Because of multiple bugs and browser inconsistencies, we have dropped the intl a
 ### Bug Fixes
 
 * **animations:** do not leak DOM nodes/styling for host triggered animations ([#18853](https://github.com/angular/angular/issues/18853)) ([1cc3fe2](https://github.com/angular/angular/commit/1cc3fe2)), closes [#18606](https://github.com/angular/angular/issues/18606)
-* **common:** fix improper packaging for [@angular](https://github.com/angular)/common/http ([#18613](https://github.com/angular/angular/issues/18613)) ([a203a95](https://github.com/angular/angular/commit/a203a95))
+* **common:** fix improper packaging for @angular/common/http ([#18613](https://github.com/angular/angular/issues/18613)) ([a203a95](https://github.com/angular/angular/commit/a203a95))
 * **common:** fix XSSI prefix stripping by using JSON.parse always ([#18466](https://github.com/angular/angular/issues/18466)) ([8821723](https://github.com/angular/angular/commit/8821723)), closes [#18396](https://github.com/angular/angular/issues/18396) [#18453](https://github.com/angular/angular/issues/18453)
 * **compiler:** normalize the locale name ([#18963](https://github.com/angular/angular/issues/18963)) ([497e017](https://github.com/angular/angular/commit/497e017))
 * **core:** complete EventEmitter in QueryList on component destroy ([#18902](https://github.com/angular/angular/issues/18902)) ([7d137d7](https://github.com/angular/angular/commit/7d137d7)), closes [#18741](https://github.com/angular/angular/issues/18741)
@@ -2853,7 +2853,7 @@ Note: the 4.4.0 release on npm accidentally glitched-out midway, so we cut 4.4.1
 * **compiler-cli:** allow '==' to compare nullable types ([#16731](https://github.com/angular/angular/issues/16731)) ([d761059](https://github.com/angular/angular/commit/d761059))
 * **core:** detach projected views when a parent view is destroyed ([#16592](https://github.com/angular/angular/issues/16592)) ([f0f6544](https://github.com/angular/angular/commit/f0f6544)), closes [#15578](https://github.com/angular/angular/issues/15578)
 * **core:** projected views should be dirty checked when the declaring component is dirty checked. ([#16592](https://github.com/angular/angular/issues/16592)) ([fcc91d8](https://github.com/angular/angular/commit/fcc91d8)), closes [#14321](https://github.com/angular/angular/issues/14321)
-* **http:** flatten metadata for [@angular](https://github.com/angular)/http/testing ([9da6340](https://github.com/angular/angular/commit/9da6340)), closes [#15521](https://github.com/angular/angular/issues/15521)
+* **http:** flatten metadata for @angular/http/testing ([9da6340](https://github.com/angular/angular/commit/9da6340)), closes [#15521](https://github.com/angular/angular/issues/15521)
 * **http:** honor RequestArgs.search and RequestArgs.params map type ([aef5245](https://github.com/angular/angular/commit/aef5245)), closes [#15761](https://github.com/angular/angular/issues/15761) [#16392](https://github.com/angular/angular/issues/16392)
 * **http:** introduce encodingHint for text() for better ArrayBuffer support ([7ae7a84](https://github.com/angular/angular/commit/7ae7a84)), closes [#15932](https://github.com/angular/angular/issues/15932) [#16420](https://github.com/angular/angular/issues/16420)
 * **router:** fix redirect to a URL with a param having multiple values ([#16376](https://github.com/angular/angular/issues/16376)) ([5d4b36f](https://github.com/angular/angular/commit/5d4b36f)), closes [#16310](https://github.com/angular/angular/issues/16310)
@@ -2909,7 +2909,7 @@ Note: the 4.4.0 release on npm accidentally glitched-out midway, so we cut 4.4.1
 * **compiler:** avoid a `...null` spread in extraction ([#16547](https://github.com/angular/angular/issues/16547)) ([d0e1688](https://github.com/angular/angular/commit/d0e1688))
 * **core:** detach projected views when a parent view is destroyed ([#16592](https://github.com/angular/angular/issues/16592)) ([ee6705a](https://github.com/angular/angular/commit/ee6705a)), closes [#15578](https://github.com/angular/angular/issues/15578)
 * **core:** projected views should be dirty checked when the declaring component is dirty checked. ([#16592](https://github.com/angular/angular/issues/16592)) ([9218812](https://github.com/angular/angular/commit/9218812)), closes [#14321](https://github.com/angular/angular/issues/14321)
-* **http:** flatten metadata for [@angular](https://github.com/angular)/http/testing ([9c70a3c](https://github.com/angular/angular/commit/9c70a3c)), closes [#15521](https://github.com/angular/angular/issues/15521)
+* **http:** flatten metadata for @angular/http/testing ([9c70a3c](https://github.com/angular/angular/commit/9c70a3c)), closes [#15521](https://github.com/angular/angular/issues/15521)
 * **http:** honor RequestArgs.search and RequestArgs.params map type ([63066f7](https://github.com/angular/angular/commit/63066f7)), closes [#15761](https://github.com/angular/angular/issues/15761) [#16392](https://github.com/angular/angular/issues/16392)
 * **http:** introduce encodingHint for text() for better ArrayBuffer support ([ec3b6e9](https://github.com/angular/angular/commit/ec3b6e9)), closes [#15932](https://github.com/angular/angular/issues/15932) [#16420](https://github.com/angular/angular/issues/16420)
 * **router:** fix redirect to a URL with a param having multiple values ([#16376](https://github.com/angular/angular/issues/16376)) ([915eae5](https://github.com/angular/angular/commit/915eae5)), closes [#16310](https://github.com/angular/angular/issues/16310)
@@ -3539,7 +3539,7 @@ Note: the 4.0.0-rc.0 release on npm accidentally omitted one bug fix, so we cut
 * **core:** add isStable Observable property to ApplicationRef to indicate when it's stable and unstable ([#14337](https://github.com/angular/angular/issues/14337)) ([c481798](https://github.com/angular/angular/commit/c481798))
 * **platform-server:** add API to render Module and ModuleFactory to string ([#14381](https://github.com/angular/angular/issues/14381)) ([b4d444a](https://github.com/angular/angular/commit/b4d444a))
 * **platform-server:** Implement PlatformLocation for platformServer() ([#14405](https://github.com/angular/angular/issues/14405)) ([9e28568](https://github.com/angular/angular/commit/9e28568))
-* **platform-server:** support [@angular](https://github.com/angular)/http from [@angular](https://github.com/angular)/platform-server ([9559d3e](https://github.com/angular/angular/commit/9559d3e))
+* **platform-server:** support @angular/http from @angular/platform-server ([9559d3e](https://github.com/angular/angular/commit/9559d3e))
 * **tsc-wrapped:** add an option to `ngc` to bundle metadata ([#14509](https://github.com/angular/angular/issues/14509)) ([3b89670](https://github.com/angular/angular/commit/3b89670))
 
 
@@ -4500,7 +4500,7 @@ Note: The 2.2.0-beta.0 release also contains all the changes present in the 2.1.
 * **compiler:** properly shim `:host:before` and `:host(:before)` ([#12171](https://github.com/angular/angular/issues/12171)) ([aa92512](https://github.com/angular/angular/commit/aa92512)), closes [#12165](https://github.com/angular/angular/issues/12165)
 * **compiler:** validate `@HostBinding` name ([#12139](https://github.com/angular/angular/issues/12139)) ([13ecc14](https://github.com/angular/angular/commit/13ecc14))
 * **compiler-cli:** don't clone static symbols when simplifying annotation metadata ([#12158](https://github.com/angular/angular/issues/12158)) ([8c477b2](https://github.com/angular/angular/commit/8c477b2))
-* **compiler-cli:** remove peerDependency on [@angular](https://github.com/angular)/platform-server ([#12122](https://github.com/angular/angular/issues/12122)) ([71b7654](https://github.com/angular/angular/commit/71b7654))
+* **compiler-cli:** remove peerDependency on @angular/platform-server ([#12122](https://github.com/angular/angular/issues/12122)) ([71b7654](https://github.com/angular/angular/commit/71b7654))
 * **compiler-cli:** remove unused parse5 dependency from package.json ([eaaec69](https://github.com/angular/angular/commit/eaaec69))
 * **forms:** allow optional fields with pattern and minlength validators ([#12147](https://github.com/angular/angular/issues/12147)) ([d22eeb7](https://github.com/angular/angular/commit/d22eeb7))
 * **forms:** properly validate blank strings with minlength ([#12091](https://github.com/angular/angular/issues/12091)) ([f50c1da](https://github.com/angular/angular/commit/f50c1da))

From 77578266fdc97c7bc1489cfd2711270b7f5173f0 Mon Sep 17 00:00:00 2001
From: Cotton Hou <himcotton@gmail.com>
Date: Wed, 29 May 2019 09:22:50 +0800
Subject: [PATCH 212/275] docs: code sample closing in ivy.md (#30711) PR Close
 #30711

---
 aio/content/guide/ivy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/ivy.md b/aio/content/guide/ivy.md
index 260952faf4..ab47c40a3b 100644
--- a/aio/content/guide/ivy.md
+++ b/aio/content/guide/ivy.md
@@ -49,7 +49,7 @@ AOT compilation with Ivy is faster and should be used by default. In the `angula
     }
   }
 }
-
+```
 
 To stop using the Ivy compiler, set `enableIvy` to `false` in `tsconfig.app.json`, or remove it completely. Also remove `"aot": true` from your default build options if you didn't have it there before.
- 
\ No newline at end of file
+ 

From af4925f3743642951e22d3bd4dad4fdda08f810a Mon Sep 17 00:00:00 2001
From: Blakenator <blakestacks@rocketmail.com>
Date: Tue, 14 May 2019 12:01:37 -0500
Subject: [PATCH 213/275] docs: clarify usage of using /deep/ in component
 styles guide (#30452)

Updated the description regarding the (deprecated) /deep/ pseudo-selector to clarify its propensity to bleed styles across components and its solution

closes #29967

PR Close #30452
---
 aio/content/guide/component-styles.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/aio/content/guide/component-styles.md b/aio/content/guide/component-styles.md
index 6075b05577..ab5704bb33 100644
--- a/aio/content/guide/component-styles.md
+++ b/aio/content/guide/component-styles.md
@@ -106,10 +106,11 @@ if some ancestor element has the CSS class `theme-light`.
 
 Component styles normally apply only to the HTML in the component's own template.
 
-Use the `/deep/` shadow-piercing descendant combinator to force a style down through the child
-component tree into all the child component views.
-The `/deep/` combinator works to any depth of nested components, and it applies to both the view
-children and content children of the component.
+Applying the `::ng-deep` pseudo-class to any CSS rule completely disables view-encapsulation for
+that rule. Any style with `::ng-deep` applied becomes a global style. In order to scope the specified style
+to the current component and all its descendants, be sure to include the `:host` selector before
+`::ng-deep`. If the `::ng-deep` combinator is used without the `:host` pseudo-class selector, the style
+can bleed into other components.
 
 The following example targets all `<h3>` elements, from the host element down
 through this component to all of its child elements in the DOM.

From 24ca8ba7cef19c54f75036dc4cbd6afd7f908572 Mon Sep 17 00:00:00 2001
From: jaideepghosh <er.jaideepghosh@gmail.com>
Date: Mon, 20 May 2019 22:53:10 +0530
Subject: [PATCH 214/275] docs: fix the sequence of creating class in HTTP
 tutorial (#30566)

For more accurate procedure of creating a class in the "Tour of Heroes" app, updated the sequence of creating one class.

PR Close #30566
---
 aio/content/tutorial/toh-pt6.md | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/aio/content/tutorial/toh-pt6.md b/aio/content/tutorial/toh-pt6.md
index 3d2163070e..98a863e4cc 100644
--- a/aio/content/tutorial/toh-pt6.md
+++ b/aio/content/tutorial/toh-pt6.md
@@ -56,8 +56,24 @@ Install the *In-memory Web API* package from _npm_
   npm install angular-in-memory-web-api --save
 </code-example>
 
-Import the `HttpClientInMemoryWebApiModule` and the `InMemoryDataService` class, 
-which you will create in a moment.
+
+The class `src/app/in-memory-data.service.ts` is generated by the following command:
+
+<code-example language="sh" class="code-shell">
+  ng generate service InMemoryData
+</code-example>
+
+This class has the following content:
+
+<code-example path="toh-pt6/src/app/in-memory-data.service.ts" region="init" header="src/app/in-memory-data.service.ts" linenums="false"></code-example>
+
+This file replaces `mock-heroes.ts`, which is now safe to delete.
+
+When your server is ready, detach the *In-memory Web API*, and the app's requests will go through to the server.
+
+Now back to the `HttpClient` story.
+
+Import the `HttpClientInMemoryWebApiModule` and the `InMemoryDataService` class.
 
 <code-example 
   path="toh-pt6/src/app/app.module.ts" 
@@ -77,22 +93,6 @@ _after importing the `HttpClientModule`_,
 The `forRoot()` configuration method takes an `InMemoryDataService` class
 that primes the in-memory database.
 
-The class `src/app/in-memory-data.service.ts` is generated by the following command:
-
-<code-example language="sh" class="code-shell">
-  ng generate service InMemoryData
-</code-example>
-
-This class has the following content:
-
-<code-example path="toh-pt6/src/app/in-memory-data.service.ts" region="init" header="src/app/in-memory-data.service.ts" linenums="false"></code-example>
-
-This file replaces `mock-heroes.ts`, which is now safe to delete.
-
-When your server is ready, detach the *In-memory Web API*, and the app's requests will go through to the server.
-
-Now back to the `HttpClient` story.
-
 {@a import-heroes}
 ## Heroes and HTTP
 

From fa5d8ca041d940487708e196a06c726e55be969f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 16 May 2019 13:39:56 +0100
Subject: [PATCH 215/275] ci: do not override bazel action_env on Windows
 (#30510)

Fix #27514

PR Close #30510
---
 .codefresh/bazel.rc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.codefresh/bazel.rc b/.codefresh/bazel.rc
index b75f7287e4..7d8ec00a51 100644
--- a/.codefresh/bazel.rc
+++ b/.codefresh/bazel.rc
@@ -30,8 +30,3 @@ test --flaky_test_attempts=2
 
 # More details on failures
 build --verbose_failures=true
-
-# Include PATH in Windows build/tests
-# https://github.com/bazelbuild/rules_typescript/pull/356
-build --action_env=PATH
-test --action_env=PATH --test_env=PATH

From ba5309c1f8bcb12b2654d055a8038d667b4803a9 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 17 May 2019 17:45:45 +0100
Subject: [PATCH 216/275] ci: describe next steps for Bazel cache on Windows CI
 (#30510)

PR Close #30510
---
 .codefresh/bazel.rc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.codefresh/bazel.rc b/.codefresh/bazel.rc
index 7d8ec00a51..1dd9c1e81f 100644
--- a/.codefresh/bazel.rc
+++ b/.codefresh/bazel.rc
@@ -2,11 +2,17 @@
 # We do this by copying this file to /etc/bazel.bazelrc at the start of the build.
 # See documentation in /docs/BAZEL.md
 
-# Save downloaded repositories in a location that can be cached by CodeFresh and shared between
-# builds. This helps speed up the analysis time significantly with Bazel managed node dependencies
-# on the CI.
+# Save built files and downloaded repositories in a location that can be cached by CodeFresh and
+# shared between builds. This helps speed up the analysis time significantly with Bazel managed node
+# dependencies on the CI.
 # https://codefresh.io/docs/docs/configure-ci-cd-pipeline/introduction-to-codefresh-pipelines/#caching-the-artifacts-of-your-build-system
 build --repository_cache=C:/codefresh/volume/bazel_repository_cache
+# Setting the output_base to a Docker volume is currently broken because of a Docker bug on Windows:
+# https://github.com/moby/moby/issues/37024
+# This affects Bazel because bazel_output_base\external\bazel_tools is an absolute path junction.
+# When its fixed we can uncomment this line, and use a different output_base for Ivy tests (they
+# use a separate compiler and destructively replace the cache).
+# startup --output_base=C:/codefresh/volume/bazel_output_base
 
 # Don't be spammy in the logs
 # TODO(gmagolan): Hide progress again once build performance improves

From 8301028319630e5353c061b6e6843a0c590f58dc Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 17 May 2019 17:46:33 +0100
Subject: [PATCH 217/275] ci: add descriptive titles to Codefresh steps
 (#30510)

PR Close #30510
---
 .codefresh/codefresh.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.codefresh/codefresh.yml b/.codefresh/codefresh.yml
index c1550040f9..0c738e78ed 100644
--- a/.codefresh/codefresh.yml
+++ b/.codefresh/codefresh.yml
@@ -2,6 +2,7 @@ version: '1.0'
 
 steps:
   BuildImage:
+    title: Build Docker image
     type: build
     image_name: node-bazel-windows
     working_directory: ./.codefresh
@@ -12,7 +13,7 @@ steps:
     dockerfile: ./Dockerfile.win-1809
 
   RunTests:
-    title: Run Tests
+    title: Run Bazel tests
     image: ${{BuildImage}}
     commands:
     # Install dependencies

From f1f8d70a41ded7212b2f9298e1927bfe41c2cd8c Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 28 May 2019 10:40:18 +0100
Subject: [PATCH 218/275] ci: remove msys workaround (#30510)

Verified it isn't a problem anymore https://github.com/docker/for-win/issues/2920

PR Close #30510
---
 .codefresh/Dockerfile.win-1809 | 7 +------
 .codefresh/fix-msys64.cmd      | 6 ------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 .codefresh/fix-msys64.cmd

diff --git a/.codefresh/Dockerfile.win-1809 b/.codefresh/Dockerfile.win-1809
index 44202e0ec1..eff6e1771a 100644
--- a/.codefresh/Dockerfile.win-1809
+++ b/.codefresh/Dockerfile.win-1809
@@ -117,9 +117,4 @@ RUN Invoke-WebRequest -UseBasicParsing https://www.python.org/ftp/python/3.5.1/p
     Start-Process python-3.5.1.exe -ArgumentList '/quiet InstallAllUsers=1 PrependPath=1' -Wait; `
     Remove-Item -Force python-3.5.1.exe
 
-# Add a fix for https://github.com/docker/for-win/issues/2920 as entry point to the container.
-SHELL ["cmd", "/c"]
-COPY "fix-msys64.cmd" "C:\\fix-msys64.cmd"
-ENTRYPOINT cmd /C C:\\fix-msys64.cmd && cmd /c
-
-CMD ["cmd.exe"]
\ No newline at end of file
+CMD ["cmd.exe"]
diff --git a/.codefresh/fix-msys64.cmd b/.codefresh/fix-msys64.cmd
deleted file mode 100644
index 3869596d08..0000000000
--- a/.codefresh/fix-msys64.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-REM Fix for https://github.com/docker/for-win/issues/2920
-REM echo "Fixing msys64 folder..."
-REM Touch all .dll files inside C:\msys64\
-forfiles /p C:\msys64\ /s /m *.dll /c "cmd /c Copy /B @path+,, >NUL"
-REM echo "Fixed msys64 folder."
\ No newline at end of file

From 671f64324ba67d887fd113df90f932eeeac18f83 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 28 May 2019 10:41:29 +0100
Subject: [PATCH 219/275] ci: remove buildkite setup (#30510)

We don't use it anymore and it's pretty stable by now.

PR Close #30510
---
 .buildkite/Dockerfile                      | 42 ----------
 .buildkite/README.md                       | 96 ----------------------
 .buildkite/fix-msys64.cmd                  |  6 --
 .buildkite/pipeline.yml                    | 10 ---
 .buildkite/provision-windows-buildkite.ps1 | 94 ---------------------
 5 files changed, 248 deletions(-)
 delete mode 100644 .buildkite/Dockerfile
 delete mode 100644 .buildkite/README.md
 delete mode 100644 .buildkite/fix-msys64.cmd
 delete mode 100644 .buildkite/pipeline.yml
 delete mode 100644 .buildkite/provision-windows-buildkite.ps1

diff --git a/.buildkite/Dockerfile b/.buildkite/Dockerfile
deleted file mode 100644
index d9d13f16e6..0000000000
--- a/.buildkite/Dockerfile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Heavily based on https://github.com/StefanScherer/dockerfiles-windows/ images.
-# Combines the node windowsservercore image with the Bazel Prerequisites (https://docs.bazel.build/versions/master/install-windows.html).
-# msys install taken from https://github.com/StefanScherer/dockerfiles-windows/issues/30
-# VS redist install taken from https://github.com/StefanScherer/dockerfiles-windows/blob/master/apache/Dockerfile
-# The nanoserver image won't work because MSYS2 does not run in it https://github.com/Alexpux/MSYS2-packages/issues/1493
-
-# Before building this image, you must locally build node-windows:10.13.0-windowsservercore-1803.
-# Clone https://github.com/StefanScherer/dockerfiles-windows/commit/4ce7101a766b9b880ac262479dd9126b64d656cf and build using
-# docker build -t node-windows:10.13.0-windowsservercore-1803 --build-arg core=microsoft/windowsservercore:1803 --build-arg target=microsoft/windowsservercore:1803 .
-FROM node-windows:10.13.0-windowsservercore-1803
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# Install 7zip to extract msys2
-RUN Invoke-WebRequest -UseBasicParsing 'https://www.7-zip.org/a/7z1805-x64.exe' -OutFile 7z.exe
-# For some reason the last letter in the destination directory is lost. So '/D=C:\\7zip0' will extract to '/D=C:\\7zip'.
-RUN Start-Process -FilePath 'C:\\7z.exe' -ArgumentList '/S', '/D=C:\\7zip0' -NoNewWindow -Wait
-
-# Extract msys2
-RUN Invoke-WebRequest -UseBasicParsing 'http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz' -OutFile msys2.tar.xz
-RUN Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'e', 'msys2.tar.xz' -Wait
-RUN Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'x', 'msys2.tar', '-oC:\\' -Wait
-RUN Remove-Item msys2.tar.xz
-RUN Remove-Item msys2.tar
-RUN Remove-Item 7z.exe
-RUN Remove-Item -Recurse 7zip
-
-# Add MSYS2 to PATH, and set BAZEL_SH
-RUN [Environment]::SetEnvironmentVariable('Path', $env:Path + ';C:\msys64\usr\bin', [System.EnvironmentVariableTarget]::Machine)
-RUN [Environment]::SetEnvironmentVariable('BAZEL_SH', 'C:\msys64\usr\bin\bash.exe', [System.EnvironmentVariableTarget]::Machine)
-
-# Install Microsoft Visual C++ Redistributable for Visual Studio 2015
-RUN Invoke-WebRequest -UseBasicParsing 'https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe' -OutFile vc_redist.x64.exe
-RUN Start-Process 'c:\\vc_redist.x64.exe' -ArgumentList '/Install', '/Passive', '/NoRestart' -NoNewWindow -Wait
-RUN Remove-Item vc_redist.x64.exe
-
-# Add a fix for https://github.com/docker/for-win/issues/2920 as entry point to the container.
-SHELL ["cmd", "/c"]
-COPY "fix-msys64.cmd" "C:\\fix-msys64.cmd"
-ENTRYPOINT cmd /C C:\\fix-msys64.cmd && cmd /c
-
-CMD ["cmd.exe"]
diff --git a/.buildkite/README.md b/.buildkite/README.md
deleted file mode 100644
index b7e25cd93b..0000000000
--- a/.buildkite/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# BuildKite configuration
-
-This folder contains configuration for the [BuildKite](https://buildkite.com) based CI checks for 
-this repository.
-
-BuildKite is a CI provider that provides build coordination and reports while we provide the 
-infrastructure.
-
-CI runs are triggered by new PRs and will show up on the GitHub checks interface, along with the 
-other current CI solutions.
-
-Currently it is only used for tests on Windows platforms.
-
-
-## The build pipeline
-
-BuildKite uses a pipeline for each repository. The `pipeline.yml` file defines pipeline 
-[build steps](https://buildkite.com/docs/pipelines/defining-steps) for this repository.
-
-Run results can be seen in the GitHub checks interface and in the 
-[pipeline dashboard](https://buildkite.com/angular/angular).
-
-Although most configuration is done via `pipeline.yml`, some options are only available
-in the online [pipeline settings](https://buildkite.com/angular/angular/settings).
-
-
-## Infrastructure
-
-BuildKite does not provide the host machines where the builds runs, providing instead the
-[BuildKite Agent](https://buildkite.com/docs/agent/v3) that should be run our own infrastructure.
-
-
-### Agents
-
-This agent polls the BuildKite API for builds, runs them, and reports back the results.
-Agents are the unit of concurrency: each agent can run one build at any given time. 
-Adding agents allows more builds to be ran at the same time.
-
-Individual agents can have tags, and pipeline steps can target only agents with certain tags via the
-`agents` field in `pipeline.yml`.
-For example: agents on Windows machines are tagged as `windows`, and the Windows specific build 
-steps list `windows: true` in their `agents` field.
-
-You can see the current agent pool, along with their tags, in the 
-[agents list](https://buildkite.com/organizations/angular/agents).
-
-
-### Our host machines
-
-We use [Google Cloud](https://cloud.google.com/) as our cloud provider, under the 
-[Angular project](https://console.cloud.google.com/home/dashboard?project=internal-200822).
-To access this project you need need to be logged in with a Google account that's a member of 
-team@angular.io. 
-For googlers this may be your google.com account, for others it is an angular.io account.
-
-In this project we have a number of Windows VMs running, each of them with several agents.
-The `provision-windows-buildkite.ps1` file contains instructions on how to create new host VMs that
-are fully configured to run the BuildKite agents as services.
-
-Our pipeline uses [docker-buildkite-plugin](https://github.com/buildkite-plugins/docker-buildkite-plugin)
-to run build steps inside docker containers.
-This way we achieve isolation and hermeticity.
-
-The `Dockerfile` file describes a custom Docker image that includes NodeJs, Yarn, and the Bazel 
-pre-requisites on Windows.
-
-To upload a new version of the docker image, follow any build instructions in `Dockerfile` and then
-run `docker build -t angular/node-bazel-windows:NEW_VERSION`, followed by 
-`docker push angular/node-bazel-windows:NEW_VERSION`. 
-After being pushed it should be available online, and you can use the new version in `pipeline.yml`.
-
-
-## Caretaker 
-
-BuildKite status can be found at https://www.buildkitestatus.com/.
-
-Issues related to the BuildKite setup should be escalated to the Tools Team via the current 
-caretaker, followed by Alex Eagle and Filipe Silva.
-
-Support requests should be submitted via email to support@buildkite.com and cc Igor, Misko, Alex,
-Jeremy and Manu
-
-
-## Rollout strategy
-
-At the moment our BuildKite CI uses 1 host VM running 4 agents, thus being capable of 4 concurrent 
-builds.
-The only test running is `bazel test //tools/ts-api-guardian:all`, and the PR check is not 
-mandatory.
-
-In the future we should add cache support to speed up the initial `yarn` install, and also Bazel
-remote caching to speed up Bazel builds.
-
-After the current setup is verified as stable and reliable the GitHub PR check can become mandatory.
-
-The tests ran should also be expanded to cover most, if not all, of the Bazel tests.
diff --git a/.buildkite/fix-msys64.cmd b/.buildkite/fix-msys64.cmd
deleted file mode 100644
index 4722e6edd6..0000000000
--- a/.buildkite/fix-msys64.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-REM Fix for https://github.com/docker/for-win/issues/2920
-REM echo "Fixing msys64 folder..."
-REM Touch all .dll files inside C:\msys64\
-forfiles /p C:\msys64\ /s /m *.dll /c "cmd /c Copy /B @path+,, >NUL"
-REM echo "Fixed msys64 folder."
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
deleted file mode 100644
index 58dd597bc4..0000000000
--- a/.buildkite/pipeline.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-steps:
-  - label: windows-test
-    commands:
-      - "yarn install --frozen-lockfile --non-interactive --network-timeout 100000"
-      - "yarn bazel test //tools/ts-api-guardian:all --noshow_progress"
-    plugins:
-      - docker#v2.1.0:
-          image: "filipesilva/node-bazel-windows:0.0.2"
-    agents:
-      windows: true
diff --git a/.buildkite/provision-windows-buildkite.ps1 b/.buildkite/provision-windows-buildkite.ps1
deleted file mode 100644
index 7af03b2319..0000000000
--- a/.buildkite/provision-windows-buildkite.ps1
+++ /dev/null
@@ -1,94 +0,0 @@
-# PowerShell script to provision a Windows Server with BuildKite
-# This script follows https://buildkite.com/docs/agent/v3/windows.
-
-# Instructions
-
-# VM creation:
-# In Google Cloud Platform, create a Compute Engine instance.
-# We recommend machine type n1-standard-16 (16 vCPUs, 60 GB memory).
-# Use a recent windows boot disk with container support such as
-# "Windows Server version 1803 Datacenter Core for Containers", and add a 128GB SSD disk.
-# Give it a name, then click "Create".
-
-# VM setup:
-# In the Compute Engine menu, select "VM Instances". Click on the VM name you chose before.
-# Click "Set Windows Password" to choose a username and password.
-# Click RDP to open a remote desktop via browser, using the username and password.
-# In the Windows command prompt start an elevated powershell by inputing
-# "powershell -Command "Start-Process PowerShell -Verb RunAs" followed by Enter.
-# Download and execute this script from GitHub, passing the token (mandatory), tags (optional)
-# and number of agents (optional) as args:
-# ```
-# Invoke-WebRequest -Uri https://raw.githubusercontent.com/angular/angular/master/.buildkite/provision-windows-buildkite.ps1 -OutFile provision.ps1
-# .\provision.ps1 -token "MY_TOKEN" -tags "windows=true,another_tag=true" -agents 4
-# ```
-# The VM should restart and be fully configured.
-
-# Creating extra VMs
-# You can create an image of the current VM by following the instructions below.
-# https://cloud.google.com/compute/docs/instances/windows/creating-windows-os-image
-# Then create a new VM and choose "Custom images".
-
-
-# Script proper.
-
-# Get the token and tags from arguments.
-param (
-  [Parameter(Mandatory=$true)][string]$token,
-  [string]$tags = "",
-  [Int]$agents = 1
-)
-
-# Allow HTTPS
-[Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"
-
-# Helper to add to PATH.
-# Will take current PATH so avoid running it after anything to modifies only the powershell session path.
-function Add-Path ([string]$newPathItem) {
-  $Env:Path+= ";" +  $newPathItem + ";"
-  [Environment]::SetEnvironmentVariable("Path",$env:Path, [System.EnvironmentVariableTarget]::Machine)
-}
-
-# Install Git for Windows
-Write-Host "Installing Git for Windows."
-Invoke-WebRequest -Uri https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/Git-2.19.1-64-bit.exe -OutFile git.exe
-.\git.exe /VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh" /DIR="C:\git"
-Add-Path "C:\git\bin"
-# Sleep for 15s while git is installed. Trying to remove the git.exe before it finishes install causes an error.
-Start-Sleep -s 15
-Remove-Item git.exe
-
-# Download NSSM (https://nssm.cc/) to run the BuildKite agent as a service.
-Write-Host "Downloading NSSM."
-Invoke-WebRequest -Uri https://nssm.cc/ci/nssm-2.24-101-g897c7ad.zip -OutFile nssm.zip
-Expand-Archive -Path nssm.zip -DestinationPath C:\nssm
-Add-Path "C:\nssm\nssm-2.24-101-g897c7ad\win64"
-Remove-Item nssm.zip
-
-# Run the BuildKite agent install script
-Write-Host "Installing BuildKite agent."
-$env:buildkiteAgentToken = $token
-$env:buildkiteAgentTags = $tags
-Set-ExecutionPolicy Bypass -Scope Process -Force
-iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/buildkite/agent/master/install.ps1'))
-
-# Configure the BuildKite agent clone and timestamp behavior
-Add-Content C:\buildkite-agent\buildkite-agent.cfg "`ngit-clone-flags=--config core.autocrlf=input --config core.eol=lf --config core.longpaths=true --config core.symlinks=true`n"
-Add-Content C:\buildkite-agent\buildkite-agent.cfg "`ntimestamp-lines=true`n"
-
-# Register the BuildKite agent service using NSSM, so that it persists through restarts and is
-# restarted if the process dies.
-for ($i=1; $i -le $agents; $i++)
-{
-  $agentName = "buildkite-agent-$i"
-  Write-Host "Registering $agentName as a service."
-  nssm.exe install $agentName "C:\buildkite-agent\bin\buildkite-agent.exe" "start"
-  nssm.exe set $agentName AppStdout "C:\buildkite-agent\$agentName.log"
-  nssm.exe set $agentName AppStderr "C:\buildkite-agent\$agentName.log"
-  nssm.exe status $agentName
-  nssm.exe start $agentName
-  nssm.exe status $agentName
-}
-
-# Restart the machine.
-Restart-Computer

From 0b23adca8037c927332ba5ea5d3f1180f2f6a90f Mon Sep 17 00:00:00 2001
From: Stefan van Groningen <groninge@hotmail.com>
Date: Wed, 15 May 2019 14:53:48 +0200
Subject: [PATCH 220/275] docs(common): fix typo in ngSwitch directive
 description (#30483)

PR Close #30483
---
 packages/common/src/directives/ng_switch.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common/src/directives/ng_switch.ts b/packages/common/src/directives/ng_switch.ts
index 83d20067d9..11c0fc8aef 100644
--- a/packages/common/src/directives/ng_switch.ts
+++ b/packages/common/src/directives/ng_switch.ts
@@ -98,7 +98,7 @@ export class SwitchView {
  * @publicApi
  * @see `NgSwitchCase`
  * @see `NgSwitchDefault`
- * @see [Stuctural Directives](guide/structural-directives)
+ * @see [Structural Directives](guide/structural-directives)
  *
  */
 @Directive({selector: '[ngSwitch]'})

From 2c406fb1a9ec49972130c3c0228485977fb65340 Mon Sep 17 00:00:00 2001
From: Bryce Kolton <BBKolton@users.noreply.github.com>
Date: Tue, 21 May 2019 11:32:24 -0700
Subject: [PATCH 221/275] docs(elements): move clarification about custom
 elements (#30594)

Moved clarification that "custom elements" are a subtype of Web Components to the first use of the term "custom elements"

PR Close #30594
---
 aio/content/guide/elements.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/elements.md b/aio/content/guide/elements.md
index f7dfa98f12..dd9975ef77 100644
--- a/aio/content/guide/elements.md
+++ b/aio/content/guide/elements.md
@@ -1,10 +1,10 @@
 # Angular Elements Overview
 
-_Angular elements_ are Angular components packaged as _custom elements_, a web standard for defining new HTML elements in a framework-agnostic way.
+_Angular elements_ are Angular components packaged as _custom elements_ (also called Web Components), a web standard for defining new HTML elements in a framework-agnostic way.
 
 [Custom elements](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Using_custom_elements) are a Web Platform feature currently supported by Chrome, Firefox, Opera, and Safari, and available in other browsers through polyfills (see [Browser Support](#browser-support)).
 A custom element extends HTML by allowing you to define a tag whose content is created and controlled by JavaScript code.
-The browser maintains a `CustomElementRegistry` of defined custom elements (also called Web Components), which maps an instantiable JavaScript class to an HTML tag.
+The browser maintains a `CustomElementRegistry` of defined custom elements, which maps an instantiable JavaScript class to an HTML tag.
 
 The `@angular/elements` package exports a `createCustomElement()` API that provides a bridge from Angular's component interface and change detection functionality to the built-in DOM API.
 

From 6a5cc8f95c50aebaa61394f814b520c25040f103 Mon Sep 17 00:00:00 2001
From: Michael Prentice <splaktar@gmail.com>
Date: Fri, 24 May 2019 03:23:04 -0400
Subject: [PATCH 222/275] docs: merge duplicated platform-webworker content in
 Deprecation Guide (#30651)

fix issue of duplicate anchors/ids

PR Close #30651
---
 aio/content/guide/deprecations.md | 38 +++++++++++++------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index cf1c5ba1ff..aea0be6915 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -369,33 +369,27 @@ These two properties have subtle differences, so switching to `textContent` unde
 
 All of the `wtf*` APIs are deprecated and will be removed in a future version.
 
-{@a platform-webworker}
-### `platform-webworker`
-
-The `@angular/platform-*` packages enable Angular to be run in different contexts. Some examples are running Angular on the server (`@angular/platform-server`), in the browser (`@angular/platform-browser`), or in a [web worker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) (`@angular/platform-webworker`).
-
-Though web worker is useful to offload things requiring lots of processing, pushing whole apps to run in the web worker isn't a winning strategy due to many unresolved issues.
-
-Angular CLI doesn't allow use of these APIs because the build system and bundling doesn't support them. This whole package is deprecated in Angular version 8 and will be removed in the future. If you're currently using the `@angular/platform-webworker` APIs in production, please reach out to devrel@angular.io and let us know - we're interested in hearing your use cases.
-
-Instead, use web workers primarily for offloading CPU intensive, but functionally not critical, work needed for initial rendering (for example, in memory search, image processing, and so on).
-
-
-
 {@a webworker-apps}
-### platform-webworker Angular applications
+### Running Angular applications in platform-webworker 
 
+The `@angular/platform-*` packages enable Angular to be run in different contexts. For examples,
+`@angular/platform-server` enables Angular to be run on the server, and `@angular/platform-browser`
+enables Angular to be run in a web browser.
 
-platform-webworker has been around since the initial release of Angular version 2. It began as an experiment to leverage Angular's rendering architecture and try something different: to run an entire web application in a web worker.
+`@angular/platform-webworker` was introduced in Angular version 2 as an experiment in leveraging
+Angular's rendering architecture to run an entire web application in a
+[web worker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API). We've learned a lot
+from this experiment and have come to the conclusion that running the entire application in a web
+worker is not the best strategy for most applications.
 
-We've learned a lot from this experiment, and have come to the conclusion that pushing entire applications to run in a web worker is not a recipe for success for most applications. This is due to a number of unresolved issues, including:
+Going forward, we will focus our efforts related to web workers around their primary use case of
+offloading CPU-intensive, non-critical work needed for initial rendering (such as in-memory search
+and image processing). Learn more in the 
+[guide to Using Web Workers with the Angular CLI](guide/web-worker).
 
-* Poor or non-existent support for web worker APIs in web crawlers/indexers.
-* Poor support in build and bundling tooling.
-
-As a result, as of Angular version 8, we are deprecating the `platform-webworker` APIs in Angular. This consists of both NPM packages, `@angular/platform-webworker` and `@angular/platform-webworker-dynamic`.
-
-Going forward, we will focus our efforts related to web workers around their primary use case of offloading CPU-intensive but not critical work.
+As of Angular version 8, all  `platform-webworker` APIs are deprecated.
+This includes both packages: `@angular/platform-webworker` and
+`@angular/platform-webworker-dynamic`.
 
 {@a removed}
 ## Removed APIs

From 71be1da0ada983a6bca6eec9bc031fcd1aa7680d Mon Sep 17 00:00:00 2001
From: Trotyl Yu <trotyl@qq.com>
Date: Thu, 30 May 2019 01:39:30 +0800
Subject: [PATCH 223/275] docs: fix deprecation information (#30717)

PR Close #30717
---
 aio/content/guide/deprecations.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index aea0be6915..82af74b934 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -318,8 +318,6 @@ The need for this polyfill was removed in Angular version 8.0 ([see #14473](http
 
 In a typical Angular project, the polyfill is not used in production builds, so removing it should not impact production applications. The goal behind this removal is overall simplification of the build setup and decrease in the number of external dependencies.
 
-We expect to remove the polyfill from most if not all CLI projects via an `ng upgrade` migration from version 8 to 9.
-
 {@a static-query-resolution}
 ### `@ViewChild()` / `@ContentChild()` static resolution as the default
 

From fd23663a29058ee4593ed29d306ef2037ed352a7 Mon Sep 17 00:00:00 2001
From: Shawn Clabough <sclabough@wsu.edu>
Date: Wed, 29 May 2019 12:19:53 -0700
Subject: [PATCH 224/275] docs: fix closing tags in deprecation summary
 (#30735)

 fix closing tags in "Cannot assign to template variables" section

PR Close #30735
---
 aio/content/guide/deprecations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index 82af74b934..b4ab940d55 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -346,13 +346,13 @@ In the following example, the two-way binding means that `optionName`
 should be written when the `valueChange` event fires.
 
 ```html
-<option *ngFor="let optionName of options" [(value)]="optionName"></cmp>
+<option *ngFor="let optionName of options" [(value)]="optionName"></option>
 ```
 
 However, in practice, Angular simply ignores two-way bindings to template variables. Starting in version 8, attempting to write to template variables is deprecated. In a future version, we will throw to indicate that the write is not supported.
 
 ```html
-<option *ngFor="let optionName of options" [value]="optionName"></cmp>
+<option *ngFor="let optionName of options" [value]="optionName"></option>
 ```
 
 {@a binding-to-innertext}

From e3f3b106ac2e049b7770e1e821e84266388f949b Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 20 May 2019 14:41:44 +0200
Subject: [PATCH 225/275] docs(ivy): improve debug documentation (#30562)

PR Close #30562
---
 docs/BAZEL.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/BAZEL.md b/docs/BAZEL.md
index 2a7cf4f4e7..f993420276 100644
--- a/docs/BAZEL.md
+++ b/docs/BAZEL.md
@@ -81,6 +81,9 @@ See also: [`//.bazelrc`](https://github.com/angular/angular/blob/master/.bazelrc
 
 The process should automatically connect to the debugger. For additional info and testing options, see the [nodejs_test documentation](https://bazelbuild.github.io/rules_nodejs/node/node.html#nodejs_test).
 
+- Click on "Resume script execution" to let the code run until the first `debugger` statement or a previously set breakpoint.
+- If you're debugging an ivy test and you want to inspect the generated template instructions, find the template of your component in the call stack and click on `(source mapped from [CompName].js)` at the bottom of the code. You can also disable sourcemaps in the options or go to sources and look into ng:// namespace to see all the generated code.
+
 ### Debugging a Node Test in VSCode
 
 First time setup:

From 62332b80daec33c332fec9869371256a76b1acde Mon Sep 17 00:00:00 2001
From: likui <2218301630@qq.com>
Date: Mon, 13 May 2019 10:01:20 +0800
Subject: [PATCH 226/275] docs: fix typo in upgrade guide example (#30428)

An code snippet from a `package.json` file used `script`
rather than `scripts`.

Fixes #30418

PR Close #30428
---
 aio/content/guide/upgrade.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index c98254cbd7..75f0d3b95e 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -1177,7 +1177,7 @@ Finally, you should add some npm scripts in `package.json` to compile the TypeSc
 JavaScript (based on the `tsconfig.json` configuration file):
 
 <code-example format="">
-  "script": {
+  "scripts": {
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     ...

From a2d26c6f2a17a60cac300f59dd4314053655d2b1 Mon Sep 17 00:00:00 2001
From: Rado Kirov <rkirov@gmail.com>
Date: Wed, 20 Mar 2019 14:40:27 -0700
Subject: [PATCH 227/275] docs: improve glossary for entry-point. (#29433)

PR Close #29433
---
 aio/content/guide/glossary.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index 6f37759986..ae5f9ecc79 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -362,11 +362,12 @@ Compare to [custom element](#custom-element).
 
 ## entry point
 
-A JavaScript symbol that makes parts of an [npm package](guide/npm-packages) available for import by other code.
-The Angular [scoped packages](#scoped-package) each have an entry point named `index`.
-
-Within Angular, use [NgModules](#ngmodule) to make public parts available for import by other NgModules.
-
+A JavaScript module(#module) that is intended to be imported by a user of [an
+npm package](guide/npm-packages). An entry-point module typically re-exports
+symbols from other internal modules. A package can contain multiple
+entry points. For example, the `@angular/core` package has two entry-point
+modules, which can be imported using the module names `@angular/core` and
+`@angular/core/testing`.
 
 {@a F}
 

From d2b0ac7de8f081427f7989a47d9e6f3a6ca6f30b Mon Sep 17 00:00:00 2001
From: diyews <diyews@users.noreply.github.com>
Date: Thu, 30 May 2019 17:09:46 +0800
Subject: [PATCH 228/275] docs(ivy): fix symbol in example AST (#30745)

PR Close #30745
---
 packages/compiler/src/compiler_util/expression_converter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler/src/compiler_util/expression_converter.ts b/packages/compiler/src/compiler_util/expression_converter.ts
index b98b0090ba..67cc3ceeb8 100644
--- a/packages/compiler/src/compiler_util/expression_converter.ts
+++ b/packages/compiler/src/compiler_util/expression_converter.ts
@@ -582,7 +582,7 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
     //      / \    / \
     //     .  c   .   e
     //    / \    / \
-    //   a   b  ,   d
+    //   a   b  .   d
     //         / \
     //        .   c
     //       / \

From f5b0c8a323328b34cb96159cbe3a6d0cd267bf25 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 28 May 2019 13:41:52 -0400
Subject: [PATCH 229/275] docs: remove mention of project settings from
 analytics (#30701)

This settings are not yet implemented and will be available in 8.1.

PR Close #30701
---
 aio/content/marketing/analytics.md | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/aio/content/marketing/analytics.md b/aio/content/marketing/analytics.md
index a6b495c7aa..e6d2f093d7 100644
--- a/aio/content/marketing/analytics.md
+++ b/aio/content/marketing/analytics.md
@@ -15,8 +15,7 @@ include the following information:
 - For Schematics commands (add, generate, new and update), a list of whitelisted flags.
 - For build commands (build, serve), the number and size of bundles (initial and lazy),
   compilation units, the time it took to build and rebuild, and basic Angular-specific
-  API usage. *This data is collected only if usage analytics gathering is enabled for
-  the project.*
+  API usage.
 - Error code of exceptions and crash data. No stack trace is collected.
 
 Only Angular owned and developed schematics and builders are reported. Third-party schematics and
@@ -26,9 +25,6 @@ builders do not send data to the Angular Team.
 When installing the Angular CLI or upgrading an existing version, you are prompted to allow global
 collection of usage statistics. If you say no or skip the prompt, no data is collected.
 
-The first time a command affecting the project is run, you are prompted to allow collection of data
-related to the project. If you say no or skip the prompt, no data is collected for that project.
-
 Starting with version 8, we added the `analytics` command to the CLI. You can change your opt-in
 decision at any time using this command.
 
@@ -38,9 +34,6 @@ To disable analytics gathering, run the following command:
 ```bash
 # Disable all usage analytics.
 ng analytics off
-
-# Disable project-specific usage analytics.
-ng analytics project off
 ```
 
 ### Enabling usage analytics
@@ -49,9 +42,6 @@ To enable usage analytics, run the following command:
 ```bash
 # Enable all usage analytics.
 ng analytics on
-
-# Enable project-specific usage analytics.
-ng analytics project on
 ```
 
 ### Prompting
@@ -60,7 +50,4 @@ To prompt the user again about usage analytics, run the following command:
 ```bash
 # Prompt for all usage analytics.
 ng analytics prompt
-
-# Prompt for project-specific usage analytics.
-ng analytics project prompt
 ```

From 5e0f982961167efdcbd99c20038bbe9ea5b64163 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Fri, 17 May 2019 16:13:31 +0200
Subject: [PATCH 230/275] feat(ivy): use i18n locale data to determine the
 plural form of ICU expressions (#29249)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Plural ICU expressions depend on the locale (different languages have different plural forms). Until now the locale was hard coded as `en-US`.
For compatibility reasons, if you use ivy with AOT and bootstrap your app with `bootstrapModule` then the `LOCALE_ID` token will be set automatically for ivy, which is then used to get the correct plural form.
If you use JIT, you need to define the `LOCALE_ID` provider on the module that you bootstrap.
For `TestBed` you can use either `configureTestingModule` or `overrideProvider` to define that provider.
If you don't use the compat mode and start your app with `renderComponent` you need to call `ɵsetLocaleId` manually to define the `LOCALE_ID` before bootstrap. We expect this to change once we start adding the new i18n APIs, so don't rely on this function (there's a reason why it's a private export).
PR Close #29249
---
 packages/common/src/i18n/locale_data.ts       |  31 +-
 packages/common/src/i18n/locale_data_api.ts   |  51 +--
 .../common/test/i18n/locale_data_api_spec.ts  |   3 +-
 .../src/ngtsc/annotations/src/ng_module.ts    |  21 +-
 packages/compiler-cli/src/ngtsc/program.ts    |   3 +-
 packages/core/src/application_ref.ts          |   5 +
 packages/core/src/core_private_export.ts      |   2 +
 .../core/src/core_render3_private_export.ts   |   2 +
 packages/core/src/i18n/locale_data.ts         |  38 ++
 packages/core/src/i18n/locale_data_api.ts     |  53 +++
 .../{common => core}/src/i18n/locale_en.ts    |   0
 packages/core/src/i18n/localization.ts        |  31 ++
 packages/core/src/render3/component.ts        |   2 +-
 packages/core/src/render3/definition.ts       |   8 +-
 packages/core/src/render3/fields.ts           |   1 +
 packages/core/src/render3/i18n.ts             | 382 ++----------------
 packages/core/src/render3/index.ts            |   3 +
 packages/core/src/render3/jit/module.ts       |   1 -
 packages/core/src/render3/ng_module_ref.ts    |   8 +-
 packages/core/test/BUILD.bazel                |   1 +
 packages/core/test/acceptance/BUILD.bazel     |   1 +
 packages/core/test/acceptance/i18n_spec.ts    |  44 +-
 packages/core/test/application_ref_spec.ts    |  20 +-
 .../core/testing/src/r3_test_bed_compiler.ts  |  10 +-
 tools/gulp-tasks/cldr/extract.js              |  15 +-
 tools/public_api_guard/common/common.d.ts     |   2 +-
 26 files changed, 288 insertions(+), 450 deletions(-)
 create mode 100644 packages/core/src/i18n/locale_data.ts
 create mode 100644 packages/core/src/i18n/locale_data_api.ts
 rename packages/{common => core}/src/i18n/locale_en.ts (100%)
 create mode 100644 packages/core/src/i18n/localization.ts

diff --git a/packages/common/src/i18n/locale_data.ts b/packages/common/src/i18n/locale_data.ts
index 1d3301999a..975dcc0b69 100644
--- a/packages/common/src/i18n/locale_data.ts
+++ b/packages/common/src/i18n/locale_data.ts
@@ -6,10 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @publicApi
- */
-export const LOCALE_DATA: {[localeId: string]: any} = {};
+import {ɵLOCALE_DATA as LOCALE_DATA, ɵLocaleDataIndex as LocaleDataIndex} from '@angular/core';
 
 /**
  * Register global data to be used internally by Angular. See the
@@ -33,32 +30,6 @@ export function registerLocaleData(data: any, localeId?: string | any, extraData
   }
 }
 
-/**
- * Index of each type of locale data from the locale data array
- */
-export const enum LocaleDataIndex {
-  LocaleId = 0,
-  DayPeriodsFormat,
-  DayPeriodsStandalone,
-  DaysFormat,
-  DaysStandalone,
-  MonthsFormat,
-  MonthsStandalone,
-  Eras,
-  FirstDayOfWeek,
-  WeekendRange,
-  DateFormat,
-  TimeFormat,
-  DateTimeFormat,
-  NumberSymbols,
-  NumberFormats,
-  CurrencySymbol,
-  CurrencyName,
-  Currencies,
-  PluralCase,
-  ExtraData
-}
-
 /**
  * Index of each type of locale data from the extra locale data array
  */
diff --git a/packages/common/src/i18n/locale_data_api.ts b/packages/common/src/i18n/locale_data_api.ts
index 46d02421cc..072add5903 100644
--- a/packages/common/src/i18n/locale_data_api.ts
+++ b/packages/common/src/i18n/locale_data_api.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import localeEn from './locale_en';
-import {LOCALE_DATA, LocaleDataIndex, ExtraLocaleDataIndex, CurrencyIndex} from './locale_data';
+import {ɵLocaleDataIndex as LocaleDataIndex, ɵfindLocaleData as findLocaleData, ɵgetLocalePluralCase} from '@angular/core';
 import {CURRENCIES_EN, CurrenciesSymbols} from './currencies';
+import {CurrencyIndex, ExtraLocaleDataIndex} from './locale_data';
 
 /**
  * Format styles that can be used to represent numbers.
@@ -31,7 +31,8 @@ export enum NumberFormatStyle {
  * @see `NgPluralCase`
  * @see [Internationalization (i18n) Guide](https://angular.io/guide/i18n)
  *
- * @publicApi */
+ * @publicApi
+ */
 export enum Plural {
   Zero = 0,
   One = 1,
@@ -485,19 +486,11 @@ function getLocaleCurrencies(locale: string): {[code: string]: CurrenciesSymbols
 }
 
 /**
- * Retrieves the plural function used by ICU expressions to determine the plural case to use
- * for a given locale.
- * @param locale A locale code for the locale format rules to use.
- * @returns The plural function for the locale.
- * @see `NgPlural`
- * @see [Internationalization (i18n) Guide](https://angular.io/guide/i18n)
- *
+ * @alias core/ɵgetLocalePluralCase
  * @publicApi
  */
-export function getLocalePluralCase(locale: string): (value: number) => Plural {
-  const data = findLocaleData(locale);
-  return data[LocaleDataIndex.PluralCase];
-}
+export const getLocalePluralCase: (locale: string) => ((value: number) => Plural) =
+    ɵgetLocalePluralCase;
 
 function checkFullData(data: any) {
   if (!data[LocaleDataIndex.ExtraData]) {
@@ -609,37 +602,7 @@ function extractTime(time: string): Time {
   return {hours: +h, minutes: +m};
 }
 
-/**
- * Finds the locale data for a given locale.
- *
- * @param locale The locale code.
- * @returns The locale data.
- * @see [Internationalization (i18n) Guide](https://angular.io/guide/i18n)
- *
- * @publicApi
- */
-export function findLocaleData(locale: string): any {
-  const normalizedLocale = locale.toLowerCase().replace(/_/g, '-');
 
-  let match = LOCALE_DATA[normalizedLocale];
-  if (match) {
-    return match;
-  }
-
-  // let's try to find a parent locale
-  const parentLocale = normalizedLocale.split('-')[0];
-  match = LOCALE_DATA[parentLocale];
-
-  if (match) {
-    return match;
-  }
-
-  if (parentLocale === 'en') {
-    return localeEn;
-  }
-
-  throw new Error(`Missing locale data for the locale "${locale}".`);
-}
 
 /**
  * Retrieves the currency symbol for a given currency code.
diff --git a/packages/common/test/i18n/locale_data_api_spec.ts b/packages/common/test/i18n/locale_data_api_spec.ts
index 9fee387070..6babf0bd20 100644
--- a/packages/common/test/i18n/locale_data_api_spec.ts
+++ b/packages/common/test/i18n/locale_data_api_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ɵfindLocaleData as findLocaleData} from '@angular/core';
 import localeCaESVALENCIA from '@angular/common/locales/ca-ES-VALENCIA';
 import localeEn from '@angular/common/locales/en';
 import localeFr from '@angular/common/locales/fr';
@@ -13,7 +14,7 @@ import localeZh from '@angular/common/locales/zh';
 import localeFrCA from '@angular/common/locales/fr-CA';
 import localeEnAU from '@angular/common/locales/en-AU';
 import {registerLocaleData} from '../../src/i18n/locale_data';
-import {findLocaleData, getCurrencySymbol, getLocaleDateFormat, FormatWidth, getNumberOfCurrencyDigits} from '../../src/i18n/locale_data_api';
+import {getCurrencySymbol, getLocaleDateFormat, FormatWidth, getNumberOfCurrencyDigits} from '../../src/i18n/locale_data_api';
 
 {
   describe('locale data api', () => {
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
index 52040dfd1e..fcb414c366 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Expression, ExternalExpr, InvokeFunctionExpr, LiteralArrayExpr, R3Identifiers, R3InjectorMetadata, R3NgModuleMetadata, R3Reference, Statement, WrappedNodeExpr, compileInjector, compileNgModule} from '@angular/compiler';
+import {Expression, ExternalExpr, InvokeFunctionExpr, LiteralArrayExpr, LiteralExpr, R3Identifiers, R3InjectorMetadata, R3NgModuleMetadata, R3Reference, Statement, WrappedNodeExpr, compileInjector, compileNgModule} from '@angular/compiler';
+import {STRING_TYPE} from '@angular/compiler/src/output/output_ast';
 import * as ts from 'typescript';
 
 import {ErrorCode, FatalDiagnosticError} from '../../diagnostics';
@@ -18,7 +19,6 @@ import {NgModuleRouteAnalyzer} from '../../routing';
 import {LocalModuleScopeRegistry, ScopeData} from '../../scope';
 import {AnalysisOutput, CompileResult, DecoratorHandler, DetectResult, HandlerPrecedence, ResolveResult} from '../../transform';
 import {getSourceFile} from '../../util/src/typescript';
-
 import {generateSetClassMetadataCall} from './metadata';
 import {ReferencesRegistry} from './references_registry';
 import {combineResolvers, findAngularDecorator, forwardRefResolver, getValidConstructorDependencies, isExpressionForwardReference, toR3Reference, unwrapExpression} from './util';
@@ -43,7 +43,7 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
       private metaRegistry: MetadataRegistry, private scopeRegistry: LocalModuleScopeRegistry,
       private referencesRegistry: ReferencesRegistry, private isCore: boolean,
       private routeAnalyzer: NgModuleRouteAnalyzer|null, private refEmitter: ReferenceEmitter,
-      private defaultImportRecorder: DefaultImportRecorder) {}
+      private defaultImportRecorder: DefaultImportRecorder, private localeId?: string) {}
 
   readonly precedence = HandlerPrecedence.PRIMARY;
 
@@ -258,7 +258,7 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
         ngModuleStatements.push(callExpr.toStmt());
       }
     }
-    return [
+    const res: CompileResult[] = [
       {
         name: 'ngModuleDef',
         initializer: ngModuleDef.expression,
@@ -270,8 +270,19 @@ export class NgModuleDecoratorHandler implements DecoratorHandler<NgModuleAnalys
         initializer: ngInjectorDef.expression,
         statements: ngInjectorDef.statements,
         type: ngInjectorDef.type,
-      },
+      }
     ];
+
+    if (this.localeId) {
+      res.push({
+        name: 'ngLocaleIdDef',
+        initializer: new LiteralExpr(this.localeId),
+        statements: [],
+        type: STRING_TYPE
+      });
+    }
+
+    return res;
   }
 
   private _toR3Reference(
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index e16a415fbd..0d768d3df6 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -501,7 +501,8 @@ export class NgtscProgram implements api.Program {
           this.options.strictInjectionParameters || false),
       new NgModuleDecoratorHandler(
           this.reflector, evaluator, metaRegistry, scopeRegistry, referencesRegistry, this.isCore,
-          this.routeAnalyzer, this.refEmitter, this.defaultImportTracker),
+          this.routeAnalyzer, this.refEmitter, this.defaultImportTracker,
+          this.options.i18nInLocale),
       new PipeDecoratorHandler(
           this.reflector, evaluator, metaRegistry, this.defaultImportTracker, this.isCore),
     ];
diff --git a/packages/core/src/application_ref.ts b/packages/core/src/application_ref.ts
index e6a2faf3dd..e8c6f81545 100644
--- a/packages/core/src/application_ref.ts
+++ b/packages/core/src/application_ref.ts
@@ -15,6 +15,7 @@ import {getCompilerFacade} from './compiler/compiler_facade';
 import {Console} from './console';
 import {Injectable, InjectionToken, Injector, StaticProvider} from './di';
 import {ErrorHandler} from './error_handler';
+import {LOCALE_ID} from './i18n/tokens';
 import {Type} from './interface/type';
 import {COMPILER_OPTIONS, CompilerFactory, CompilerOptions} from './linker/compiler';
 import {ComponentFactory, ComponentRef} from './linker/component_factory';
@@ -25,6 +26,7 @@ import {isComponentResourceResolutionQueueEmpty, resolveComponentResources} from
 import {WtfScopeFn, wtfCreateScope, wtfLeave} from './profile/profile';
 import {assertNgModuleType} from './render3/assert';
 import {ComponentFactory as R3ComponentFactory} from './render3/component_ref';
+import {DEFAULT_LOCALE_ID, setLocaleId} from './render3/i18n';
 import {NgModuleFactory as R3NgModuleFactory} from './render3/ng_module_ref';
 import {Testability, TestabilityRegistry} from './testability/testability';
 import {isDevMode} from './util/is_dev_mode';
@@ -261,6 +263,9 @@ export class PlatformRef {
       if (!exceptionHandler) {
         throw new Error('No ErrorHandler. Is platform module (BrowserModule) included?');
       }
+      // If the `LOCALE_ID` provider is defined at bootstrap we set the value for runtime i18n (ivy)
+      const localeId = moduleRef.injector.get(LOCALE_ID, DEFAULT_LOCALE_ID);
+      setLocaleId(localeId);
       moduleRef.onDestroy(() => remove(this._modules, moduleRef));
       ngZone !.runOutsideAngular(
           () => ngZone !.onError.subscribe(
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index d4f139a16e..510f4326f1 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -34,3 +34,5 @@ export {makeDecorator as ɵmakeDecorator} from './util/decorators';
 export {isObservable as ɵisObservable, isPromise as ɵisPromise} from './util/lang';
 export {clearOverrides as ɵclearOverrides, initServicesIfNeeded as ɵinitServicesIfNeeded, overrideComponentView as ɵoverrideComponentView, overrideProvider as ɵoverrideProvider} from './view/index';
 export {NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR as ɵNOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR} from './view/provider';
+export {getLocalePluralCase as ɵgetLocalePluralCase, findLocaleData as ɵfindLocaleData} from './i18n/locale_data_api';
+export {LOCALE_DATA as ɵLOCALE_DATA, LocaleDataIndex as ɵLocaleDataIndex} from './i18n/locale_data';
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 6a9e57fb18..23b3cfac9c 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -162,6 +162,8 @@ export {
   ɵɵi18nPostprocess,
   i18nConfigureLocalize as ɵi18nConfigureLocalize,
   ɵɵi18nLocalize,
+  setLocaleId as ɵsetLocaleId,
+  DEFAULT_LOCALE_ID as ɵDEFAULT_LOCALE_ID,
   setClassMetadata as ɵsetClassMetadata,
   ɵɵresolveWindow,
   ɵɵresolveDocument,
diff --git a/packages/core/src/i18n/locale_data.ts b/packages/core/src/i18n/locale_data.ts
new file mode 100644
index 0000000000..734cc16680
--- /dev/null
+++ b/packages/core/src/i18n/locale_data.ts
@@ -0,0 +1,38 @@
+/**
+ * @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 const is used to store the locale data registered with `registerLocaleData`
+ */
+export const LOCALE_DATA: {[localeId: string]: any} = {};
+
+/**
+ * Index of each type of locale data from the locale data array
+ */
+export enum LocaleDataIndex {
+  LocaleId = 0,
+  DayPeriodsFormat,
+  DayPeriodsStandalone,
+  DaysFormat,
+  DaysStandalone,
+  MonthsFormat,
+  MonthsStandalone,
+  Eras,
+  FirstDayOfWeek,
+  WeekendRange,
+  DateFormat,
+  TimeFormat,
+  DateTimeFormat,
+  NumberSymbols,
+  NumberFormats,
+  CurrencySymbol,
+  CurrencyName,
+  Currencies,
+  PluralCase,
+  ExtraData
+}
diff --git a/packages/core/src/i18n/locale_data_api.ts b/packages/core/src/i18n/locale_data_api.ts
new file mode 100644
index 0000000000..cc30c20348
--- /dev/null
+++ b/packages/core/src/i18n/locale_data_api.ts
@@ -0,0 +1,53 @@
+/**
+ * @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 {LOCALE_DATA, LocaleDataIndex} from './locale_data';
+import localeEn from './locale_en';
+
+/**
+ * Retrieves the plural function used by ICU expressions to determine the plural case to use
+ * for a given locale.
+ * @param locale A locale code for the locale format rules to use.
+ * @returns The plural function for the locale.
+ * @see `NgPlural`
+ * @see [Internationalization (i18n) Guide](https://angular.io/guide/i18n)
+ */
+export function getLocalePluralCase(locale: string): (value: number) => number {
+  const data = findLocaleData(locale);
+  return data[LocaleDataIndex.PluralCase];
+}
+
+/**
+ * Finds the locale data for a given locale.
+ *
+ * @param locale The locale code.
+ * @returns The locale data.
+ * @see [Internationalization (i18n) Guide](https://angular.io/guide/i18n)
+ */
+export function findLocaleData(locale: string): any {
+  const normalizedLocale = locale.toLowerCase().replace(/_/g, '-');
+
+  let match = LOCALE_DATA[normalizedLocale];
+  if (match) {
+    return match;
+  }
+
+  // let's try to find a parent locale
+  const parentLocale = normalizedLocale.split('-')[0];
+  match = LOCALE_DATA[parentLocale];
+
+  if (match) {
+    return match;
+  }
+
+  if (parentLocale === 'en') {
+    return localeEn;
+  }
+
+  throw new Error(`Missing locale data for the locale "${locale}".`);
+}
diff --git a/packages/common/src/i18n/locale_en.ts b/packages/core/src/i18n/locale_en.ts
similarity index 100%
rename from packages/common/src/i18n/locale_en.ts
rename to packages/core/src/i18n/locale_en.ts
diff --git a/packages/core/src/i18n/localization.ts b/packages/core/src/i18n/localization.ts
new file mode 100644
index 0000000000..0cb492f18b
--- /dev/null
+++ b/packages/core/src/i18n/localization.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 {getLocalePluralCase} from './locale_data_api';
+
+/**
+ * Returns the plural case based on the locale
+ */
+export function getPluralCase(value: any, locale: string): string {
+  const plural = getLocalePluralCase(locale)(value);
+
+  switch (plural) {
+    case 0:
+      return 'zero';
+    case 1:
+      return 'one';
+    case 2:
+      return 'two';
+    case 3:
+      return 'few';
+    case 4:
+      return 'many';
+    default:
+      return 'other';
+  }
+}
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 6f436b01f8..ed6cd447e7 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -61,7 +61,7 @@ export interface CreateComponentOptions {
    * Typically, the features in this list are features that cannot be added to the
    * other features list in the component definition because they rely on other factors.
    *
-   * Example: `RootLifecycleHooks` is a function that adds lifecycle hook capabilities
+   * Example: `LifecycleHooksFeature` is a function that adds lifecycle hook capabilities
    * to root components in a tree-shakable way. It cannot be added to the component
    * features list because there's no way of knowing when the component will be used as
    * a root component.
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index b2637ef8db..ed07f6a001 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -7,7 +7,6 @@
  */
 
 import '../util/ng_dev_mode';
-
 import {ChangeDetectionStrategy} from '../change_detection/constants';
 import {NG_INJECTABLE_DEF, ɵɵdefineInjectable} from '../di/interface/defs';
 import {Mutable, Type} from '../interface/type';
@@ -16,9 +15,8 @@ import {SchemaMetadata} from '../metadata/schema';
 import {ViewEncapsulation} from '../metadata/view';
 import {noSideEffects} from '../util/closure';
 import {stringify} from '../util/stringify';
-
 import {EMPTY_ARRAY, EMPTY_OBJ} from './empty';
-import {NG_BASE_DEF, NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
+import {NG_BASE_DEF, NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_LOCALE_ID_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
 import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature, DirectiveType, DirectiveTypesOrFactory, FactoryFn, HostBindingsFunction, PipeDef, PipeType, PipeTypesOrFactory, ViewQueriesFunction, ɵɵBaseDef} from './interfaces/definition';
 // while SelectorFlags is unused here, it's required so that types don't get resolved lazily
 // see: https://github.com/Microsoft/web-build-tools/issues/1050
@@ -779,3 +777,7 @@ export function getNgModuleDef<T>(type: any, throwNotFound?: boolean): NgModuleD
   }
   return ngModuleDef;
 }
+
+export function getNgLocaleIdDef(type: any): string|null {
+  return (type as any)[NG_LOCALE_ID_DEF] || null;
+}
diff --git a/packages/core/src/render3/fields.ts b/packages/core/src/render3/fields.ts
index 26b29af9da..92642b417f 100644
--- a/packages/core/src/render3/fields.ts
+++ b/packages/core/src/render3/fields.ts
@@ -12,6 +12,7 @@ export const NG_COMPONENT_DEF = getClosureSafeProperty({ngComponentDef: getClosu
 export const NG_DIRECTIVE_DEF = getClosureSafeProperty({ngDirectiveDef: getClosureSafeProperty});
 export const NG_PIPE_DEF = getClosureSafeProperty({ngPipeDef: getClosureSafeProperty});
 export const NG_MODULE_DEF = getClosureSafeProperty({ngModuleDef: getClosureSafeProperty});
+export const NG_LOCALE_ID_DEF = getClosureSafeProperty({ngLocaleIdDef: getClosureSafeProperty});
 export const NG_BASE_DEF = getClosureSafeProperty({ngBaseDef: getClosureSafeProperty});
 
 /**
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 0d921754c9..182ad42026 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -7,13 +7,12 @@
  */
 
 import '../util/ng_i18n_closure_mode';
-
+import {getPluralCase} from '../i18n/localization';
 import {SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS, getTemplateContent} from '../sanitization/html_sanitizer';
 import {InertBodyHelper} from '../sanitization/inert_body';
 import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer';
 import {addAllToArray} from '../util/array_utils';
 import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
-
 import {attachPatchData} from './context_discovery';
 import {attachI18nOpCodesDebug} from './debug';
 import {ɵɵelementAttribute, ɵɵload, ɵɵtextBinding} from './instructions/all';
@@ -1020,351 +1019,6 @@ export function ɵɵi18nApply(index: number) {
   }
 }
 
-enum Plural {
-  Zero = 0,
-  One = 1,
-  Two = 2,
-  Few = 3,
-  Many = 4,
-  Other = 5,
-}
-
-/**
- * Returns the plural case based on the locale.
- * This is a copy of the deprecated function that we used in Angular v4.
- * // TODO(ocombe): remove this once we can the real getPluralCase function
- *
- * @deprecated from v5 the plural case function is in locale data files common/locales/*.ts
- */
-function getPluralCase(locale: string, nLike: number | string): Plural {
-  if (typeof nLike === 'string') {
-    nLike = parseInt(<string>nLike, 10);
-  }
-  const n: number = nLike as number;
-  const nDecimal = n.toString().replace(/^[^.]*\.?/, '');
-  const i = Math.floor(Math.abs(n));
-  const v = nDecimal.length;
-  const f = parseInt(nDecimal, 10);
-  const t = parseInt(n.toString().replace(/^[^.]*\.?|0+$/g, ''), 10) || 0;
-
-  const lang = locale.split('-')[0].toLowerCase();
-
-  switch (lang) {
-    case 'af':
-    case 'asa':
-    case 'az':
-    case 'bem':
-    case 'bez':
-    case 'bg':
-    case 'brx':
-    case 'ce':
-    case 'cgg':
-    case 'chr':
-    case 'ckb':
-    case 'ee':
-    case 'el':
-    case 'eo':
-    case 'es':
-    case 'eu':
-    case 'fo':
-    case 'fur':
-    case 'gsw':
-    case 'ha':
-    case 'haw':
-    case 'hu':
-    case 'jgo':
-    case 'jmc':
-    case 'ka':
-    case 'kk':
-    case 'kkj':
-    case 'kl':
-    case 'ks':
-    case 'ksb':
-    case 'ky':
-    case 'lb':
-    case 'lg':
-    case 'mas':
-    case 'mgo':
-    case 'ml':
-    case 'mn':
-    case 'nb':
-    case 'nd':
-    case 'ne':
-    case 'nn':
-    case 'nnh':
-    case 'nyn':
-    case 'om':
-    case 'or':
-    case 'os':
-    case 'ps':
-    case 'rm':
-    case 'rof':
-    case 'rwk':
-    case 'saq':
-    case 'seh':
-    case 'sn':
-    case 'so':
-    case 'sq':
-    case 'ta':
-    case 'te':
-    case 'teo':
-    case 'tk':
-    case 'tr':
-    case 'ug':
-    case 'uz':
-    case 'vo':
-    case 'vun':
-    case 'wae':
-    case 'xog':
-      if (n === 1) return Plural.One;
-      return Plural.Other;
-    case 'ak':
-    case 'ln':
-    case 'mg':
-    case 'pa':
-    case 'ti':
-      if (n === Math.floor(n) && n >= 0 && n <= 1) return Plural.One;
-      return Plural.Other;
-    case 'am':
-    case 'as':
-    case 'bn':
-    case 'fa':
-    case 'gu':
-    case 'hi':
-    case 'kn':
-    case 'mr':
-    case 'zu':
-      if (i === 0 || n === 1) return Plural.One;
-      return Plural.Other;
-    case 'ar':
-      if (n === 0) return Plural.Zero;
-      if (n === 1) return Plural.One;
-      if (n === 2) return Plural.Two;
-      if (n % 100 === Math.floor(n % 100) && n % 100 >= 3 && n % 100 <= 10) return Plural.Few;
-      if (n % 100 === Math.floor(n % 100) && n % 100 >= 11 && n % 100 <= 99) return Plural.Many;
-      return Plural.Other;
-    case 'ast':
-    case 'ca':
-    case 'de':
-    case 'en':
-    case 'et':
-    case 'fi':
-    case 'fy':
-    case 'gl':
-    case 'it':
-    case 'nl':
-    case 'sv':
-    case 'sw':
-    case 'ur':
-    case 'yi':
-      if (i === 1 && v === 0) return Plural.One;
-      return Plural.Other;
-    case 'be':
-      if (n % 10 === 1 && !(n % 100 === 11)) return Plural.One;
-      if (n % 10 === Math.floor(n % 10) && n % 10 >= 2 && n % 10 <= 4 &&
-          !(n % 100 >= 12 && n % 100 <= 14))
-        return Plural.Few;
-      if (n % 10 === 0 || n % 10 === Math.floor(n % 10) && n % 10 >= 5 && n % 10 <= 9 ||
-          n % 100 === Math.floor(n % 100) && n % 100 >= 11 && n % 100 <= 14)
-        return Plural.Many;
-      return Plural.Other;
-    case 'br':
-      if (n % 10 === 1 && !(n % 100 === 11 || n % 100 === 71 || n % 100 === 91)) return Plural.One;
-      if (n % 10 === 2 && !(n % 100 === 12 || n % 100 === 72 || n % 100 === 92)) return Plural.Two;
-      if (n % 10 === Math.floor(n % 10) && (n % 10 >= 3 && n % 10 <= 4 || n % 10 === 9) &&
-          !(n % 100 >= 10 && n % 100 <= 19 || n % 100 >= 70 && n % 100 <= 79 ||
-            n % 100 >= 90 && n % 100 <= 99))
-        return Plural.Few;
-      if (!(n === 0) && n % 1e6 === 0) return Plural.Many;
-      return Plural.Other;
-    case 'bs':
-    case 'hr':
-    case 'sr':
-      if (v === 0 && i % 10 === 1 && !(i % 100 === 11) || f % 10 === 1 && !(f % 100 === 11))
-        return Plural.One;
-      if (v === 0 && i % 10 === Math.floor(i % 10) && i % 10 >= 2 && i % 10 <= 4 &&
-              !(i % 100 >= 12 && i % 100 <= 14) ||
-          f % 10 === Math.floor(f % 10) && f % 10 >= 2 && f % 10 <= 4 &&
-              !(f % 100 >= 12 && f % 100 <= 14))
-        return Plural.Few;
-      return Plural.Other;
-    case 'cs':
-    case 'sk':
-      if (i === 1 && v === 0) return Plural.One;
-      if (i === Math.floor(i) && i >= 2 && i <= 4 && v === 0) return Plural.Few;
-      if (!(v === 0)) return Plural.Many;
-      return Plural.Other;
-    case 'cy':
-      if (n === 0) return Plural.Zero;
-      if (n === 1) return Plural.One;
-      if (n === 2) return Plural.Two;
-      if (n === 3) return Plural.Few;
-      if (n === 6) return Plural.Many;
-      return Plural.Other;
-    case 'da':
-      if (n === 1 || !(t === 0) && (i === 0 || i === 1)) return Plural.One;
-      return Plural.Other;
-    case 'dsb':
-    case 'hsb':
-      if (v === 0 && i % 100 === 1 || f % 100 === 1) return Plural.One;
-      if (v === 0 && i % 100 === 2 || f % 100 === 2) return Plural.Two;
-      if (v === 0 && i % 100 === Math.floor(i % 100) && i % 100 >= 3 && i % 100 <= 4 ||
-          f % 100 === Math.floor(f % 100) && f % 100 >= 3 && f % 100 <= 4)
-        return Plural.Few;
-      return Plural.Other;
-    case 'ff':
-    case 'fr':
-    case 'hy':
-    case 'kab':
-      if (i === 0 || i === 1) return Plural.One;
-      return Plural.Other;
-    case 'fil':
-      if (v === 0 && (i === 1 || i === 2 || i === 3) ||
-          v === 0 && !(i % 10 === 4 || i % 10 === 6 || i % 10 === 9) ||
-          !(v === 0) && !(f % 10 === 4 || f % 10 === 6 || f % 10 === 9))
-        return Plural.One;
-      return Plural.Other;
-    case 'ga':
-      if (n === 1) return Plural.One;
-      if (n === 2) return Plural.Two;
-      if (n === Math.floor(n) && n >= 3 && n <= 6) return Plural.Few;
-      if (n === Math.floor(n) && n >= 7 && n <= 10) return Plural.Many;
-      return Plural.Other;
-    case 'gd':
-      if (n === 1 || n === 11) return Plural.One;
-      if (n === 2 || n === 12) return Plural.Two;
-      if (n === Math.floor(n) && (n >= 3 && n <= 10 || n >= 13 && n <= 19)) return Plural.Few;
-      return Plural.Other;
-    case 'gv':
-      if (v === 0 && i % 10 === 1) return Plural.One;
-      if (v === 0 && i % 10 === 2) return Plural.Two;
-      if (v === 0 &&
-          (i % 100 === 0 || i % 100 === 20 || i % 100 === 40 || i % 100 === 60 || i % 100 === 80))
-        return Plural.Few;
-      if (!(v === 0)) return Plural.Many;
-      return Plural.Other;
-    case 'he':
-      if (i === 1 && v === 0) return Plural.One;
-      if (i === 2 && v === 0) return Plural.Two;
-      if (v === 0 && !(n >= 0 && n <= 10) && n % 10 === 0) return Plural.Many;
-      return Plural.Other;
-    case 'is':
-      if (t === 0 && i % 10 === 1 && !(i % 100 === 11) || !(t === 0)) return Plural.One;
-      return Plural.Other;
-    case 'ksh':
-      if (n === 0) return Plural.Zero;
-      if (n === 1) return Plural.One;
-      return Plural.Other;
-    case 'kw':
-    case 'naq':
-    case 'se':
-    case 'smn':
-      if (n === 1) return Plural.One;
-      if (n === 2) return Plural.Two;
-      return Plural.Other;
-    case 'lag':
-      if (n === 0) return Plural.Zero;
-      if ((i === 0 || i === 1) && !(n === 0)) return Plural.One;
-      return Plural.Other;
-    case 'lt':
-      if (n % 10 === 1 && !(n % 100 >= 11 && n % 100 <= 19)) return Plural.One;
-      if (n % 10 === Math.floor(n % 10) && n % 10 >= 2 && n % 10 <= 9 &&
-          !(n % 100 >= 11 && n % 100 <= 19))
-        return Plural.Few;
-      if (!(f === 0)) return Plural.Many;
-      return Plural.Other;
-    case 'lv':
-    case 'prg':
-      if (n % 10 === 0 || n % 100 === Math.floor(n % 100) && n % 100 >= 11 && n % 100 <= 19 ||
-          v === 2 && f % 100 === Math.floor(f % 100) && f % 100 >= 11 && f % 100 <= 19)
-        return Plural.Zero;
-      if (n % 10 === 1 && !(n % 100 === 11) || v === 2 && f % 10 === 1 && !(f % 100 === 11) ||
-          !(v === 2) && f % 10 === 1)
-        return Plural.One;
-      return Plural.Other;
-    case 'mk':
-      if (v === 0 && i % 10 === 1 || f % 10 === 1) return Plural.One;
-      return Plural.Other;
-    case 'mt':
-      if (n === 1) return Plural.One;
-      if (n === 0 || n % 100 === Math.floor(n % 100) && n % 100 >= 2 && n % 100 <= 10)
-        return Plural.Few;
-      if (n % 100 === Math.floor(n % 100) && n % 100 >= 11 && n % 100 <= 19) return Plural.Many;
-      return Plural.Other;
-    case 'pl':
-      if (i === 1 && v === 0) return Plural.One;
-      if (v === 0 && i % 10 === Math.floor(i % 10) && i % 10 >= 2 && i % 10 <= 4 &&
-          !(i % 100 >= 12 && i % 100 <= 14))
-        return Plural.Few;
-      if (v === 0 && !(i === 1) && i % 10 === Math.floor(i % 10) && i % 10 >= 0 && i % 10 <= 1 ||
-          v === 0 && i % 10 === Math.floor(i % 10) && i % 10 >= 5 && i % 10 <= 9 ||
-          v === 0 && i % 100 === Math.floor(i % 100) && i % 100 >= 12 && i % 100 <= 14)
-        return Plural.Many;
-      return Plural.Other;
-    case 'pt':
-      if (n === Math.floor(n) && n >= 0 && n <= 2 && !(n === 2)) return Plural.One;
-      return Plural.Other;
-    case 'ro':
-      if (i === 1 && v === 0) return Plural.One;
-      if (!(v === 0) || n === 0 ||
-          !(n === 1) && n % 100 === Math.floor(n % 100) && n % 100 >= 1 && n % 100 <= 19)
-        return Plural.Few;
-      return Plural.Other;
-    case 'ru':
-    case 'uk':
-      if (v === 0 && i % 10 === 1 && !(i % 100 === 11)) return Plural.One;
-      if (v === 0 && i % 10 === Math.floor(i % 10) && i % 10 >= 2 && i % 10 <= 4 &&
-          !(i % 100 >= 12 && i % 100 <= 14))
-        return Plural.Few;
-      if (v === 0 && i % 10 === 0 ||
-          v === 0 && i % 10 === Math.floor(i % 10) && i % 10 >= 5 && i % 10 <= 9 ||
-          v === 0 && i % 100 === Math.floor(i % 100) && i % 100 >= 11 && i % 100 <= 14)
-        return Plural.Many;
-      return Plural.Other;
-    case 'shi':
-      if (i === 0 || n === 1) return Plural.One;
-      if (n === Math.floor(n) && n >= 2 && n <= 10) return Plural.Few;
-      return Plural.Other;
-    case 'si':
-      if (n === 0 || n === 1 || i === 0 && f === 1) return Plural.One;
-      return Plural.Other;
-    case 'sl':
-      if (v === 0 && i % 100 === 1) return Plural.One;
-      if (v === 0 && i % 100 === 2) return Plural.Two;
-      if (v === 0 && i % 100 === Math.floor(i % 100) && i % 100 >= 3 && i % 100 <= 4 || !(v === 0))
-        return Plural.Few;
-      return Plural.Other;
-    case 'tzm':
-      if (n === Math.floor(n) && n >= 0 && n <= 1 || n === Math.floor(n) && n >= 11 && n <= 99)
-        return Plural.One;
-      return Plural.Other;
-    // When there is no specification, the default is always "other"
-    // Spec: http://cldr.unicode.org/index/cldr-spec/plural-rules
-    // > other (required—general plural form — also used if the language only has a single form)
-    default:
-      return Plural.Other;
-  }
-}
-
-function getPluralCategory(value: any, locale: string): string {
-  const plural = getPluralCase(locale, value);
-
-  switch (plural) {
-    case Plural.Zero:
-      return 'zero';
-    case Plural.One:
-      return 'one';
-    case Plural.Two:
-      return 'two';
-    case Plural.Few:
-      return 'few';
-    case Plural.Many:
-      return 'many';
-    default:
-      return 'other';
-  }
-}
-
 /**
  * Returns the index of the current case of an ICU expression depending on the main binding value
  *
@@ -1376,9 +1030,7 @@ function getCaseIndex(icuExpression: TIcu, bindingValue: string): number {
   if (index === -1) {
     switch (icuExpression.type) {
       case IcuType.plural: {
-        // TODO(ocombe): replace this hard-coded value by the real LOCALE_ID value
-        const locale = 'en-US';
-        const resolvedCase = getPluralCategory(bindingValue, locale);
+        const resolvedCase = getPluralCase(bindingValue, getLocaleId());
         index = icuExpression.cases.indexOf(resolvedCase);
         if (index === -1 && resolvedCase !== 'other') {
           index = icuExpression.cases.indexOf('other');
@@ -1624,7 +1276,7 @@ const LOCALIZE_PH_REGEXP = /\{\$(.*?)\}/g;
  * running outside of Closure Compiler. This method will not be needed once runtime translation
  * service support is introduced.
  *
- * @publicApi
+ * @codeGenApi
  * @deprecated this method is temporary & should not be used as it will be removed soon
  */
 export function ɵɵi18nLocalize(input: string, placeholders: {[key: string]: string} = {}) {
@@ -1635,3 +1287,31 @@ export function ɵɵi18nLocalize(input: string, placeholders: {[key: string]: st
       input.replace(LOCALIZE_PH_REGEXP, (match, key) => placeholders[key] || '') :
       input;
 }
+
+/**
+ * The locale id that the application is currently using (for translations and ICU expressions).
+ * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
+ * but is now defined as a global value.
+ */
+export const DEFAULT_LOCALE_ID = 'en-US';
+let LOCALE_ID = DEFAULT_LOCALE_ID;
+
+/**
+ * Sets the locale id that will be used for translations and ICU expressions.
+ * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
+ * but is now defined as a global value.
+ *
+ * @param localeId
+ */
+export function setLocaleId(localeId: string) {
+  LOCALE_ID = localeId.toLowerCase().replace(/_/g, '-');
+}
+
+/**
+ * Gets the locale id that will be used for translations and ICU expressions.
+ * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
+ * but is now defined as a global value.
+ */
+export function getLocaleId(): string {
+  return LOCALE_ID;
+}
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index a85c4255e2..22af60ac7a 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -131,6 +131,7 @@ export {
 } from './state';
 
 export {
+  DEFAULT_LOCALE_ID,
   ɵɵi18n,
   ɵɵi18nAttributes,
   ɵɵi18nExp,
@@ -140,6 +141,8 @@ export {
   ɵɵi18nPostprocess,
   i18nConfigureLocalize,
   ɵɵi18nLocalize,
+  getLocaleId,
+  setLocaleId,
 } from './i18n';
 
 export {NgModuleFactory, NgModuleRef, NgModuleType} from './ng_module_ref';
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index e639c9b25b..a0f6145254 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -104,7 +104,6 @@ export function compileNgModuleDefs(
   ngDevMode && assertDefined(moduleType, 'Required value moduleType');
   ngDevMode && assertDefined(ngModule, 'Required value ngModule');
   const declarations: Type<any>[] = flatten(ngModule.declarations || EMPTY_ARRAY);
-
   let ngModuleDef: any = null;
   Object.defineProperty(moduleType, NG_MODULE_DEF, {
     configurable: true,
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
index 07518d77f2..96b88d10ae 100644
--- a/packages/core/src/render3/ng_module_ref.ts
+++ b/packages/core/src/render3/ng_module_ref.ts
@@ -20,7 +20,8 @@ import {assertDefined} from '../util/assert';
 import {stringify} from '../util/stringify';
 
 import {ComponentFactoryResolver} from './component_ref';
-import {getNgModuleDef} from './definition';
+import {getNgLocaleIdDef, getNgModuleDef} from './definition';
+import {setLocaleId} from './i18n';
 import {maybeUnwrapFn} from './util/misc_utils';
 
 export interface NgModuleType<T = any> extends Type<T> { ngModuleDef: NgModuleDef<T>; }
@@ -47,6 +48,11 @@ export class NgModuleRef<T> extends viewEngine_NgModuleRef<T> implements Interna
                      ngModuleDef,
                      `NgModule '${stringify(ngModuleType)}' is not a subtype of 'NgModuleType'.`);
 
+    const ngLocaleIdDef = getNgLocaleIdDef(ngModuleType);
+    if (ngLocaleIdDef) {
+      setLocaleId(ngLocaleIdDef);
+    }
+
     this._bootstrapComponents = maybeUnwrapFn(ngModuleDef !.bootstrap);
     const additionalProviders: StaticProvider[] = [
       {
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index 99fa8a82cc..bc1d670deb 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -18,6 +18,7 @@ ts_library(
         "//packages/animations/browser",
         "//packages/animations/browser/testing",
         "//packages/common",
+        "//packages/common/locales",
         "//packages/compiler",
         "//packages/compiler/testing",
         "//packages/core",
diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel
index 19c700031d..1b7f6fd370 100644
--- a/packages/core/test/acceptance/BUILD.bazel
+++ b/packages/core/test/acceptance/BUILD.bazel
@@ -13,6 +13,7 @@ ts_library(
         "//packages/animations/browser",
         "//packages/animations/browser/testing",
         "//packages/common",
+        "//packages/common/locales",
         "//packages/compiler",
         "//packages/compiler/testing",
         "//packages/core",
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index 51f615d830..d5431494f8 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, ContentChild, ContentChildren, Directive, HostBinding, QueryList, TemplateRef, Type, ViewChild, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
+import {registerLocaleData} from '@angular/common';
+import localeRo from '@angular/common/locales/ro';
+import {Component, ContentChild, ContentChildren, Directive, HostBinding, LOCALE_ID, QueryList, TemplateRef, Type, ViewChild, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {onlyInIvy} from '@angular/private/testing';
@@ -549,6 +551,46 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       expect(fixture.nativeElement.innerHTML)
           .toEqual(`<div>4 animaux<!--nested ICU 0-->!<!--ICU 5--></div>`);
     });
+
+    it('should return the correct plural form for ICU expressions when using a specific locale',
+       () => {
+         registerLocaleData(localeRo);
+         TestBed.configureTestingModule({providers: [{provide: LOCALE_ID, useValue: 'ro'}]});
+         // We could also use `TestBed.overrideProvider(LOCALE_ID, {useValue: 'ro'});`
+         const fixture = initWithTemplate(AppComp, `
+          {count, plural,
+            =0 {no email}
+            =one {one email}
+            =few {a few emails}
+            =other {lots of emails}
+          }`);
+
+         expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+
+         // Change detection cycle, no model changes
+         fixture.detectChanges();
+         expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+
+         fixture.componentInstance.count = 3;
+         fixture.detectChanges();
+         expect(fixture.nativeElement.innerHTML).toEqual('a few emails<!--ICU 2-->');
+
+         fixture.componentInstance.count = 1;
+         fixture.detectChanges();
+         expect(fixture.nativeElement.innerHTML).toEqual('one email<!--ICU 2-->');
+
+         fixture.componentInstance.count = 10;
+         fixture.detectChanges();
+         expect(fixture.nativeElement.innerHTML).toEqual('a few emails<!--ICU 2-->');
+
+         fixture.componentInstance.count = 20;
+         fixture.detectChanges();
+         expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 2-->');
+
+         fixture.componentInstance.count = 0;
+         fixture.detectChanges();
+         expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+       });
   });
 
   describe('should support attributes', () => {
diff --git a/packages/core/test/application_ref_spec.ts b/packages/core/test/application_ref_spec.ts
index 571ad7b111..3974575acd 100644
--- a/packages/core/test/application_ref_spec.ts
+++ b/packages/core/test/application_ref_spec.ts
@@ -8,14 +8,16 @@
 
 import {DOCUMENT} from '@angular/common';
 import {ResourceLoader} from '@angular/compiler';
-import {APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, Compiler, CompilerFactory, Component, InjectionToken, NgModule, NgZone, PlatformRef, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core';
+import {APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, Compiler, CompilerFactory, Component, InjectionToken, LOCALE_ID, NgModule, NgZone, PlatformRef, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core';
 import {ApplicationRef} from '@angular/core/src/application_ref';
 import {ErrorHandler} from '@angular/core/src/error_handler';
 import {ComponentRef} from '@angular/core/src/linker/component_factory';
+import {getLocaleId} from '@angular/core/src/render3';
 import {BrowserModule} from '@angular/platform-browser';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
+import {onlyInIvy} from '@angular/private/testing';
 
 import {NoopNgZone} from '../src/zone/ng_zone';
 import {ComponentFixtureNoNgZone, TestBed, async, inject, withModule} from '../testing';
@@ -325,6 +327,22 @@ class SomeComponent {
         expect(loadResourceSpy).toHaveBeenCalledTimes(1);
         expect(loadResourceSpy).toHaveBeenCalledWith('/test-template.html');
       });
+
+      onlyInIvy('We only need to define `LOCALE_ID` for runtime i18n')
+          .it('should define `LOCALE_ID`', async() => {
+            @Component({
+              selector: 'i18n-app',
+              templateUrl: '',
+            })
+            class I18nComponent {
+            }
+
+            const testModule = createModule(
+                {component: I18nComponent, providers: [{provide: LOCALE_ID, useValue: 'ro'}]});
+            await defaultPlatform.bootstrapModule(testModule);
+
+            expect(getLocaleId()).toEqual('ro');
+          });
     });
 
     describe('bootstrapModuleFactory', () => {
diff --git a/packages/core/testing/src/r3_test_bed_compiler.ts b/packages/core/testing/src/r3_test_bed_compiler.ts
index 3c53f11ad5..5943e89717 100644
--- a/packages/core/testing/src/r3_test_bed_compiler.ts
+++ b/packages/core/testing/src/r3_test_bed_compiler.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgZone, Injector, Pipe, PlatformRef, Provider, Type, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵNG_COMPONENT_DEF as NG_COMPONENT_DEF, ɵNG_DIRECTIVE_DEF as NG_DIRECTIVE_DEF, ɵNG_INJECTOR_DEF as NG_INJECTOR_DEF, ɵNG_MODULE_DEF as NG_MODULE_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ɵɵInjectableDef as InjectableDef, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵDirectiveDef as DirectiveDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵtransitiveScopesFor as transitiveScopesFor,} from '@angular/core';
 import {ResourceLoader} from '@angular/compiler';
+import {ApplicationInitStatus, COMPILER_OPTIONS, Compiler, Component, Directive, Injector, LOCALE_ID, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgZone, Pipe, PlatformRef, Provider, Type, ɵDEFAULT_LOCALE_ID as DEFAULT_LOCALE_ID, ɵDirectiveDef as DirectiveDef, ɵNG_COMPONENT_DEF as NG_COMPONENT_DEF, ɵNG_DIRECTIVE_DEF as NG_DIRECTIVE_DEF, ɵNG_INJECTOR_DEF as NG_INJECTOR_DEF, ɵNG_MODULE_DEF as NG_MODULE_DEF, ɵNG_PIPE_DEF as NG_PIPE_DEF, ɵNgModuleFactory as R3NgModuleFactory, ɵNgModuleTransitiveScopes as NgModuleTransitiveScopes, ɵNgModuleType as NgModuleType, ɵRender3ComponentFactory as ComponentFactory, ɵRender3NgModuleRef as NgModuleRef, ɵcompileComponent as compileComponent, ɵcompileDirective as compileDirective, ɵcompileNgModuleDefs as compileNgModuleDefs, ɵcompilePipe as compilePipe, ɵgetInjectableDef as getInjectableDef, ɵpatchComponentDefWithScope as patchComponentDefWithScope, ɵsetLocaleId as setLocaleId, ɵtransitiveScopesFor as transitiveScopesFor, ɵɵInjectableDef as InjectableDef} from '@angular/core';
 
-import {clearResolutionOfComponentResourcesQueue, restoreComponentResolutionQueue, resolveComponentResources, isComponentDefPendingResolution} from '../../src/metadata/resource_loading';
-
+import {clearResolutionOfComponentResourcesQueue, isComponentDefPendingResolution, resolveComponentResources, restoreComponentResolutionQueue} from '../../src/metadata/resource_loading';
 import {MetadataOverride} from './metadata_override';
 import {ComponentResolver, DirectiveResolver, NgModuleResolver, PipeResolver, Resolver} from './resolvers';
 import {TestModuleMetadata} from './test_bed_common';
@@ -238,6 +237,9 @@ export class R3TestBedCompiler {
     const parentInjector = this.platform.injector;
     this.testModuleRef = new NgModuleRef(this.testModuleType, parentInjector);
 
+    // Set the locale ID, it can be overridden for the tests
+    const localeId = this.testModuleRef.injector.get(LOCALE_ID, DEFAULT_LOCALE_ID);
+    setLocaleId(localeId);
 
     // ApplicationInitStatus.runInitializers() is marked @internal to core.
     // Cast it to any before accessing it.
@@ -523,6 +525,8 @@ export class R3TestBedCompiler {
     this.initialNgDefs.clear();
     this.moduleProvidersOverridden.clear();
     this.restoreComponentResolutionQueue();
+    // Restore the locale ID to the default value, this shouldn't be necessary but we never know
+    setLocaleId(DEFAULT_LOCALE_ID);
   }
 
   private compileTestModule(): void {
diff --git a/tools/gulp-tasks/cldr/extract.js b/tools/gulp-tasks/cldr/extract.js
index 3c0e0ce16c..1a92bc8fd2 100644
--- a/tools/gulp-tasks/cldr/extract.js
+++ b/tools/gulp-tasks/cldr/extract.js
@@ -14,11 +14,14 @@ const cldr = require('cldr');
 // used to extract all other cldr data
 const cldrJs = require('cldrjs');
 
-const PACKAGE_FOLDER = 'packages/common';
-const I18N_FOLDER = `${PACKAGE_FOLDER}/src/i18n`;
-const I18N_DATA_FOLDER = `${PACKAGE_FOLDER}/locales`;
+const COMMON_PACKAGE = 'packages/common';
+const CORE_PACKAGE = 'packages/core';
+const I18N_FOLDER = `${COMMON_PACKAGE}/src/i18n`;
+const I18N_CORE_FOLDER = `${CORE_PACKAGE}/src/i18n`;
+const I18N_DATA_FOLDER = `${COMMON_PACKAGE}/locales`;
 const I18N_DATA_EXTRA_FOLDER = `${I18N_DATA_FOLDER}/extra`;
 const RELATIVE_I18N_FOLDER = path.resolve(__dirname, `../../../${I18N_FOLDER}`);
+const RELATIVE_I18N_CORE_FOLDER = path.resolve(__dirname, `../../../${I18N_CORE_FOLDER}`);
 const RELATIVE_I18N_DATA_FOLDER = path.resolve(__dirname, `../../../${I18N_DATA_FOLDER}`);
 const RELATIVE_I18N_DATA_EXTRA_FOLDER = path.resolve(__dirname, `../../../${I18N_DATA_EXTRA_FOLDER}`);
 const DEFAULT_RULE = 'function anonymous(n\n/*``*/) {\nreturn"other"\n}';
@@ -60,9 +63,9 @@ module.exports = (gulp, done) => {
 
   const baseCurrencies = generateBaseCurrencies(new cldrJs('en'));
   // additional "en" file that will be included in common
-  console.log(`Writing file ${I18N_FOLDER}/locale_en.ts`);
+  console.log(`Writing file ${I18N_CORE_FOLDER}/locale_en.ts`);
   const localeEnFile = generateLocale('en', new cldrJs('en'), baseCurrencies);
-  fs.writeFileSync(`${RELATIVE_I18N_FOLDER}/locale_en.ts`, localeEnFile);
+  fs.writeFileSync(`${RELATIVE_I18N_CORE_FOLDER}/locale_en.ts`, localeEnFile);
 
   LOCALES.forEach((locale, index) => {
     const localeData = new cldrJs(locale);
@@ -82,7 +85,7 @@ module.exports = (gulp, done) => {
     .src([
       `${I18N_DATA_FOLDER}/**/*.ts`,
       `${I18N_FOLDER}/currencies.ts`,
-      `${I18N_FOLDER}/locale_en.ts`
+      `${I18N_CORE_FOLDER}/locale_en.ts`
     ], {base: '.'})
     .pipe(format.format('file', clangFormat))
     .pipe(gulp.dest('.'));
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts
index 3cded495d8..2606601215 100644
--- a/tools/public_api_guard/common/common.d.ts
+++ b/tools/public_api_guard/common/common.d.ts
@@ -103,7 +103,7 @@ export declare function getLocaleNumberFormat(locale: string, type: NumberFormat
 
 export declare function getLocaleNumberSymbol(locale: string, symbol: NumberSymbol): string;
 
-export declare function getLocalePluralCase(locale: string): (value: number) => Plural;
+export declare const getLocalePluralCase: (locale: string) => ((value: number) => Plural);
 
 export declare function getLocaleTimeFormat(locale: string, width: FormatWidth): string;
 

From 7a0f8ac36ceedf751490f55244b3ca6a91f61bb3 Mon Sep 17 00:00:00 2001
From: Andrew Kushnir <akushnir@google.com>
Date: Tue, 28 May 2019 15:52:59 -0700
Subject: [PATCH 231/275] fix(ivy): generate explicit type annotation for
 NgModuleFactory calls in ngfactories (#30708)

Prior to this commit there were no explicit types setup for NgModuleFactory calls in ngfactories, so TypeScript inferred the type based on a given call. In some cases (when generic types were used for Components/Directives) that turned out to be problematic, so we add explicit typing for NgModuleFactory calls.

PR Close #30708
---
 .../src/ngtsc/shims/src/factory_generator.ts     |  3 ++-
 packages/compiler-cli/test/ngtsc/ngtsc_spec.ts   | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts b/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts
index 329156266c..e1ed7126ad 100644
--- a/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts
+++ b/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts
@@ -73,7 +73,8 @@ export class FactoryGenerator implements ShimGenerator {
       // This will encompass a lot of symbols which don't need factories, but that's okay
       // because it won't miss any that do.
       const varLines = symbolNames.map(
-          name => `export const ${name}NgFactory = new i0.ɵNgModuleFactory(${name});`);
+          name =>
+              `export const ${name}NgFactory: i0.ɵNgModuleFactory<any> = new i0.ɵNgModuleFactory(${name});`);
       sourceText += [
         // This might be incorrect if the current package being compiled is Angular core, but it's
         // okay to leave in at type checking time. TypeScript can handle this reference via its path
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index a8046c9539..afde805218 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -2149,6 +2149,22 @@ describe('ngtsc behavioral tests', () => {
     expect(emptyFactory).toContain(`export var \u0275NonEmptyModule = true;`);
   });
 
+  it('should generate correct type annotation for NgModuleFactory calls in ngfactories', () => {
+    env.tsconfig({'allowEmptyCodegenFiles': true});
+    env.write('test.ts', `
+      import {Component} from '@angular/core';
+      @Component({
+        selector: 'test',
+        template: '...',
+      })
+      export class TestCmp {}
+    `);
+    env.driveMain();
+
+    const ngfactoryContents = env.getContents('test.ngfactory.d.ts');
+    expect(ngfactoryContents).toContain(`i0.ɵNgModuleFactory<any>`);
+  });
+
   it('should copy a top-level comment into a factory stub', () => {
     env.tsconfig({'allowEmptyCodegenFiles': true});
 

From b4644d7bb042dd73e72101c1e44d1f832971500c Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 28 May 2019 15:20:53 -0700
Subject: [PATCH 232/275] fix(ivy): correct timing of NgModuleFactory
 registration (#30706)

Commit 0df719a46 introduced registration of NgModules with ids when compiled
with AOT, and f74373f2d corrected the timing to avoid issues with tree
shaking. Neither of these approaches were correct.

This commit fixes the timing to match View Engine and avoid tree shaking
issues, as well as fixes a bug with the registration of imported module ids.

A new Ivy-only test is added which verifies that modules get registered
correctly under real-world conditions.

PR Close #30706
---
 .../linker/ng_module_factory_registration.ts  | 19 +++++++--
 packages/core/src/render3/ng_module_ref.ts    | 39 +++++++++++++++----
 .../test/linker/ng_module_integration_spec.ts | 24 +++++++++++-
 3 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/linker/ng_module_factory_registration.ts b/packages/core/src/linker/ng_module_factory_registration.ts
index e63314323f..60ed6d603d 100644
--- a/packages/core/src/linker/ng_module_factory_registration.ts
+++ b/packages/core/src/linker/ng_module_factory_registration.ts
@@ -37,10 +37,21 @@ function assertSameOrNotExisting(id: string, type: Type<any>| null, incoming: Ty
   }
 }
 
-export function registerNgModuleType(id: string, ngModuleType: NgModuleType) {
-  const existing = modules.get(id) as NgModuleType | null;
-  assertSameOrNotExisting(id, existing, ngModuleType);
-  modules.set(id, ngModuleType);
+export function registerNgModuleType(ngModuleType: NgModuleType) {
+  if (ngModuleType.ngModuleDef.id !== null) {
+    const id = ngModuleType.ngModuleDef.id;
+    const existing = modules.get(id) as NgModuleType | null;
+    assertSameOrNotExisting(id, existing, ngModuleType);
+    modules.set(id, ngModuleType);
+  }
+
+  let imports = ngModuleType.ngModuleDef.imports;
+  if (imports instanceof Function) {
+    imports = imports();
+  }
+  if (imports) {
+    imports.forEach((i: NgModuleType<any>) => registerNgModuleType(i));
+  }
 }
 
 export function clearModulesForTest(): void {
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
index 96b88d10ae..f46b63e0b6 100644
--- a/packages/core/src/render3/ng_module_ref.ts
+++ b/packages/core/src/render3/ng_module_ref.ts
@@ -92,14 +92,39 @@ export class NgModuleRef<T> extends viewEngine_NgModuleRef<T> implements Interna
 }
 
 export class NgModuleFactory<T> extends viewEngine_NgModuleFactory<T> {
-  constructor(public moduleType: Type<T>) { super(); }
+  constructor(public moduleType: Type<T>) {
+    super();
+
+    const ngModuleDef = getNgModuleDef(moduleType);
+    if (ngModuleDef !== null) {
+      // Register the NgModule with Angular's module registry. The location (and hence timing) of
+      // this call is critical to ensure this works correctly (modules get registered when expected)
+      // without bloating bundles (modules are registered when otherwise not referenced).
+      //
+      // In View Engine, registration occurs in the .ngfactory.js file as a side effect. This has
+      // several practical consequences:
+      //
+      // - If an .ngfactory file is not imported from, the module won't be registered (and can be
+      //   tree shaken).
+      // - If an .ngfactory file is imported from, the module will be registered even if an instance
+      //   is not actually created (via `create` below).
+      // - Since an .ngfactory file in View Engine references the .ngfactory files of the NgModule's
+      //   imports,
+      //
+      // In Ivy, things are a bit different. .ngfactory files still exist for compatibility, but are
+      // not a required API to use - there are other ways to obtain an NgModuleFactory for a given
+      // NgModule. Thus, relying on a side effect in the .ngfactory file is not sufficient. Instead,
+      // the side effect of registration is added here, in the constructor of NgModuleFactory,
+      // ensuring no matter how a factory is created, the module is registered correctly.
+      //
+      // An alternative would be to include the registration side effect inline following the actual
+      // NgModule definition. This also has the correct timing, but breaks tree-shaking - modules
+      // will be registered and retained even if they're otherwise never referenced.
+      registerNgModuleType(moduleType as NgModuleType);
+    }
+  }
 
   create(parentInjector: Injector|null): viewEngine_NgModuleRef<T> {
-    const moduleType = this.moduleType;
-    const moduleRef = new NgModuleRef(moduleType, parentInjector);
-    const ngModuleDef = getNgModuleDef(moduleType);
-    ngModuleDef && ngModuleDef.id &&
-        registerNgModuleType(ngModuleDef.id, moduleType as NgModuleType);
-    return moduleRef;
+    return new NgModuleRef(this.moduleType, parentInjector);
   }
 }
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index 54ce976a3a..ee6eee8241 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ANALYZE_FOR_ENTRY_COMPONENTS, CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef, Compiler, Component, ComponentFactoryResolver, Directive, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, forwardRef, getModuleFactory, ɵivyEnabled as ivyEnabled} from '@angular/core';
+import {ANALYZE_FOR_ENTRY_COMPONENTS, CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef, Compiler, Component, ComponentFactoryResolver, Directive, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, forwardRef, getModuleFactory, ɵivyEnabled as ivyEnabled, ɵɵdefineNgModule as defineNgModule} from '@angular/core';
 import {Console} from '@angular/core/src/console';
 import {ɵɵInjectableDef, ɵɵdefineInjectable} from '@angular/core/src/di/interface/defs';
 import {getNgModuleDef} from '@angular/core/src/render3/definition';
@@ -339,6 +339,28 @@ function declareTests(config?: {useJit: boolean}) {
           }
         }).not.toThrow();
       });
+
+      onlyInIvy('VE does not allow use of NgModuleFactory without importing the .ngfactory')
+          .it('should register a module even if not importing the .ngfactory file or calling create()',
+              () => {
+                class ChildModule {
+                  static ngModuleDef = defineNgModule({
+                    type: ChildModule,
+                    id: 'child',
+                  });
+                }
+
+                class Module {
+                  static ngModuleDef = defineNgModule({
+                    type: Module,
+                    id: 'test',
+                    imports: [ChildModule],
+                  });
+                }
+
+                createModuleFactory(ChildModule);
+                expect(getModuleFactory('child')).toBeAnInstanceOf(NgModuleFactory);
+              });
     });
 
     describe('entryComponents', () => {

From b61784948afb3e5d08c4f55abeb25b146beebda3 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 24 May 2019 14:37:52 -0700
Subject: [PATCH 233/275] fix(ivy): template inputs/outputs should not be bound
 in template scope (#30669)

The R3TargetBinder "binds" an Angular template AST, computing semantic
information regarding the template and making it accessible.

One of the binding passes previously had a bug, where for the following
template:

<div *ngIf="foo as foo"></div>

which desugars to:

<ng-template ngIf [ngIf]="foo" let-foo="ngIf">
  <div></div>
</ng-template>

would have the `[ngIf]` binding processed twice - in both the scope which
contains the `<ng-template>` and the scope inside the template. The bug
arises because during the latter, `foo` is a variable defined by `let-foo`,
and so the R3TargetBinder would incorrectly learn that `foo` inside `[ngIf]`
maps to that variable.

This commit fixes the bug by only processing inputs, outputs, and
templateAttrs from `Template`s in the outer scope.

PR Close #30669
---
 .../test/ngtsc/template_typecheck_spec.ts     | 25 +++++++++++++++++++
 .../compiler/src/render3/view/t2_binder.ts    |  8 ++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
index 09116d003a..2ed017e3e9 100644
--- a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
@@ -270,6 +270,31 @@ describe('ngtsc type checking', () => {
     expect(diags[0].messageText).toContain('does_not_exist');
   });
 
+  it('should property type-check a microsyntax variable with the same name as the expression',
+     () => {
+       env.write('test.ts', `
+    import {CommonModule} from '@angular/common';
+    import {Component, Input, NgModule} from '@angular/core';
+
+    @Component({
+      selector: 'test',
+      template: '<div *ngIf="foo as foo">{{foo}}</div>',
+    })
+    export class TestCmp<T extends {name: string}> {
+      foo: any;
+    }
+
+    @NgModule({
+      declarations: [TestCmp],
+      imports: [CommonModule],
+    })
+    export class Module {}
+    `);
+
+       const diags = env.driveDiagnostics();
+       expect(diags.length).toBe(0);
+     });
+
   it('should properly type-check inherited directives', () => {
     env.write('test.ts', `
     import {Component, Directive, Input, NgModule} from '@angular/core';
diff --git a/packages/compiler/src/render3/view/t2_binder.ts b/packages/compiler/src/render3/view/t2_binder.ts
index d67b353551..a1eb09df4b 100644
--- a/packages/compiler/src/render3/view/t2_binder.ts
+++ b/packages/compiler/src/render3/view/t2_binder.ts
@@ -372,12 +372,8 @@ class TemplateBinder extends RecursiveAstVisitor implements Visitor {
 
   private ingest(template: Template|Node[]): void {
     if (template instanceof Template) {
-      // For <ng-template>s, process inputs, outputs, template attributes,
-      // variables, and child nodes.
-      // References were processed in the scope of the containing template.
-      template.inputs.forEach(this.visitNode);
-      template.outputs.forEach(this.visitNode);
-      template.templateAttrs.forEach(this.visitNode);
+      // For <ng-template>s, process only variables and child nodes. Inputs, outputs, templateAttrs,
+      // and references were all processed in the scope of the containing template.
       template.variables.forEach(this.visitNode);
       template.children.forEach(this.visitNode);
 

From 8e8c1ad47d0e7993f989963ec1c2d048b3c98006 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Fri, 24 May 2019 13:45:02 +0200
Subject: [PATCH 234/275] refactor(ivy): name LQuery object for easier memory
 allocation tracking (#30656)

PR Close #30656
---
 packages/core/src/render3/query.ts | 78 ++++++++++++------------------
 1 file changed, 30 insertions(+), 48 deletions(-)

diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index e768e40f7c..18a5bd4183 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -58,35 +58,35 @@ export interface QueryPredicate<T> {
  * - values collected based on a predicate
  * - `QueryList` to which collected values should be reported
  */
-export interface LQuery<T> {
-  /**
-   * Next query. Used when queries are stored as a linked list in `LQueries`.
-   */
-  next: LQuery<any>|null;
+class LQuery<T> {
+  constructor(
+      /**
+       * Next query. Used when queries are stored as a linked list in `LQueries`.
+       */
+      public next: LQuery<any>|null,
 
-  /**
-   * Destination to which the value should be added.
-   */
-  list: QueryList<T>;
+      /**
+       * Destination to which the value should be added.
+       */
+      public list: QueryList<T>,
 
-  /**
-   * A predicate which determines if a given element/directive should be included in the query
-   * results.
-   */
-  predicate: QueryPredicate<T>;
+      /**
+       * A predicate which determines if a given element/directive should be included in the query
+       * results.
+       */
+      public predicate: QueryPredicate<T>,
 
-  /**
-   * Values which have been located.
-   *
-   * This is what builds up the `QueryList._valuesTree`.
-   */
-  values: any[];
+      /**
+       * Values which have been located.
+       * This is what builds up the `QueryList._valuesTree`.
+       */
+      public values: any[],
 
-  /**
-   * A pointer to an array that stores collected values from views. This is necessary so we know a
-   * container into which to insert nodes collected from views.
-   */
-  containerValues: any[]|null;
+      /**
+       * A pointer to an array that stores collected values from views. This is necessary so we
+       * know a container into which to insert nodes collected from views.
+       */
+      public containerValues: any[]|null) {}
 }
 
 export class LQueries_ implements LQueries {
@@ -145,14 +145,7 @@ function copyQueriesToContainer(query: LQuery<any>| null): LQuery<any>|null {
   while (query) {
     const containerValues: any[] = [];  // prepare room for views
     query.values.push(containerValues);
-    const clonedQuery: LQuery<any> = {
-      next: result,
-      list: query.list,
-      predicate: query.predicate,
-      values: containerValues,
-      containerValues: null
-    };
-    result = clonedQuery;
+    result = new LQuery<any>(result, query.list, query.predicate, containerValues, null);
     query = query.next;
   }
 
@@ -163,14 +156,7 @@ function copyQueriesToView(query: LQuery<any>| null): LQuery<any>|null {
   let result: LQuery<any>|null = null;
 
   while (query) {
-    const clonedQuery: LQuery<any> = {
-      next: result,
-      list: query.list,
-      predicate: query.predicate,
-      values: [],
-      containerValues: query.values
-    };
-    result = clonedQuery;
+    result = new LQuery<any>(result, query.list, query.predicate, [], query.values);
     query = query.next;
   }
 
@@ -349,13 +335,9 @@ function createPredicate<T>(predicate: Type<T>| string[], read: Type<T>| null):
 function createLQuery<T>(
     previous: LQuery<any>| null, queryList: QueryList<T>, predicate: Type<T>| string[],
     read: Type<T>| null): LQuery<T> {
-  return {
-    next: previous,
-    list: queryList,
-    predicate: createPredicate(predicate, read),
-    values: (queryList as any as QueryList_<T>)._valuesTree,
-    containerValues: null
-  };
+  return new LQuery(
+      previous, queryList, createPredicate(predicate, read),
+      (queryList as any as QueryList_<T>)._valuesTree, null);
 }
 
 type QueryList_<T> = QueryList<T>& {_valuesTree: any[], _static: boolean};

From 41f372fe7990808139f68bf39a70197c394f0912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 30 May 2019 12:54:39 -0700
Subject: [PATCH 235/275] ci: fix payload limits value

---
 integration/_payload-limits.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
index 9957587800..cc45acecbb 100644
--- a/integration/_payload-limits.json
+++ b/integration/_payload-limits.json
@@ -21,7 +21,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1440,
-        "main": 147764,
+        "main": 149248,
         "polyfills": 43567
       }
     }
@@ -34,4 +34,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From 91699259b2f45f6ae51776476a9f7752ca4632c9 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Wed, 15 May 2019 14:27:07 +0200
Subject: [PATCH 236/275] fix(ivy): trigger directive inputs with i18n
 translations (#30402)

Changed runtime i18n to define attributes with bindings, or matching directive inputs/outputs as element properties as we are supposed to do in Angular.
This PR fixes the issue where directive inputs wouldn't be trigged.

FW-1315 #resolve
PR Close #30402
---
 .../compliance/r3_view_compiler_i18n_spec.ts  | 17 +++----
 .../compiler/src/render3/view/template.ts     | 15 ++++--
 packages/core/src/render3/i18n.ts             | 25 +++++++---
 .../core/src/render3/instructions/element.ts  | 50 ++++++++++---------
 packages/core/test/acceptance/i18n_spec.ts    | 46 +++++++++++++++--
 5 files changed, 105 insertions(+), 48 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index 0951d62d62..558e00eaf9 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -197,7 +197,7 @@ describe('i18n support in the view compiler', () => {
         else {
             $I18N_0$ = $r3$.ɵɵi18nLocalize("Content A");
         }
-        const $_c2$ = ["title", "Title B"];
+        const $_c2$ = [${AttributeMarker.Bindings}, "title"];
         var $I18N_3$;
         if (ngI18nClosureMode) {
             /**
@@ -211,7 +211,6 @@ describe('i18n support in the view compiler', () => {
             $I18N_3$ = $r3$.ɵɵi18nLocalize("Title B");
         }
         const $_c5$ = ["title", $I18N_3$];
-        const $_c6$ = ["title", "Title C"];
         var $I18N_7$;
         if (ngI18nClosureMode) {
             /**
@@ -224,7 +223,6 @@ describe('i18n support in the view compiler', () => {
             $I18N_7$ = $r3$.ɵɵi18nLocalize("Title C");
         }
         const $_c9$ = ["title", $I18N_7$];
-        const $_c10$ = ["title", "Title D"];
         var $I18N_11$;
         if (ngI18nClosureMode) {
             /**
@@ -238,7 +236,6 @@ describe('i18n support in the view compiler', () => {
             $I18N_11$ = $r3$.ɵɵi18nLocalize("Title D");
         }
         const $_c13$ = ["title", $I18N_11$];
-        const $_c14$ = ["title", "Title E"];
         var $I18N_15$;
         if (ngI18nClosureMode) {
             /**
@@ -251,7 +248,6 @@ describe('i18n support in the view compiler', () => {
             $I18N_15$ = $r3$.ɵɵi18nLocalize("Title E");
         }
         const $_c17$ = ["title", $I18N_15$];
-        const $_c18$ = ["title", "Title F"];
         var $I18N_19$;
         if (ngI18nClosureMode) {
             const $MSG_EXTERNAL_idF$$APP_SPEC_TS_20$ = goog.getMsg("Title F");
@@ -261,7 +257,6 @@ describe('i18n support in the view compiler', () => {
             $I18N_19$ = $r3$.ɵɵi18nLocalize("Title F");
         }
         const $_c21$ = ["title", $I18N_19$];
-        const $_c22$ = ["title", "Title G"];
         var $I18N_23$;
         if (ngI18nClosureMode) {
             /**
@@ -335,7 +330,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = `
-        const $_c0$ = ["id", "static", "title", "introduction"];
+        const $_c0$ = ["id", "static", ${AttributeMarker.Bindings}, "title"];
         var $I18N_1$;
         if (ngI18nClosureMode) {
           /**
@@ -376,7 +371,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = String.raw `
-        const $_c0$ = ["id", "dynamic-1", "aria-roledescription", "static text", ${AttributeMarker.Bindings}, "title", "aria-label"];
+        const $_c0$ = ["id", "dynamic-1", ${AttributeMarker.Bindings}, "aria-roledescription", "title", "aria-label"];
         var $I18N_1$;
         if (ngI18nClosureMode) {
           const $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$ = goog.getMsg("static text");
@@ -603,8 +598,8 @@ describe('i18n support in the view compiler', () => {
 
       const output = String.raw `
         const $_c0$ = [
-          "id", "dynamic-1", "aria-roledescription", "static text",
-          ${AttributeMarker.Bindings}, "title", "aria-label"
+          "id", "dynamic-1", 
+          ${AttributeMarker.Bindings}, "aria-roledescription", "title", "aria-label"
         ];
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -781,7 +776,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = String.raw `
-        const $_c0$ = ["title", "Element title"];
+        const $_c0$ = [${AttributeMarker.Bindings}, "title"];
         var $I18N_0$;
         if (ngI18nClosureMode) {
             /**
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 783ac4ab65..49444431ad 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -518,6 +518,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     const i18nAttrs: (t.TextAttribute | t.BoundAttribute)[] = [];
     const outputAttrs: t.TextAttribute[] = [];
+    const allOtherInputs: (t.TextAttribute | t.BoundAttribute)[] = [];
 
     const [namespaceKey, elementName] = splitNsName(element.name);
     const isNgContainer = checkIsNgContainer(element.name);
@@ -538,8 +539,14 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           // TODO(FW-1248): prevent attributes duplication in `i18nAttributes` and `elementStart`
           // arguments
           i18nAttrs.push(attr);
+          // We treat this attribute as if it was a binding so that we don't risk calling inputs
+          // with the untranslated value.
+          // Also this generates smaller templates until FW-1248 is fixed.
+          // TODO(FW-1332): Create an AttributeMarker for i18n attributes
+          allOtherInputs.push(attr);
+        } else {
+          outputAttrs.push(attr);
         }
-        outputAttrs.push(attr);
       }
     }
 
@@ -554,7 +561,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     // Add the attributes
     const attributes: o.Expression[] = [];
-    const allOtherInputs: t.BoundAttribute[] = [];
 
     element.inputs.forEach((input: t.BoundAttribute) => {
       const stylingInputWasSet = stylingBuilder.registerBoundInput(input);
@@ -1148,7 +1154,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
    * because those values are intended to always be generated as property instructions.
    */
   private prepareNonRenderAttrs(
-      inputs: t.BoundAttribute[], outputs: t.BoundEvent[], styles?: StylingBuilder,
+      inputs: (t.TextAttribute|t.BoundAttribute)[], outputs: t.BoundEvent[],
+      styles?: StylingBuilder,
       templateAttrs: (t.BoundAttribute|t.TextAttribute)[] = []): o.Expression[] {
     const alreadySeen = new Set<string>();
     const attrExprs: o.Expression[] = [];
@@ -1176,7 +1183,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       const attrsStartIndex = attrExprs.length;
 
       for (let i = 0; i < inputs.length; i++) {
-        const input = inputs[i];
+        const input = inputs[i] as t.BoundAttribute;
         if (input.type !== BindingType.Animation) {
           addAttrExpr(input.name);
         }
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 182ad42026..868d8ede3a 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -15,8 +15,8 @@ import {addAllToArray} from '../util/array_utils';
 import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
 import {attachPatchData} from './context_discovery';
 import {attachI18nOpCodesDebug} from './debug';
-import {ɵɵelementAttribute, ɵɵload, ɵɵtextBinding} from './instructions/all';
-import {allocExpando, getOrCreateTNode} from './instructions/shared';
+import {elementAttributeInternal, ɵɵload, ɵɵtextBinding} from './instructions/all';
+import {allocExpando, elementPropertyInternal, getOrCreateTNode, setInputsForProperty} from './instructions/shared';
 import {LContainer, NATIVE} from './interfaces/container';
 import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
 import {TElementNode, TIcuContainerNode, TNode, TNodeType} from './interfaces/node';
@@ -30,6 +30,7 @@ import {NO_CHANGE} from './tokens';
 import {renderStringify} from './util/misc_utils';
 import {getNativeByIndex, getNativeByTNode, getTNode, isLContainer} from './util/view_utils';
 
+
 const MARKER = `�`;
 const ICU_BLOCK_REGEXP = /^\s*(�\d+:?\d*�)\s*,\s*(select|plural)\s*,/;
 const SUBTEMPLATE_REGEXP = /�\/?\*(\d+:\d+)�/gi;
@@ -735,7 +736,10 @@ function readCreateOpCodes(
           const elementNodeIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;
           const attrName = createOpCodes[++i] as string;
           const attrValue = createOpCodes[++i] as string;
-          ɵɵelementAttribute(elementNodeIndex, attrName, attrValue);
+          const renderer = viewData[RENDERER];
+          // This code is used for ICU expressions only, since we don't support
+          // directives/components in ICUs, we don't need to worry about inputs here
+          elementAttributeInternal(elementNodeIndex, attrName, attrValue, viewData, renderer);
           break;
         default:
           throw new Error(`Unable to determine the type of mutate operation for "${opCode}"`);
@@ -810,9 +814,9 @@ function readUpdateOpCodes(
             let icuTNode: TIcuContainerNode;
             switch (opCode & I18nUpdateOpCode.MASK_OPCODE) {
               case I18nUpdateOpCode.Attr:
-                const attrName = updateOpCodes[++j] as string;
+                const propName = updateOpCodes[++j] as string;
                 const sanitizeFn = updateOpCodes[++j] as SanitizerFn | null;
-                ɵɵelementAttribute(nodeIndex, attrName, value, sanitizeFn);
+                elementPropertyInternal(nodeIndex, propName, value, sanitizeFn);
                 break;
               case I18nUpdateOpCode.Text:
                 ɵɵtextBinding(nodeIndex, value);
@@ -954,6 +958,7 @@ function i18nAttributesFirstPass(tView: TView, index: number, values: string[])
       if (j & 1) {
         // Odd indexes are ICU expressions
         // TODO(ocombe): support ICU expressions in attributes
+        throw new Error('ICU expressions are not yet supported in attributes');
       } else if (value !== '') {
         // Even indexes are text (including bindings)
         const hasBinding = !!value.match(BINDING_REGEXP);
@@ -961,7 +966,15 @@ function i18nAttributesFirstPass(tView: TView, index: number, values: string[])
           addAllToArray(
               generateBindingUpdateOpCodes(value, previousElementIndex, attrName), updateOpCodes);
         } else {
-          ɵɵelementAttribute(previousElementIndex, attrName, value);
+          const lView = getLView();
+          const renderer = lView[RENDERER];
+          elementAttributeInternal(previousElementIndex, attrName, value, lView, renderer);
+          // Check if that attribute is a directive input
+          const tNode = getTNode(previousElementIndex, lView);
+          const dataValue = tNode.inputs && tNode.inputs[attrName];
+          if (dataValue) {
+            setInputsForProperty(lView, dataValue, value);
+          }
         }
       }
     }
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index b75bc91eb8..f95a582d87 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -11,10 +11,10 @@ import {assertHasParent} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {registerPostOrderHooks} from '../hooks';
 import {TAttributes, TNodeFlags, TNodeType} from '../interfaces/node';
-import {RElement, isProceduralRenderer} from '../interfaces/renderer';
+import {RElement, Renderer3, isProceduralRenderer} from '../interfaces/renderer';
 import {SanitizerFn} from '../interfaces/sanitization';
 import {StylingContext} from '../interfaces/styling';
-import {BINDING_INDEX, HEADER_OFFSET, QUERIES, RENDERER, TVIEW, T_HOST} from '../interfaces/view';
+import {BINDING_INDEX, HEADER_OFFSET, LView, QUERIES, RENDERER, TVIEW, T_HOST} from '../interfaces/view';
 import {assertNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
 import {applyOnCreateInstructions} from '../node_util';
@@ -27,12 +27,10 @@ import {NO_CHANGE} from '../tokens';
 import {attrsStylingIndexOf, setUpAttributes} from '../util/attrs_utils';
 import {renderStringify} from '../util/misc_utils';
 import {getNativeByIndex, getNativeByTNode, getTNode} from '../util/view_utils';
-
 import {createDirectivesAndLocals, elementCreate, executeContentQueries, getOrCreateTNode, initializeTNodeInputs, setInputsForProperty, setNodeStylingTemplate} from './shared';
 import {getActiveDirectiveStylingIndex} from './styling';
 
 
-
 /**
  * Create DOM element. The instruction must later be followed by `elementEnd()` call.
  *
@@ -202,7 +200,7 @@ export function ɵɵelement(
 /**
  * Updates the value or removes an attribute on an Element.
  *
- * @param number index The index of the element in the data array
+ * @param index The index of the element in the data array
  * @param name name The name of the attribute.
  * @param value value The attribute is removed when value is `null` or `undefined`.
  *                  Otherwise the attribute value is set to the stringified value.
@@ -215,27 +213,33 @@ export function ɵɵelementAttribute(
     index: number, name: string, value: any, sanitizer?: SanitizerFn | null,
     namespace?: string): void {
   if (value !== NO_CHANGE) {
-    ngDevMode && validateAgainstEventAttributes(name);
     const lView = getLView();
     const renderer = lView[RENDERER];
-    const element = getNativeByIndex(index, lView) as RElement;
-    if (value == null) {
-      ngDevMode && ngDevMode.rendererRemoveAttribute++;
-      isProceduralRenderer(renderer) ? renderer.removeAttribute(element, name, namespace) :
-                                       element.removeAttribute(name);
+    elementAttributeInternal(index, name, value, lView, renderer, sanitizer, namespace);
+  }
+}
+
+export function elementAttributeInternal(
+    index: number, name: string, value: any, lView: LView, renderer: Renderer3,
+    sanitizer?: SanitizerFn | null, namespace?: string) {
+  ngDevMode && validateAgainstEventAttributes(name);
+  const element = getNativeByIndex(index, lView) as RElement;
+  if (value == null) {
+    ngDevMode && ngDevMode.rendererRemoveAttribute++;
+    isProceduralRenderer(renderer) ? renderer.removeAttribute(element, name, namespace) :
+                                     element.removeAttribute(name);
+  } else {
+    ngDevMode && ngDevMode.rendererSetAttribute++;
+    const tNode = getTNode(index, lView);
+    const strValue =
+        sanitizer == null ? renderStringify(value) : sanitizer(value, tNode.tagName || '', name);
+
+
+    if (isProceduralRenderer(renderer)) {
+      renderer.setAttribute(element, name, strValue, namespace);
     } else {
-      ngDevMode && ngDevMode.rendererSetAttribute++;
-      const tNode = getTNode(index, lView);
-      const strValue =
-          sanitizer == null ? renderStringify(value) : sanitizer(value, tNode.tagName || '', name);
-
-
-      if (isProceduralRenderer(renderer)) {
-        renderer.setAttribute(element, name, strValue, namespace);
-      } else {
-        namespace ? element.setAttributeNS(namespace, name, strValue) :
-                    element.setAttribute(name, strValue);
-      }
+      namespace ? element.setAttributeNS(namespace, name, strValue) :
+                  element.setAttribute(name, strValue);
     }
   }
 }
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index d5431494f8..ad3b47fc97 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -8,7 +8,7 @@
 
 import {registerLocaleData} from '@angular/common';
 import localeRo from '@angular/common/locales/ro';
-import {Component, ContentChild, ContentChildren, Directive, HostBinding, LOCALE_ID, QueryList, TemplateRef, Type, ViewChild, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
+import {Component, ContentChild, ContentChildren, Directive, HostBinding, Input, LOCALE_ID, QueryList, TemplateRef, Type, ViewChild, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {onlyInIvy} from '@angular/private/testing';
@@ -625,14 +625,14 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
           {translations: {'hello {$interpolation}': 'bonjour {$interpolation}'}});
       const fixture = initWithTemplate(
           AppComp,
-          `<div i18n i18n-title title="hello {{name}}" i18n-aria-label aria-label="hello {{name}}"></div>`);
+          `<input i18n i18n-title title="hello {{name}}" i18n-placeholder placeholder="hello {{name}}">`);
       expect(fixture.nativeElement.innerHTML)
-          .toEqual(`<div title="bonjour Angular" aria-label="bonjour Angular"></div>`);
+          .toEqual(`<input title="bonjour Angular" placeholder="bonjour Angular">`);
 
       fixture.componentRef.instance.name = 'John';
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
-          .toEqual(`<div title="bonjour John" aria-label="bonjour John"></div>`);
+          .toEqual(`<input title="bonjour John" placeholder="bonjour John">`);
     });
 
     it('on removed elements', () => {
@@ -732,6 +732,44 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
             `<div test="" title="début 3 milieu 2 fin" class="bar"> traduction: 2 emails<!--ICU 19--></div><div test="" class="bar"></div>`);
   });
 
+  it('should handle i18n attribute with directive inputs', () => {
+    let calledTitle = false;
+    let calledValue = false;
+    @Component({selector: 'my-comp', template: ''})
+    class MyComp {
+      t !: string;
+      @Input()
+      get title() { return this.t; }
+      set title(title) {
+        calledTitle = true;
+        this.t = title;
+      }
+
+      @Input()
+      get value() { return this.val; }
+      set value(value: string) {
+        calledValue = true;
+        this.val = value;
+      }
+      val !: string;
+    }
+
+    TestBed.configureTestingModule({declarations: [AppComp, MyComp]});
+    ɵi18nConfigureLocalize({
+      translations: {'Hello {$interpolation}': 'Bonjour {$interpolation}', 'works': 'fonctionne'}
+    });
+    const fixture = initWithTemplate(
+        AppComp,
+        `<my-comp i18n i18n-title title="works" i18n-value="hi" value="Hello {{name}}"></my-comp>`);
+    fixture.detectChanges();
+
+    const directive = fixture.debugElement.children[0].injector.get(MyComp);
+    expect(calledValue).toEqual(true);
+    expect(calledTitle).toEqual(true);
+    expect(directive.value).toEqual(`Bonjour Angular`);
+    expect(directive.title).toEqual(`fonctionne`);
+  });
+
   it('should support adding/moving/removing nodes', () => {
     ɵi18nConfigureLocalize({
       translations: {

From 53c6b78c51331c247ec132d28a10c196123285a3 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Wed, 15 May 2019 17:08:50 +0200
Subject: [PATCH 237/275] feat(ivy): add `AttributeMarker.I18n` for i18n
 attributes (#30402)

`i18nAttributes` instructions always occur after the element instruction. This means that we need to treat `i18n-` attributes differently.
By defining a specific `AttributeMarker` we can ensure that we won't trigger directive inputs with untranslated attribute values.

FW-1332 #resolve
PR Close #30402
---
 .../compliance/r3_view_compiler_i18n_spec.ts  | 24 +++++++--------
 packages/compiler/src/core.ts                 | 18 +++++++++++-
 .../compiler/src/render3/view/template.ts     | 29 ++++++++++---------
 packages/core/src/render3/interfaces/node.ts  | 18 +++++++++++-
 .../core/src/render3/node_selector_matcher.ts | 26 +++++++++--------
 packages/core/src/render3/util/attrs_utils.ts |  5 ++--
 6 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index 558e00eaf9..6f5a741f96 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -197,7 +197,7 @@ describe('i18n support in the view compiler', () => {
         else {
             $I18N_0$ = $r3$.ɵɵi18nLocalize("Content A");
         }
-        const $_c2$ = [${AttributeMarker.Bindings}, "title"];
+        const $_c2$ = [${AttributeMarker.I18n}, "title"];
         var $I18N_3$;
         if (ngI18nClosureMode) {
             /**
@@ -330,7 +330,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = `
-        const $_c0$ = ["id", "static", ${AttributeMarker.Bindings}, "title"];
+        const $_c0$ = ["id", "static", ${AttributeMarker.I18n}, "title"];
         var $I18N_1$;
         if (ngI18nClosureMode) {
           /**
@@ -371,7 +371,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = String.raw `
-        const $_c0$ = ["id", "dynamic-1", ${AttributeMarker.Bindings}, "aria-roledescription", "title", "aria-label"];
+        const $_c0$ = ["id", "dynamic-1", ${AttributeMarker.I18n}, "aria-roledescription", "title", "aria-label"];
         var $I18N_1$;
         if (ngI18nClosureMode) {
           const $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$ = goog.getMsg("static text");
@@ -417,7 +417,7 @@ describe('i18n support in the view compiler', () => {
           "title", $I18N_2$,
           "aria-label", $I18N_3$
         ];
-        const $_c2$ = ["id", "dynamic-2", ${AttributeMarker.Bindings}, "title", "aria-roledescription"];
+        const $_c2$ = ["id", "dynamic-2", ${AttributeMarker.I18n}, "title", "aria-roledescription"];
         var $I18N_6$;
         if (ngI18nClosureMode) {
             /**
@@ -487,7 +487,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = String.raw `
-        const $_c0$ = [${AttributeMarker.Bindings}, "title"];
+        const $_c0$ = [${AttributeMarker.I18n}, "title"];
         var $I18N_1$;
         if (ngI18nClosureMode) {
             /**
@@ -532,7 +532,7 @@ describe('i18n support in the view compiler', () => {
 
       const output = String.raw `
         const $_c0$ = [${AttributeMarker.Template}, "ngFor", "ngForOf"];
-        const $_c1$ = [${AttributeMarker.Bindings}, "title"];
+        const $_c1$ = [${AttributeMarker.I18n}, "title"];
         var $I18N_1$;
         if (ngI18nClosureMode) {
             /**
@@ -599,7 +599,7 @@ describe('i18n support in the view compiler', () => {
       const output = String.raw `
         const $_c0$ = [
           "id", "dynamic-1", 
-          ${AttributeMarker.Bindings}, "aria-roledescription", "title", "aria-label"
+          ${AttributeMarker.I18n}, "aria-roledescription", "title", "aria-label"
         ];
         var $I18N_1$;
         if (ngI18nClosureMode) {
@@ -646,7 +646,7 @@ describe('i18n support in the view compiler', () => {
           "title", $I18N_2$,
           "aria-label", $I18N_3$
         ];
-        const $_c2$ = ["id", "dynamic-2", ${AttributeMarker.Bindings}, "title", "aria-roledescription"];
+        const $_c2$ = ["id", "dynamic-2", ${AttributeMarker.I18n}, "title", "aria-roledescription"];
         var $I18N_6$;
         if (ngI18nClosureMode) {
             /**
@@ -719,7 +719,7 @@ describe('i18n support in the view compiler', () => {
 
       const output = String.raw `
         const $_c0$ = [${AttributeMarker.Template}, "ngFor", "ngForOf"];
-        const $_c1$ = [${AttributeMarker.Bindings}, "title"];
+        const $_c1$ = [${AttributeMarker.I18n}, "title"];
         var $I18N_2$;
         if (ngI18nClosureMode) {
             /**
@@ -776,7 +776,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = String.raw `
-        const $_c0$ = [${AttributeMarker.Bindings}, "title"];
+        const $_c0$ = [${AttributeMarker.I18n}, "title"];
         var $I18N_0$;
         if (ngI18nClosureMode) {
             /**
@@ -1256,7 +1256,7 @@ describe('i18n support in the view compiler', () => {
       `;
 
       const output = String.raw `
-        const $_c1$ = [${AttributeMarker.Bindings}, "title"];
+        const $_c1$ = [${AttributeMarker.I18n}, "title"];
         var $I18N_2$;
         if (ngI18nClosureMode) {
             const $MSG_EXTERNAL_4782264005467235841$$APP_SPEC_TS_3$ = goog.getMsg("Span title {$interpolation} and {$interpolation_1}", {
@@ -1448,7 +1448,7 @@ describe('i18n support in the view compiler', () => {
             $r3$.ɵɵelement(0, "img", $_c0$);
           }
         }
-        const $_c3$ = ["src", "logo.png", ${AttributeMarker.Bindings}, "title"];
+        const $_c3$ = ["src", "logo.png", ${AttributeMarker.I18n}, "title"];
         var $I18N_2$;
         if (ngI18nClosureMode) {
             const $MSG_EXTERNAL_2367729185105559721$$APP_SPEC_TS__2$ = goog.getMsg("App logo #{$interpolation}", {
diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts
index 18bc01d523..f228d6ead0 100644
--- a/packages/compiler/src/core.ts
+++ b/packages/compiler/src/core.ts
@@ -491,5 +491,21 @@ export const enum AttributeMarker {
    * ['attr', 'value', AttributeMarker.ProjectAs, ['', 'title', '']]
    * ```
    */
-  ProjectAs = 5
+  ProjectAs = 5,
+
+  /**
+   * Signals that the following attribute will be translated by runtime i18n
+   *
+   * For example, given the following HTML:
+   *
+   * ```
+   * <div moo="car" foo="value" i18n-foo [bar]="binding" i18n-bar>
+   * ```
+   *
+   * the generated code is:
+   *
+   * ```
+   * var _c1 = ['moo', 'car', AttributeMarker.I18n, 'foo', 'bar'];
+   */
+  I18n = 6,
 }
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 49444431ad..6b19902457 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -518,7 +518,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     const i18nAttrs: (t.TextAttribute | t.BoundAttribute)[] = [];
     const outputAttrs: t.TextAttribute[] = [];
-    const allOtherInputs: (t.TextAttribute | t.BoundAttribute)[] = [];
 
     const [namespaceKey, elementName] = splitNsName(element.name);
     const isNgContainer = checkIsNgContainer(element.name);
@@ -539,11 +538,6 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           // TODO(FW-1248): prevent attributes duplication in `i18nAttributes` and `elementStart`
           // arguments
           i18nAttrs.push(attr);
-          // We treat this attribute as if it was a binding so that we don't risk calling inputs
-          // with the untranslated value.
-          // Also this generates smaller templates until FW-1248 is fixed.
-          // TODO(FW-1332): Create an AttributeMarker for i18n attributes
-          allOtherInputs.push(attr);
         } else {
           outputAttrs.push(attr);
         }
@@ -561,6 +555,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     // Add the attributes
     const attributes: o.Expression[] = [];
+    const allOtherInputs: t.BoundAttribute[] = [];
 
     element.inputs.forEach((input: t.BoundAttribute) => {
       const stylingInputWasSet = stylingBuilder.registerBoundInput(input);
@@ -571,8 +566,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           // TODO(FW-1248): prevent attributes duplication in `i18nAttributes` and `elementStart`
           // arguments
           i18nAttrs.push(input);
+        } else {
+          allOtherInputs.push(input);
         }
-        allOtherInputs.push(input);
       }
     });
 
@@ -585,7 +581,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     });
 
     // add attributes for directive and projection matching purposes
-    attributes.push(...this.prepareNonRenderAttrs(allOtherInputs, element.outputs, stylingBuilder));
+    attributes.push(...this.prepareNonRenderAttrs(
+        allOtherInputs, element.outputs, stylingBuilder, [], i18nAttrs));
     parameters.push(this.toAttrsParam(attributes));
 
     // local refs (ex.: <div #foo #bar="baz">)
@@ -1147,16 +1144,17 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
    *   CLASSES, class1, class2,
    *   STYLES, style1, value1, style2, value2,
    *   BINDINGS, name1, name2, name3,
-   *   TEMPLATE, name4, name5, ...]
+   *   TEMPLATE, name4, name5, name6,
+   *   I18N, name7, name8, ...]
    * ```
    *
    * Note that this function will fully ignore all synthetic (@foo) attribute values
    * because those values are intended to always be generated as property instructions.
    */
   private prepareNonRenderAttrs(
-      inputs: (t.TextAttribute|t.BoundAttribute)[], outputs: t.BoundEvent[],
-      styles?: StylingBuilder,
-      templateAttrs: (t.BoundAttribute|t.TextAttribute)[] = []): o.Expression[] {
+      inputs: t.BoundAttribute[], outputs: t.BoundEvent[], styles?: StylingBuilder,
+      templateAttrs: (t.BoundAttribute|t.TextAttribute)[] = [],
+      i18nAttrs: (t.BoundAttribute|t.TextAttribute)[] = []): o.Expression[] {
     const alreadySeen = new Set<string>();
     const attrExprs: o.Expression[] = [];
 
@@ -1183,7 +1181,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       const attrsStartIndex = attrExprs.length;
 
       for (let i = 0; i < inputs.length; i++) {
-        const input = inputs[i] as t.BoundAttribute;
+        const input = inputs[i];
         if (input.type !== BindingType.Animation) {
           addAttrExpr(input.name);
         }
@@ -1210,6 +1208,11 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       templateAttrs.forEach(attr => addAttrExpr(attr.name));
     }
 
+    if (i18nAttrs.length) {
+      attrExprs.push(o.literal(core.AttributeMarker.I18n));
+      i18nAttrs.forEach(attr => addAttrExpr(attr.name));
+    }
+
     return attrExprs;
   }
 
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index cb6f99b466..4e88949712 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -180,7 +180,23 @@ export const enum AttributeMarker {
    * ['attr', 'value', AttributeMarker.ProjectAs, ['', 'title', '']]
    * ```
    */
-  ProjectAs = 5
+  ProjectAs = 5,
+
+  /**
+   * Signals that the following attribute will be translated by runtime i18n
+   *
+   * For example, given the following HTML:
+   *
+   * ```
+   * <div moo="car" foo="value" i18n-foo [bar]="binding" i18n-bar>
+   * ```
+   *
+   * the generated code is:
+   *
+   * ```
+   * var _c1 = ['moo', 'car', AttributeMarker.I18n, 'foo', 'bar'];
+   */
+  I18n,
 }
 
 /**
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index b291587bc2..a65facee12 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -171,17 +171,18 @@ function readClassValueFromTNode(tNode: TNode): string {
  * Attribute matching depends upon `isInlineTemplate` and `isProjectionMode`.
  * The following table summarizes which types of attributes we attempt to match:
  *
- * =========================================================================================
- * Modes                   | Normal Attributes | Bindings Attributes | Template Attributes
- * =========================================================================================
- * Inline + Projection     | YES               | YES                 | NO
- * -----------------------------------------------------------------------------------------
- * Inline + Directive      | NO                | NO                  | YES
- * -----------------------------------------------------------------------------------------
- * Non-inline + Projection | YES               | YES                 | NO
- * -----------------------------------------------------------------------------------------
- * Non-inline + Directive  | YES               | YES                 | NO
- * =========================================================================================
+ * ===========================================================================================================
+ * Modes                   | Normal Attributes | Bindings Attributes | Template Attributes | I18n
+ * Attributes
+ * ===========================================================================================================
+ * Inline + Projection     | YES               | YES                 | NO                  | YES
+ * -----------------------------------------------------------------------------------------------------------
+ * Inline + Directive      | NO                | NO                  | YES                 | NO
+ * -----------------------------------------------------------------------------------------------------------
+ * Non-inline + Projection | YES               | YES                 | NO                  | YES
+ * -----------------------------------------------------------------------------------------------------------
+ * Non-inline + Directive  | YES               | YES                 | NO                  | YES
+ * ===========================================================================================================
  *
  * @param name the name of the attribute to find
  * @param attrs the attribute array to examine
@@ -203,7 +204,8 @@ function findAttrIndexInNode(
       const maybeAttrName = attrs[i];
       if (maybeAttrName === name) {
         return i;
-      } else if (maybeAttrName === AttributeMarker.Bindings) {
+      } else if (
+          maybeAttrName === AttributeMarker.Bindings || maybeAttrName === AttributeMarker.I18n) {
         bindingsMode = true;
       } else if (maybeAttrName === AttributeMarker.Classes) {
         let value = attrs[++i];
diff --git a/packages/core/src/render3/util/attrs_utils.ts b/packages/core/src/render3/util/attrs_utils.ts
index 445404948a..c64e2df6ce 100644
--- a/packages/core/src/render3/util/attrs_utils.ts
+++ b/packages/core/src/render3/util/attrs_utils.ts
@@ -109,8 +109,9 @@ export function attrsStylingIndexOf(attrs: TAttributes, startIndex: number): num
  * attribute values in a `TAttributes` array are only the names of attributes,
  * and not name-value pairs.
  * @param marker The attribute marker to test.
- * @returns true if the marker is a "name-only" marker (e.g. `Bindings` or `Template`).
+ * @returns true if the marker is a "name-only" marker (e.g. `Bindings`, `Template` or `I18n`).
  */
 export function isNameOnlyAttributeMarker(marker: string | AttributeMarker | CssSelector) {
-  return marker === AttributeMarker.Bindings || marker === AttributeMarker.Template;
+  return marker === AttributeMarker.Bindings || marker === AttributeMarker.Template ||
+      marker === AttributeMarker.I18n;
 }

From 19bbf4bc8e885258ba29e81e973b3cbca91a4b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 30 May 2019 13:53:06 -0700
Subject: [PATCH 238/275] test(ivy): fix sanitization state leaking issue

Due to sanitization being stored as a temp/global value between
instructions, unit tests randomly failed because one test failed
to clean up its temporary value. This patch fixes this issue.
---
 packages/core/test/acceptance/styling_next_spec.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/test/acceptance/styling_next_spec.ts b/packages/core/test/acceptance/styling_next_spec.ts
index 8186a241e8..1b22f5d273 100644
--- a/packages/core/test/acceptance/styling_next_spec.ts
+++ b/packages/core/test/acceptance/styling_next_spec.ts
@@ -11,7 +11,7 @@ import {SecurityContext} from '@angular/core/src/core';
 import {getLContext} from '@angular/core/src/render3/context_discovery';
 import {DebugNode, LViewDebug, toDebug} from '@angular/core/src/render3/debug';
 import {SANITIZER} from '@angular/core/src/render3/interfaces/view';
-import {RuntimeStylingMode, runtimeSetStylingMode} from '@angular/core/src/render3/styling_next/state';
+import {RuntimeStylingMode, runtimeSetStylingMode, setCurrentStyleSanitizer} from '@angular/core/src/render3/styling_next/state';
 import {loadLContextFromNode} from '@angular/core/src/render3/util/discovery_utils';
 import {ngDevModeResetPerfCounters as resetStylingCounters} from '@angular/core/src/util/ng_dev_mode';
 import {TestBed} from '@angular/core/testing';
@@ -712,6 +712,10 @@ describe('new styling integration', () => {
         const node = getDebugNode(element) !;
         const styles = node.styles !;
         expect(styles.values['width']).toEqual('200px-safe');
+
+        // this is here so that it won't get picked up accidentally in another test
+        lView[SANITIZER] = null;
+        setCurrentStyleSanitizer(null);
       });
 
   it('should be able to bind a SafeValue to clip-path', () => {

From 282abdb02d758f861eefd0d11f1fa9a63a873e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Thu, 30 May 2019 14:29:27 -0700
Subject: [PATCH 239/275] release: cut the v8.1.0-beta.0 release

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  4 ++--
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f657180ba..66cb186484 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,52 @@
+<a name="8.1.0-beta.0"></a>
+# [8.1.0-beta.0](https://github.com/angular/angular/compare/8.0.0...8.1.0-beta.0) (2019-05-30)
+
+
+### Bug Fixes
+
+* **bazel:** allow ts_library interop with list-typed inputs ([#30600](https://github.com/angular/angular/issues/30600)) ([3125376](https://github.com/angular/angular/commit/3125376))
+* **bazel:** Bump ibazel to 0.10.1 for windows fixes ([#30196](https://github.com/angular/angular/issues/30196)) ([1353bf0](https://github.com/angular/angular/commit/1353bf0))
+* **bazel:** Directly spawn native Bazel binary ([#30306](https://github.com/angular/angular/issues/30306)) ([2a0f497](https://github.com/angular/angular/commit/2a0f497))
+* **bazel:** Disable sandbox on Mac OS ([#30460](https://github.com/angular/angular/issues/30460)) ([b6b1aec](https://github.com/angular/angular/commit/b6b1aec))
+* **bazel:** Exclude common/upgrade* in metadata.tsconfig.json ([#30133](https://github.com/angular/angular/issues/30133)) ([1f4c380](https://github.com/angular/angular/commit/1f4c380))
+* **bazel:** ng test should run specific ts_web_test_suite ([#30526](https://github.com/angular/angular/issues/30526)) ([e688e02](https://github.com/angular/angular/commit/e688e02))
+* **bazel:** pass correct arguments to http_server in Windows ([#30346](https://github.com/angular/angular/issues/30346)) ([3aff79c](https://github.com/angular/angular/commit/3aff79c)), closes [#29785](https://github.com/angular/angular/issues/29785)
+* **bazel:** update peerDep ranges ([#30155](https://github.com/angular/angular/issues/30155)) ([4ae0ee8](https://github.com/angular/angular/commit/4ae0ee8))
+* **bazel:** Use existing npm/yarn lock files ([#30438](https://github.com/angular/angular/issues/30438)) ([ff29ccc](https://github.com/angular/angular/commit/ff29ccc))
+* **compiler-cli:** log ngcc skipping messages as debug instead of info ([#30232](https://github.com/angular/angular/issues/30232)) ([60a8888](https://github.com/angular/angular/commit/60a8888))
+* **core:** consistently use ng:/// for sourcemap URLs ([#29826](https://github.com/angular/angular/issues/29826)) ([392473e](https://github.com/angular/angular/commit/392473e))
+* **core:** CSS sanitizer now allows parens in file names ([#30322](https://github.com/angular/angular/issues/30322)) ([728db88](https://github.com/angular/angular/commit/728db88))
+* **core:** fix interpolate identifier in AOT ([#30243](https://github.com/angular/angular/issues/30243)) ([30d1f29](https://github.com/angular/angular/commit/30d1f29))
+* **core:** migrations not always migrating all files ([#30269](https://github.com/angular/angular/issues/30269)) ([349935a](https://github.com/angular/angular/commit/349935a))
+* **core:** remove deprecated `TestBed.deprecatedOverrideProvider` API ([#30576](https://github.com/angular/angular/issues/30576)) ([a96976e](https://github.com/angular/angular/commit/a96976e))
+* **core:** require 'static' flag on queries in typings ([#30639](https://github.com/angular/angular/issues/30639)) ([84dd267](https://github.com/angular/angular/commit/84dd267))
+* **core:** static-query migration errors not printed properly ([#30458](https://github.com/angular/angular/issues/30458)) ([6ceb903](https://github.com/angular/angular/commit/6ceb903))
+* **core:** static-query migration fails with default parameter values ([#30269](https://github.com/angular/angular/issues/30269)) ([6357d4a](https://github.com/angular/angular/commit/6357d4a))
+* **core:** static-query migration should gracefully exit if AOT compiler throws ([#30269](https://github.com/angular/angular/issues/30269)) ([509352f](https://github.com/angular/angular/commit/509352f))
+* **core:** static-query migration should handle queries on accessors ([#30327](https://github.com/angular/angular/issues/30327)) ([0ffdb48](https://github.com/angular/angular/commit/0ffdb48))
+* **core:** static-query migration should not fallback to test strategy ([#30458](https://github.com/angular/angular/issues/30458)) ([0cdf598](https://github.com/angular/angular/commit/0cdf598))
+* **core:** static-query migration should not prompt if no queries are used ([#30254](https://github.com/angular/angular/issues/30254)) ([4c12d74](https://github.com/angular/angular/commit/4c12d74))
+* **core:** static-query usage migration strategy should detect ambiguous query usage ([#30215](https://github.com/angular/angular/issues/30215)) ([8d3365e](https://github.com/angular/angular/commit/8d3365e))
+* **core:** temporarily remove [@deprecated](https://github.com/deprecated) jsdoc tag for a TextBed.get overload ([#30514](https://github.com/angular/angular/issues/30514)) ([f6bf892](https://github.com/angular/angular/commit/f6bf892)), closes [#29290](https://github.com/angular/angular/issues/29290) [#29905](https://github.com/angular/angular/issues/29905)
+* **language-service:** Remove tsserverlibrary from rollup globals ([#30123](https://github.com/angular/angular/issues/30123)) ([124e497](https://github.com/angular/angular/commit/124e497))
+* **router:** ensure `history.state` is set in `eager` update mode ([#30154](https://github.com/angular/angular/issues/30154)) ([b40f6f3](https://github.com/angular/angular/commit/b40f6f3))
+* **router:** ensure navigations start with the current URL value incase redirect is skipped ([#30344](https://github.com/angular/angular/issues/30344)) ([0fd9d08](https://github.com/angular/angular/commit/0fd9d08)), closes [#30340](https://github.com/angular/angular/issues/30340) [#30160](https://github.com/angular/angular/issues/30160)
+* **router:** fix a problem with router not responding to back button ([#30160](https://github.com/angular/angular/issues/30160)) ([3327bd8](https://github.com/angular/angular/commit/3327bd8))
+* **router:** IE 11 bug can break URL unification when comparing objects ([#30393](https://github.com/angular/angular/issues/30393)) ([197584d](https://github.com/angular/angular/commit/197584d))
+* **router:** type cast correctly for IE 11 bug breaking URL Unification when comparing objects ([#30464](https://github.com/angular/angular/issues/30464)) ([53f3564](https://github.com/angular/angular/commit/53f3564))
+
+
+### Features
+
+* **bazel:** use `rbe_autoconfig()` and new container. ([#29336](https://github.com/angular/angular/issues/29336)) ([9abf114](https://github.com/angular/angular/commit/9abf114))
+* **common:** add ability to watch for AngularJS URL updates through `onUrlChange` hook ([#30466](https://github.com/angular/angular/issues/30466)) ([1aff524](https://github.com/angular/angular/commit/1aff524))
+* **common:** stricter types for `SlicePipe` ([#30156](https://github.com/angular/angular/issues/30156)) ([95830ee](https://github.com/angular/angular/commit/95830ee))
+* **core:** deprecate integration with the Web Tracing Framework (WTF) ([#30642](https://github.com/angular/angular/issues/30642)) ([f310a59](https://github.com/angular/angular/commit/f310a59))
+* **language-service:** Implement `definitionAndBoundSpan` ([#30125](https://github.com/angular/angular/issues/30125)) ([f491673](https://github.com/angular/angular/commit/f491673))
+* **platform-webworker:** deprecate platform-webworker ([#30642](https://github.com/angular/angular/issues/30642)) ([ccc76f7](https://github.com/angular/angular/commit/ccc76f7))
+
+
+
 <a name="8.0.0"></a>
 # [8.0.0](https://github.com/angular/angular/compare/8.0.0-rc.5...8.0.0) (2019-05-28)
 
diff --git a/package.json b/package.json
index c02e09c1bd..3b9e8567af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "8.0.0",
+  "version": "8.1.0-beta.0",
   "private": true,
   "description": "Angular - a web framework for modern web apps",
   "homepage": "https://github.com/angular/angular",
@@ -165,4 +165,4 @@
   "resolutions": {
     "natives": "1.1.6"
   }
-}
\ No newline at end of file
+}

From 09c57ecf953f40ea19906d606c21a8c4ced4d325 Mon Sep 17 00:00:00 2001
From: jenniferfell <jenniferfell.sf@gmail.com>
Date: Wed, 29 May 2019 00:00:14 -0600
Subject: [PATCH 240/275] docs: add final release date and update future
 schedule (#30712)

PR Close #30712
---
 aio/content/guide/releases.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/aio/content/guide/releases.md b/aio/content/guide/releases.md
index 7835c6f38e..113a74ea8b 100644
--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@@ -92,9 +92,9 @@ The following table contains our current target release dates for the next two m
 
  Date                   | Stable Release | Compatibility 
  ---------------------- | -------------- | -------------
- May 2019               | 8.0.0          | ^7.0.0
  October/November 2019  | 9.0.0          | ^8.0.0
-
+ May 2020               | 10.0.0         | ^9.0.0
+ 
  Compatibility note: The primary goal of the backward compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.
 
 
@@ -115,7 +115,7 @@ The following table provides the status for Angular versions under support.
 
 Version | Status | Released     | Active Ends  | LTS Ends
 ------- | ------ | ------------ | ------------ | ------------ 
-^8.0.0  | Active | May 22, 2019 | Nov 22, 2019 | Nov 22, 2020
+^8.0.0  | Active | May 28, 2019 | Nov 28, 2019 | Nov 28, 2020
 ^7.0.0  | LTS    | Oct 18, 2018 | Apr 18, 2019 | Apr 18, 2020
 ^6.0.0  | LTS    | May 3, 2018  | Nov 3, 2018  | Nov 3, 2019
 

From d82adbe8c4e91cd561d16fb3dbd816eaf2a47f45 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 30 May 2019 13:28:44 -0700
Subject: [PATCH 241/275] fix(ivy): align DebugNode/DebugElement behavior with
 View Engine (#30756)

Two issues with DebugNode/DebugElement in Ivy were causing problems in user
tests.

1. The DebugNodes returned by Ivy were not actually instances of DebugNode.

This was due to an issue with the Ivy switch logic in debug_node.ts.
The declaration of the exported DebugNode reference was set to
`DebugNode__PRE_R3__ as any`. The cast prevented the Ivy switch transform
from detecting this as a switchable declaration. The transform cannot handle
arbitrary syntax, and exports *must* be of the form "const x = y__PRE_R3__;"
or they will not work. The cast to any in this case was not needed, so this
commit removes it.

2. DebugNodes returned by Ivy multiple times for the same element were not
reference-identical. This was previously considered a minor breaking change
in Ivy, but testing has shown that users depend on referential equality of
DebugNodes. This commit caches a DebugNode on a DOM node when first creating
it, to allow returning the same instance in subsequent operations.

PR Close #30756
---
 packages/core/src/debug/debug_node.ts       | 15 ++++++++++-----
 packages/core/test/debug/debug_node_spec.ts | 19 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/debug/debug_node.ts b/packages/core/src/debug/debug_node.ts
index f4ecc218c2..e8547d8783 100644
--- a/packages/core/src/debug/debug_node.ts
+++ b/packages/core/src/debug/debug_node.ts
@@ -638,14 +638,19 @@ function getDebugNode__PRE_R3__(nativeNode: any): DebugNode|null {
   return _nativeNodeToDebugNode.get(nativeNode) || null;
 }
 
+const NG_DEBUG_PROPERTY = '__ng_debug__';
+
 export function getDebugNode__POST_R3__(nativeNode: Element): DebugElement__POST_R3__;
 export function getDebugNode__POST_R3__(nativeNode: Node): DebugNode__POST_R3__;
 export function getDebugNode__POST_R3__(nativeNode: null): null;
 export function getDebugNode__POST_R3__(nativeNode: any): DebugNode|null {
   if (nativeNode instanceof Node) {
-    return nativeNode.nodeType == Node.ELEMENT_NODE ?
-        new DebugElement__POST_R3__(nativeNode as Element) :
-        new DebugNode__POST_R3__(nativeNode);
+    if (!(nativeNode.hasOwnProperty(NG_DEBUG_PROPERTY))) {
+      (nativeNode as any)[NG_DEBUG_PROPERTY] = nativeNode.nodeType == Node.ELEMENT_NODE ?
+          new DebugElement__POST_R3__(nativeNode as Element) :
+          new DebugNode__POST_R3__(nativeNode);
+    }
+    return (nativeNode as any)[NG_DEBUG_PROPERTY];
   }
   return null;
 }
@@ -678,9 +683,9 @@ export interface Predicate<T> { (value: T): boolean; }
 /**
  * @publicApi
  */
-export const DebugNode: {new (...args: any[]): DebugNode} = DebugNode__PRE_R3__ as any;
+export const DebugNode: {new (...args: any[]): DebugNode} = DebugNode__PRE_R3__;
 
 /**
  * @publicApi
  */
-export const DebugElement: {new (...args: any[]): DebugElement} = DebugElement__PRE_R3__ as any;
+export const DebugElement: {new (...args: any[]): DebugElement} = DebugElement__PRE_R3__;
diff --git a/packages/core/test/debug/debug_node_spec.ts b/packages/core/test/debug/debug_node_spec.ts
index ac3773b873..b45cb43031 100644
--- a/packages/core/test/debug/debug_node_spec.ts
+++ b/packages/core/test/debug/debug_node_spec.ts
@@ -7,7 +7,7 @@
  */
 
 
-import {Component, Directive, ElementRef, EmbeddedViewRef, EventEmitter, HostBinding, Injectable, Input, NO_ERRORS_SCHEMA, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
+import {Component, DebugNode, Directive, ElementRef, EmbeddedViewRef, EventEmitter, HostBinding, Injectable, Input, NO_ERRORS_SCHEMA, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
 import {ComponentFixture, TestBed, async} from '@angular/core/testing';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
@@ -678,5 +678,22 @@ class TestCmptWithPropBindings {
       expect(divB.nativeElement.getAttribute('id')).toBe('b');
     });
 
+    it('should be an instance of DebugNode', () => {
+      fixture = TestBed.createComponent(ParentComp);
+      fixture.detectChanges();
+      expect(fixture.debugElement).toBeAnInstanceOf(DebugNode);
+    });
+
+    it('should return the same element when queried twice', () => {
+      fixture = TestBed.createComponent(ParentComp);
+      fixture.detectChanges();
+
+      const childTestElsFirst = fixture.debugElement.queryAll(By.css('child-comp'));
+      const childTestElsSecond = fixture.debugElement.queryAll(By.css('child-comp'));
+
+      expect(childTestElsFirst.length).toBe(1);
+      expect(childTestElsSecond[0]).toBe(childTestElsFirst[0]);
+    });
+
   });
 }

From fa354888b1bb15fb4603f44ee1dd0000bb754021 Mon Sep 17 00:00:00 2001
From: Trotyl Yu <trotyl@qq.com>
Date: Wed, 29 May 2019 21:16:58 +0800
Subject: [PATCH 242/275] ci: add reviewer group for deprecations guide
 (#30722) PR Close #30722

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 05112c88c4..730f816c81 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -812,6 +812,7 @@ testing/**                                                      @angular/fw-test
 /aio/content/guide/releases.md                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/updating.md                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/workspace-config.md                          @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/deprecations.md                              @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 
 
 

From 99c9bcab03271775943df9c0bf21b0cd4229037e Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Thu, 30 May 2019 12:43:18 +0200
Subject: [PATCH 243/275] test: move away from deprecated testing method
 (#30747)

Switches all of the tests away from the `runSchematic` method which was deprecated in 8.0 (see https://github.com/angular/angular-cli/pull/14412). Along the same lines as https://github.com/angular/components/pull/16150.

PR Close #30747
---
 .../bazel/src/schematics/ng-add/index_spec.ts | 104 +++++++++++-------
 .../bazel/src/schematics/ng-new/index_spec.ts |   8 +-
 .../test/injectable_pipe_migration_spec.ts    |  24 ++--
 .../test/move_document_migration_spec.ts      |  28 ++---
 .../template_var_assignment_migration_spec.ts |  60 +++++-----
 .../elements/schematics/ng-add/index_spec.ts  |   5 +-
 6 files changed, 130 insertions(+), 99 deletions(-)

diff --git a/packages/bazel/src/schematics/ng-add/index_spec.ts b/packages/bazel/src/schematics/ng-add/index_spec.ts
index bac2d182ba..5dae5973da 100644
--- a/packages/bazel/src/schematics/ng-add/index_spec.ts
+++ b/packages/bazel/src/schematics/ng-add/index_spec.ts
@@ -61,22 +61,38 @@ describe('ng-add schematic', () => {
         new SchematicTestRunner('@angular/bazel', require.resolve('../collection.json'));
   });
 
-  it('throws if package.json is not found', () => {
+  it('throws if package.json is not found', async() => {
     expect(host.files).toContain('/package.json');
     host.delete('/package.json');
-    expect(() => schematicRunner.runSchematic('ng-add', defaultOptions))
-        .toThrowError('Could not find package.json');
+
+    let message = 'No error';
+
+    try {
+      await schematicRunner.runSchematicAsync('ng-add', defaultOptions).toPromise();
+    } catch (e) {
+      message = e.message;
+    }
+
+    expect(message).toBe('Could not find package.json');
   });
 
-  it('throws if angular.json is not found', () => {
+  it('throws if angular.json is not found', async() => {
     expect(host.files).toContain('/angular.json');
     host.delete('/angular.json');
-    expect(() => schematicRunner.runSchematic('ng-add', defaultOptions, host))
-        .toThrowError('Could not find angular.json');
+
+    let message = 'No error';
+
+    try {
+      await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
+    } catch (e) {
+      message = e.message;
+    }
+
+    expect(message).toBe('Could not find angular.json');
   });
 
-  it('should add @angular/bazel to package.json dependencies', () => {
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+  it('should add @angular/bazel to package.json dependencies', async() => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const {files} = host;
     expect(files).toContain('/package.json');
     const content = host.readContent('/package.json');
@@ -91,8 +107,8 @@ describe('ng-add schematic', () => {
     expect(json.dependencies[core]).toBe(json.devDependencies[bazel]);
   });
 
-  it('should add @bazel/* dev dependencies', () => {
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+  it('should add @bazel/* dev dependencies', async() => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const content = host.readContent('/package.json');
     const json = JSON.parse(content);
     const devDeps = Object.keys(json.devDependencies);
@@ -101,12 +117,12 @@ describe('ng-add schematic', () => {
     expect(devDeps).toContain('@bazel/karma');
   });
 
-  it('should replace an existing dev dependency', () => {
+  it('should replace an existing dev dependency', async() => {
     expect(host.files).toContain('/package.json');
     const packageJson = JSON.parse(host.readContent('/package.json'));
     packageJson.devDependencies['@angular/bazel'] = '4.2.42';
     host.overwrite('/package.json', JSON.stringify(packageJson));
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const content = host.readContent('/package.json');
     // It is possible that a dep gets added twice if the package already exists.
     expect(content.match(/@angular\/bazel/g) !.length).toEqual(1);
@@ -114,29 +130,29 @@ describe('ng-add schematic', () => {
     expect(json.devDependencies['@angular/bazel']).toBe('1.2.3');
   });
 
-  it('should remove an existing dependency', () => {
+  it('should remove an existing dependency', async() => {
     expect(host.files).toContain('/package.json');
     const packageJson = JSON.parse(host.readContent('/package.json'));
     packageJson.dependencies['@angular/bazel'] = '4.2.42';
     expect(Object.keys(packageJson.dependencies)).toContain('@angular/bazel');
     host.overwrite('/package.json', JSON.stringify(packageJson));
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const content = host.readContent('/package.json');
     const json = JSON.parse(content);
     expect(Object.keys(json.dependencies)).not.toContain('@angular/bazel');
     expect(json.devDependencies['@angular/bazel']).toBe('1.2.3');
   });
 
-  it('should not create Bazel workspace file', () => {
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+  it('should not create Bazel workspace file', async() => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const {files} = host;
     expect(files).not.toContain('/WORKSPACE');
     expect(files).not.toContain('/BUILD.bazel');
   });
 
-  it('should produce main.dev.ts and main.prod.ts for AOT', () => {
+  it('should produce main.dev.ts and main.prod.ts for AOT', async() => {
     host.create('/src/main.ts', 'generated by CLI');
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const {files} = host;
     // main.dev.ts and main.prod.ts are used by Bazel for AOT
     expect(files).toContain('/src/main.dev.ts');
@@ -146,9 +162,9 @@ describe('ng-add schematic', () => {
     expect(files).toContain('/src/main.ts');
   });
 
-  it('should not overwrite index.html with script tags', () => {
+  it('should not overwrite index.html with script tags', async() => {
     host.create('/src/index.html', '<html>Hello World</html>');
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const {files} = host;
     expect(files).toContain('/src/index.html');
     const content = host.readContent('/src/index.html');
@@ -156,34 +172,34 @@ describe('ng-add schematic', () => {
     expect(content).not.toMatch('<script src="/bundle.min.js"></script>');
   });
 
-  it('should generate main.dev.ts and main.prod.ts', () => {
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+  it('should generate main.dev.ts and main.prod.ts', async() => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const {files} = host;
     expect(files).toContain('/src/main.dev.ts');
     expect(files).toContain('/src/main.prod.ts');
   });
 
-  it('should overwrite .gitignore for bazel-out directory', () => {
+  it('should overwrite .gitignore for bazel-out directory', async() => {
     host.create('.gitignore', '\n# compiled output\n');
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const {files} = host;
     expect(files).toContain('/.gitignore');
     const content = host.readContent('/.gitignore');
     expect(content).toMatch('\n# compiled output\n/bazel-out\n');
   });
 
-  it('should create a backup for original angular.json', () => {
+  it('should create a backup for original angular.json', async() => {
     expect(host.files).toContain('/angular.json');
     const original = host.readContent('/angular.json');
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     expect(host.files).toContain('/angular.json.bak');
     const content = host.readContent('/angular.json.bak');
     expect(content.startsWith('// This is a backup file')).toBe(true);
     expect(content).toMatch(original);
   });
 
-  it('should update angular.json to use Bazel builder', () => {
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+  it('should update angular.json to use Bazel builder', async() => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     const {files} = host;
     expect(files).toContain('/angular.json');
     const content = host.readContent('/angular.json');
@@ -203,27 +219,27 @@ describe('ng-add schematic', () => {
     expect(lint.builder).toBe('@angular-devkit/build-angular:tslint');
   });
 
-  it('should get defaultProject if name is not provided', () => {
+  it('should get defaultProject if name is not provided', async() => {
     const options = {};
-    host = schematicRunner.runSchematic('ng-add', options, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', options, host).toPromise();
     const content = host.readContent('/angular.json');
     const json = JSON.parse(content);
     const builder = json.projects.demo.architect.build.builder;
     expect(builder).toBe('@angular/bazel:build');
   });
 
-  it('should create a backup for original tsconfig.json', () => {
+  it('should create a backup for original tsconfig.json', async() => {
     expect(host.files).toContain('/tsconfig.json');
     const original = host.readContent('/tsconfig.json');
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     expect(host.files).toContain('/tsconfig.json.bak');
     const content = host.readContent('/tsconfig.json.bak');
     expect(content.startsWith('// This is a backup file')).toBe(true);
     expect(content).toMatch(original);
   });
 
-  it('should remove Bazel-controlled options from tsconfig.json', () => {
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+  it('should remove Bazel-controlled options from tsconfig.json', async() => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     expect(host.files).toContain('/tsconfig.json');
     const content = host.readContent('/tsconfig.json');
     expect(() => JSON.parse(content)).not.toThrow();
@@ -251,7 +267,7 @@ describe('ng-add schematic', () => {
       ['~7.0.1', false],
     ];
     for (const [version, upgrade] of cases) {
-      it(`should ${upgrade ? '' : 'not '}upgrade v${version}')`, () => {
+      it(`should ${upgrade ? '' : 'not '}upgrade v${version}')`, async() => {
         host.overwrite('package.json', JSON.stringify({
           name: 'demo',
           dependencies: {
@@ -262,7 +278,7 @@ describe('ng-add schematic', () => {
             'typescript': '3.2.2',
           },
         }));
-        host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+        host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
         expect(host.files).toContain('/package.json');
         const content = host.readContent('/package.json');
         const json = JSON.parse(content);
@@ -275,15 +291,15 @@ describe('ng-add schematic', () => {
     }
   });
 
-  it('should add a postinstall step to package.json', () => {
-    host = schematicRunner.runSchematic('ng-add', defaultOptions, host);
+  it('should add a postinstall step to package.json', async() => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
     expect(host.files).toContain('/package.json');
     const content = host.readContent('/package.json');
     const json = JSON.parse(content);
     expect(json.scripts.postinstall).toBe('ngc -p ./angular-metadata.tsconfig.json');
   });
 
-  it('should work when run on a minimal project (without test and e2e targets)', () => {
+  it('should work when run on a minimal project (without test and e2e targets)', async() => {
     host.overwrite('angular.json', JSON.stringify({
       projects: {
         'demo': {
@@ -298,7 +314,15 @@ describe('ng-add schematic', () => {
       },
     }));
 
-    expect(() => schematicRunner.runSchematic('ng-add', defaultOptions, host)).not.toThrowError();
+    let error: Error|null = null;
+
+    try {
+      await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error).toBeNull();
   });
 
 });
diff --git a/packages/bazel/src/schematics/ng-new/index_spec.ts b/packages/bazel/src/schematics/ng-new/index_spec.ts
index 3c33b3fb95..3d1fef16bf 100644
--- a/packages/bazel/src/schematics/ng-new/index_spec.ts
+++ b/packages/bazel/src/schematics/ng-new/index_spec.ts
@@ -16,18 +16,18 @@ describe('ng-new schematic', () => {
     version: '7.0.0',
   };
 
-  it('should call external @schematics/angular', () => {
+  it('should call external @schematics/angular', async() => {
     const options = {...defaultOptions};
-    const host = schematicRunner.runSchematic('ng-new', options);
+    const host = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const {files} = host;
     // External schematic should produce workspace file angular.json
     expect(files).toContain('/demo/angular.json');
     expect(files).toContain('/demo/package.json');
   });
 
-  it('should call ng-add to generate additional files needed by Bazel', () => {
+  it('should call ng-add to generate additional files needed by Bazel', async() => {
     const options = {...defaultOptions};
-    const host = schematicRunner.runSchematic('ng-new', options);
+    const host = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const {files} = host;
     expect(files).toContain('/demo/src/main.dev.ts');
     expect(files).toContain('/demo/src/main.prod.ts');
diff --git a/packages/core/schematics/test/injectable_pipe_migration_spec.ts b/packages/core/schematics/test/injectable_pipe_migration_spec.ts
index a37399414e..be238ed894 100644
--- a/packages/core/schematics/test/injectable_pipe_migration_spec.ts
+++ b/packages/core/schematics/test/injectable_pipe_migration_spec.ts
@@ -46,7 +46,7 @@ describe('injectable pipe migration', () => {
     shx.rm('-r', tmpDirPath);
   });
 
-  it('should add @Injectable to pipes that do not have it', () => {
+  it('should add @Injectable to pipes that do not have it', async() => {
     writeFile('/index.ts', `
       import { Pipe } from '@angular/core';
 
@@ -55,12 +55,12 @@ describe('injectable pipe migration', () => {
       }
     `);
 
-    runMigration();
+    await runMigration();
     expect(tree.readContent('/index.ts'))
         .toMatch(/@Injectable\(\)\s+@Pipe\(\{ name: 'myPipe' \}\)\s+export class MyPipe/);
   });
 
-  it('should add an import for Injectable to the @angular/core import declaration', () => {
+  it('should add an import for Injectable to the @angular/core import declaration', async() => {
     writeFile('/index.ts', `
       import { Pipe } from '@angular/core';
 
@@ -69,14 +69,14 @@ describe('injectable pipe migration', () => {
       }
     `);
 
-    runMigration();
+    await runMigration();
 
     const content = tree.readContent('/index.ts');
     expect(content).toContain('import { Pipe, Injectable } from \'@angular/core\'');
     expect((content.match(/import/g) || []).length).toBe(1, 'Expected only one import statement');
   });
 
-  it('should not add an import for Injectable if it is imported already', () => {
+  it('should not add an import for Injectable if it is imported already', async() => {
     writeFile('/index.ts', `
       import { Pipe, Injectable, NgModule } from '@angular/core';
 
@@ -85,12 +85,12 @@ describe('injectable pipe migration', () => {
       }
     `);
 
-    runMigration();
+    await runMigration();
     expect(tree.readContent('/index.ts'))
         .toContain('import { Pipe, Injectable, NgModule } from \'@angular/core\'');
   });
 
-  it('should do nothing if the pipe is marked as injectable already', () => {
+  it('should do nothing if the pipe is marked as injectable already', async() => {
     const source = `
       import { Injectable, Pipe } from '@angular/core';
 
@@ -101,11 +101,11 @@ describe('injectable pipe migration', () => {
     `;
 
     writeFile('/index.ts', source);
-    runMigration();
+    await runMigration();
     expect(tree.readContent('/index.ts')).toBe(source);
   });
 
-  it('should not add @Injectable if @Pipe was not imported from @angular/core', () => {
+  it('should not add @Injectable if @Pipe was not imported from @angular/core', async() => {
     const source = `
       import { Pipe } from '@not-angular/core';
 
@@ -115,7 +115,7 @@ describe('injectable pipe migration', () => {
     `;
 
     writeFile('/index.ts', source);
-    runMigration();
+    await runMigration();
     expect(tree.readContent('/index.ts')).toBe(source);
   });
 
@@ -123,5 +123,7 @@ describe('injectable pipe migration', () => {
     host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
   }
 
-  function runMigration() { runner.runSchematic('migration-injectable-pipe', {}, tree); }
+  function runMigration() {
+    runner.runSchematicAsync('migration-injectable-pipe', {}, tree).toPromise();
+  }
 });
diff --git a/packages/core/schematics/test/move_document_migration_spec.ts b/packages/core/schematics/test/move_document_migration_spec.ts
index 85f55411ac..f7093e6785 100644
--- a/packages/core/schematics/test/move_document_migration_spec.ts
+++ b/packages/core/schematics/test/move_document_migration_spec.ts
@@ -47,12 +47,12 @@ describe('move-document migration', () => {
   });
 
   describe('move-document', () => {
-    it('should properly apply import replacement', () => {
+    it('should properly apply import replacement', async() => {
       writeFile('/index.ts', `
         import {DOCUMENT} from '@angular/platform-browser';
       `);
 
-      runMigration();
+      await runMigration();
 
       const content = tree.readContent('/index.ts');
 
@@ -60,7 +60,7 @@ describe('move-document migration', () => {
       expect(content).not.toContain(`import {DOCUMENT} from '@angular/platform-browser';`);
     });
 
-    it('should properly apply import replacement with existing import', () => {
+    it('should properly apply import replacement with existing import', async() => {
       writeFile('/index.ts', `
         import {DOCUMENT} from '@angular/platform-browser';
         import {someImport} from '@angular/common';
@@ -71,7 +71,7 @@ describe('move-document migration', () => {
         import {DOCUMENT} from '@angular/platform-browser';
       `);
 
-      runMigration();
+      await runMigration();
 
       const content = tree.readContent('/index.ts');
       const contentReverse = tree.readContent('/reverse.ts');
@@ -83,7 +83,7 @@ describe('move-document migration', () => {
       expect(contentReverse).not.toContain(`import {DOCUMENT} from '@angular/platform-browser';`);
     });
 
-    it('should properly apply import replacement with existing import w/ comments', () => {
+    it('should properly apply import replacement with existing import w/ comments', async() => {
       writeFile('/index.ts', `
         /**
          * this is a comment
@@ -92,7 +92,7 @@ describe('move-document migration', () => {
         import {DOCUMENT} from '@angular/platform-browser';
       `);
 
-      runMigration();
+      await runMigration();
 
       const content = tree.readContent('/index.ts');
 
@@ -102,14 +102,14 @@ describe('move-document migration', () => {
       expect(content).toMatch(/.*this is a comment.*/);
     });
 
-    it('should properly apply import replacement with existing and redundant imports', () => {
+    it('should properly apply import replacement with existing and redundant imports', async() => {
       writeFile('/index.ts', `
         import {DOCUMENT} from '@angular/platform-browser';
         import {anotherImport} from '@angular/platform-browser-dynamic';
         import {someImport} from '@angular/common';
       `);
 
-      runMigration();
+      await runMigration();
 
       const content = tree.readContent('/index.ts');
 
@@ -118,13 +118,13 @@ describe('move-document migration', () => {
     });
 
     it('should properly apply import replacement with existing import and leave original import',
-       () => {
+       async() => {
          writeFile('/index.ts', `
         import {DOCUMENT, anotherImport} from '@angular/platform-browser';
         import {someImport} from '@angular/common';
       `);
 
-         runMigration();
+         await runMigration();
 
          const content = tree.readContent('/index.ts');
 
@@ -132,13 +132,13 @@ describe('move-document migration', () => {
          expect(content).toContain(`import { anotherImport } from '@angular/platform-browser';`);
        });
 
-    it('should properly apply import replacement with existing import and alias', () => {
+    it('should properly apply import replacement with existing import and alias', async() => {
       writeFile('/index.ts', `
         import {DOCUMENT as doc, anotherImport} from '@angular/platform-browser';
         import {someImport} from '@angular/common';
       `);
 
-      runMigration();
+      await runMigration();
 
       const content = tree.readContent('/index.ts');
 
@@ -151,5 +151,7 @@ describe('move-document migration', () => {
     host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
   }
 
-  function runMigration() { runner.runSchematic('migration-v8-move-document', {}, tree); }
+  function runMigration() {
+    runner.runSchematicAsync('migration-v8-move-document', {}, tree).toPromise();
+  }
 });
diff --git a/packages/core/schematics/test/template_var_assignment_migration_spec.ts b/packages/core/schematics/test/template_var_assignment_migration_spec.ts
index 742ced7e15..f0af511a57 100644
--- a/packages/core/schematics/test/template_var_assignment_migration_spec.ts
+++ b/packages/core/schematics/test/template_var_assignment_migration_spec.ts
@@ -59,10 +59,10 @@ describe('template variable assignment migration', () => {
   }
 
   function runMigration() {
-    runner.runSchematic('migration-v8-template-local-variables', {}, tree);
+    return runner.runSchematicAsync('migration-v8-template-local-variables', {}, tree).toPromise();
   }
 
-  it('should warn for two-way data binding variable assignment', () => {
+  it('should warn for two-way data binding variable assignment', async() => {
     writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -72,13 +72,13 @@ describe('template variable assignment migration', () => {
       export class MyComp {}
     `);
 
-    runMigration();
+    await runMigration();
 
     expect(warnOutput.length).toBe(1);
     expect(warnOutput[0]).toMatch(/^⮑ {3}index.ts@5:69: Found assignment/);
   });
 
-  it('should warn for two-way data binding assigning to "as" variable', () => {
+  it('should warn for two-way data binding assigning to "as" variable', async() => {
     writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -94,13 +94,13 @@ describe('template variable assignment migration', () => {
       </div>
     `);
 
-    runMigration();
+    await runMigration();
 
     expect(warnOutput.length).toBe(1);
     expect(warnOutput).toMatch(/^⮑ {3}tmpl.html@3:31: Found assignment/);
   });
 
-  it('should warn for bound event assignments to "as" variable', () => {
+  it('should warn for bound event assignments to "as" variable', async() => {
     writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -117,14 +117,14 @@ describe('template variable assignment migration', () => {
       </div>
     `);
 
-    runMigration();
+    await runMigration();
 
     expect(warnOutput.length).toBe(2);
     expect(warnOutput[0]).toMatch(/^⮑ {3}sub_dir\/tmpl.html@3:25: Found assignment/);
     expect(warnOutput[1]).toMatch(/^⮑ {3}sub_dir\/tmpl.html@4:25: Found assignment/);
   });
 
-  it('should warn for bound event assignments to template "let" variables', () => {
+  it('should warn for bound event assignments to template "let" variables', async() => {
     writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -141,14 +141,14 @@ describe('template variable assignment migration', () => {
       </ng-template>
     `);
 
-    runMigration();
+    await runMigration();
 
     expect(warnOutput.length).toBe(2);
     expect(warnOutput[0]).toMatch(/^⮑ {3}sub_dir\/tmpl.html@3:25: Found assignment/);
     expect(warnOutput[1]).toMatch(/^⮑ {3}sub_dir\/tmpl.html@4:25: Found assignment/);
   });
 
-  it('should not warn for bound event assignments to component property', () => {
+  it('should not warn for bound event assignments to component property', async() => {
     writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -160,13 +160,14 @@ describe('template variable assignment migration', () => {
 
     writeFile('/sub_dir/tmpl.html', `<button (click)="myProp = true"></button>`);
 
-    runMigration();
+    await runMigration();
 
     expect(warnOutput.length).toBe(0);
   });
 
-  it('should not warn for bound event assignments to template variable object property', () => {
-    writeFile('/index.ts', `
+  it('should not warn for bound event assignments to template variable object property',
+     async() => {
+       writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
       @Component({
@@ -175,17 +176,17 @@ describe('template variable assignment migration', () => {
       export class MyComp {}
     `);
 
-    writeFile('/sub_dir/tmpl.html', `
+       writeFile('/sub_dir/tmpl.html', `
       <button *ngFor="let element of list" (click)="element.value = null">Reset</button>
     `);
 
-    runMigration();
+       await runMigration();
 
-    expect(warnOutput.length).toBe(0);
-  });
+       expect(warnOutput.length).toBe(0);
+     });
 
   it('should not warn for property writes with template variable name but different receiver',
-     () => {
+     async() => {
        writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -205,13 +206,14 @@ describe('template variable assignment migration', () => {
       </button>
     `);
 
-       runMigration();
+       await runMigration();
 
        expect(warnOutput.length).toBe(0);
      });
 
-  it('should not warn for property writes with template variable name but different scope', () => {
-    writeFile('/index.ts', `
+  it('should not warn for property writes with template variable name but different scope',
+     async() => {
+       writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
       @Component({
@@ -222,18 +224,18 @@ describe('template variable assignment migration', () => {
       }
     `);
 
-    writeFile('/sub_dir/tmpl.html', `
+       writeFile('/sub_dir/tmpl.html', `
       <button *ngFor="let element of list">{{element}}</button>
       <button (click)="element = null"></button>
     `);
 
-    runMigration();
+       await runMigration();
 
-    expect(warnOutput.length).toBe(0);
-  });
+       expect(warnOutput.length).toBe(0);
+     });
 
 
-  it('should not throw an error if a detected template fails parsing', () => {
+  it('should not throw an error if a detected template fails parsing', async() => {
     writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -245,12 +247,12 @@ describe('template variable assignment migration', () => {
 
     writeFile('/sub_dir/tmpl.html', `<x (click)="<invalid-syntax>"></x>`);
 
-    runMigration();
+    await runMigration();
 
     expect(warnOutput.length).toBe(0);
   });
 
-  it('should be able to report multiple templates within the same source file', () => {
+  it('should be able to report multiple templates within the same source file', async() => {
     writeFile('/index.ts', `
       import {Component} from '@angular/core';
 
@@ -265,7 +267,7 @@ describe('template variable assignment migration', () => {
       export class MyComp2 {}
     `);
 
-    runMigration();
+    await runMigration();
 
     expect(warnOutput.length).toBe(2);
     expect(warnOutput[0]).toMatch(/^⮑ {3}index.ts@5:56: Found assignment/);
diff --git a/packages/elements/schematics/ng-add/index_spec.ts b/packages/elements/schematics/ng-add/index_spec.ts
index 1a4cf30a40..674a4584c2 100644
--- a/packages/elements/schematics/ng-add/index_spec.ts
+++ b/packages/elements/schematics/ng-add/index_spec.ts
@@ -48,8 +48,9 @@ describe('Elements Schematics', () => {
         .subscribe((tree: UnitTestTree) => appTree = tree, done.fail, done);
   });
 
-  it('should run the ng-add schematic', () => {
-    const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
+  it('should run the ng-add schematic', async() => {
+    const tree =
+        await schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise();
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
     const scripts = config.projects.elements.architect.build.options.scripts;

From 80394ce08b12ff95167cf1c4aec61044bb78fbe6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 29 May 2019 12:05:49 +0200
Subject: [PATCH 244/275] fix(core): TypeScript related migrations should cater
 for BOM (#30719)

fix(@schematics/angular): TypeScript related migrations should cater for BOM

In the CLI `UpdateRecorder` methods such as `insertLeft`, `remove` etc.. accepts positions which are not offset by a BOM. This is because when a file has a BOM a different recorder will be used https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts#L72 which caters for an addition offset/delta.

The main reason for this is that when a developer is writing a schematic they shouldn't need to compute the offset based if a file has a BOM or not and is handled out of the box.

Example
```ts
recorder.insertLeft(5, 'true');
```

However this is unfortunate in the case if a ts SourceFile is used and one uses `getWidth` and `getStart` method they will already be offset by 1, which at the end it results in a double offset and hence the problem.

Fixes #30713

PR Close #30719
---
 .../migrations/injectable-pipe/index.ts       |  5 +++-
 .../migrations/move-document/index.ts         |  5 +++-
 .../migrations/static-queries/index.ts        |  5 +++-
 .../template-var-assignment/index.ts          |  5 +++-
 .../test/injectable_pipe_migration_spec.ts    | 16 ++++++++++++-
 .../test/move_document_migration_spec.ts      | 15 +++++++++++-
 .../static_queries_migration_template_spec.ts | 23 +++++++++++++++++++
 .../static_queries_migration_usage_spec.ts    | 20 ++++++++++++++++
 8 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/packages/core/schematics/migrations/injectable-pipe/index.ts b/packages/core/schematics/migrations/injectable-pipe/index.ts
index 5c4615bd90..51c088677b 100644
--- a/packages/core/schematics/migrations/injectable-pipe/index.ts
+++ b/packages/core/schematics/migrations/injectable-pipe/index.ts
@@ -47,7 +47,10 @@ function runInjectablePipeMigration(tree: Tree, tsconfigPath: string, basePath:
   // source files, it can end up updating query definitions multiple times.
   host.readFile = fileName => {
     const buffer = tree.read(relative(basePath, fileName));
-    return buffer ? buffer.toString() : undefined;
+    // Strip BOM as otherwise TSC methods (Ex: getWidth) will return an offset which
+    // which breaks the CLI UpdateRecorder.
+    // See: https://github.com/angular/angular/pull/30719
+    return buffer ? buffer.toString().replace(/^\uFEFF/, '') : undefined;
   };
 
   const program = ts.createProgram(parsed.fileNames, parsed.options, host);
diff --git a/packages/core/schematics/migrations/move-document/index.ts b/packages/core/schematics/migrations/move-document/index.ts
index ffb2a59079..30d0cc5597 100644
--- a/packages/core/schematics/migrations/move-document/index.ts
+++ b/packages/core/schematics/migrations/move-document/index.ts
@@ -48,7 +48,10 @@ function runMoveDocumentMigration(tree: Tree, tsconfigPath: string, basePath: st
   // source files, it can end up updating query definitions multiple times.
   host.readFile = fileName => {
     const buffer = tree.read(relative(basePath, fileName));
-    return buffer ? buffer.toString() : undefined;
+    // Strip BOM as otherwise TSC methods (Ex: getWidth) will return an offset which
+    // which breaks the CLI UpdateRecorder.
+    // See: https://github.com/angular/angular/pull/30719
+    return buffer ? buffer.toString().replace(/^\uFEFF/, '') : undefined;
   };
 
   const program = ts.createProgram(parsed.fileNames, parsed.options, host);
diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts
index a12f1c06ba..207531bbeb 100644
--- a/packages/core/schematics/migrations/static-queries/index.ts
+++ b/packages/core/schematics/migrations/static-queries/index.ts
@@ -125,7 +125,10 @@ function analyzeProject(
       // source files, it can end up updating query definitions multiple times.
       host.readFile = fileName => {
         const buffer = tree.read(relative(basePath, fileName));
-        return buffer ? buffer.toString() : undefined;
+        // Strip BOM as otherwise TSC methods (Ex: getWidth) will return an offset which
+        // which breaks the CLI UpdateRecorder.
+        // See: https://github.com/angular/angular/pull/30719
+        return buffer ? buffer.toString().replace(/^\uFEFF/, '') : undefined;
       };
 
       const program = ts.createProgram(parsed.fileNames, parsed.options, host);
diff --git a/packages/core/schematics/migrations/template-var-assignment/index.ts b/packages/core/schematics/migrations/template-var-assignment/index.ts
index e6b0ddef48..a7fce2081b 100644
--- a/packages/core/schematics/migrations/template-var-assignment/index.ts
+++ b/packages/core/schematics/migrations/template-var-assignment/index.ts
@@ -53,7 +53,10 @@ function runTemplateVariableAssignmentCheck(
   // program to be based on the file contents in the virtual file tree.
   host.readFile = fileName => {
     const buffer = tree.read(relative(basePath, fileName));
-    return buffer ? buffer.toString() : undefined;
+    // Strip BOM as otherwise TSC methods (Ex: getWidth) will return an offset which
+    // which breaks the CLI UpdateRecorder.
+    // See: https://github.com/angular/angular/pull/30719
+    return buffer ? buffer.toString().replace(/^\uFEFF/, '') : undefined;
   };
 
   const program = ts.createProgram(parsed.fileNames, parsed.options, host);
diff --git a/packages/core/schematics/test/injectable_pipe_migration_spec.ts b/packages/core/schematics/test/injectable_pipe_migration_spec.ts
index be238ed894..a07732b4e9 100644
--- a/packages/core/schematics/test/injectable_pipe_migration_spec.ts
+++ b/packages/core/schematics/test/injectable_pipe_migration_spec.ts
@@ -60,7 +60,21 @@ describe('injectable pipe migration', () => {
         .toMatch(/@Injectable\(\)\s+@Pipe\(\{ name: 'myPipe' \}\)\s+export class MyPipe/);
   });
 
-  it('should add an import for Injectable to the @angular/core import declaration', async() => {
+  it('should add @Injectable to pipes that do not have it (BOM)', () => {
+    writeFile('/index.ts', `\uFEFF
+      import { Pipe } from '@angular/core';
+
+      @Pipe({ name: 'myPipe' })
+      export class MyPipe {
+      }
+    `);
+
+    runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toMatch(/@Injectable\(\)\s+@Pipe\(\{ name: 'myPipe' \}\)\s+export class MyPipe/);
+  });
+
+  it('should add an import for Injectable to the @angular/core import declaration', () => {
     writeFile('/index.ts', `
       import { Pipe } from '@angular/core';
 
diff --git a/packages/core/schematics/test/move_document_migration_spec.ts b/packages/core/schematics/test/move_document_migration_spec.ts
index f7093e6785..066f04a122 100644
--- a/packages/core/schematics/test/move_document_migration_spec.ts
+++ b/packages/core/schematics/test/move_document_migration_spec.ts
@@ -60,7 +60,20 @@ describe('move-document migration', () => {
       expect(content).not.toContain(`import {DOCUMENT} from '@angular/platform-browser';`);
     });
 
-    it('should properly apply import replacement with existing import', async() => {
+    it('should properly apply import replacement (BOM)', () => {
+      writeFile('/index.ts', `\uFEFF
+        import {DOCUMENT} from '@angular/platform-browser';
+      `);
+
+      runMigration();
+
+      const content = tree.readContent('/index.ts');
+
+      expect(content).toContain(`import { DOCUMENT } from "@angular/common";`);
+      expect(content).not.toContain(`import {DOCUMENT} from '@angular/platform-browser';`);
+    });
+
+    it('should properly apply import replacement with existing import', () => {
       writeFile('/index.ts', `
         import {DOCUMENT} from '@angular/platform-browser';
         import {someImport} from '@angular/common';
diff --git a/packages/core/schematics/test/static_queries_migration_template_spec.ts b/packages/core/schematics/test/static_queries_migration_template_spec.ts
index bafd77b11f..89956ce4dc 100644
--- a/packages/core/schematics/test/static_queries_migration_template_spec.ts
+++ b/packages/core/schematics/test/static_queries_migration_template_spec.ts
@@ -158,6 +158,29 @@ describe('static-queries migration with template strategy', () => {
           .toContain(`@ViewChild('myTmpl', { static: true }) query: any;`);
     });
 
+    it('should detect queries selecting ng-template as static (BOM)', async() => {
+      writeFile('/index.ts', `\uFEFF
+        import {Component, NgModule, ViewChild} from '@angular/core';
+
+        @Component({template: \`
+          <ng-template #myTmpl>
+            My template
+          </ng-template>
+        \`})
+        export class MyComp {
+          private @ViewChild('myTmpl') query: any;
+        }
+
+        @NgModule({declarations: [MyComp]})
+        export class MyModule {}
+      `);
+
+      await runMigration();
+
+      expect(tree.readContent('/index.ts'))
+          .toContain(`@ViewChild('myTmpl', { static: true }) query: any;`);
+    });
+
     it('should detect queries selecting component view providers through string token', async() => {
       writeFile('/index.ts', `
         import {Component, Directive, NgModule, ViewChild} from '@angular/core';
diff --git a/packages/core/schematics/test/static_queries_migration_usage_spec.ts b/packages/core/schematics/test/static_queries_migration_usage_spec.ts
index c1e065276f..02946c884d 100644
--- a/packages/core/schematics/test/static_queries_migration_usage_spec.ts
+++ b/packages/core/schematics/test/static_queries_migration_usage_spec.ts
@@ -127,6 +127,26 @@ describe('static-queries migration with usage strategy', () => {
           .toContain(`@ContentChild('test', { static: false }) query: any;`);
     });
 
+    it('should not mark content queries used in "ngAfterContentInit" as static (BOM)', async() => {
+      writeFile('/index.ts', `\uFEFF
+        import {Component, ContentChild} from '@angular/core';
+
+        @Component({template: '<span #test></span>'})
+        export class MyComp {
+          @ContentChild('test') query: any;
+
+          ngAfterContentInit() {
+            this.query.classList.add('test');
+          }
+        }
+      `);
+
+      await runMigration();
+
+      expect(tree.readContent('/index.ts'))
+          .toContain(`@ContentChild('test', { static: false }) query: any;`);
+    });
+
     it('should not mark content queries used in "ngAfterContentChecked" as static', async() => {
       writeFile('/index.ts', `
         import {Component, ContentChild} from '@angular/core';

From e0c36620c18e85892e6f3db88b661c3bc51187ef Mon Sep 17 00:00:00 2001
From: Andrew Kushnir <akushnir@google.com>
Date: Thu, 30 May 2019 21:09:28 -0700
Subject: [PATCH 245/275] test: resotre "async" around tests where "await" is
 used (#30762)

The "async" around a couple tests was removed because of the merge conflict in one of the previous commits (80394ce08b12ff95167cf1c4aec61044bb78fbe6). This change restores missing "async"s.

PR Close #30762
---
 packages/core/schematics/test/injectable_pipe_migration_spec.ts | 2 +-
 packages/core/schematics/test/move_document_migration_spec.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/schematics/test/injectable_pipe_migration_spec.ts b/packages/core/schematics/test/injectable_pipe_migration_spec.ts
index a07732b4e9..4cdf8c7918 100644
--- a/packages/core/schematics/test/injectable_pipe_migration_spec.ts
+++ b/packages/core/schematics/test/injectable_pipe_migration_spec.ts
@@ -74,7 +74,7 @@ describe('injectable pipe migration', () => {
         .toMatch(/@Injectable\(\)\s+@Pipe\(\{ name: 'myPipe' \}\)\s+export class MyPipe/);
   });
 
-  it('should add an import for Injectable to the @angular/core import declaration', () => {
+  it('should add an import for Injectable to the @angular/core import declaration', async() => {
     writeFile('/index.ts', `
       import { Pipe } from '@angular/core';
 
diff --git a/packages/core/schematics/test/move_document_migration_spec.ts b/packages/core/schematics/test/move_document_migration_spec.ts
index 066f04a122..7254158615 100644
--- a/packages/core/schematics/test/move_document_migration_spec.ts
+++ b/packages/core/schematics/test/move_document_migration_spec.ts
@@ -73,7 +73,7 @@ describe('move-document migration', () => {
       expect(content).not.toContain(`import {DOCUMENT} from '@angular/platform-browser';`);
     });
 
-    it('should properly apply import replacement with existing import', () => {
+    it('should properly apply import replacement with existing import', async() => {
       writeFile('/index.ts', `
         import {DOCUMENT} from '@angular/platform-browser';
         import {someImport} from '@angular/common';

From 1f79c827a0925f3115415eaccdf8960f527aedaa Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 31 May 2019 10:05:34 +0000
Subject: [PATCH 246/275] build(docs-infra): upgrade cli command docs sources
 to 2bbd7f288 (#30776)

Updating [angular#master](https://github.com/angular/angular/tree/master) from [cli-builds#master](https://github.com/angular/cli-builds/tree/master).

##
Relevant changes in [commit range](https://github.com/angular/cli-builds/compare/30036352e...2bbd7f288):

**Modified**
- help/update.json

##

PR Close #30776
---
 aio/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/package.json b/aio/package.json
index be0bdc24d6..70776b8531 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -19,7 +19,7 @@
     "build-local": "yarn ~~build",
     "prebuild-with-ivy": "yarn setup-local && node scripts/switch-to-ivy",
     "build-with-ivy": "yarn ~~build",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 30036352e",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 2bbd7f288",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",

From 6d861f240b4a601fcdb4a2e76ac561a7f0c54875 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 27 May 2019 20:34:01 +0200
Subject: [PATCH 247/275] fix(ivy): module with providers are processed too
 early (#30688)

Currently with Ivy, `ModuleWithProvider` providers are processed in order
of declaration in the `NgModule` imports. This technically makes makes
sense but is a potential breaking change as `ModuleWithProvider` providers
are processed after all imported modules in View Engine.

In order to keep the behavior of View Engine, the `r3_injector` is updated
to no longer process `ModuleWithProvider` providers egarly.

Resolves FW-1349

PR Close #30688
---
 packages/core/src/di/r3_injector.ts           | 49 +++++++++-----
 packages/core/test/acceptance/BUILD.bazel     |  1 +
 packages/core/test/acceptance/di_spec.ts      | 28 +++++++-
 .../acceptance/router_integration_spec.ts     | 64 +++++++++++++++++++
 packages/core/test/di/r3_injector_spec.ts     | 30 +++++++++
 5 files changed, 156 insertions(+), 16 deletions(-)
 create mode 100644 packages/core/test/acceptance/router_integration_spec.ts

diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index be8b0cb07c..b5863856df 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -222,14 +222,20 @@ export class R3Injector {
   }
 
   /**
-   * Add an `InjectorType` or `InjectorDefTypeWithProviders` and all of its transitive providers
+   * Add an `InjectorType` or `InjectorTypeWithProviders` and all of its transitive providers
    * to this injector.
+   *
+   * If an `InjectorTypeWithProviders` that declares providers besides the type is specified,
+   * the function will return "true" to indicate that the providers of the type definition need
+   * to be processed. This allows us to process providers of injector types after all imports of
+   * an injector definition are processed. (following View Engine semantics: see FW-1349)
    */
   private processInjectorType(
       defOrWrappedDef: InjectorType<any>|InjectorTypeWithProviders<any>,
-      parents: InjectorType<any>[], dedupStack: InjectorType<any>[]) {
+      parents: InjectorType<any>[],
+      dedupStack: InjectorType<any>[]): defOrWrappedDef is InjectorTypeWithProviders<any> {
     defOrWrappedDef = resolveForwardRef(defOrWrappedDef);
-    if (!defOrWrappedDef) return;
+    if (!defOrWrappedDef) return false;
 
     // Either the defOrWrappedDef is an InjectorType (with ngInjectorDef) or an
     // InjectorDefTypeWithProviders (aka ModuleWithProviders). Detecting either is a megamorphic
@@ -259,12 +265,6 @@ export class R3Injector {
     // Check for multiple imports of the same module
     const isDuplicate = dedupStack.indexOf(defType) !== -1;
 
-    // If defOrWrappedType was an InjectorDefTypeWithProviders, then .providers may hold some
-    // extra providers.
-    const providers =
-        (ngModule !== undefined) && (defOrWrappedDef as InjectorTypeWithProviders<any>).providers ||
-        EMPTY_ARRAY;
-
     // Finally, if defOrWrappedType was an `InjectorDefTypeWithProviders`, then the actual
     // `InjectorDef` is on its `ngModule`.
     if (ngModule !== undefined) {
@@ -273,7 +273,7 @@ export class R3Injector {
 
     // If no definition was found, it might be from exports. Remove it.
     if (def == null) {
-      return;
+      return false;
     }
 
     // Track the InjectorType and add a provider for it.
@@ -291,14 +291,33 @@ export class R3Injector {
       // Add it to the set of dedups. This way we can detect multiple imports of the same module
       dedupStack.push(defType);
 
+      let importTypesWithProviders: (InjectorTypeWithProviders<any>[])|undefined;
       try {
-        deepForEach(
-            def.imports, imported => this.processInjectorType(imported, parents, dedupStack));
+        deepForEach(def.imports, imported => {
+          if (this.processInjectorType(imported, parents, dedupStack)) {
+            if (importTypesWithProviders === undefined) importTypesWithProviders = [];
+            // If the processed import is an injector type with providers, we store it in the
+            // list of import types with providers, so that we can process those afterwards.
+            importTypesWithProviders.push(imported);
+          }
+        });
       } finally {
         // Remove it from the parents set when finished.
         // TODO(FW-1307): Re-add ngDevMode when closure can handle it
         parents.pop();
       }
+
+      // Imports which are declared with providers (TypeWithProviders) need to be processed
+      // after all imported modules are processed. This is similar to how View Engine
+      // processes/merges module imports in the metadata resolver. See: FW-1349.
+      if (importTypesWithProviders !== undefined) {
+        for (let i = 0; i < importTypesWithProviders.length; i++) {
+          const {ngModule, providers} = importTypesWithProviders[i];
+          deepForEach(
+              providers !,
+              provider => this.processProvider(provider, ngModule, providers || EMPTY_ARRAY));
+        }
+      }
     }
 
     // Next, include providers listed on the definition itself.
@@ -309,9 +328,9 @@ export class R3Injector {
           defProviders, provider => this.processProvider(provider, injectorType, defProviders));
     }
 
-    // Finally, include providers from an InjectorDefTypeWithProviders if there was one.
-    const ngModuleType = (defOrWrappedDef as InjectorTypeWithProviders<any>).ngModule;
-    deepForEach(providers, provider => this.processProvider(provider, ngModuleType, providers));
+    return (
+        ngModule !== undefined &&
+        (defOrWrappedDef as InjectorTypeWithProviders<any>).providers !== undefined);
   }
 
   /**
diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel
index 1b7f6fd370..e87138061b 100644
--- a/packages/core/test/acceptance/BUILD.bazel
+++ b/packages/core/test/acceptance/BUILD.bazel
@@ -25,6 +25,7 @@ ts_library(
         "//packages/platform-browser/testing",
         "//packages/platform-server",
         "//packages/private/testing",
+        "//packages/router",
         "@npm//rxjs",
         "@npm//zone.js",
     ],
diff --git a/packages/core/test/acceptance/di_spec.ts b/packages/core/test/acceptance/di_spec.ts
index a624e478ac..cdb9c2bc63 100644
--- a/packages/core/test/acceptance/di_spec.ts
+++ b/packages/core/test/acceptance/di_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {Attribute, ChangeDetectorRef, Component, Directive, ElementRef, EventEmitter, Host, HostBinding, INJECTOR, Inject, Injectable, Injector, Input, LOCALE_ID, Optional, Output, Pipe, PipeTransform, Self, SkipSelf, TemplateRef, ViewChild, ViewContainerRef, forwardRef} from '@angular/core';
+import {Attribute, ChangeDetectorRef, Component, Directive, ElementRef, EventEmitter, Host, HostBinding, INJECTOR, Inject, Injectable, InjectionToken, Injector, Input, LOCALE_ID, ModuleWithProviders, NgModule, Optional, Output, Pipe, PipeTransform, Self, SkipSelf, TemplateRef, ViewChild, ViewContainerRef, forwardRef} from '@angular/core';
 import {ViewRef} from '@angular/core/src/render3/view_ref';
 import {TestBed} from '@angular/core/testing';
 import {ivyEnabled, onlyInIvy} from '@angular/private/testing';
@@ -31,6 +31,32 @@ describe('di', () => {
     });
   });
 
+  describe('multi providers', () => {
+    it('should process ModuleWithProvider providers after module imports', () => {
+      const testToken = new InjectionToken<string[]>('test-multi');
+
+      @NgModule({providers: [{provide: testToken, useValue: 'A', multi: true}]})
+      class TestModuleA {
+      }
+
+      @NgModule({providers: [{provide: testToken, useValue: 'B', multi: true}]})
+      class TestModuleB {
+      }
+
+      TestBed.configureTestingModule({
+        imports: [
+          {
+            ngModule: TestModuleA,
+            providers: [{provide: testToken, useValue: 'C', multi: true}],
+          },
+          TestModuleB,
+        ]
+      });
+
+      expect(TestBed.get(testToken) as string[]).toEqual(['A', 'B', 'C']);
+    });
+  });
+
   describe('directive injection', () => {
 
     let log: string[] = [];
diff --git a/packages/core/test/acceptance/router_integration_spec.ts b/packages/core/test/acceptance/router_integration_spec.ts
new file mode 100644
index 0000000000..bfa5666f2e
--- /dev/null
+++ b/packages/core/test/acceptance/router_integration_spec.ts
@@ -0,0 +1,64 @@
+/**
+ * @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 {APP_BASE_HREF} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {Router, RouterModule} from '@angular/router';
+
+describe('router integration acceptance', () => {
+  // Test case that ensures that we don't regress in multi-provider ordering
+  // which is leveraged in the router. See: FW-1349
+  it('should have correct order for multiple routes declared in different modules', () => {
+    @NgModule({
+      imports: [
+        RouterModule.forChild([
+          {path: '1a:1', redirectTo: ''},
+          {path: '1a:2', redirectTo: ''},
+        ]),
+      ],
+    })
+    class Level1AModule {
+    }
+
+    @NgModule({
+      imports: [
+        RouterModule.forChild([
+          {path: '1b:1', redirectTo: ''},
+          {path: '1b:2', redirectTo: ''},
+        ]),
+      ],
+    })
+    class Level1BModule {
+    }
+
+    @NgModule({
+      imports: [
+        RouterModule.forRoot([{path: 'root', redirectTo: ''}]),
+        Level1AModule,
+        Level1BModule,
+      ],
+      providers: [
+        {provide: APP_BASE_HREF, useValue: '/'},
+      ]
+    })
+    class RootModule {
+    }
+
+    TestBed.configureTestingModule({
+      imports: [RootModule],
+    });
+    expect((TestBed.get(Router) as Router).config.map(r => r.path)).toEqual([
+      '1a:1',
+      '1a:2',
+      '1b:1',
+      '1b:2',
+      'root',
+    ]);
+  });
+});
diff --git a/packages/core/test/di/r3_injector_spec.ts b/packages/core/test/di/r3_injector_spec.ts
index 75907a1aee..f60301a0f2 100644
--- a/packages/core/test/di/r3_injector_spec.ts
+++ b/packages/core/test/di/r3_injector_spec.ts
@@ -217,6 +217,31 @@ describe('InjectorDef-based createInjector()', () => {
     });
   }
 
+  class MultiProviderA {
+    static ngInjectorDef = ɵɵdefineInjector({
+      factory: () => new MultiProviderA(),
+      providers: [{provide: LOCALE, multi: true, useValue: 'A'}],
+    });
+  }
+
+  class MultiProviderB {
+    static ngInjectorDef = ɵɵdefineInjector({
+      factory: () => new MultiProviderB(),
+      providers: [{provide: LOCALE, multi: true, useValue: 'B'}],
+    });
+  }
+
+  class WithProvidersTest {
+    static ngInjectorDef = ɵɵdefineInjector({
+      factory: () => new WithProvidersTest(),
+      imports: [
+        {ngModule: MultiProviderA, providers: [{provide: LOCALE, multi: true, useValue: 'C'}]},
+        MultiProviderB
+      ],
+      providers: [],
+    });
+  }
+
   let injector: Injector;
 
   beforeEach(() => {
@@ -274,6 +299,11 @@ describe('InjectorDef-based createInjector()', () => {
     expect(instance.locale).toEqual(['en', 'es']);
   });
 
+  it('should process "InjectionTypeWithProviders" providers after imports injection type', () => {
+    injector = createInjector(WithProvidersTest);
+    expect(injector.get(LOCALE)).toEqual(['A', 'B', 'C']);
+  });
+
   it('injects an injector with dependencies', () => {
     const instance = injector.get(InjectorWithDep);
     expect(instance instanceof InjectorWithDep);

From f4cd3740b20fbe483fbee54b0039eb487b82630e Mon Sep 17 00:00:00 2001
From: hugoer <hugoerdev@gmail.com>
Date: Thu, 23 May 2019 21:55:14 +0200
Subject: [PATCH 248/275] fix(docs-infra): update tooltip of events link
 (#30643)

PR Close #30643
---
 aio/content/navigation.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index c3b9c14f2a..f13105fca8 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -788,7 +788,7 @@
         {
           "url": "events",
           "title": "Events",
-          "tooltip": "Post issues and suggestions on github."
+          "tooltip": "Angular events around the world."
         },
         {
           "url": "http://www.meetup.com/topics/angularjs/",

From aca339e8642c58607ffac3a973db973a6c803ae4 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 21 May 2019 22:00:47 +0200
Subject: [PATCH 249/275] fix(ivy): unable to project into multiple slots with
 default selector (#30561)

With View engine it was possible to declare multiple projection
definitions and to programmatically project nodes into the slots.

e.g.

```html
<ng-content></ng-content>
<ng-content></ng-content>
```

Using `ViewContainerRef#createComponent` allowed projecting
nodes into one of the projection defs (through index)

This no longer works with Ivy as the `projectionDef` instruction only
retrieves a list of selectors instead of also retrieving entries for
reserved projection slots which appear when using the default
selector multiple times (as seen above).

In order to fix this issue, the Ivy compiler now passes all
projection slots to the `projectionDef` instruction. Meaning that
there can be multiple projection slots with the same wildcard
selector. This allows multi-slot projection as seen in the
example above, and it also allows us to match the multi-slot node
projection order from View Engine (to avoid breaking changes).

It basically ensures that Ivy fully matches the View Engine behavior
except of a very small edge case that has already been discussed
in FW-886 (with the conclusion of working as intended).

Read more here: https://hackmd.io/s/Sy2kQlgTE

PR Close #30561
---
 .../compliance/r3_compiler_compliance_spec.ts | 76 +++++++++++++++----
 .../test/ngtsc/template_mapping_spec.ts       |  4 +-
 .../compiler/src/render3/view/template.ts     | 57 +++++++-------
 packages/core/src/render3/component_ref.ts    |  4 +-
 packages/core/src/render3/index.ts            |  2 +-
 .../src/render3/instructions/projection.ts    | 67 ++++++++++++----
 .../core/src/render3/interfaces/projection.ts | 10 +++
 .../core/src/render3/node_selector_matcher.ts | 25 +-----
 .../acceptance/view_container_ref_spec.ts     | 30 ++------
 .../linker/projection_integration_spec.ts     | 53 +++++++++++--
 .../core/test/render3/component_ref_spec.ts   |  2 +-
 packages/core/test/render3/content_spec.ts    | 18 ++---
 tools/public_api_guard/core/core.d.ts         |  2 +-
 13 files changed, 219 insertions(+), 131 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index 705b619340..a43ef0e09b 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -1159,7 +1159,7 @@ describe('compiler compliance', () => {
             type: SimpleComponent,
             selectors: [["simple"]],
             factory: function SimpleComponent_Factory(t) { return new (t || SimpleComponent)(); },
-            ngContentSelectors: _c0,
+            ngContentSelectors: $c0$,
             consts: 2,
             vars: 0,
             template:  function SimpleComponent_Template(rf, ctx) {
@@ -1189,10 +1189,10 @@ describe('compiler compliance', () => {
               if (rf & 1) {
                 $r3$.ɵɵprojectionDef($c1$);
                 $r3$.ɵɵelementStart(0, "div", $c3$);
-                $r3$.ɵɵprojection(1, 1);
+                $r3$.ɵɵprojection(1);
                 $r3$.ɵɵelementEnd();
                 $r3$.ɵɵelementStart(2, "div", $c4$);
-                $r3$.ɵɵprojection(3, 2);
+                $r3$.ɵɵprojection(3, 1);
                 $r3$.ɵɵelementEnd();
               }
             },
@@ -1209,6 +1209,54 @@ describe('compiler compliance', () => {
             result.source, ComplexComponentDefinition, 'Incorrect ComplexComponent definition');
       });
 
+      it('should support multi-slot content projection with multiple wildcard slots', () => {
+        const files = {
+          app: {
+            'spec.ts': `
+              import {Component, NgModule} from '@angular/core';
+
+              @Component({
+                template: \`
+                  <ng-content></ng-content>
+                  <ng-content select="[spacer]"></ng-content>
+                  <ng-content></ng-content>
+                \`,
+              })
+              class Cmp {}
+
+              @NgModule({ declarations: [Cmp] })
+              class Module {}
+            `,
+          }
+        };
+
+        const output = `
+          const $c0$ = ["*", [["", "spacer", ""]], "*"];
+          const $c1$ = ["*", "[spacer]", "*"];
+          …
+          Cmp.ngComponentDef = $r3$.ɵɵdefineComponent({
+            type: Cmp,
+            selectors: [["ng-component"]],
+            factory: function Cmp_Factory(t) { return new (t || Cmp)(); },
+            ngContentSelectors: $c1$,
+            consts: 3,
+            vars: 0,
+            template: function Cmp_Template(rf, ctx) {
+              if (rf & 1) {
+                i0.ɵɵprojectionDef($c0$);
+                i0.ɵɵprojection(0);
+                i0.ɵɵprojection(1, 1);
+                i0.ɵɵprojection(2, 2);
+              }
+            },
+            encapsulation: 2
+          });
+        `;
+
+        const {source} = compile(files, angularFiles);
+        expectEmit(source, output, 'Invalid content projection instructions generated');
+      });
+
       it('should support content projection in nested templates', () => {
         const files = {
           app: {
@@ -1241,7 +1289,7 @@ describe('compiler compliance', () => {
           const $_c2$ = ["id", "second"];
           function Cmp_div_0_Template(rf, ctx) { if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", $_c2$);
-            $r3$.ɵɵprojection(1, 1);
+            $r3$.ɵɵprojection(1);
             $r3$.ɵɵelementEnd();
           } }
           const $_c3$ = ["id", "third"];
@@ -1255,10 +1303,10 @@ describe('compiler compliance', () => {
           function Cmp_ng_template_2_Template(rf, ctx) {
             if (rf & 1) {
               $r3$.ɵɵtext(0, " '*' selector: ");
-              $r3$.ɵɵprojection(1);
+              $r3$.ɵɵprojection(1, 1);
             }
           }
-          const $_c4$ = [[["span", "title", "tofirst"]]];
+          const $_c4$ = [[["span", "title", "tofirst"]], "*"];
           …
           template: function Cmp_Template(rf, ctx) {
             if (rf & 1) {
@@ -1312,31 +1360,31 @@ describe('compiler compliance', () => {
         const output = `
           function Cmp_ng_template_1_ng_template_1_Template(rf, ctx) {
               if (rf & 1) {
-                $r3$.ɵɵprojection(0, 4);
+                $r3$.ɵɵprojection(0, 3);
             }
           }
           function Cmp_ng_template_1_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵprojection(0, 3);
+              $r3$.ɵɵprojection(0, 2);
               $r3$.ɵɵtemplate(1, Cmp_ng_template_1_ng_template_1_Template, 1, 0, "ng-template");
             }
           }
           function Cmp_ng_template_2_Template(rf, ctx) {
             if (rf & 1) {
               $r3$.ɵɵtext(0, " '*' selector in a template: ");
-              $r3$.ɵɵprojection(1);
+              $r3$.ɵɵprojection(1, 4);
             }
           }
-          const $_c0$ = [[["", "id", "tomainbefore"]], [["", "id", "tomainafter"]], [["", "id", "totemplate"]], [["", "id", "tonestedtemplate"]]];
-          const $_c1$ = ["[id=toMainBefore]", "[id=toMainAfter]", "[id=toTemplate]", "[id=toNestedTemplate]"];
+          const $_c0$ = [[["", "id", "tomainbefore"]], [["", "id", "tomainafter"]], [["", "id", "totemplate"]], [["", "id", "tonestedtemplate"]], "*"];
+          const $_c1$ = ["[id=toMainBefore]", "[id=toMainAfter]", "[id=toTemplate]", "[id=toNestedTemplate]", "*"];
           …
           template: function Cmp_Template(rf, ctx) {
             if (rf & 1) {
-              $r3$.ɵɵprojectionDef($_c2$);
-              $r3$.ɵɵprojection(0, 1);
+              $r3$.ɵɵprojectionDef($_c0$);
+              $r3$.ɵɵprojection(0);
               $r3$.ɵɵtemplate(1, Cmp_ng_template_1_Template, 2, 0, "ng-template");
               $r3$.ɵɵtemplate(2, Cmp_ng_template_2_Template, 2, 0, "ng-template");
-              $r3$.ɵɵprojection(3, 2);
+              $r3$.ɵɵprojection(3, 1);
             }
           }
         `;
diff --git a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
index f8899c36da..4b6bbdc537 100644
--- a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
@@ -332,7 +332,7 @@ describe('template source-mapping', () => {
             {source: '<h3>', generated: 'i0.ɵɵelementStart(0, "h3")', sourceUrl: '../test.ts'});
         expect(mappings).toContain({
           source: '<ng-content select="title">',
-          generated: 'i0.ɵɵprojection(1, 1)',
+          generated: 'i0.ɵɵprojection(1)',
           sourceUrl: '../test.ts'
         });
         expect(mappings).toContain(
@@ -340,7 +340,7 @@ describe('template source-mapping', () => {
         expect(mappings).toContain(
             {source: '<div>', generated: 'i0.ɵɵelementStart(2, "div")', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
-            {source: '<ng-content>', generated: 'i0.ɵɵprojection(3)', sourceUrl: '../test.ts'});
+            {source: '<ng-content>', generated: 'i0.ɵɵprojection(3, 1)', sourceUrl: '../test.ts'});
         expect(mappings).toContain(
             {source: '</div>', generated: 'i0.ɵɵelementEnd()', sourceUrl: '../test.ts'});
       });
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 6b19902457..552dfbd675 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -40,9 +40,6 @@ import {Instruction, StylingBuilder} from './styling_builder';
 import {CONTEXT_NAME, IMPLICIT_REFERENCE, NON_BINDABLE_ATTR, REFERENCE_PREFIX, RENDER_FLAGS, asLiteral, getAttrsForDirectiveMatching, invalid, trimTrailingNulls, unsupported} from './util';
 
 
-// Default selector used by `<ng-content>` if none specified
-const DEFAULT_NG_CONTENT_SELECTOR = '*';
-
 // Selector attribute name of `<ng-content>`
 const NG_CONTENT_SELECT_ATTR = 'select';
 
@@ -146,14 +143,13 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
   private fileBasedI18nSuffix: string;
 
-  // Whether the template includes <ng-content> tags.
-  private _hasNgContent: boolean = false;
-
-  // Selectors found in the <ng-content> tags in the template.
-  private _ngContentSelectors: string[] = [];
+  // Projection slots found in the template. Projection slots can distribute projected
+  // nodes based on a selector, or can just use the wildcard selector to match
+  // all nodes which aren't matching any selector.
+  private _ngContentReservedSlots: (string|'*')[] = [];
 
   // Number of non-default selectors found in all parent templates of this template. We need to
-  // track it to properly adjust projection bucket index in the `projection` instruction.
+  // track it to properly adjust projection slot index in the `projection` instruction.
   private _ngContentSelectorsOffset = 0;
 
   constructor(
@@ -247,16 +243,19 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // instructions can be generated with the correct internal const count.
     this._nestedTemplateFns.forEach(buildTemplateFn => buildTemplateFn());
 
-    // Output the `projectionDef` instruction when some `<ng-content>` are present.
-    // The `projectionDef` instruction only emitted for the component template and it is skipped for
-    // nested templates (<ng-template> tags).
-    if (this.level === 0 && this._hasNgContent) {
+    // Output the `projectionDef` instruction when some `<ng-content>` tags are present.
+    // The `projectionDef` instruction is only emitted for the component template and
+    // is skipped for nested templates (<ng-template> tags).
+    if (this.level === 0 && this._ngContentReservedSlots.length) {
       const parameters: o.Expression[] = [];
 
-      // Only selectors with a non-default value are generated
-      if (this._ngContentSelectors.length) {
-        const r3Selectors = this._ngContentSelectors.map(s => core.parseSelectorToR3Selector(s));
-        parameters.push(this.constantPool.getConstLiteral(asLiteral(r3Selectors), true));
+      // By default the `projectionDef` instructions creates one slot for the wildcard
+      // selector if no parameters are passed. Therefore we only want to allocate a new
+      // array for the projection slots if the default projection slot is not sufficient.
+      if (this._ngContentReservedSlots.length > 1 || this._ngContentReservedSlots[0] !== '*') {
+        const r3ReservedSlots = this._ngContentReservedSlots.map(
+            s => s !== '*' ? core.parseSelectorToR3Selector(s) : s);
+        parameters.push(this.constantPool.getConstLiteral(asLiteral(r3ReservedSlots), true));
       }
 
       // Since we accumulate ngContent selectors while processing template elements,
@@ -461,14 +460,13 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   }
 
   visitContent(ngContent: t.Content) {
-    this._hasNgContent = true;
     const slot = this.allocateDataSlot();
-    let selectorIndex = ngContent.selector === DEFAULT_NG_CONTENT_SELECTOR ?
-        0 :
-        this._ngContentSelectors.push(ngContent.selector) + this._ngContentSelectorsOffset;
+    const projectionSlotIdx = this._ngContentSelectorsOffset + this._ngContentReservedSlots.length;
     const parameters: o.Expression[] = [o.literal(slot)];
     const attributes: o.Expression[] = [];
 
+    this._ngContentReservedSlots.push(ngContent.selector);
+
     ngContent.attributes.forEach((attribute) => {
       const {name, value} = attribute;
       if (name === NG_PROJECT_AS_ATTR_NAME) {
@@ -479,9 +477,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     });
 
     if (attributes.length > 0) {
-      parameters.push(o.literal(selectorIndex), o.literalArr(attributes));
-    } else if (selectorIndex !== 0) {
-      parameters.push(o.literal(selectorIndex));
+      parameters.push(o.literal(projectionSlotIdx), o.literalArr(attributes));
+    } else if (projectionSlotIdx !== 0) {
+      parameters.push(o.literal(projectionSlotIdx));
     }
 
     this.creationInstruction(ngContent.sourceSpan, R3.projection, parameters);
@@ -887,11 +885,10 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     this._nestedTemplateFns.push(() => {
       const templateFunctionExpr = templateVisitor.buildTemplateFunction(
           template.children, template.variables,
-          this._ngContentSelectors.length + this._ngContentSelectorsOffset, template.i18n);
+          this._ngContentReservedSlots.length + this._ngContentSelectorsOffset, template.i18n);
       this.constantPool.statements.push(templateFunctionExpr.toDeclStmt(templateName, null));
-      if (templateVisitor._hasNgContent) {
-        this._hasNgContent = true;
-        this._ngContentSelectors.push(...templateVisitor._ngContentSelectors);
+      if (templateVisitor._ngContentReservedSlots.length) {
+        this._ngContentReservedSlots.push(...templateVisitor._ngContentReservedSlots);
       }
     });
 
@@ -1011,8 +1008,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   getVarCount() { return this._pureFunctionSlots; }
 
   getNgContentSelectors(): o.Expression|null {
-    return this._hasNgContent ?
-        this.constantPool.getConstLiteral(asLiteral(this._ngContentSelectors), true) :
+    return this._ngContentReservedSlots.length ?
+        this.constantPool.getConstLiteral(asLiteral(this._ngContentReservedSlots), true) :
         null;
   }
 
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index 77fca80daf..803ab65891 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -123,10 +123,8 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
     super();
     this.componentType = componentDef.type;
     this.selector = componentDef.selectors[0][0] as string;
-    // The component definition does not include the wildcard ('*') selector in its list.
-    // It is implicitly expected as the first item in the projectable nodes array.
     this.ngContentSelectors =
-        componentDef.ngContentSelectors ? ['*', ...componentDef.ngContentSelectors] : [];
+        componentDef.ngContentSelectors ? componentDef.ngContentSelectors : [];
     this.isBoundToModule = !!ngModule;
   }
 
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 22af60ac7a..73b79f84fb 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -121,7 +121,7 @@ export {
   ɵɵtextInterpolateV,
 } from './instructions/all';
 export {RenderFlags} from './interfaces/definition';
-export {CssSelectorList} from './interfaces/projection';
+export {CssSelectorList, ProjectionSlots} from './interfaces/projection';
 
 export {
   ɵɵrestoreView,
diff --git a/packages/core/src/render3/instructions/projection.ts b/packages/core/src/render3/instructions/projection.ts
index 9d8f699734..4a76d6e843 100644
--- a/packages/core/src/render3/instructions/projection.ts
+++ b/packages/core/src/render3/instructions/projection.ts
@@ -5,18 +5,47 @@
  * 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 {assertDataInRange} from '../../util/assert';
 import {TAttributes, TElementNode, TNode, TNodeType} from '../interfaces/node';
-import {CssSelectorList} from '../interfaces/projection';
-import {HEADER_OFFSET, TVIEW, T_HOST} from '../interfaces/view';
+import {ProjectionSlots} from '../interfaces/projection';
+import {TVIEW, T_HOST} from '../interfaces/view';
 import {appendProjectedNodes} from '../node_manipulation';
-import {matchingProjectionSelectorIndex} from '../node_selector_matcher';
+import {getProjectAsAttrValue, isNodeMatchingSelectorList, isSelectorInSelectorList} from '../node_selector_matcher';
 import {getLView, setIsNotParent} from '../state';
 import {findComponentView} from '../util/view_traversal_utils';
 
 import {getOrCreateTNode} from './shared';
 
 
+/**
+ * Checks a given node against matching projection slots and returns the
+ * determined slot index. Returns "null" if no slot matched the given node.
+ *
+ * This function takes into account the parsed ngProjectAs selector from the
+ * node's attributes. If present, it will check whether the ngProjectAs selector
+ * matches any of the projection slot selectors.
+ */
+export function matchingProjectionSlotIndex(tNode: TNode, projectionSlots: ProjectionSlots): number|
+    null {
+  let wildcardNgContentIndex = null;
+  const ngProjectAsAttrVal = getProjectAsAttrValue(tNode);
+  for (let i = 0; i < projectionSlots.length; i++) {
+    const slotValue = projectionSlots[i];
+    // The last wildcard projection slot should match all nodes which aren't matching
+    // any selector. This is necessary to be backwards compatible with view engine.
+    if (slotValue === '*') {
+      wildcardNgContentIndex = i;
+      continue;
+    }
+    // If we ran into an `ngProjectAs` attribute, we should match its parsed selector
+    // to the list of selectors, otherwise we fall back to matching against the node.
+    if (ngProjectAsAttrVal === null ?
+            isNodeMatchingSelectorList(tNode, slotValue, /* isProjectionMode */ true) :
+            isSelectorInSelectorList(ngProjectAsAttrVal, slotValue)) {
+      return i;  // first matching selector "captures" a given node
+    }
+  }
+  return wildcardNgContentIndex;
+}
 
 /**
  * Instruction to distribute projectable nodes among <ng-content> occurrences in a given template.
@@ -36,32 +65,38 @@ import {getOrCreateTNode} from './shared';
  * - we can't have only a parsed as we can't re-construct textual form from it (as entered by a
  * template author).
  *
- * @param selectors A collection of parsed CSS selectors
- * @param rawSelectors A collection of CSS selectors in the raw, un-parsed form
+ * @param projectionSlots? A collection of projection slots. A projection slot can be based
+ *        on a parsed CSS selectors or set to the wildcard selector ("*") in order to match
+ *        all nodes which do not match any selector. If not specified, a single wildcard
+ *        selector projection slot will be defined.
  *
  * @codeGenApi
  */
-export function ɵɵprojectionDef(selectors?: CssSelectorList[]): void {
+export function ɵɵprojectionDef(projectionSlots?: ProjectionSlots): void {
   const componentNode = findComponentView(getLView())[T_HOST] as TElementNode;
 
   if (!componentNode.projection) {
-    const noOfNodeBuckets = selectors ? selectors.length + 1 : 1;
+    // If no explicit projection slots are defined, fall back to a single
+    // projection slot with the wildcard selector.
+    const numProjectionSlots = projectionSlots ? projectionSlots.length : 1;
     const projectionHeads: (TNode | null)[] = componentNode.projection =
-        new Array(noOfNodeBuckets).fill(null);
+        new Array(numProjectionSlots).fill(null);
     const tails: (TNode | null)[] = projectionHeads.slice();
 
     let componentChild: TNode|null = componentNode.child;
 
     while (componentChild !== null) {
-      const bucketIndex =
-          selectors ? matchingProjectionSelectorIndex(componentChild, selectors) : 0;
+      const slotIndex =
+          projectionSlots ? matchingProjectionSlotIndex(componentChild, projectionSlots) : 0;
 
-      if (tails[bucketIndex]) {
-        tails[bucketIndex] !.projectionNext = componentChild;
-      } else {
-        projectionHeads[bucketIndex] = componentChild;
+      if (slotIndex !== null) {
+        if (tails[slotIndex]) {
+          tails[slotIndex] !.projectionNext = componentChild;
+        } else {
+          projectionHeads[slotIndex] = componentChild;
+        }
+        tails[slotIndex] = componentChild;
       }
-      tails[bucketIndex] = componentChild;
 
       componentChild = componentChild.next;
     }
diff --git a/packages/core/src/render3/interfaces/projection.ts b/packages/core/src/render3/interfaces/projection.ts
index 891dd28135..6657ab7ff9 100644
--- a/packages/core/src/render3/interfaces/projection.ts
+++ b/packages/core/src/render3/interfaces/projection.ts
@@ -50,6 +50,16 @@ export type CssSelector = (string | SelectorFlags)[];
  */
 export type CssSelectorList = CssSelector[];
 
+/**
+ * List of slots for a projection. A slot can be either based on a parsed CSS selector
+ * which will be used to determine nodes which are projected into that slot.
+ *
+ * When set to "*", the slot is reserved and can be used for multi-slot projection
+ * using {@link ViewContainerRef#createComponent}. The last slot that specifies the
+ * wildcard selector will retrieve all projectable nodes which do not match any selector.
+ */
+export type ProjectionSlots = (CssSelectorList | '*')[];
+
 /** Flags used to build up CssSelectors */
 export const enum SelectorFlags {
   /** Indicates this is the beginning of a new negative selector */
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index a65facee12..33c88df692 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -257,29 +257,6 @@ export function getProjectAsAttrValue(tNode: TNode): CssSelector|null {
   return null;
 }
 
-/**
- * Checks a given node against matching projection selectors and returns
- * selector index (or 0 if none matched).
- *
- * This function takes into account the parsed ngProjectAs selector from the node's attributes.
- * If present, it will check whether the ngProjectAs selector matches any of the projection
- * selectors.
- */
-export function matchingProjectionSelectorIndex(
-    tNode: TNode, selectors: CssSelectorList[]): number {
-  const ngProjectAsAttrVal = getProjectAsAttrValue(tNode);
-  for (let i = 0; i < selectors.length; i++) {
-    // If we ran into an `ngProjectAs` attribute, we should match its parsed selector
-    // to the list of selectors, otherwise we fall back to matching against the node.
-    if (ngProjectAsAttrVal === null ?
-            isNodeMatchingSelectorList(tNode, selectors[i], /* isProjectionMode */ true) :
-            isSelectorInSelectorList(ngProjectAsAttrVal, selectors[i])) {
-      return i + 1;  // first matching selector "captures" a given node
-    }
-  }
-  return 0;
-}
-
 function getNameOnlyMarkerIndex(nodeAttrs: TAttributes) {
   for (let i = 0; i < nodeAttrs.length; i++) {
     const nodeAttr = nodeAttrs[i];
@@ -307,7 +284,7 @@ function matchTemplateAttribute(attrs: TAttributes, name: string): number {
  * @param selector Selector to be checked.
  * @param list List in which to look for the selector.
  */
-function isSelectorInSelectorList(selector: CssSelector, list: CssSelectorList): boolean {
+export function isSelectorInSelectorList(selector: CssSelector, list: CssSelectorList): boolean {
   selectorListLoop: for (let i = 0; i < list.length; i++) {
     const currentSelectorInList = list[i];
     if (selector.length !== currentSelectorInList.length) {
diff --git a/packages/core/test/acceptance/view_container_ref_spec.ts b/packages/core/test/acceptance/view_container_ref_spec.ts
index 45d4a5d10f..97eb4f8db0 100644
--- a/packages/core/test/acceptance/view_container_ref_spec.ts
+++ b/packages/core/test/acceptance/view_container_ref_spec.ts
@@ -963,18 +963,10 @@ describe('ViewContainerRef', () => {
           [[myNode]]);
       fixture.detectChanges();
 
-      // With Ivy the projected content is inserted into the last ng-content container,
-      // while with View Engine the content is projected into the first ng-content slot.
-      // View Engine correctly respects the passed index of "projectedNodes". See: FW-1331.
-      if (ivyEnabled) {
-        expect(getElementHtml(fixture.nativeElement))
-            .toEqual(
-                '<p vcref=""></p><embedded-cmp-with-ngcontent><hr><div>barbaz</div></embedded-cmp-with-ngcontent>');
-      } else {
-        expect(getElementHtml(fixture.nativeElement))
-            .toEqual(
-                '<p vcref=""></p><embedded-cmp-with-ngcontent><div>barbaz</div><hr></embedded-cmp-with-ngcontent>');
-      }
+
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<p vcref=""></p><embedded-cmp-with-ngcontent><div>barbaz</div><hr></embedded-cmp-with-ngcontent>');
     });
 
     it('should support reprojection of projectable nodes', () => {
@@ -1039,17 +1031,9 @@ describe('ViewContainerRef', () => {
           ]);
       fixture.detectChanges();
 
-      // With Ivy multi-slot projection is currently not working. This is a bug that
-      // is tracked with FW-1333.
-      if (ivyEnabled) {
-        expect(getElementHtml(fixture.nativeElement))
-            .toEqual(
-                '<p vcref=""></p><embedded-cmp-with-ngcontent><hr>12</embedded-cmp-with-ngcontent>');
-      } else {
-        expect(getElementHtml(fixture.nativeElement))
-            .toEqual(
-                '<p vcref=""></p><embedded-cmp-with-ngcontent>12<hr>34</embedded-cmp-with-ngcontent>');
-      }
+      expect(getElementHtml(fixture.nativeElement))
+          .toEqual(
+              '<p vcref=""></p><embedded-cmp-with-ngcontent>12<hr>34</embedded-cmp-with-ngcontent>');
     });
   });
 
diff --git a/packages/core/test/linker/projection_integration_spec.ts b/packages/core/test/linker/projection_integration_spec.ts
index 7829aaf48a..8e528141fd 100644
--- a/packages/core/test/linker/projection_integration_spec.ts
+++ b/packages/core/test/linker/projection_integration_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {CommonModule} from '@angular/common';
 import {Component, ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Injector, Input, NO_ERRORS_SCHEMA, NgModule, OnInit, TemplateRef, ViewChild, ViewContainerRef, ViewEncapsulation} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
@@ -111,13 +112,48 @@ describe('projection', () => {
     expect(main.nativeElement).toHaveText('(A, BC)');
   });
 
-  modifiedInIvy(
-      'FW-886: `projectableNodes` passed to a componentFactory should be in the order of declaration')
-      .it('should support passing projectable nodes via factory function', () => {
+  it('should support passing projectable nodes via factory function', () => {
+    @Component({
+      selector: 'multiple-content-tags',
+      template: '(<ng-content SELECT="h1"></ng-content>, <ng-content></ng-content>)',
+    })
+    class MultipleContentTagsComponent {
+    }
 
+    @NgModule({
+      declarations: [MultipleContentTagsComponent],
+      entryComponents: [MultipleContentTagsComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+    class MyModule {
+    }
+
+    TestBed.configureTestingModule({imports: [MyModule]});
+    const injector: Injector = TestBed.get(Injector);
+
+    const componentFactoryResolver: ComponentFactoryResolver =
+        injector.get(ComponentFactoryResolver);
+    const componentFactory =
+        componentFactoryResolver.resolveComponentFactory(MultipleContentTagsComponent);
+    expect(componentFactory.ngContentSelectors).toEqual(['h1', '*']);
+
+    const nodeOne = getDOM().createTextNode('one');
+    const nodeTwo = getDOM().createTextNode('two');
+    const component = componentFactory.create(injector, [[nodeOne], [nodeTwo]]);
+    expect(component.location.nativeElement).toHaveText('(one, two)');
+  });
+
+  modifiedInIvy(
+      'FW-886: `projectableNodes` passed to a componentFactory should be in the order of' +
+      'declaration. In Ivy, the ng-content slots are determined with breadth-first search.')
+      .it('should respect order of declaration for projectable nodes', () => {
         @Component({
           selector: 'multiple-content-tags',
-          template: '(<ng-content SELECT="h1"></ng-content>, <ng-content></ng-content>)',
+          template: `
+          1<ng-content select="h1"></ng-content>
+          2<ng-template [ngIf]="true"><ng-content></ng-content></ng-template>
+          3<ng-content select="h2"></ng-content>
+        `,
         })
         class MultipleContentTagsComponent {
         }
@@ -125,6 +161,7 @@ describe('projection', () => {
         @NgModule({
           declarations: [MultipleContentTagsComponent],
           entryComponents: [MultipleContentTagsComponent],
+          imports: [CommonModule],
           schemas: [NO_ERRORS_SCHEMA],
         })
         class MyModule {
@@ -137,12 +174,14 @@ describe('projection', () => {
             injector.get(ComponentFactoryResolver);
         const componentFactory =
             componentFactoryResolver.resolveComponentFactory(MultipleContentTagsComponent);
-        expect(componentFactory.ngContentSelectors).toEqual(['h1', '*']);
+        expect(componentFactory.ngContentSelectors).toEqual(['h1', '*', 'h2']);
 
         const nodeOne = getDOM().createTextNode('one');
         const nodeTwo = getDOM().createTextNode('two');
-        const component = componentFactory.create(injector, [[nodeOne], [nodeTwo]]);
-        expect(component.location.nativeElement).toHaveText('(one, two)');
+        const nodeThree = getDOM().createTextNode('three');
+        const component = componentFactory.create(injector, [[nodeOne], [nodeTwo], [nodeThree]]);
+        component.changeDetectorRef.detectChanges();
+        expect(component.location.nativeElement.textContent.trim()).toBe('1one 2two 3three');
       });
 
   it('should redistribute only direct children', () => {
diff --git a/packages/core/test/render3/component_ref_spec.ts b/packages/core/test/render3/component_ref_spec.ts
index 9af77d2d46..71c61c6d4f 100644
--- a/packages/core/test/render3/component_ref_spec.ts
+++ b/packages/core/test/render3/component_ref_spec.ts
@@ -48,7 +48,7 @@ describe('ComponentFactory', () => {
           consts: 0,
           vars: 0,
           template: () => undefined,
-          ngContentSelectors: ['a', 'b'],
+          ngContentSelectors: ['*', 'a', 'b'],
           factory: () => new TestComponent(),
           inputs: {
             in1: 'in1',
diff --git a/packages/core/test/render3/content_spec.ts b/packages/core/test/render3/content_spec.ts
index 49aa362f8f..2f1beaa77b 100644
--- a/packages/core/test/render3/content_spec.ts
+++ b/packages/core/test/render3/content_spec.ts
@@ -913,7 +913,7 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]]);
+          ɵɵprojectionDef(['*', [['span', 'title', 'toFirst']], [['span', 'title', 'toSecond']]]);
           ɵɵelementStart(0, 'div', ['id', 'first']);
           { ɵɵprojection(1, 1); }
           ɵɵelementEnd();
@@ -958,7 +958,7 @@ describe('content projection', () => {
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           ɵɵprojectionDef([
-            [['span', SelectorFlags.CLASS, 'toFirst']],
+            '*', [['span', SelectorFlags.CLASS, 'toFirst']],
             [['span', SelectorFlags.CLASS, 'toSecond']]
           ]);
           ɵɵelementStart(0, 'div', ['id', 'first']);
@@ -1005,7 +1005,7 @@ describe('content projection', () => {
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
           ɵɵprojectionDef([
-            [['span', SelectorFlags.CLASS, 'toFirst']],
+            '*', [['span', SelectorFlags.CLASS, 'toFirst']],
             [['span', SelectorFlags.CLASS, 'toSecond']]
           ]);
           ɵɵelementStart(0, 'div', ['id', 'first']);
@@ -1051,7 +1051,7 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span']], [['span', SelectorFlags.CLASS, 'toSecond']]]);
+          ɵɵprojectionDef(['*', [['span']], [['span', SelectorFlags.CLASS, 'toSecond']]]);
           ɵɵelementStart(0, 'div', ['id', 'first']);
           { ɵɵprojection(1, 1); }
           ɵɵelementEnd();
@@ -1095,7 +1095,7 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span', SelectorFlags.CLASS, 'toFirst']]]);
+          ɵɵprojectionDef(['*', [['span', SelectorFlags.CLASS, 'toFirst']]]);
           ɵɵelementStart(0, 'div', ['id', 'first']);
           { ɵɵprojection(1, 1); }
           ɵɵelementEnd();
@@ -1140,7 +1140,7 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span', SelectorFlags.CLASS, 'toSecond']]]);
+          ɵɵprojectionDef(['*', [['span', SelectorFlags.CLASS, 'toSecond']]]);
           ɵɵelementStart(0, 'div', ['id', 'first']);
           { ɵɵprojection(1); }
           ɵɵelementEnd();
@@ -1192,7 +1192,7 @@ describe('content projection', () => {
        */
       const GrandChild = createComponent('grand-child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['span']]]);
+          ɵɵprojectionDef(['*', [['span']]]);
           ɵɵprojection(0, 1);
           ɵɵelement(1, 'hr');
           ɵɵprojection(2);
@@ -1253,7 +1253,7 @@ describe('content projection', () => {
        */
       const Card = createComponent('card', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['', 'card-title', '']], [['', 'card-content', '']]]);
+          ɵɵprojectionDef(['*', [['', 'card-title', '']], [['', 'card-content', '']]]);
           ɵɵprojection(0, 1);
           ɵɵelement(1, 'hr');
           ɵɵprojection(2, 2);
@@ -1306,7 +1306,7 @@ describe('content projection', () => {
        */
       const Child = createComponent('child', function(rf: RenderFlags, ctx: any) {
         if (rf & RenderFlags.Create) {
-          ɵɵprojectionDef([[['div']]]);
+          ɵɵprojectionDef(['*', [['div']]]);
           ɵɵprojection(0, 1);
         }
       }, 1);
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index d72f29d65e..f07ece41d6 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -940,7 +940,7 @@ export declare type ɵɵPipeDefWithMeta<T, Name extends string> = PipeDef<T>;
 
 export declare function ɵɵprojection(nodeIndex: number, selectorIndex?: number, attrs?: TAttributes): void;
 
-export declare function ɵɵprojectionDef(selectors?: CssSelectorList[]): void;
+export declare function ɵɵprojectionDef(projectionSlots?: ProjectionSlots): void;
 
 export declare function ɵɵproperty<T>(propName: string, value: T, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): TsickleIssue1009;
 

From 876cd603f18b17f059bb635fde56f99f10601d29 Mon Sep 17 00:00:00 2001
From: Santosh Yadav <santosh.yadav198613@gmail.com>
Date: Sat, 11 May 2019 20:21:48 +0530
Subject: [PATCH 250/275] docs(docs-infra): remove deprecated `Buffer` usage
 from stackblitz builder (#30369)

Fixes #30364

PR Close #30369
---
 aio/tools/stackblitz-builder/builder.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/aio/tools/stackblitz-builder/builder.js b/aio/tools/stackblitz-builder/builder.js
index 35ad2b2745..00da191c95 100644
--- a/aio/tools/stackblitz-builder/builder.js
+++ b/aio/tools/stackblitz-builder/builder.js
@@ -221,9 +221,7 @@ class StackblitzBuilder {
 
   _encodeBase64(file) {
     // read binary data
-    var bitmap = fs.readFileSync(file);
-    // convert binary data to base64 encoded string
-    return Buffer(bitmap).toString('base64');
+    return fs.readFileSync(file, { encoding: 'base64' });
   }
 
   _existsSync(filename) {

From f93659057309ea30f73bf3168f8d1df9923ab599 Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Fri, 31 May 2019 21:47:33 +0200
Subject: [PATCH 251/275] fix(ivy): DebugNode.queryAll matching sibling nodes
 (#30788)

Inside of `DebugNode.queryAll` we walk through all of the descendants of the node that we're querying against, however the logic that walks sideways through a node siblings also applies to the root node. This means that eventually we'll match against its nodes as well which will give us invalid results. These changes add an extra check to ensure that we aren't matching against the siblings of the root node.

This PR resolves FW-1353.

PR Close #30788
---
 packages/core/src/debug/debug_node.ts       | 43 ++++++++++-----------
 packages/core/test/debug/debug_node_spec.ts | 41 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/packages/core/src/debug/debug_node.ts b/packages/core/src/debug/debug_node.ts
index e8547d8783..bc15842731 100644
--- a/packages/core/src/debug/debug_node.ts
+++ b/packages/core/src/debug/debug_node.ts
@@ -423,24 +423,24 @@ function _queryAllR3(
 function _queryNodeChildrenR3(
     tNode: TNode, lView: LView, predicate: Predicate<DebugNode>, matches: DebugNode[],
     elementsOnly: boolean, rootNativeNode: any) {
+  const nativeNode = getNativeByTNode(tNode, lView);
   // For each type of TNode, specific logic is executed.
   if (tNode.type === TNodeType.Element || tNode.type === TNodeType.ElementContainer) {
     // Case 1: the TNode is an element
     // The native node has to be checked.
-    _addQueryMatchR3(
-        getNativeByTNode(tNode, lView), predicate, matches, elementsOnly, rootNativeNode);
+    _addQueryMatchR3(nativeNode, predicate, matches, elementsOnly, rootNativeNode);
     if (isComponent(tNode)) {
       // If the element is the host of a component, then all nodes in its view have to be processed.
       // Note: the component's content (tNode.child) will be processed from the insertion points.
       const componentView = getComponentViewByIndex(tNode.index, lView);
-      if (componentView && componentView[TVIEW].firstChild)
+      if (componentView && componentView[TVIEW].firstChild) {
         _queryNodeChildrenR3(
             componentView[TVIEW].firstChild !, componentView, predicate, matches, elementsOnly,
             rootNativeNode);
-    } else {
+      }
+    } else if (tNode.child) {
       // Otherwise, its children have to be processed.
-      if (tNode.child)
-        _queryNodeChildrenR3(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
+      _queryNodeChildrenR3(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
     }
     // In all cases, if a dynamic container exists for this node, each view inside it has to be
     // processed.
@@ -468,25 +468,24 @@ function _queryNodeChildrenR3(
       for (let nativeNode of head) {
         _addQueryMatchR3(nativeNode, predicate, matches, elementsOnly, rootNativeNode);
       }
-    } else {
-      if (head) {
-        const nextLView = componentView[PARENT] !as LView;
-        const nextTNode = nextLView[TVIEW].data[head.index] as TNode;
-        _queryNodeChildrenR3(
-            nextTNode, nextLView, predicate, matches, elementsOnly, rootNativeNode);
-      }
+    } else if (head) {
+      const nextLView = componentView[PARENT] !as LView;
+      const nextTNode = nextLView[TVIEW].data[head.index] as TNode;
+      _queryNodeChildrenR3(nextTNode, nextLView, predicate, matches, elementsOnly, rootNativeNode);
     }
-  } else {
+  } else if (tNode.child) {
     // Case 4: the TNode is a view.
-    if (tNode.child) {
-      _queryNodeChildrenR3(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
-    }
+    _queryNodeChildrenR3(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
   }
-  // To determine the next node to be processed, we need to use the next or the projectionNext link,
-  // depending on whether the current node has been projected.
-  const nextTNode = (tNode.flags & TNodeFlags.isProjected) ? tNode.projectionNext : tNode.next;
-  if (nextTNode) {
-    _queryNodeChildrenR3(nextTNode, lView, predicate, matches, elementsOnly, rootNativeNode);
+
+  // We don't want to go to the next sibling of the root node.
+  if (rootNativeNode !== nativeNode) {
+    // To determine the next node to be processed, we need to use the next or the projectionNext
+    // link, depending on whether the current node has been projected.
+    const nextTNode = (tNode.flags & TNodeFlags.isProjected) ? tNode.projectionNext : tNode.next;
+    if (nextTNode) {
+      _queryNodeChildrenR3(nextTNode, lView, predicate, matches, elementsOnly, rootNativeNode);
+    }
   }
 }
 
diff --git a/packages/core/test/debug/debug_node_spec.ts b/packages/core/test/debug/debug_node_spec.ts
index b45cb43031..cbec33a9ca 100644
--- a/packages/core/test/debug/debug_node_spec.ts
+++ b/packages/core/test/debug/debug_node_spec.ts
@@ -695,5 +695,46 @@ class TestCmptWithPropBindings {
       expect(childTestElsSecond[0]).toBe(childTestElsFirst[0]);
     });
 
+    it('should not query the descendants of a sibling node', () => {
+      @Component({
+        selector: 'my-comp',
+        template: `
+          <div class="div.1">
+            <p class="p.1">
+              <span class="span.1">span.1</span>
+              <span class="span.2">span.2</span>
+            </p>
+            <p class="p.2">
+              <span class="span.3">span.3</span>
+              <span class="span.4">span.4</span>
+            </p>
+          </div>
+          <div class="div.2">
+            <p class="p.3">
+              <span class="span.5">span.5</span>
+              <span class="span.6">span.6</span>
+            </p>
+            <p class="p.4">
+              <span class="span.7">span.7</span>
+              <span class="span.8">span.8</span>
+            </p>
+          </div>
+        `
+      })
+      class MyComp {
+      }
+
+      TestBed.configureTestingModule({declarations: [MyComp]});
+      const fixture = TestBed.createComponent(MyComp);
+      fixture.detectChanges();
+
+      const firstDiv = fixture.debugElement.query(By.css('div'));
+      const firstDivChildren = firstDiv.queryAll(By.css('span'));
+
+      expect(firstDivChildren.map(child => child.nativeNode.textContent.trim())).toEqual([
+        'span.1', 'span.2', 'span.3', 'span.4'
+      ]);
+    });
+
   });
 }

From 8ce288a8524ccb73c9e472020dcb93d136bc7b1b Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 31 May 2019 12:45:51 +0300
Subject: [PATCH 252/275] fix(docs-infra): add v7 in versions dropdown (#30775)

Fixes #30769

PR Close #30775
---
 aio/content/navigation.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index f13105fca8..c3a1c3979e 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -831,21 +831,25 @@
     }
   ],
   "docVersions": [
+    {
+      "title": "v7",
+      "url": "https://v7.angular.io/"
+    },
     {
       "title": "v6",
-      "url": "https://v6.angular.io"
+      "url": "https://v6.angular.io/"
     },
     {
       "title": "v5",
-      "url": "https://v5.angular.io"
+      "url": "https://v5.angular.io/"
     },
     {
       "title": "v4",
-      "url": "https://v4.angular.io"
+      "url": "https://v4.angular.io/"
     },
     {
       "title": "v2",
-      "url": "https://v2.angular.io"
+      "url": "https://v2.angular.io/"
     }
   ]
 }

From 1315d23aa419fd51e51ecd6a08a074abad9f8387 Mon Sep 17 00:00:00 2001
From: Michael Head <michaelehead@gmail.com>
Date: Fri, 5 Apr 2019 14:43:29 -0400
Subject: [PATCH 253/275] docs: increase color contrast on elements in tutorial

This increases the color contrast of elements in the tutorial (parts 1-6)
in order to meet WCAG 2.0 AA standards.
---
 aio/content/examples/toh-pt0/src/styles.1.css                 | 2 +-
 .../examples/toh-pt2/src/app/heroes/heroes.component.css      | 2 +-
 .../examples/toh-pt3/src/app/heroes/heroes.component.css      | 2 +-
 .../examples/toh-pt4/src/app/heroes/heroes.component.css      | 2 +-
 .../examples/toh-pt4/src/app/messages/messages.component.css  | 2 +-
 aio/content/examples/toh-pt5/src/app/app.component.css        | 3 +--
 .../toh-pt5/src/app/dashboard/dashboard.component.css         | 2 +-
 .../examples/toh-pt5/src/app/heroes/heroes.component.css      | 4 ++--
 .../examples/toh-pt5/src/app/messages/messages.component.css  | 2 +-
 aio/content/examples/toh-pt6/src/app/app.component.css        | 3 +--
 .../toh-pt6/src/app/dashboard/dashboard.component.css         | 2 +-
 .../toh-pt6/src/app/hero-search/hero-search.component.html    | 2 +-
 .../examples/toh-pt6/src/app/heroes/heroes.component.css      | 4 ++--
 .../examples/toh-pt6/src/app/messages/messages.component.css  | 2 +-
 aio/tools/examples/shared/boilerplate/common/src/styles.css   | 2 +-
 15 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/aio/content/examples/toh-pt0/src/styles.1.css b/aio/content/examples/toh-pt0/src/styles.1.css
index 264b345eba..1821a5fc8d 100644
--- a/aio/content/examples/toh-pt0/src/styles.1.css
+++ b/aio/content/examples/toh-pt0/src/styles.1.css
@@ -13,7 +13,7 @@ body {
   margin: 2em;
 }
 body, input[type="text"], button {
-  color: #888;
+  color: #333;
   font-family: Cambria, Georgia;
 }
 /* everywhere else */
diff --git a/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.css b/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.css
index e956eab987..9121bec918 100644
--- a/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.css
+++ b/aio/content/examples/toh-pt2/src/app/heroes/heroes.component.css
@@ -37,7 +37,7 @@
   font-size: small;
   color: white;
   padding: 0.8em 0.7em 0 0.7em;
-  background-color: #607D8B;
+  background-color:#405061;
   line-height: 1em;
   position: relative;
   left: -1px;
diff --git a/aio/content/examples/toh-pt3/src/app/heroes/heroes.component.css b/aio/content/examples/toh-pt3/src/app/heroes/heroes.component.css
index e956eab987..9121bec918 100644
--- a/aio/content/examples/toh-pt3/src/app/heroes/heroes.component.css
+++ b/aio/content/examples/toh-pt3/src/app/heroes/heroes.component.css
@@ -37,7 +37,7 @@
   font-size: small;
   color: white;
   padding: 0.8em 0.7em 0 0.7em;
-  background-color: #607D8B;
+  background-color:#405061;
   line-height: 1em;
   position: relative;
   left: -1px;
diff --git a/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.css b/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.css
index 4bef1bb3c4..1d73d53659 100644
--- a/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.css
+++ b/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.css
@@ -37,7 +37,7 @@
   font-size: small;
   color: white;
   padding: 0.8em 0.7em 0 0.7em;
-  background-color: #607D8B;
+  background-color:#405061;
   line-height: 1em;
   position: relative;
   left: -1px;
diff --git a/aio/content/examples/toh-pt4/src/app/messages/messages.component.css b/aio/content/examples/toh-pt4/src/app/messages/messages.component.css
index d08d9be581..de06809856 100644
--- a/aio/content/examples/toh-pt4/src/app/messages/messages.component.css
+++ b/aio/content/examples/toh-pt4/src/app/messages/messages.component.css
@@ -30,6 +30,6 @@ button:disabled {
   cursor: auto;
 }
 button.clear {
-  color: #888;
+  color: #333;
   margin-bottom: 12px;
 }
diff --git a/aio/content/examples/toh-pt5/src/app/app.component.css b/aio/content/examples/toh-pt5/src/app/app.component.css
index 7cf19e6ede..c62f266159 100644
--- a/aio/content/examples/toh-pt5/src/app/app.component.css
+++ b/aio/content/examples/toh-pt5/src/app/app.component.css
@@ -1,7 +1,6 @@
 /* AppComponent's private CSS styles */
 h1 {
   font-size: 1.2em;
-  color: #999;
   margin-bottom: 0;
 }
 h2 {
@@ -18,7 +17,7 @@ nav a {
   border-radius: 4px;
 }
 nav a:visited, a:link {
-  color: #607d8b;
+  color: #334953;
 }
 nav a:hover {
   color: #039be5;
diff --git a/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css b/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
index 68e65dda00..4b7ec1c3ee 100644
--- a/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
+++ b/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
@@ -34,7 +34,7 @@ h4 {
   color: #eee;
   max-height: 120px;
   min-width: 120px;
-  background-color: #607d8b;
+  background-color: #3f525c;
   border-radius: 2px;
 }
 .module:hover {
diff --git a/aio/content/examples/toh-pt5/src/app/heroes/heroes.component.css b/aio/content/examples/toh-pt5/src/app/heroes/heroes.component.css
index 91e0badceb..2ad3fefb31 100644
--- a/aio/content/examples/toh-pt5/src/app/heroes/heroes.component.css
+++ b/aio/content/examples/toh-pt5/src/app/heroes/heroes.component.css
@@ -22,7 +22,7 @@
 }
 
 .heroes a {
-  color: #888;
+  color: #333;
   text-decoration: none;
   position: relative;
   display: block;
@@ -38,7 +38,7 @@
   font-size: small;
   color: white;
   padding: 0.8em 0.7em 0 0.7em;
-  background-color: #607D8B;
+  background-color:#405061;
   line-height: 1em;
   position: relative;
   left: -1px;
diff --git a/aio/content/examples/toh-pt5/src/app/messages/messages.component.css b/aio/content/examples/toh-pt5/src/app/messages/messages.component.css
index d08d9be581..de06809856 100644
--- a/aio/content/examples/toh-pt5/src/app/messages/messages.component.css
+++ b/aio/content/examples/toh-pt5/src/app/messages/messages.component.css
@@ -30,6 +30,6 @@ button:disabled {
   cursor: auto;
 }
 button.clear {
-  color: #888;
+  color: #333;
   margin-bottom: 12px;
 }
diff --git a/aio/content/examples/toh-pt6/src/app/app.component.css b/aio/content/examples/toh-pt6/src/app/app.component.css
index bf741e4575..c1d8721226 100644
--- a/aio/content/examples/toh-pt6/src/app/app.component.css
+++ b/aio/content/examples/toh-pt6/src/app/app.component.css
@@ -1,7 +1,6 @@
 /* AppComponent's private CSS styles */
 h1 {
   font-size: 1.2em;
-  color: #999;
   margin-bottom: 0;
 }
 h2 {
@@ -18,7 +17,7 @@ nav a {
   border-radius: 4px;
 }
 nav a:visited, a:link {
-  color: #607D8B;
+  color: #334953;
 }
 nav a:hover {
   color: #039be5;
diff --git a/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.css b/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.css
index 6222c23bb7..938b84b2b0 100644
--- a/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.css
+++ b/aio/content/examples/toh-pt6/src/app/dashboard/dashboard.component.css
@@ -34,7 +34,7 @@ h4 {
   color: #eee;
   max-height: 120px;
   min-width: 120px;
-  background-color: #607D8B;
+  background-color: #3f525c;
   border-radius: 2px;
 }
 .module:hover {
diff --git a/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.html b/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.html
index 52f3e958e3..de72fd791f 100644
--- a/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.html
+++ b/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.html
@@ -1,5 +1,5 @@
 <div id="search-component">
-  <h4>Hero Search</h4>
+  <h4><label for="search-box">Hero Search</label></h4>
 
   <!-- #docregion input -->
   <input #searchBox id="search-box" (input)="search(searchBox.value)" />
diff --git a/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.css b/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.css
index c345d1d970..0b13f0fe4c 100644
--- a/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.css
+++ b/aio/content/examples/toh-pt6/src/app/heroes/heroes.component.css
@@ -22,7 +22,7 @@
 }
 
 .heroes a {
-  color: #888;
+  color: #333;
   text-decoration: none;
   position: relative;
   display: block;
@@ -38,7 +38,7 @@
   font-size: small;
   color: white;
   padding: 0.8em 0.7em 0 0.7em;
-  background-color: #607D8B;
+  background-color:#405061;
   line-height: 1em;
   position: relative;
   left: -1px;
diff --git a/aio/content/examples/toh-pt6/src/app/messages/messages.component.css b/aio/content/examples/toh-pt6/src/app/messages/messages.component.css
index d08d9be581..de06809856 100644
--- a/aio/content/examples/toh-pt6/src/app/messages/messages.component.css
+++ b/aio/content/examples/toh-pt6/src/app/messages/messages.component.css
@@ -30,6 +30,6 @@ button:disabled {
   cursor: auto;
 }
 button.clear {
-  color: #888;
+  color: #333;
   margin-bottom: 12px;
 }
diff --git a/aio/tools/examples/shared/boilerplate/common/src/styles.css b/aio/tools/examples/shared/boilerplate/common/src/styles.css
index aa756e7d70..d4e07e4175 100644
--- a/aio/tools/examples/shared/boilerplate/common/src/styles.css
+++ b/aio/tools/examples/shared/boilerplate/common/src/styles.css
@@ -13,7 +13,7 @@ body {
   margin: 2em;
 }
 body, input[text], button {
-  color: #888;
+  color: #333;
   font-family: Cambria, Georgia;
 }
 a {

From fcef39048aa7697e67ce72fe96ee021fec70316c Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Tue, 14 May 2019 09:35:10 -0500
Subject: [PATCH 254/275] refactor(docs-infra): update loading of custom
 elements to use dynamic import syntax (#30704)

Removes the usage of `NgModuleFactoryLoader` and string-based imports for lazy loading.

PR Close #30704
---
 aio/scripts/_payload-limits.json              |  4 +--
 .../custom-elements/custom-elements.module.ts | 10 +++----
 .../app/custom-elements/element-registry.ts   | 29 ++++++++++---------
 .../custom-elements/elements-loader.spec.ts   | 20 ++++---------
 .../app/custom-elements/elements-loader.ts    | 17 +++++------
 5 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json
index 14cf8a8afb..13f6a2bc0d 100755
--- a/aio/scripts/_payload-limits.json
+++ b/aio/scripts/_payload-limits.json
@@ -2,8 +2,8 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime-es5": 2980,
-        "runtime-es2015": 2986,
+        "runtime-es5": 2516,
+        "runtime-es2015": 2522,
         "main-es5": 504760,
         "main-es2015": 443497,
         "polyfills-es5": 128751,
diff --git a/aio/src/app/custom-elements/custom-elements.module.ts b/aio/src/app/custom-elements/custom-elements.module.ts
index f2000a391f..2975720d80 100644
--- a/aio/src/app/custom-elements/custom-elements.module.ts
+++ b/aio/src/app/custom-elements/custom-elements.module.ts
@@ -2,9 +2,9 @@ import { NgModule, NgModuleFactoryLoader, SystemJsNgModuleLoader } from '@angula
 import { ROUTES} from '@angular/router';
 import { ElementsLoader } from './elements-loader';
 import {
-  ELEMENT_MODULE_PATHS,
-  ELEMENT_MODULE_PATHS_AS_ROUTES,
-  ELEMENT_MODULE_PATHS_TOKEN
+  ELEMENT_MODULE_LOAD_CALLBACKS,
+  ELEMENT_MODULE_LOAD_CALLBACKS_AS_ROUTES,
+  ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN
 } from './element-registry';
 import { LazyCustomElementComponent } from './lazy-custom-element.component';
 
@@ -14,12 +14,12 @@ import { LazyCustomElementComponent } from './lazy-custom-element.component';
   providers: [
     ElementsLoader,
     { provide: NgModuleFactoryLoader, useClass: SystemJsNgModuleLoader },
-    { provide: ELEMENT_MODULE_PATHS_TOKEN, useValue: ELEMENT_MODULE_PATHS },
+    { provide: ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, useValue: ELEMENT_MODULE_LOAD_CALLBACKS },
 
     // Providing these routes as a signal to the build system that these modules should be
     // registered as lazy-loadable.
     // TODO(andrewjs): Provide first-class support for providing this.
-    { provide: ROUTES, useValue: ELEMENT_MODULE_PATHS_AS_ROUTES, multi: true },
+    { provide: ROUTES, useValue: ELEMENT_MODULE_LOAD_CALLBACKS_AS_ROUTES, multi: true },
   ],
 })
 export class CustomElementsModule { }
diff --git a/aio/src/app/custom-elements/element-registry.ts b/aio/src/app/custom-elements/element-registry.ts
index 0a80932e9a..b4a7cadd5a 100644
--- a/aio/src/app/custom-elements/element-registry.ts
+++ b/aio/src/app/custom-elements/element-registry.ts
@@ -1,44 +1,45 @@
 import { InjectionToken, Type } from '@angular/core';
+import { LoadChildrenCallback } from '@angular/router';
 
 // Modules containing custom elements must be set up as lazy-loaded routes (loadChildren)
 // TODO(andrewjs): This is a hack, Angular should have first-class support for preparing a module
 // that contains custom elements.
-export const ELEMENT_MODULE_PATHS_AS_ROUTES = [
+export const ELEMENT_MODULE_LOAD_CALLBACKS_AS_ROUTES = [
   {
     selector: 'aio-announcement-bar',
-    loadChildren: './announcement-bar/announcement-bar.module#AnnouncementBarModule'
+    loadChildren: () => import('./announcement-bar/announcement-bar.module').then(mod => mod.AnnouncementBarModule)
   },
   {
     selector: 'aio-api-list',
-    loadChildren: './api/api-list.module#ApiListModule'
+    loadChildren: () => import('./api/api-list.module').then(mod => mod.ApiListModule)
   },
   {
     selector: 'aio-contributor-list',
-    loadChildren: './contributor/contributor-list.module#ContributorListModule'
+    loadChildren: () => import('./contributor/contributor-list.module').then(mod => mod.ContributorListModule)
   },
   {
     selector: 'aio-file-not-found-search',
-    loadChildren: './search/file-not-found-search.module#FileNotFoundSearchModule'
+    loadChildren: () => import('./search/file-not-found-search.module').then(mod => mod.FileNotFoundSearchModule)
   },
   {
     selector: 'aio-resource-list',
-    loadChildren: './resource/resource-list.module#ResourceListModule'
+    loadChildren: () => import('./resource/resource-list.module').then(mod => mod.ResourceListModule)
   },
   {
     selector: 'aio-toc',
-    loadChildren: './toc/toc.module#TocModule'
+    loadChildren: () => import('./toc/toc.module').then(mod => mod.TocModule)
   },
   {
     selector: 'code-example',
-    loadChildren: './code/code-example.module#CodeExampleModule'
+    loadChildren: () => import('./code/code-example.module').then(mod => mod.CodeExampleModule)
   },
   {
     selector: 'code-tabs',
-    loadChildren: './code/code-tabs.module#CodeTabsModule'
+    loadChildren: () => import('./code/code-tabs.module').then(mod => mod.CodeTabsModule)
   },
   {
     selector: 'live-example',
-    loadChildren: './live-example/live-example.module#LiveExampleModule'
+    loadChildren: () => import('./live-example/live-example.module').then(mod => mod.LiveExampleModule)
   }
 ];
 
@@ -51,10 +52,10 @@ export interface WithCustomElementComponent {
 }
 
 /** Injection token to provide the element path modules. */
-export const ELEMENT_MODULE_PATHS_TOKEN = new InjectionToken('aio/elements-map');
+export const ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN = new InjectionToken<Map<string, LoadChildrenCallback>>('aio/elements-map');
 
 /** Map of possible custom element selectors to their lazy-loadable module paths. */
-export const ELEMENT_MODULE_PATHS = new Map<string, string>();
-ELEMENT_MODULE_PATHS_AS_ROUTES.forEach(route => {
-  ELEMENT_MODULE_PATHS.set(route.selector, route.loadChildren);
+export const ELEMENT_MODULE_LOAD_CALLBACKS = new Map<string, LoadChildrenCallback>();
+ELEMENT_MODULE_LOAD_CALLBACKS_AS_ROUTES.forEach(route => {
+  ELEMENT_MODULE_LOAD_CALLBACKS.set(route.selector, route.loadChildren);
 });
diff --git a/aio/src/app/custom-elements/elements-loader.spec.ts b/aio/src/app/custom-elements/elements-loader.spec.ts
index acb2befd82..d2ccf28780 100644
--- a/aio/src/app/custom-elements/elements-loader.spec.ts
+++ b/aio/src/app/custom-elements/elements-loader.spec.ts
@@ -1,13 +1,13 @@
 import {
   ComponentFactory,
-  ComponentFactoryResolver, ComponentRef, Injector, NgModuleFactory, NgModuleFactoryLoader,
+  ComponentFactoryResolver, ComponentRef, Injector, NgModuleFactory,
   NgModuleRef,
   Type
 } from '@angular/core';
 import { TestBed, fakeAsync, flushMicrotasks } from '@angular/core/testing';
 
 import { ElementsLoader } from './elements-loader';
-import { ELEMENT_MODULE_PATHS_TOKEN, WithCustomElementComponent } from './element-registry';
+import { ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, WithCustomElementComponent } from './element-registry';
 
 
 interface Deferred {
@@ -22,10 +22,9 @@ describe('ElementsLoader', () => {
     const injector = TestBed.configureTestingModule({
       providers: [
         ElementsLoader,
-        { provide: NgModuleFactoryLoader, useClass: FakeModuleFactoryLoader },
-        { provide: ELEMENT_MODULE_PATHS_TOKEN, useValue: new Map([
-          ['element-a-selector', 'element-a-module-path'],
-          ['element-b-selector', 'element-b-module-path']
+        { provide: ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, useValue: new Map<string, () => Promise<NgModuleFactory<WithCustomElementComponent>>>([
+          ['element-a-selector', () => Promise.resolve(new FakeModuleFactory('element-a-module'))],
+          ['element-b-selector', () => Promise.resolve(new FakeModuleFactory('element-b-module'))]
         ])},
       ]
     });
@@ -148,7 +147,7 @@ describe('ElementsLoader', () => {
 
       // Verify the right component was loaded/registered.
       const Ctor = definedSpy.calls.argsFor(0)[1];
-      expect(Ctor.observedAttributes).toEqual(['element-a-module-path']);
+      expect(Ctor.observedAttributes).toEqual(['element-a-module']);
     }));
 
     it('should wait until the element is defined', fakeAsync(() => {
@@ -282,13 +281,6 @@ class FakeModuleFactory extends NgModuleFactory<any> {
   }
 }
 
-class FakeModuleFactoryLoader extends NgModuleFactoryLoader {
-  load(modulePath: string): Promise<NgModuleFactory<any>> {
-    const fakeModuleFactory = new FakeModuleFactory(modulePath);
-    return Promise.resolve(fakeModuleFactory);
-  }
-}
-
 function returnPromisesFromSpy(spy: jasmine.Spy): Deferred[] {
   const deferreds: Deferred[] = [];
   spy.and.callFake(() => new Promise((resolve, reject) => deferreds.push({resolve, reject})));
diff --git a/aio/src/app/custom-elements/elements-loader.ts b/aio/src/app/custom-elements/elements-loader.ts
index b2ee24cf4f..7156164a16 100644
--- a/aio/src/app/custom-elements/elements-loader.ts
+++ b/aio/src/app/custom-elements/elements-loader.ts
@@ -1,24 +1,24 @@
 import {
   Inject,
   Injectable,
-  NgModuleFactoryLoader,
+  NgModuleFactory,
   NgModuleRef,
 } from '@angular/core';
-import { ELEMENT_MODULE_PATHS_TOKEN } from './element-registry';
+import { ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, WithCustomElementComponent } from './element-registry';
 import { from, Observable, of } from 'rxjs';
 import { createCustomElement } from '@angular/elements';
+import { LoadChildrenCallback } from '@angular/router';
 
 
 @Injectable()
 export class ElementsLoader {
   /** Map of unregistered custom elements and their respective module paths to load. */
-  private elementsToLoad: Map<string, string>;
+  private elementsToLoad: Map<string, LoadChildrenCallback>;
   /** Map of custom elements that are in the process of being loaded and registered. */
   private elementsLoading = new Map<string, Promise<void>>();
 
-  constructor(private moduleFactoryLoader: NgModuleFactoryLoader,
-              private moduleRef: NgModuleRef<any>,
-              @Inject(ELEMENT_MODULE_PATHS_TOKEN) elementModulePaths: Map<string, string>) {
+  constructor(private moduleRef: NgModuleRef<any>,
+              @Inject(ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN) elementModulePaths: Map<string, LoadChildrenCallback>) {
     this.elementsToLoad = new Map(elementModulePaths);
   }
 
@@ -47,9 +47,8 @@ export class ElementsLoader {
 
     if (this.elementsToLoad.has(selector)) {
       // Load and register the custom element (for the first time).
-      const modulePath = this.elementsToLoad.get(selector)!;
-      const loadedAndRegistered = this.moduleFactoryLoader
-          .load(modulePath)
+      const modulePathLoader = this.elementsToLoad.get(selector)!;
+      const loadedAndRegistered = (modulePathLoader() as Promise<NgModuleFactory<WithCustomElementComponent>>)
           .then(elementModuleFactory => {
             const elementModuleRef = elementModuleFactory.create(this.moduleRef.injector);
             const injector = elementModuleRef.injector;

From 32886cf9ace539e14e2b387cd8afb10715c8d3de Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Thu, 30 May 2019 11:55:59 -0500
Subject: [PATCH 255/275] docs(docs-infra): compile module first for Ivy when
 loading element modules (#30704)

In View Engine, NgModule factories are created for each NgModule and loaded when the module is requested. Ivy doesn't generate the
factories by design and only loads the module class, so it must be compiled after being loaded.

PR Close #30704
---
 .../custom-elements/custom-elements.module.ts |  3 +--
 .../custom-elements/elements-loader.spec.ts   | 27 ++++++++++++++++---
 .../app/custom-elements/elements-loader.ts    | 22 +++++++++++++--
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/aio/src/app/custom-elements/custom-elements.module.ts b/aio/src/app/custom-elements/custom-elements.module.ts
index 2975720d80..064dfb8e40 100644
--- a/aio/src/app/custom-elements/custom-elements.module.ts
+++ b/aio/src/app/custom-elements/custom-elements.module.ts
@@ -1,4 +1,4 @@
-import { NgModule, NgModuleFactoryLoader, SystemJsNgModuleLoader } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { ROUTES} from '@angular/router';
 import { ElementsLoader } from './elements-loader';
 import {
@@ -13,7 +13,6 @@ import { LazyCustomElementComponent } from './lazy-custom-element.component';
   exports: [ LazyCustomElementComponent ],
   providers: [
     ElementsLoader,
-    { provide: NgModuleFactoryLoader, useClass: SystemJsNgModuleLoader },
     { provide: ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, useValue: ELEMENT_MODULE_LOAD_CALLBACKS },
 
     // Providing these routes as a signal to the build system that these modules should be
diff --git a/aio/src/app/custom-elements/elements-loader.spec.ts b/aio/src/app/custom-elements/elements-loader.spec.ts
index d2ccf28780..36185a2067 100644
--- a/aio/src/app/custom-elements/elements-loader.spec.ts
+++ b/aio/src/app/custom-elements/elements-loader.spec.ts
@@ -1,8 +1,9 @@
 import {
+  Compiler,
   ComponentFactory,
   ComponentFactoryResolver, ComponentRef, Injector, NgModuleFactory,
   NgModuleRef,
-  Type
+  Type,
 } from '@angular/core';
 import { TestBed, fakeAsync, flushMicrotasks } from '@angular/core/testing';
 
@@ -17,19 +18,25 @@ interface Deferred {
 
 describe('ElementsLoader', () => {
   let elementsLoader: ElementsLoader;
+  let compiler: Compiler;
 
   beforeEach(() => {
     const injector = TestBed.configureTestingModule({
       providers: [
         ElementsLoader,
-        { provide: ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, useValue: new Map<string, () => Promise<NgModuleFactory<WithCustomElementComponent>>>([
+        {
+          provide: ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, useValue: new Map<
+            string, () => Promise<NgModuleFactory<WithCustomElementComponent> | Type<WithCustomElementComponent>>
+          >([
           ['element-a-selector', () => Promise.resolve(new FakeModuleFactory('element-a-module'))],
-          ['element-b-selector', () => Promise.resolve(new FakeModuleFactory('element-b-module'))]
+          ['element-b-selector', () => Promise.resolve(new FakeModuleFactory('element-b-module'))],
+          ['element-c-selector', () => Promise.resolve(FakeCustomElementModule)]
         ])},
       ]
     });
 
     elementsLoader = injector.get(ElementsLoader);
+    compiler = injector.get(Compiler);
   });
 
   describe('loadContainedCustomElements()', () => {
@@ -221,6 +228,20 @@ describe('ElementsLoader', () => {
         expect(definedSpy).toHaveBeenCalledTimes(1);
       })
     );
+
+    it('should be able to load and register an element after compiling its NgModule', fakeAsync(() => {
+      const compilerSpy = spyOn(compiler, 'compileModuleAsync')
+        .and.returnValue(Promise.resolve(new FakeModuleFactory('element-c-module')));
+
+      elementsLoader.loadCustomElement('element-c-selector');
+      flushMicrotasks();
+
+      expect(definedSpy).toHaveBeenCalledTimes(1);
+      expect(definedSpy).toHaveBeenCalledWith('element-c-selector', jasmine.any(Function));
+
+      expect(compilerSpy).toHaveBeenCalledTimes(1);
+      expect(compilerSpy).toHaveBeenCalledWith(FakeCustomElementModule);
+    }));
   });
 });
 
diff --git a/aio/src/app/custom-elements/elements-loader.ts b/aio/src/app/custom-elements/elements-loader.ts
index 7156164a16..f06894082b 100644
--- a/aio/src/app/custom-elements/elements-loader.ts
+++ b/aio/src/app/custom-elements/elements-loader.ts
@@ -1,8 +1,10 @@
 import {
+  Compiler,
   Inject,
   Injectable,
   NgModuleFactory,
   NgModuleRef,
+  Type,
 } from '@angular/core';
 import { ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN, WithCustomElementComponent } from './element-registry';
 import { from, Observable, of } from 'rxjs';
@@ -18,7 +20,8 @@ export class ElementsLoader {
   private elementsLoading = new Map<string, Promise<void>>();
 
   constructor(private moduleRef: NgModuleRef<any>,
-              @Inject(ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN) elementModulePaths: Map<string, LoadChildrenCallback>) {
+              @Inject(ELEMENT_MODULE_LOAD_CALLBACKS_TOKEN) elementModulePaths: Map<string, LoadChildrenCallback>,
+              private compiler: Compiler) {
     this.elementsToLoad = new Map(elementModulePaths);
   }
 
@@ -48,7 +51,22 @@ export class ElementsLoader {
     if (this.elementsToLoad.has(selector)) {
       // Load and register the custom element (for the first time).
       const modulePathLoader = this.elementsToLoad.get(selector)!;
-      const loadedAndRegistered = (modulePathLoader() as Promise<NgModuleFactory<WithCustomElementComponent>>)
+      const loadedAndRegistered =
+          (modulePathLoader() as Promise<NgModuleFactory<WithCustomElementComponent> | Type<WithCustomElementComponent>>)
+          .then(elementModuleOrFactory => {
+            /**
+             * With View Engine, the NgModule factory is created and provided when loaded.
+             * With Ivy, only the NgModule class is provided loaded and must be compiled.
+             * This uses the same mechanism as the deprecated `SystemJsNgModuleLoader` in
+             * in `packages/core/src/linker/system_js_ng_module_factory_loader.ts`
+             * to pass on the NgModuleFactory, or compile the NgModule and return its NgModuleFactory.
+             */
+            if (elementModuleOrFactory instanceof NgModuleFactory) {
+              return elementModuleOrFactory;
+            } else {
+              return this.compiler.compileModuleAsync(elementModuleOrFactory);
+            }
+          })
           .then(elementModuleFactory => {
             const elementModuleRef = elementModuleFactory.create(this.moduleRef.injector);
             const injector = elementModuleRef.injector;

From 8bedf50073a14a7992aa09b01913e6d071bceb3c Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Fri, 31 May 2019 15:03:36 -0500
Subject: [PATCH 256/275] docs: update example references from "my-app" to
 "app-root" (#30789)

"app" is the default prefix for CLI projects when generating components.
This updates our examples to conform that that default

Closes #19778

PR Close #30789
---
 aio/content/examples/architecture/src/app/mini-app.ts       | 2 +-
 aio/content/examples/ngcontainer/src/app/app.component.ts   | 2 +-
 aio/content/examples/ngcontainer/src/index.html             | 2 +-
 aio/content/examples/setup/src/app/app.component.ts         | 2 +-
 aio/content/examples/setup/src/index.html                   | 6 +++---
 .../styleguide/src/01-01/app/heroes/hero.component.avoid.ts | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aio/content/examples/architecture/src/app/mini-app.ts b/aio/content/examples/architecture/src/app/mini-app.ts
index b064428be3..85689b6304 100644
--- a/aio/content/examples/architecture/src/app/mini-app.ts
+++ b/aio/content/examples/architecture/src/app/mini-app.ts
@@ -12,7 +12,7 @@ import { Component } from '@angular/core';
 // #enddocregion import-core-component
 
 @Component({
- selector: 'my-app',
+ selector: 'app-root',
  template: 'Welcome to Angular'
 })
 export class AppComponent {
diff --git a/aio/content/examples/ngcontainer/src/app/app.component.ts b/aio/content/examples/ngcontainer/src/app/app.component.ts
index 068d1896d8..e17f5ecdf9 100644
--- a/aio/content/examples/ngcontainer/src/app/app.component.ts
+++ b/aio/content/examples/ngcontainer/src/app/app.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
 import { heroes } from './hero';
 
 @Component({
-  selector: 'my-app',
+  selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
diff --git a/aio/content/examples/ngcontainer/src/index.html b/aio/content/examples/ngcontainer/src/index.html
index 38a7c1dff1..d189d0a056 100644
--- a/aio/content/examples/ngcontainer/src/index.html
+++ b/aio/content/examples/ngcontainer/src/index.html
@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
   <body>
-    <my-app>Loading...</my-apps>
+    <app-root>Loading...</app-root>
   </body>
 
 </html>
diff --git a/aio/content/examples/setup/src/app/app.component.ts b/aio/content/examples/setup/src/app/app.component.ts
index 1ef28fc5c4..10bb6053e2 100644
--- a/aio/content/examples/setup/src/app/app.component.ts
+++ b/aio/content/examples/setup/src/app/app.component.ts
@@ -2,7 +2,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'my-app',
+  selector: 'app-root',
   template: `<h1>Hello {{name}}</h1>`
 })
 export class AppComponent { name = 'Angular'; }
diff --git a/aio/content/examples/setup/src/index.html b/aio/content/examples/setup/src/index.html
index 58e5112308..d28fe05691 100644
--- a/aio/content/examples/setup/src/index.html
+++ b/aio/content/examples/setup/src/index.html
@@ -20,9 +20,9 @@
   </head>
 
   <body>
-    <!-- #docregion my-app-->
-    <my-app><!-- content managed by Angular --></my-app>
-    <!-- #enddocregion my-app-->
+    <!-- #docregion app-root-->
+    <app-root><!-- content managed by Angular --></app-root>
+    <!-- #enddocregion app-root-->
   </body>
 
 </html>
diff --git a/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts b/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
index 2ec03ca8b3..7e0775b858 100644
--- a/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
+++ b/aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts
@@ -10,7 +10,7 @@ class Hero {
 }
 
 @Component({
-  selector: 'my-app',
+  selector: 'app-root',
   template: `
       <h1>{{title}}</h1>
       <pre>{{heroes | json}}</pre>

From dd8cf19352f006ec1fac80066cbf574c529f359a Mon Sep 17 00:00:00 2001
From: Tim Deschryver <28659384+timdeschryver@users.noreply.github.com>
Date: Fri, 31 May 2019 19:51:03 +0200
Subject: [PATCH 257/275] docs: fix a small typo in injectable decorator
 description (#30785)

PR Close #30785
---
 packages/core/src/di/injectable.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/di/injectable.ts b/packages/core/src/di/injectable.ts
index 19767f6f4b..d64dfb9281 100644
--- a/packages/core/src/di/injectable.ts
+++ b/packages/core/src/di/injectable.ts
@@ -40,7 +40,7 @@ export interface InjectableDecorator {
    *
    * The following example shows how service classes are properly marked as
    * injectable.
-   *Z
+   *
    * <code-example path="core/di/ts/metadata_spec.ts" region="Injectable"></code-example>
    *
    */

From 21328f2373dddf4a7dfdb194438732d26b102986 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Tue, 28 May 2019 15:35:47 -0700
Subject: [PATCH 258/275] fix(ivy): add back ngDevMode to r3_injector (#30707)

Import the definition so that it doesn't cause breakage with closure conformance rules.

FW-1307 #resolve

PR Close #30707
---
 packages/core/src/di/r3_injector.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index b5863856df..276e868117 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import '../util/ng_dev_mode';
+
 import {OnDestroy} from '../interface/lifecycle_hooks';
 import {Type} from '../interface/type';
 import {throwCyclicDependencyError, throwInvalidProviderError, throwMixedMultiProviderError} from '../render3/errors';
@@ -255,8 +257,7 @@ export class R3Injector {
         (ngModule === undefined) ? (defOrWrappedDef as InjectorType<any>) : ngModule;
 
     // Check for circular dependencies.
-    // TODO(FW-1307): Re-add ngDevMode when closure can handle it
-    if (parents.indexOf(defType) !== -1) {
+    if (ngDevMode && parents.indexOf(defType) !== -1) {
       const defName = stringify(defType);
       throw new Error(
           `Circular dependency in DI detected for type ${defName}. Dependency path: ${parents.map(defType => stringify(defType)).join(' > ')} > ${defName}.`);
@@ -286,8 +287,7 @@ export class R3Injector {
     if (def.imports != null && !isDuplicate) {
       // Before processing defType's imports, add it to the set of parents. This way, if it ends
       // up deeply importing itself, this can be detected.
-      // TODO(FW-1307): Re-add ngDevMode when closure can handle it
-      parents.push(defType);
+      ngDevMode && parents.push(defType);
       // Add it to the set of dedups. This way we can detect multiple imports of the same module
       dedupStack.push(defType);
 
@@ -303,8 +303,7 @@ export class R3Injector {
         });
       } finally {
         // Remove it from the parents set when finished.
-        // TODO(FW-1307): Re-add ngDevMode when closure can handle it
-        parents.pop();
+        ngDevMode && parents.pop();
       }
 
       // Imports which are declared with providers (TypeWithProviders) need to be processed

From 680d38513b4da21b30e2c92103c66942db5e46dd Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Mon, 3 Jun 2019 15:05:34 +0200
Subject: [PATCH 259/275] fix(ivy): correctly project bare ICU expressions
 (#30696)

Projecting bare ICU expressions failed because we would assume that component's content nodes would be projected later and doing so at that point would be wasteful. But ICU nodes are handled independently and should be inserted immediately because they will be ignored by projections.

FW-1348 #resolve

PR Close #30696
---
 integration/_payload-limits.json              |  2 +-
 .../core/src/render3/node_manipulation.ts     | 22 ++++++++++-----
 packages/core/test/acceptance/i18n_spec.ts    | 27 +++++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
index cc45acecbb..35c68b565d 100644
--- a/integration/_payload-limits.json
+++ b/integration/_payload-limits.json
@@ -12,7 +12,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1440,
-        "main": 14487,
+        "main": 14664,
         "polyfills": 43567
       }
     }
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 8a586c5fd7..8fc447f32b 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -15,7 +15,7 @@ import {ComponentDef} from './interfaces/definition';
 import {NodeInjectorFactory} from './interfaces/injector';
 import {TElementNode, TNode, TNodeFlags, TNodeType, TProjectionNode, TViewNode, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
-import {ProceduralRenderer3, RComment, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
+import {ProceduralRenderer3, RElement, RNode, RText, Renderer3, isProceduralRenderer, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {CHILD_HEAD, CLEANUP, FLAGS, HookData, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, TVIEW, T_HOST, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
 import {assertNodeType} from './node_assert';
 import {renderStringify} from './util/misc_utils';
@@ -558,11 +558,12 @@ function getRenderParent(tNode: TNode, currentView: LView): RElement|null {
 
   // Skip over element and ICU containers as those are represented by a comment node and
   // can't be used as a render parent.
-  const parent = getHighestElementOrICUContainer(tNode).parent;
+  const parent = getHighestElementOrICUContainer(tNode);
+  const renderParent = parent.parent;
 
   // If the parent is null, then we are inserting across views: either into an embedded view or a
   // component view.
-  if (parent == null) {
+  if (renderParent == null) {
     const hostTNode = currentView[T_HOST] !;
     if (hostTNode.type === TNodeType.View) {
       // We are inserting a root element of an embedded view We might delay insertion of children
@@ -579,10 +580,17 @@ function getRenderParent(tNode: TNode, currentView: LView): RElement|null {
       return getHostNative(currentView);
     }
   } else {
-    ngDevMode && assertNodeType(parent, TNodeType.Element);
-    if (parent.flags & TNodeFlags.isComponent) {
+    const isIcuCase = parent && parent.type === TNodeType.IcuContainer;
+    // If the parent of this node is an ICU container, then it is represented by comment node and we
+    // need to use it as an anchor. If it is projected then its direct parent node is the renderer.
+    if (isIcuCase && parent.flags & TNodeFlags.isProjected) {
+      return getNativeByTNode(parent, currentView).parentNode as RElement;
+    }
+
+    ngDevMode && assertNodeType(renderParent, TNodeType.Element);
+    if (renderParent.flags & TNodeFlags.isComponent && !isIcuCase) {
       const tData = currentView[TVIEW].data;
-      const tNode = tData[parent.index] as TNode;
+      const tNode = tData[renderParent.index] as TNode;
       const encapsulation = (tData[tNode.directiveStart] as ComponentDef<any>).encapsulation;
 
       // We've got a parent which is an element in the current view. We just need to verify if the
@@ -597,7 +605,7 @@ function getRenderParent(tNode: TNode, currentView: LView): RElement|null {
       }
     }
 
-    return getNativeByTNode(parent, currentView) as RElement;
+    return getNativeByTNode(renderParent, currentView) as RElement;
   }
 }
 
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index ad3b47fc97..a71d17304c 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -591,6 +591,33 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
          fixture.detectChanges();
          expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
        });
+
+    it('projection', () => {
+      @Component({selector: 'child', template: '<div><ng-content></ng-content></div>'})
+      class Child {
+      }
+
+      @Component({
+        selector: 'parent',
+        template: `
+      <child i18n>{
+        value // i18n(ph = "blah"),
+        plural,
+         =1 {one}
+        other {at least {{value}} .}
+      }</child>`
+      })
+      class Parent {
+        value = 3;
+      }
+      TestBed.configureTestingModule({declarations: [Parent, Child]});
+      ɵi18nConfigureLocalize({translations: {}});
+
+      const fixture = TestBed.createComponent(Parent);
+      fixture.detectChanges();
+
+      expect(fixture.nativeElement.innerHTML).toContain('at least');
+    });
   });
 
   describe('should support attributes', () => {

From b4e68025f8dbe825fc1e3edc126b8a48d18c8d50 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Fri, 24 May 2019 17:21:41 -0700
Subject: [PATCH 260/275] =?UTF-8?q?refactor(ivy):=20add=20=C9=B5=C9=B5upda?=
 =?UTF-8?q?teSyntheticHostBinding=20command=20(#30670)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Refactors `ɵɵcomponentHostSyntheticProperty` into `ɵɵupdateSyntheticHostBinding`, to better align it with other new instructions.

PR Close #30670
---
 .../compliance/r3_compiler_compliance_spec.ts     | 10 ++++------
 .../compliance/r3_view_compiler_styling_spec.ts   |  2 +-
 packages/compiler/src/render3/r3_identifiers.ts   |  4 ++--
 packages/compiler/src/render3/view/compiler.ts    | 15 ++-------------
 packages/core/src/core_render3_private_export.ts  |  2 +-
 packages/core/src/render3/index.ts                |  3 ++-
 .../core/src/render3/instructions/property.ts     | 12 +++++++-----
 packages/core/src/render3/jit/environment.ts      |  2 +-
 tools/public_api_guard/core/core.d.ts             |  4 ++--
 9 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
index a43ef0e09b..82b4379423 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -444,19 +444,17 @@ describe('compiler compliance', () => {
             $r3$.ɵɵallocHostVars(14);
           }
           if (rf & 2) {
-            $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@expansionHeight",
-              $r3$.ɵɵbind(
+            $r3$.ɵɵupdateSyntheticHostBinding("@expansionHeight",
                 $r3$.ɵɵpureFunction2(5, $_c1$, ctx.getExpandedState(),
                   $r3$.ɵɵpureFunction2(2, $_c0$, ctx.collapsedHeight, ctx.expandedHeight)
                 )
-              ), null, true
+              , null, true
             );
-            $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@expansionWidth",
-              $r3$.ɵɵbind(
+            $r3$.ɵɵupdateSyntheticHostBinding("@expansionWidth",
                 $r3$.ɵɵpureFunction2(11, $_c1$, ctx.getExpandedState(),
                   $r3$.ɵɵpureFunction2(8, $_c2$, ctx.collapsedWidth, ctx.expandedWidth)
                 )
-              ), null, true
+              , null, true
             );
           }
         },
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
index bb506bd473..8ac751f5f9 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
@@ -350,7 +350,7 @@ describe('compiler compliance: styling', () => {
               $r3$.ɵɵcomponentHostSyntheticListener("@myAnim.start", function MyAnimDir_animation_myAnim_start_HostBindingHandler($event) { return ctx.onStart(); });
               $r3$.ɵɵcomponentHostSyntheticListener("@myAnim.done", function MyAnimDir_animation_myAnim_done_HostBindingHandler($event) { return ctx.onDone(); });
             } if (rf & 2) {
-              $r3$.ɵɵcomponentHostSyntheticProperty(elIndex, "@myAnim", $r3$.ɵɵbind(ctx.myAnimState), null, true);
+              $r3$.ɵɵupdateSyntheticHostBinding("@myAnim", ctx.myAnimState, null, true);
             }
           }
           …
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 6979c3e140..285bb4c7b0 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -33,8 +33,8 @@ export class Identifiers {
 
   static select: o.ExternalReference = {name: 'ɵɵselect', moduleName: CORE};
 
-  static componentHostSyntheticProperty:
-      o.ExternalReference = {name: 'ɵɵcomponentHostSyntheticProperty', moduleName: CORE};
+  static updateSyntheticHostBinding:
+      o.ExternalReference = {name: 'ɵɵupdateSyntheticHostBinding', moduleName: CORE};
 
   static componentHostSyntheticListener:
       o.ExternalReference = {name: 'ɵɵcomponentHostSyntheticListener', moduleName: CORE};
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 175bee4458..5d6378730d 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -667,18 +667,7 @@ function createHostBindingsFunction(
           sanitizerFn = resolveSanitizationFn(securityContexts[0], isAttribute);
         }
       }
-      const isInstructionWithoutElementIndex =
-          instruction === R3.property || instruction === R3.attribute;
-      const instructionParams: o.Expression[] = isInstructionWithoutElementIndex ?
-          [
-            o.literal(bindingName),
-            bindingExpr.currValExpr,
-          ] :
-          [
-            elVarExp,
-            o.literal(bindingName),
-            o.importExpr(R3.bind).callFn([bindingExpr.currValExpr]),
-          ];
+      const instructionParams = [o.literal(bindingName), bindingExpr.currValExpr];
       if (sanitizerFn) {
         instructionParams.push(sanitizerFn);
       }
@@ -783,7 +772,7 @@ function getBindingNameAndInstruction(binding: ParsedProperty):
       // host bindings that have a synthetic property (e.g. @foo) should always be rendered
       // in the context of the component and not the parent. Therefore there is a special
       // compatibility instruction available for this purpose.
-      instruction = R3.componentHostSyntheticProperty;
+      instruction = R3.updateSyntheticHostBinding;
     } else {
       instruction = R3.property;
     }
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index 23b3cfac9c..b23bc2c35f 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -120,7 +120,7 @@ export {
   ɵɵpropertyInterpolate7,
   ɵɵpropertyInterpolate8,
   ɵɵpropertyInterpolateV,
-  ɵɵcomponentHostSyntheticProperty,
+  ɵɵupdateSyntheticHostBinding,
   ɵɵcomponentHostSyntheticListener,
   ɵɵprojectionDef,
   ɵɵreference,
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 73b79f84fb..723982608a 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -39,7 +39,6 @@ export {
   ɵɵclassMap,
   ɵɵclassProp,
   ɵɵcomponentHostSyntheticListener,
-  ɵɵcomponentHostSyntheticProperty,
 
   ɵɵcontainer,
   ɵɵcontainerRefreshEnd,
@@ -119,6 +118,8 @@ export {
   ɵɵtextInterpolate7,
   ɵɵtextInterpolate8,
   ɵɵtextInterpolateV,
+
+  ɵɵupdateSyntheticHostBinding,
 } from './instructions/all';
 export {RenderFlags} from './interfaces/definition';
 export {CssSelectorList, ProjectionSlots} from './interfaces/projection';
diff --git a/packages/core/src/render3/instructions/property.ts b/packages/core/src/render3/instructions/property.ts
index 4a4b14ad91..8dd5d615e8 100644
--- a/packages/core/src/render3/instructions/property.ts
+++ b/packages/core/src/render3/instructions/property.ts
@@ -110,10 +110,12 @@ export function ɵɵelementProperty<T>(
  *
  * @codeGenApi
  */
-export function ɵɵcomponentHostSyntheticProperty<T>(
-    index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null,
-    nativeOnly?: boolean) {
-  if (value !== NO_CHANGE) {
-    elementPropertyInternal(index, propName, value, sanitizer, nativeOnly, loadComponentRenderer);
+export function ɵɵupdateSyntheticHostBinding<T>(
+    propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean) {
+  const index = getSelectedIndex();
+  // TODO(benlesh): remove bind call here.
+  const bound = ɵɵbind(value);
+  if (bound !== NO_CHANGE) {
+    elementPropertyInternal(index, propName, bound, sanitizer, nativeOnly, loadComponentRenderer);
   }
 }
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index c48a3a02ae..d5180a3158 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -88,7 +88,7 @@ export const angularCoreEnv: {[name: string]: Function} =
        'ɵɵload': r3.ɵɵload,
        'ɵɵprojection': r3.ɵɵprojection,
        'ɵɵelementProperty': r3.ɵɵelementProperty,
-       'ɵɵcomponentHostSyntheticProperty': r3.ɵɵcomponentHostSyntheticProperty,
+       'ɵɵupdateSyntheticHostBinding': r3.ɵɵupdateSyntheticHostBinding,
        'ɵɵcomponentHostSyntheticListener': r3.ɵɵcomponentHostSyntheticListener,
        'ɵɵpipeBind1': r3.ɵɵpipeBind1,
        'ɵɵpipeBind2': r3.ɵɵpipeBind2,
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index f07ece41d6..80a2574b6b 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -712,8 +712,6 @@ export declare type ɵɵComponentDefWithMeta<T, Selector extends String, ExportA
 
 export declare function ɵɵcomponentHostSyntheticListener<T>(eventName: string, listenerFn: (e?: any) => any, useCapture?: boolean, eventTargetResolver?: GlobalTargetResolver): void;
 
-export declare function ɵɵcomponentHostSyntheticProperty<T>(index: number, propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
-
 export declare function ɵɵcontainer(index: number): void;
 
 export declare function ɵɵcontainerRefreshEnd(): void;
@@ -1077,6 +1075,8 @@ export declare function ɵɵtextInterpolate8(prefix: string, v0: any, i0: string
 
 export declare function ɵɵtextInterpolateV(values: any[]): TsickleIssue1009;
 
+export declare function ɵɵupdateSyntheticHostBinding<T>(propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null, nativeOnly?: boolean): void;
+
 export declare function ɵɵviewQuery<T>(predicate: Type<any> | string[], descend: boolean, read: any): QueryList<T>;
 
 export declare const PACKAGE_ROOT_URL: InjectionToken<string>;

From a981dd2aab4e060ac01d2e1a3441364b0481727b Mon Sep 17 00:00:00 2001
From: Umberto Tarantino <smartmouse@gmail.com>
Date: Mon, 3 Jun 2019 17:05:50 +0200
Subject: [PATCH 261/275] docs(core): fix typo in style bindings comment
 (#30661)

PR Close #30661
---
 packages/core/src/render3/styling/class_and_style_bindings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/render3/styling/class_and_style_bindings.ts b/packages/core/src/render3/styling/class_and_style_bindings.ts
index f90b1ca6f2..23881b4caa 100644
--- a/packages/core/src/render3/styling/class_and_style_bindings.ts
+++ b/packages/core/src/render3/styling/class_and_style_bindings.ts
@@ -1752,7 +1752,7 @@ export function getInitialStyleStringValue(context: StylingContext): string {
 }
 
 /**
- * Returns the current cached mutli-value for a given directiveIndex within the provided context.
+ * Returns the current cached multi-value for a given directiveIndex within the provided context.
  */
 function readCachedMapValue(
     context: StylingContext, entryIsClassBased: boolean, directiveIndex: number) {

From fcdd7846674978f4f06f50cc0ccfc317e4751dd6 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Mon, 20 May 2019 22:50:30 -0700
Subject: [PATCH 262/275] refactor(core): cleanup code with side-effects which
 was preventing tree-shaking (#30580)

PR Close #30580
---
 WORKSPACE                                     |   4 +-
 integration/bazel/WORKSPACE                   |   4 +-
 .../side-effects/snapshots/core/esm2015.js    | 146 +-----------------
 .../side-effects/snapshots/core/esm5.js       |  12 --
 .../benchmarks/src/expanding_rows/index.html  |   1 -
 packages/core/src/linker/query_list.ts        |  15 +-
 packages/core/src/util/global.ts              |  22 ++-
 .../core/src/util/ng_i18n_closure_mode.ts     |  13 +-
 .../cyclic_import/bundle.golden_symbols.json  |  15 +-
 .../hello_world/bundle.golden_symbols.json    |  15 +-
 .../injection/bundle.golden_symbols.json      |   6 -
 .../bundling/todo/bundle.golden_symbols.json  |  15 +-
 tools/public_api_guard/core/core.d.ts         |   1 +
 13 files changed, 72 insertions(+), 197 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 2335aacb34..912617f7d3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,8 +15,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "1db950bbd27fb2581866e307c0130983471d4c3cd49c46063a2503ca7b6770a4",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.29.0/rules_nodejs-0.29.0.tar.gz"],
+    sha256 = "395b7568f20822c13fc5abc65b1eced637446389181fda3a108fdd6ff2cac1e9",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.29.2/rules_nodejs-0.29.2.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index d031ac5ed3..e3007a6deb 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "1db950bbd27fb2581866e307c0130983471d4c3cd49c46063a2503ca7b6770a4",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.29.0/rules_nodejs-0.29.0.tar.gz"],
+    sha256 = "395b7568f20822c13fc5abc65b1eced637446389181fda3a108fdd6ff2cac1e9",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.29.2/rules_nodejs-0.29.2.tar.gz"],
 )
 
 # Fetch sass rules for compiling sass files
diff --git a/integration/side-effects/snapshots/core/esm2015.js b/integration/side-effects/snapshots/core/esm2015.js
index 7e58a587f5..5f8109856a 100644
--- a/integration/side-effects/snapshots/core/esm2015.js
+++ b/integration/side-effects/snapshots/core/esm2015.js
@@ -1,147 +1,3 @@
-import { Subject, Subscription } from "rxjs";
+import "rxjs";
 
 import "rxjs/operators";
-
-function getGlobal() {
-    const __globalThis = "undefined" !== typeof globalThis && globalThis;
-    const __window = "undefined" !== typeof window && window;
-    const __self = "undefined" !== typeof self && "undefined" !== typeof WorkerGlobalScope && self instanceof WorkerGlobalScope && self;
-    const __global = "undefined" !== typeof global && global;
-    return __globalThis || __global || __window || __self;
-}
-
-const _global = getGlobal();
-
-let _symbolIterator = null;
-
-function getSymbolIterator() {
-    if (!_symbolIterator) {
-        const Symbol = _global["Symbol"];
-        if (Symbol && Symbol.iterator) _symbolIterator = Symbol.iterator; else {
-            const keys = Object.getOwnPropertyNames(Map.prototype);
-            for (let i = 0; i < keys.length; ++i) {
-                const key = keys[i];
-                if ("entries" !== key && "size" !== key && Map.prototype[key] === Map.prototype["entries"]) _symbolIterator = key;
-            }
-        }
-    }
-    return _symbolIterator;
-}
-
-if ("undefined" === typeof ngI18nClosureMode) _global["ngI18nClosureMode"] = "undefined" !== typeof goog && "function" === typeof goog.getMsg;
-
-function flatten(list, dst) {
-    if (void 0 === dst) dst = list;
-    for (let i = 0; i < list.length; i++) {
-        let item = list[i];
-        if (Array.isArray(item)) {
-            if (dst === list) dst = list.slice(0, i);
-            flatten(item, dst);
-        } else if (dst !== list) dst.push(item);
-    }
-    return dst;
-}
-
-class EventEmitter extends Subject {
-    constructor(isAsync = false) {
-        super();
-        this.__isAsync = isAsync;
-    }
-    emit(value) {
-        super.next(value);
-    }
-    subscribe(generatorOrNext, error, complete) {
-        let schedulerFn;
-        let errorFn = err => null;
-        let completeFn = () => null;
-        if (generatorOrNext && "object" === typeof generatorOrNext) {
-            schedulerFn = this.__isAsync ? value => {
-                setTimeout(() => generatorOrNext.next(value));
-            } : value => {
-                generatorOrNext.next(value);
-            };
-            if (generatorOrNext.error) errorFn = this.__isAsync ? err => {
-                setTimeout(() => generatorOrNext.error(err));
-            } : err => {
-                generatorOrNext.error(err);
-            };
-            if (generatorOrNext.complete) completeFn = this.__isAsync ? () => {
-                setTimeout(() => generatorOrNext.complete());
-            } : () => {
-                generatorOrNext.complete();
-            };
-        } else {
-            schedulerFn = this.__isAsync ? value => {
-                setTimeout(() => generatorOrNext(value));
-            } : value => {
-                generatorOrNext(value);
-            };
-            if (error) errorFn = this.__isAsync ? err => {
-                setTimeout(() => error(err));
-            } : err => {
-                error(err);
-            };
-            if (complete) completeFn = this.__isAsync ? () => {
-                setTimeout(() => complete());
-            } : () => {
-                complete();
-            };
-        }
-        const sink = super.subscribe(schedulerFn, errorFn, completeFn);
-        if (generatorOrNext instanceof Subscription) generatorOrNext.add(sink);
-        return sink;
-    }
-}
-
-class QueryList {
-    constructor() {
-        this.dirty = true;
-        this._results = [];
-        this.changes = new EventEmitter();
-        this.length = 0;
-    }
-    map(fn) {
-        return this._results.map(fn);
-    }
-    filter(fn) {
-        return this._results.filter(fn);
-    }
-    find(fn) {
-        return this._results.find(fn);
-    }
-    reduce(fn, init) {
-        return this._results.reduce(fn, init);
-    }
-    forEach(fn) {
-        this._results.forEach(fn);
-    }
-    some(fn) {
-        return this._results.some(fn);
-    }
-    toArray() {
-        return this._results.slice();
-    }
-    [getSymbolIterator()]() {
-        return this._results[getSymbolIterator()]();
-    }
-    toString() {
-        return this._results.toString();
-    }
-    reset(resultsTree) {
-        this._results = flatten(resultsTree);
-        this.dirty = false;
-        this.length = this._results.length;
-        this.last = this._results[this.length - 1];
-        this.first = this._results[0];
-    }
-    notifyOnChanges() {
-        this.changes.emit(this);
-    }
-    setDirty() {
-        this.dirty = true;
-    }
-    destroy() {
-        this.changes.complete();
-        this.changes.unsubscribe();
-    }
-}
diff --git a/integration/side-effects/snapshots/core/esm5.js b/integration/side-effects/snapshots/core/esm5.js
index 9f82d57120..09cc6db200 100644
--- a/integration/side-effects/snapshots/core/esm5.js
+++ b/integration/side-effects/snapshots/core/esm5.js
@@ -3,15 +3,3 @@ import "tslib";
 import "rxjs";
 
 import "rxjs/operators";
-
-function getGlobal() {
-    var __globalThis = "undefined" !== typeof globalThis && globalThis;
-    var __window = "undefined" !== typeof window && window;
-    var __self = "undefined" !== typeof self && "undefined" !== typeof WorkerGlobalScope && self instanceof WorkerGlobalScope && self;
-    var __global = "undefined" !== typeof global && global;
-    return __globalThis || __global || __window || __self;
-}
-
-var _global = getGlobal();
-
-if ("undefined" === typeof ngI18nClosureMode) _global["ngI18nClosureMode"] = "undefined" !== typeof goog && "function" === typeof goog.getMsg;
diff --git a/modules/benchmarks/src/expanding_rows/index.html b/modules/benchmarks/src/expanding_rows/index.html
index d514d50a2f..402a1fc8d8 100644
--- a/modules/benchmarks/src/expanding_rows/index.html
+++ b/modules/benchmarks/src/expanding_rows/index.html
@@ -14,7 +14,6 @@
   <benchmark-root>loading...</benchmark-root>
 
   <script>
-    window.ngDevMode = location.hash == '#ngDevMode';
     addEventListener('DOMContentLoaded', () => {
       // DevServer has automatic bootstrap code, so if we already have <scripts> than we don't need to bootstrap
       var alreadyBootstraped = document.querySelectorAll('script').length > 1; // 1 for ourselves
diff --git a/packages/core/src/linker/query_list.ts b/packages/core/src/linker/query_list.ts
index 5152125116..1642e50184 100644
--- a/packages/core/src/linker/query_list.ts
+++ b/packages/core/src/linker/query_list.ts
@@ -12,6 +12,9 @@ import {EventEmitter} from '../event_emitter';
 import {flatten} from '../util/array_utils';
 import {getSymbolIterator} from '../util/symbol';
 
+function symbolIterator<T>(this: QueryList<T>): Iterator<T> {
+  return ((this as any as{_results: Array<T>})._results as any)[getSymbolIterator()]();
+}
 
 /**
  * An unmodifiable list of items that Angular keeps up to date when the state
@@ -50,6 +53,16 @@ export class QueryList<T>/* implements Iterable<T> */ {
   // TODO(issue/24571): remove '!'.
   readonly last !: T;
 
+  constructor() {
+    // This function should be declared on the prototype, but doing so there will cause the class
+    // declaration to have side-effects and become not tree-shakable. For this reason we do it in
+    // the constructor.
+    // [getSymbolIterator()](): Iterator<T> { ... }
+    const symbol = getSymbolIterator();
+    const proto = QueryList.prototype as any;
+    if (!proto[symbol]) proto[symbol] = symbolIterator;
+  }
+
   /**
    * See
    * [Array.map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map)
@@ -99,8 +112,6 @@ export class QueryList<T>/* implements Iterable<T> */ {
    */
   toArray(): T[] { return this._results.slice(); }
 
-  [getSymbolIterator()](): Iterator<T> { return (this._results as any)[getSymbolIterator()](); }
-
   toString(): string { return this._results.toString(); }
 
   /**
diff --git a/packages/core/src/util/global.ts b/packages/core/src/util/global.ts
index 49d5b9034d..5b26299863 100644
--- a/packages/core/src/util/global.ts
+++ b/packages/core/src/util/global.ts
@@ -15,20 +15,16 @@ declare var global: any /** TODO #9100 */;
 // Not yet available in TypeScript: https://github.com/Microsoft/TypeScript/pull/29332
 declare var globalThis: any /** TODO #9100 */;
 
-function getGlobal(): any {
-  const __globalThis = typeof globalThis !== 'undefined' && globalThis;
-  const __window = typeof window !== 'undefined' && window;
-  const __self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' &&
-      self instanceof WorkerGlobalScope && self;
-  const __global = typeof global !== 'undefined' && global;
+const __globalThis = typeof globalThis !== 'undefined' && globalThis;
+const __window = typeof window !== 'undefined' && window;
+const __self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' &&
+    self instanceof WorkerGlobalScope && self;
+const __global = typeof global !== 'undefined' && global;
 
-  // Always use __globalThis if available, which is the spec-defined global variable across all
-  // environments, then fallback to __global first, because in Node tests both __global and
-  // __window may be defined and _global should be __global in that case.
-  return __globalThis || __global || __window || __self;
-}
-
-const _global = getGlobal();
+// Always use __globalThis if available, which is the spec-defined global variable across all
+// environments, then fallback to __global first, because in Node tests both __global and
+// __window may be defined and _global should be __global in that case.
+const _global = __globalThis || __global || __window || __self;
 
 /**
  * Attention: whenever providing a new value, be sure to add an
diff --git a/packages/core/src/util/ng_i18n_closure_mode.ts b/packages/core/src/util/ng_i18n_closure_mode.ts
index 1945dae272..a966565819 100644
--- a/packages/core/src/util/ng_i18n_closure_mode.ts
+++ b/packages/core/src/util/ng_i18n_closure_mode.ts
@@ -19,9 +19,12 @@ if (typeof ngI18nClosureMode === 'undefined') {
   // These property accesses can be ignored because ngI18nClosureMode will be set to false
   // when optimizing code and the whole if statement will be dropped.
   // Make sure to refer to ngI18nClosureMode as ['ngI18nClosureMode'] for closure.
-  // tslint:disable-next-line:no-toplevel-property-access
-  global['ngI18nClosureMode'] =
-      // TODO(FW-1250): validate that this actually, you know, works.
-      // tslint:disable-next-line:no-toplevel-property-access
-      typeof goog !== 'undefined' && typeof goog.getMsg === 'function';
+  // NOTE: we need to have it in IIFE so that the tree-shaker is happy.
+  (function() {
+    // tslint:disable-next-line:no-toplevel-property-access
+    global['ngI18nClosureMode'] =
+        // TODO(FW-1250): validate that this actually, you know, works.
+        // tslint:disable-next-line:no-toplevel-property-access
+        typeof goog !== 'undefined' && typeof goog.getMsg === 'function';
+  })();
 }
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index 9fa46ba84c..5fd56e86c8 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -158,9 +158,21 @@
   {
     "name": "ViewEncapsulation"
   },
+  {
+    "name": "__global"
+  },
+  {
+    "name": "__globalThis"
+  },
+  {
+    "name": "__self"
+  },
   {
     "name": "__values"
   },
+  {
+    "name": "__window"
+  },
   {
     "name": "_currentNamespace"
   },
@@ -359,9 +371,6 @@
   {
     "name": "getElementDepthCount"
   },
-  {
-    "name": "getGlobal"
-  },
   {
     "name": "getGuardMask"
   },
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
index 08560f42bc..e11a3baabb 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -125,9 +125,21 @@
   {
     "name": "ViewEncapsulation"
   },
+  {
+    "name": "__global"
+  },
+  {
+    "name": "__globalThis"
+  },
+  {
+    "name": "__self"
+  },
   {
     "name": "__values"
   },
+  {
+    "name": "__window"
+  },
   {
     "name": "_global"
   },
@@ -251,9 +263,6 @@
   {
     "name": "getDirectiveDef"
   },
-  {
-    "name": "getGlobal"
-  },
   {
     "name": "getHighestElementOrICUContainer"
   },
diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json
index 817c2a8d75..ac75847f48 100644
--- a/packages/core/test/bundling/injection/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json
@@ -95,9 +95,6 @@
   {
     "name": "_currentInjector"
   },
-  {
-    "name": "_global"
-  },
   {
     "name": "catchInjectorError"
   },
@@ -119,9 +116,6 @@
   {
     "name": "getClosureSafeProperty"
   },
-  {
-    "name": "getGlobal"
-  },
   {
     "name": "getInheritedInjectableDef"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 494d759a4f..b96cca104a 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -302,15 +302,27 @@
   {
     "name": "__forward_ref__"
   },
+  {
+    "name": "__global"
+  },
+  {
+    "name": "__globalThis"
+  },
   {
     "name": "__read"
   },
+  {
+    "name": "__self"
+  },
   {
     "name": "__spread"
   },
   {
     "name": "__values"
   },
+  {
+    "name": "__window"
+  },
   {
     "name": "_activeStylingMapApplyFn"
   },
@@ -809,9 +821,6 @@
   {
     "name": "getErrorLogger"
   },
-  {
-    "name": "getGlobal"
-  },
   {
     "name": "getGuardMask"
   },
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 80a2574b6b..15d50079a4 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -1136,6 +1136,7 @@ export declare class QueryList<T> {
     readonly first: T;
     readonly last: T;
     readonly length: number;
+    constructor();
     destroy(): void;
     filter(fn: (item: T, index: number, array: T[]) => boolean): T[];
     find(fn: (item: T, index: number, array: T[]) => boolean): T | undefined;

From cd6fc8bf064315aca8ee93451969d68667413e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Jo=C3=A3o?= <bruno@tzadi.com>
Date: Mon, 3 Jun 2019 11:26:46 -0300
Subject: [PATCH 263/275] docs: document UrlTree in guard return type in
 cheatsheet (#30822)

Add UrlTree to the types of returned values in guard methods

PR Close #30822
---
 aio/content/guide/cheatsheet.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/aio/content/guide/cheatsheet.md b/aio/content/guide/cheatsheet.md
index cc38613cc6..577872ab9c 100644
--- a/aio/content/guide/cheatsheet.md
+++ b/aio/content/guide/cheatsheet.md
@@ -371,24 +371,24 @@ so the <code>@Directive</code> configuration applies to components as well</p>
 <td><p>The provided classes are added to the element when the <code>routerLink</code> becomes the current active route.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanActivate</b>Guard implements <b>CanActivate</b> {<br>    canActivate(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canActivate: [<b>CanActivate</b>Guard] }</code></td>
-<td><p>An interface for defining a class that the router should call first to determine if it should activate this component. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
+<td><code>class <b>CanActivate</b>Guard implements <b>CanActivate</b> {<br>    canActivate(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean|UrlTree&gt;|Promise&lt;boolean|UrlTree&gt;|boolean|UrlTree { ... }<br>}<br><br>{ path: ..., canActivate: [<b>CanActivate</b>Guard] }</code></td>
+<td><p>An interface for defining a class that the router should call first to determine if it should activate this component. Should return a boolean|UrlTree or an Observable/Promise that resolves to a boolean|UrlTree.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanDeactivate</b>Guard implements <b>CanDeactivate</b>&lt;T&gt; {<br>    canDeactivate(<br>      component: T,<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canDeactivate: [<b>CanDeactivate</b>Guard] }</code></td>
-<td><p>An interface for defining a class that the router should call first to determine if it should deactivate this component after a navigation. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
+<td><code>class <b>CanDeactivate</b>Guard implements <b>CanDeactivate</b>&lt;T&gt; {<br>    canDeactivate(<br>      component: T,<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean|UrlTree&gt;|Promise&lt;boolean|UrlTree&gt;|boolean|UrlTree { ... }<br>}<br><br>{ path: ..., canDeactivate: [<b>CanDeactivate</b>Guard] }</code></td>
+<td><p>An interface for defining a class that the router should call first to determine if it should deactivate this component after a navigation. Should return a boolean|UrlTree or an Observable/Promise that resolves to a boolean|UrlTree.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanActivateChild</b>Guard implements <b>CanActivateChild</b> {<br>    canActivateChild(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canActivateChild: [CanActivateGuard],<br>    children: ... }</code></td>
-<td><p>An interface for defining a class that the router should call first to determine if it should activate the child route. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
+<td><code>class <b>CanActivateChild</b>Guard implements <b>CanActivateChild</b> {<br>    canActivateChild(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean|UrlTree&gt;|Promise&lt;boolean|UrlTree&gt;|boolean|UrlTree { ... }<br>}<br><br>{ path: ..., canActivateChild: [CanActivateGuard],<br>    children: ... }</code></td>
+<td><p>An interface for defining a class that the router should call first to determine if it should activate the child route. Should return a boolean|UrlTree or an Observable/Promise that resolves to a boolean|UrlTree.</p>
 </td>
 </tr><tr>
 <td><code>class <b>Resolve</b>Guard implements <b>Resolve</b>&lt;T&gt; {<br>    resolve(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;any&gt;|Promise&lt;any&gt;|any { ... }<br>}<br><br>{ path: ..., resolve: [<b>Resolve</b>Guard] }</code></td>
 <td><p>An interface for defining a class that the router should call first to resolve route data before rendering the route. Should return a value or an Observable/Promise that resolves to a value.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanLoad</b>Guard implements <b>CanLoad</b> {<br>    canLoad(<br>      route: Route<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canLoad: [<b>CanLoad</b>Guard], loadChildren: ... }</code></td>
-<td><p>An interface for defining a class that the router should call first to check if the lazy loaded module should be loaded. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
+<td><code>class <b>CanLoad</b>Guard implements <b>CanLoad</b> {<br>    canLoad(<br>      route: Route<br>    ): Observable&lt;boolean|UrlTree&gt;|Promise&lt;boolean|UrlTree&gt;|boolean|UrlTree { ... }<br>}<br><br>{ path: ..., canLoad: [<b>CanLoad</b>Guard], loadChildren: ... }</code></td>
+<td><p>An interface for defining a class that the router should call first to check if the lazy loaded module should be loaded. Should return a boolean|UrlTree or an Observable/Promise that resolves to a boolean|UrlTree.</p>
 </td>
 </tr>
 </tbody></table>

From 07cd65b5ec75aee59f8fde164c41539536e1017c Mon Sep 17 00:00:00 2001
From: Sergey Volynkin <SVVolynkin@gmail.com>
Date: Sun, 2 Jun 2019 16:21:23 +0300
Subject: [PATCH 264/275] docs: fix `quickstart` link in readme (#30807)

PR Close #30807
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6693a4b272..0ad87d18a4 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,6 @@ guidelines for [contributing][contributing] and then check out one of our issues
 
 [browserstack]: https://www.browserstack.com/automate/public-build/LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06
 [contributing]: https://github.com/angular/angular/blob/master/CONTRIBUTING.md
-[quickstart]: https://angular.io/guide/quickstart
+[quickstart]: https://angular.io/start
 [changelog]: https://github.com/angular/angular/blob/master/CHANGELOG.md
 [ng]: https://angular.io

From 815443313044e0ec0ec87af588d09eda6b88f0c8 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Fri, 24 May 2019 17:47:21 +0200
Subject: [PATCH 265/275] perf(ivy): limit allocation of LQueries_ objects
 (#30664)

Before this change we would systematically call LQueries.clone() when executting
elementStart / elementContainerStart instructions. This was often unnecessary as
LQueries can be mutated under 2 conditions only:
- we are crossing an element that has directives with content queries
  (new queries must be added);
- we are descending into element hierarchy (creating a child element of an existing element)
  and the current LQueries object is tracking shallow queries (shallow queries are removed).

With this PR LQueires.clone() is only done when needed and this gratelly reduces number
of LQueries object created: in the "expanding rows" benchmark number of allocated
(and often GCed just after!) LQueries is reduced from ~100k -> ~35k. This represents
over 1MB of memory that is not allocated.

PR Close #30664
---
 .../core/src/render3/instructions/element.ts  |  5 +--
 .../render3/instructions/element_container.ts |  5 +--
 packages/core/src/render3/interfaces/query.ts | 29 ++++++++++++++---
 packages/core/src/render3/query.ts            | 31 ++++++++++++-------
 4 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index f95a582d87..1cdc428251 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -125,7 +125,7 @@ export function ɵɵelementStart(
   const currentQueries = lView[QUERIES];
   if (currentQueries) {
     currentQueries.addNode(tNode);
-    lView[QUERIES] = currentQueries.clone();
+    lView[QUERIES] = currentQueries.clone(tNode);
   }
   executeContentQueries(tView, tNode, lView);
 }
@@ -153,7 +153,8 @@ export function ɵɵelementEnd(): void {
   ngDevMode && assertNodeType(previousOrParentTNode, TNodeType.Element);
   const lView = getLView();
   const currentQueries = lView[QUERIES];
-  if (currentQueries) {
+  // Go back up to parent queries only if queries have been cloned on this element.
+  if (currentQueries && previousOrParentTNode.index === currentQueries.nodeIndex) {
     lView[QUERIES] = currentQueries.parent;
   }
 
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index 1c38196a91..456051db21 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -65,7 +65,7 @@ export function ɵɵelementContainerStart(
   const currentQueries = lView[QUERIES];
   if (currentQueries) {
     currentQueries.addNode(tNode);
-    lView[QUERIES] = currentQueries.clone();
+    lView[QUERIES] = currentQueries.clone(tNode);
   }
   executeContentQueries(tView, tNode, lView);
 }
@@ -89,7 +89,8 @@ export function ɵɵelementContainerEnd(): void {
 
   ngDevMode && assertNodeType(previousOrParentTNode, TNodeType.ElementContainer);
   const currentQueries = lView[QUERIES];
-  if (currentQueries) {
+  // Go back up to parent queries only if queries have been cloned on this element.
+  if (currentQueries && previousOrParentTNode.index === currentQueries.nodeIndex) {
     lView[QUERIES] = currentQueries.parent;
   }
 
diff --git a/packages/core/src/render3/interfaces/query.ts b/packages/core/src/render3/interfaces/query.ts
index 9aad007f98..0615ec7946 100644
--- a/packages/core/src/render3/interfaces/query.ts
+++ b/packages/core/src/render3/interfaces/query.ts
@@ -25,11 +25,32 @@ export interface LQueries {
   parent: LQueries|null;
 
   /**
-   * Ask queries to prepare copy of itself. This assures that tracking new queries on content nodes
-   * doesn't mutate list of queries tracked on a parent node. We will clone LQueries before
-   * constructing content queries.
+   * The index of the node on which this LQueries instance was created / cloned in a given LView.
+   *
+   * This index is stored to minimize LQueries cloning: we can observe that LQueries can be mutated
+   * only under 2 conditions:
+   * - we are crossing an element that has directives with content queries (new queries are added);
+   * - we are descending into element hierarchy (creating a child element of an existing element)
+   * and the current LQueries object is tracking shallow queries (shallow queries are removed).
+   *
+   * Since LQueries are not cloned systematically we need to know exactly where (on each element)
+   * cloning occurred, so we can properly restore the set of tracked queries when going up the
+   * elements hierarchy.
+   *
+   * Always set to -1 for view queries as view queries are created before we process any node in a
+   * given view.
    */
-  clone(): LQueries;
+  nodeIndex: number;
+
+  /**
+   * Ask queries to prepare a copy of itself. This ensures that:
+   * - tracking new queries on content nodes doesn't mutate list of queries tracked on a parent
+   * node;
+   * - we don't track shallow queries when descending into elements hierarchy.
+   *
+   * We will clone LQueries before constructing content queries
+   */
+  clone(tNode: TNode): LQueries;
 
   /**
    * Notify `LQueries` that a new `TNode` has been created and needs to be added to query results
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 18a5bd4183..81bb75bab1 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -25,8 +25,8 @@ import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
 import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
 import {LQueries, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
 import {CONTENT_QUERIES, HEADER_OFFSET, LView, QUERIES, TVIEW, TView} from './interfaces/view';
-import {getCurrentQueryIndex, getIsParent, getLView, isCreationMode, setCurrentQueryIndex} from './state';
-import {loadInternal} from './util/view_utils';
+import {getCurrentQueryIndex, getIsParent, getLView, getPreviousOrParentTNode, isCreationMode, setCurrentQueryIndex} from './state';
+import {isContentQueryHost, loadInternal} from './util/view_utils';
 import {createElementRef, createTemplateRef} from './view_engine_compatibility';
 
 const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4;
@@ -92,7 +92,7 @@ class LQuery<T> {
 export class LQueries_ implements LQueries {
   constructor(
       public parent: LQueries_|null, private shallow: LQuery<any>|null,
-      private deep: LQuery<any>|null) {}
+      private deep: LQuery<any>|null, public nodeIndex: number = -1) {}
 
   track<T>(queryList: QueryList<T>, predicate: Type<T>|string[], descend?: boolean, read?: Type<T>):
       void {
@@ -103,7 +103,11 @@ export class LQueries_ implements LQueries {
     }
   }
 
-  clone(): LQueries { return new LQueries_(this, null, this.deep); }
+  clone(tNode: TNode): LQueries {
+    return this.shallow !== null || isContentQueryHost(tNode) ?
+        new LQueries_(this, null, this.deep, tNode.index) :
+        this;
+  }
 
   container(): LQueries|null {
     const shallowResults = copyQueriesToContainer(this.shallow);
@@ -352,11 +356,11 @@ type QueryList_<T> = QueryList<T>& {_valuesTree: any[], _static: boolean};
  */
 function createQueryListInLView<T>(
     // TODO: "read" should be an AbstractType (FW-486)
-    lView: LView, predicate: Type<any>| string[], descend: boolean, read: any,
-    isStatic: boolean): QueryList<T> {
+    lView: LView, predicate: Type<any>| string[], descend: boolean, read: any, isStatic: boolean,
+    nodeIndex: number): QueryList<T> {
   ngDevMode && assertPreviousIsParent(getIsParent());
   const queryList = new QueryList<T>() as QueryList_<T>;
-  const queries = lView[QUERIES] || (lView[QUERIES] = new LQueries_(null, null, null));
+  const queries = lView[QUERIES] || (lView[QUERIES] = new LQueries_(null, null, null, nodeIndex));
   queryList._valuesTree = [];
   queryList._static = isStatic;
   queries.track(queryList, predicate, descend, read);
@@ -430,7 +434,7 @@ function viewQueryInternal<T>(
   }
   const index = getCurrentQueryIndex();
   const queryList: QueryList<T> =
-      createQueryListInLView<T>(lView, predicate, descend, read, isStatic);
+      createQueryListInLView<T>(lView, predicate, descend, read, isStatic, -1);
   store(index - HEADER_OFFSET, queryList);
   setCurrentQueryIndex(index + 1);
   return queryList;
@@ -465,16 +469,18 @@ export function ɵɵcontentQuery<T>(
     read: any): QueryList<T> {
   const lView = getLView();
   const tView = lView[TVIEW];
-  return contentQueryInternal(lView, tView, directiveIndex, predicate, descend, read, false);
+  const tNode = getPreviousOrParentTNode();
+  return contentQueryInternal(
+      lView, tView, directiveIndex, predicate, descend, read, false, tNode.index);
 }
 
 function contentQueryInternal<T>(
     lView: LView, tView: TView, directiveIndex: number, predicate: Type<any>| string[],
     descend: boolean,
     // TODO(FW-486): "read" should be an AbstractType
-    read: any, isStatic: boolean): QueryList<T> {
+    read: any, isStatic: boolean, nodeIndex: number): QueryList<T> {
   const contentQuery: QueryList<T> =
-      createQueryListInLView<T>(lView, predicate, descend, read, isStatic);
+      createQueryListInLView<T>(lView, predicate, descend, read, isStatic, nodeIndex);
   (lView[CONTENT_QUERIES] || (lView[CONTENT_QUERIES] = [])).push(contentQuery);
   if (tView.firstTemplatePass) {
     const tViewContentQueries = tView.contentQueries || (tView.contentQueries = []);
@@ -505,7 +511,8 @@ export function ɵɵstaticContentQuery<T>(
     read: any): void {
   const lView = getLView();
   const tView = lView[TVIEW];
-  contentQueryInternal(lView, tView, directiveIndex, predicate, descend, read, true);
+  const tNode = getPreviousOrParentTNode();
+  contentQueryInternal(lView, tView, directiveIndex, predicate, descend, read, true, tNode.index);
   tView.staticContentQueries = true;
 }
 

From 3ed7463ad73b049b7ee4fee52c4be40b05f4f843 Mon Sep 17 00:00:00 2001
From: Pandiyan Murugan <PandiyanCool@users.noreply.github.com>
Date: Tue, 4 Jun 2019 17:44:31 +0530
Subject: [PATCH 266/275] docs: rename component for constructor example
 (#30845) PR Close #30845

---
 .../examples/displaying-data/src/app/app-ctor.component.1.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aio/content/examples/displaying-data/src/app/app-ctor.component.1.ts b/aio/content/examples/displaying-data/src/app/app-ctor.component.1.ts
index 5fd9d45073..aa696a3d63 100644
--- a/aio/content/examples/displaying-data/src/app/app-ctor.component.1.ts
+++ b/aio/content/examples/displaying-data/src/app/app-ctor.component.1.ts
@@ -1,14 +1,14 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-ctor',
+  selector: 'app-root',
   template: `
     <h1>{{title}} [Ctor version]</h1>
     <h2>My favorite hero is: {{myHero}}</h2>
     `
 })
 // #docregion class
-export class AppCtorComponent {
+export class AppComponent {
   title: string;
   myHero: string;
 

From 812c231b0c08a18487c08b594b0832c93b46d261 Mon Sep 17 00:00:00 2001
From: Brandon <robertsbt@gmail.com>
Date: Thu, 30 May 2019 10:09:27 -0500
Subject: [PATCH 267/275] docs: update example dependencies to 8.x release
 (#30755)

PR Close #30755
---
 .../shared/boilerplate/cli/package.json       |  24 +-
 .../shared/boilerplate/i18n/package.json      |  24 +-
 .../boilerplate/service-worker/package.json   |  26 +-
 .../shared/boilerplate/universal/package.json |  33 +-
 aio/tools/examples/shared/package.json        |  38 +--
 aio/tools/examples/shared/yarn.lock           | 313 +++++++++++-------
 6 files changed, 257 insertions(+), 201 deletions(-)

diff --git a/aio/tools/examples/shared/boilerplate/cli/package.json b/aio/tools/examples/shared/boilerplate/cli/package.json
index c152cc733e..43774dbb37 100644
--- a/aio/tools/examples/shared/boilerplate/cli/package.json
+++ b/aio/tools/examples/shared/boilerplate/cli/package.json
@@ -12,14 +12,14 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^8.0.0-rc",
-    "@angular/common": "^8.0.0-rc",
-    "@angular/compiler": "^8.0.0-rc",
-    "@angular/core": "^8.0.0-rc",
-    "@angular/forms": "^8.0.0-rc",
-    "@angular/platform-browser": "^8.0.0-rc",
-    "@angular/platform-browser-dynamic": "^8.0.0-rc",
-    "@angular/router": "^8.0.0-rc",
+    "@angular/animations": "^8.0.0",
+    "@angular/common": "^8.0.0",
+    "@angular/compiler": "^8.0.0",
+    "@angular/core": "^8.0.0",
+    "@angular/forms": "^8.0.0",
+    "@angular/platform-browser": "^8.0.0",
+    "@angular/platform-browser-dynamic": "^8.0.0",
+    "@angular/router": "^8.0.0",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
@@ -28,10 +28,10 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.0-rc",
-    "@angular/cli": "^8.0.0-rc",
-    "@angular/compiler-cli": "^8.0.0-rc",
-    "@angular/language-service": "^8.0.0-rc",
+    "@angular-devkit/build-angular": "^0.800.0",
+    "@angular/cli": "^8.0.0",
+    "@angular/compiler-cli": "^8.0.0",
+    "@angular/language-service": "^8.0.0",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
diff --git a/aio/tools/examples/shared/boilerplate/i18n/package.json b/aio/tools/examples/shared/boilerplate/i18n/package.json
index 244ec7ffca..0dfad8564b 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/package.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/package.json
@@ -15,14 +15,14 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^8.0.0-rc",
-    "@angular/common": "^8.0.0-rc",
-    "@angular/compiler": "^8.0.0-rc",
-    "@angular/core": "^8.0.0-rc",
-    "@angular/forms": "^8.0.0-rc",
-    "@angular/platform-browser": "^8.0.0-rc",
-    "@angular/platform-browser-dynamic": "^8.0.0-rc",
-    "@angular/router": "^8.0.0-rc",
+    "@angular/animations": "^8.0.0",
+    "@angular/common": "^8.0.0",
+    "@angular/compiler": "^8.0.0",
+    "@angular/core": "^8.0.0",
+    "@angular/forms": "^8.0.0",
+    "@angular/platform-browser": "^8.0.0",
+    "@angular/platform-browser-dynamic": "^8.0.0",
+    "@angular/router": "^8.0.0",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
@@ -30,10 +30,10 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.0-rc",
-    "@angular/cli": "^8.0.0-rc",
-    "@angular/compiler-cli": "^8.0.0-rc",
-    "@angular/language-service": "^8.0.0-rc",
+    "@angular-devkit/build-angular": "^0.800.0",
+    "@angular/cli": "^8.0.0",
+    "@angular/compiler-cli": "^8.0.0",
+    "@angular/language-service": "^8.0.0",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
diff --git a/aio/tools/examples/shared/boilerplate/service-worker/package.json b/aio/tools/examples/shared/boilerplate/service-worker/package.json
index 8f526d530d..28317ef6e3 100644
--- a/aio/tools/examples/shared/boilerplate/service-worker/package.json
+++ b/aio/tools/examples/shared/boilerplate/service-worker/package.json
@@ -12,15 +12,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^8.0.0-rc",
-    "@angular/common": "^8.0.0-rc",
-    "@angular/compiler": "^8.0.0-rc",
-    "@angular/core": "^8.0.0-rc",
-    "@angular/forms": "^8.0.0-rc",
-    "@angular/platform-browser": "^8.0.0-rc",
-    "@angular/platform-browser-dynamic": "^8.0.0-rc",
-    "@angular/router": "^8.0.0-rc",
-    "@angular/service-worker": "^8.0.0-rc",
+    "@angular/animations": "^8.0.0",
+    "@angular/common": "^8.0.0",
+    "@angular/compiler": "^8.0.0",
+    "@angular/core": "^8.0.0",
+    "@angular/forms": "^8.0.0",
+    "@angular/platform-browser": "^8.0.0",
+    "@angular/platform-browser-dynamic": "^8.0.0",
+    "@angular/router": "^8.0.0",
+    "@angular/service-worker": "^8.0.0",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
@@ -28,10 +28,10 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.0-rc",
-    "@angular/cli": "^8.0.0-rc",
-    "@angular/compiler-cli": "^8.0.0-rc",
-    "@angular/language-service": "^8.0.0-rc",
+    "@angular-devkit/build-angular": "^0.800.0",
+    "@angular/cli": "^8.0.0",
+    "@angular/compiler-cli": "^8.0.0",
+    "@angular/language-service": "^8.0.0",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
diff --git a/aio/tools/examples/shared/boilerplate/universal/package.json b/aio/tools/examples/shared/boilerplate/universal/package.json
index 818d95bb51..d8525c3064 100644
--- a/aio/tools/examples/shared/boilerplate/universal/package.json
+++ b/aio/tools/examples/shared/boilerplate/universal/package.json
@@ -16,18 +16,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^8.0.0-rc",
-    "@angular/common": "^8.0.0-rc",
-    "@angular/compiler": "^8.0.0-rc",
-    "@angular/core": "^8.0.0-rc",
-    "@angular/forms": "^8.0.0-rc",
-    "@angular/http": "^8.0.0-rc",
-    "@angular/platform-browser": "^8.0.0-rc",
-    "@angular/platform-browser-dynamic": "^8.0.0-rc",
-    "@angular/router": "^8.0.0-rc",
-    "@nguniversal/common": "^8.0.0-rc",
-    "@nguniversal/express-engine": "^8.0.0-rc",
-    "@nguniversal/module-map-ngfactory-loader": "^8.0.0-rc",
+    "@angular/animations": "^8.0.0",
+    "@angular/common": "^8.0.0",
+    "@angular/compiler": "^8.0.0",
+    "@angular/core": "^8.0.0",
+    "@angular/forms": "^8.0.0",
+    "@angular/platform-browser": "^8.0.0",
+    "@angular/platform-browser-dynamic": "^8.0.0",
+    "@angular/router": "^8.0.0",
+    "@nguniversal/common": "^8.0.0-rc.1",
+    "@nguniversal/express-engine": "^8.0.0-rc.1",
+    "@nguniversal/module-map-ngfactory-loader": "^8.0.0-rc.1",
     "angular-in-memory-web-api": "^0.8.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
@@ -35,11 +34,11 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.0-rc",
-    "@angular/cli": "^8.0.0-rc",
-    "@angular/compiler-cli": "^8.0.0-rc",
-    "@angular/language-service": "^8.0.0-rc",
-    "@angular/platform-server": "^8.0.0-rc",
+    "@angular-devkit/build-angular": "^0.800.0",
+    "@angular/cli": "^8.0.0",
+    "@angular/compiler-cli": "^8.0.0",
+    "@angular/language-service": "^8.0.0",
+    "@angular/platform-server": "^8.0.0",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index efe7754660..e71f7b2528 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -18,20 +18,20 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "8.0.0-rc.2",
-    "@angular/common": "8.0.0-rc.2",
-    "@angular/compiler": "8.0.0-rc.2",
-    "@angular/core": "8.0.0-rc.2",
-    "@angular/elements": "8.0.0-rc.2",
-    "@angular/forms": "8.0.0-rc.2",
-    "@angular/platform-browser": "8.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "8.0.0-rc.2",
-    "@angular/router": "8.0.0-rc.2",
-    "@angular/service-worker": "8.0.0-rc.2",
-    "@angular/upgrade": "8.0.0-rc.2",
-    "@nguniversal/common": "8.0.0-rc.0",
-    "@nguniversal/express-engine": "8.0.0-rc.0",
-    "@nguniversal/module-map-ngfactory-loader": "^8.0.0-rc.0",
+    "@angular/animations": "^8.0.0",
+    "@angular/common": "^8.0.0",
+    "@angular/compiler": "^8.0.0",
+    "@angular/core": "^8.0.0",
+    "@angular/elements": "^8.0.0",
+    "@angular/forms": "^8.0.0",
+    "@angular/platform-browser": "^8.0.0",
+    "@angular/platform-browser-dynamic": "^8.0.0",
+    "@angular/router": "^8.0.0",
+    "@angular/service-worker": "^8.0.0",
+    "@angular/upgrade": "^8.0.0",
+    "@nguniversal/common": "^8.0.0-rc.1",
+    "@nguniversal/express-engine": "^8.0.0-rc.1",
+    "@nguniversal/module-map-ngfactory-loader": "^8.0.0-rc.1",
     "angular-in-memory-web-api": "github:brandonroberts/in-memory-web-api-bazel#50a34d8",
     "core-js": "^2.5.4",
     "express": "^4.14.1",
@@ -42,11 +42,11 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.800.0-rc.3",
-    "@angular/cli": "8.0.0-rc.3",
-    "@angular/compiler-cli": "8.0.0-rc.2",
-    "@angular/language-service": "8.0.0-rc.2",
-    "@angular/platform-server": "8.0.0-rc.2",
+    "@angular-devkit/build-angular": "0.800.0",
+    "@angular/cli": "^8.0.0",
+    "@angular/compiler-cli": "^8.0.0",
+    "@angular/language-service": "^8.0.0",
+    "@angular/platform-server": "^8.0.0",
     "@types/angular": "^1.6.47",
     "@types/angular-animate": "^1.5.10",
     "@types/angular-mocks": "^1.6.0",
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index 2b11c26ce5..ff015fb6de 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -2,24 +2,24 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.800.0-rc.3":
-  version "0.800.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.0-rc.3.tgz#71043979d63bbf45d5b1cfd3d0d6feaee6399388"
-  integrity sha512-nX3sIDj7J3y5R6Hzsf052tfs5Fx+QE3KBv7u1prfaqVX9i5EnBJZeHAbwmBFPLUlhgrqp0azwwD4L2RHpPuicA==
+"@angular-devkit/architect@0.800.0":
+  version "0.800.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.0.tgz#2f2ce1178b12b0c0fde455d00def60104b9cd08e"
+  integrity sha512-haXTS9EDaJfKyYiFylK2hObJH5DVGhX3OEn3OC7XUVlfKV3GRmC6NKXPjnxcN0wWP5zIV1c4xuB2N64mcxSnaA==
   dependencies:
-    "@angular-devkit/core" "8.0.0-rc.3"
+    "@angular-devkit/core" "8.0.0"
     rxjs "6.4.0"
 
-"@angular-devkit/build-angular@0.800.0-rc.3":
-  version "0.800.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.0-rc.3.tgz#e71b2362d66d5dbd6f13766481abbb1b160939f0"
-  integrity sha512-MlKd3nMYixXgH7DgS+eO2zBzOA/GHSuEslycH2aAmLmTRYpnLaICTMenJWB2WRkndhaYlY7SEDV2nY4jQPal0g==
+"@angular-devkit/build-angular@0.800.0":
+  version "0.800.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.0.tgz#6be1a0268daeadc7f07a73f1a1ec2759e4a0965b"
+  integrity sha512-JO9oT1VMhjuXF+OwLMBTMdRrS0jC2zIThO9UZYpE8oTtkL+17ra+5SN/fFg+2L7rx4kLUWDzcZGaVp9yTptXxw==
   dependencies:
-    "@angular-devkit/architect" "0.800.0-rc.3"
-    "@angular-devkit/build-optimizer" "0.800.0-rc.3"
-    "@angular-devkit/build-webpack" "0.800.0-rc.3"
-    "@angular-devkit/core" "8.0.0-rc.3"
-    "@ngtools/webpack" "8.0.0-rc.3"
+    "@angular-devkit/architect" "0.800.0"
+    "@angular-devkit/build-optimizer" "0.800.0"
+    "@angular-devkit/build-webpack" "0.800.0"
+    "@angular-devkit/core" "8.0.0"
+    "@ngtools/webpack" "8.0.0"
     ajv "6.10.0"
     autoprefixer "9.5.1"
     browserslist "4.5.5"
@@ -65,30 +65,30 @@
     webpack-subresource-integrity "1.1.0-rc.6"
     worker-plugin "3.1.0"
 
-"@angular-devkit/build-optimizer@0.800.0-rc.3":
-  version "0.800.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.0-rc.3.tgz#d320cea2c07f373dd618f75d0dd60a29e5d5f578"
-  integrity sha512-pCKssuGq/YX6AyG8od8t781PbpQhJl3bH8trKYRuTkfNnrErN13Ebl1WMngu0cs4BnVsreUnI6x9ZZv8YxD4Ng==
+"@angular-devkit/build-optimizer@0.800.0":
+  version "0.800.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.0.tgz#c2c8d5966801e243bf25d47b704b5b4de7cbdb3f"
+  integrity sha512-Cex/BynswHw+pvhiAwHlW51PFerGoa6J+wR93Te/4yIiCrX6KzWy6/v0RO5eY+iuebAr5QZDezcofB0Eg5yjiA==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.800.0-rc.3":
-  version "0.800.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.0-rc.3.tgz#b35eb5ba98f7744737be884e1e38d4e707bb9dc7"
-  integrity sha512-h4gCBu6wENyetAxHCGT09UGXUTM+4doWLAo7n/MjEylZEfOX82xo6ylQUPzCEEiSJ6wHd+Zvcsl98ftbRPa7KA==
+"@angular-devkit/build-webpack@0.800.0":
+  version "0.800.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.0.tgz#304702b5cfcd6f4e4a578e9b9daccd8d9085eb2a"
+  integrity sha512-7lPbO1u6MMqU9G7kKWiELdFDqQGLuuiK6muqmO+nct8o1m5XpJ33HHfkxpF+nrt1qjKE1ZVCerAu0fNeaTyK0g==
   dependencies:
-    "@angular-devkit/architect" "0.800.0-rc.3"
-    "@angular-devkit/core" "8.0.0-rc.3"
+    "@angular-devkit/architect" "0.800.0"
+    "@angular-devkit/core" "8.0.0"
     rxjs "6.4.0"
     webpack-merge "4.2.1"
 
-"@angular-devkit/core@8.0.0-rc.3":
-  version "8.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0-rc.3.tgz#a5e10e941d8a046abda9046e816d45694703c695"
-  integrity sha512-5PmX42/XOzPSqhIZBtXyozBN01Qpagj3YO0+ToKPDY+veGEUonPhz1jBiJ639NBldlGW1BBdQczpGZNg3uJj9A==
+"@angular-devkit/core@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0.tgz#a0ca65d8d0f928db9288316b1f3346d21f722213"
+  integrity sha512-wYf4zzpYj5Y673DG8iteK0GsDDuXBKN/TOXm4lUwmXcz8QHTD+BfR6qA5TBDqlMGpU7CP1/0vgbv2px17CDETQ==
   dependencies:
     ajv "6.10.0"
     fast-json-stable-stringify "2.0.0"
@@ -96,31 +96,31 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@8.0.0-rc.3":
-  version "8.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0-rc.3.tgz#754db2735863393066a7dd88915b5b594ccde4b8"
-  integrity sha512-u08GNDCRbm4fYYilmnT27Pp6QW/FxD7W9bpUH8Kp4i6r0f4uBuYQiQT1x6celTwj8Bh1fQqCq/kM/lAG0dd5Zg==
+"@angular-devkit/schematics@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0.tgz#53d14646c6286b0397417990fc83e3e9a6ecf233"
+  integrity sha512-IXJOs/DkDqNbfG76sNNY5ePZ37rjkMUopmtvhN6/U1hQFwTpGa9N0bCHFphcKraXeS6Jfox5XwFEStc/1xyhfw==
   dependencies:
-    "@angular-devkit/core" "8.0.0-rc.3"
+    "@angular-devkit/core" "8.0.0"
     rxjs "6.4.0"
 
-"@angular/animations@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-rc.2.tgz#aef2683aba35498fe26253bf8f461a1658864e49"
-  integrity sha512-XTT7Eif6Km6MSbLr6qlCmx8vjRgx/Hp5Hv1WnnPtRFt8XeidYGGYIq2si3CxQ2xBjEO3OpNbPqtYvZKH1yuBdA==
+"@angular/animations@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
+  integrity sha512-hggSRi83rmocLwzrKZtmFcqPdivKSJqp2yiYaiNmJ2yQWJ1JW/Lurypv9H347RWxmwCCwC2kV8embTGbOXIFDQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@8.0.0-rc.3":
-  version "8.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.0-rc.3.tgz#88f030c3ed682717ea318210f4460e9fdc4a9799"
-  integrity sha512-yY72F9wnsvrtgSkmNA1KIyx6eTRUkLaOcpyfzSPNiIHxWCy8pZvA6TbY49bBNFUatV677RuyMS0XVjww0viVxw==
+"@angular/cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.0.tgz#0f65f60e8714b7b99f9425b862221e818959b0ac"
+  integrity sha512-F7zdAazejA94WKXULLWs0cj76/LkGx2Jb+yGE7QWx3jkp5j18KI3jTU+h9UOtxk0zgV4oSy9AQpJQVZFPZPQFA==
   dependencies:
-    "@angular-devkit/architect" "0.800.0-rc.3"
-    "@angular-devkit/core" "8.0.0-rc.3"
-    "@angular-devkit/schematics" "8.0.0-rc.3"
-    "@schematics/angular" "8.0.0-rc.3"
-    "@schematics/update" "0.800.0-rc.3"
+    "@angular-devkit/architect" "0.800.0"
+    "@angular-devkit/core" "8.0.0"
+    "@angular-devkit/schematics" "8.0.0"
+    "@schematics/angular" "8.0.0"
+    "@schematics/update" "0.800.0"
     "@yarnpkg/lockfile" "1.1.0"
     debug "^4.1.1"
     ini "1.3.5"
@@ -128,22 +128,23 @@
     npm-package-arg "6.1.0"
     open "6.2.0"
     pacote "9.5.0"
+    read-package-tree "5.2.2"
     semver "6.0.0"
     symbol-observable "1.2.0"
     universal-analytics "^0.4.20"
     uuid "^3.3.2"
 
-"@angular/common@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-rc.2.tgz#77b2da22cb11bf2039799d56ec2fb7c4f51a1374"
-  integrity sha512-/MUZhebMAkAwV8jkimBONN2eOQ2/5qO54ZvPypyy2tEHk69JRNLFjREaR+VU8yGlS/1MU6jTYxyfRW2c8ggLzA==
+"@angular/common@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0.tgz#700aeda9be8af96692fce0ea6bf6157f7c874c0e"
+  integrity sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-rc.2.tgz#a3ef74f3e4ea448ccf1387c18c32fc664b67b2e1"
-  integrity sha512-lLhedaTQ08/i4aysCPpTYbAP0/8T5/EHE79FByp/7XxqRuQxcXkFJujQT1Q/KReKa0gA9JEYD4I1eBJpNYyMLQ==
+"@angular/compiler-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0.tgz#b53ebb5accc34a68bf7a63d16130ca7c568f8a51"
+  integrity sha512-Z0U0Ih8A7V3J1gq7AXnXbrGAD2ERmz7JbREJJRHDWiUNxIqGQiV3Odo1V8FL5n/cKvLwSYM2Ubvk10gb0+3njA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -157,80 +158,80 @@
     tslib "^1.9.0"
     yargs "13.1.0"
 
-"@angular/compiler@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-rc.2.tgz#8395c20d2d7e93c6941a45b039e03ae7a6277797"
-  integrity sha512-/NR0EN6wjit2mfgOhWirOjKp+s7lO1QSKhzK3TjYCda1L7Pijo29s3BGMWUSPCRno8zNH5o7Q0mWCC55MBGB4w==
+"@angular/compiler@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0.tgz#302c987737e1473db3a113ff70fbbb315aa41b58"
+  integrity sha512-4rKsVFMNykF83tPL1VE1+j9kZ3cWHUsLOAB/VqmF64EcR/GsbjKog2v23rSso5kqUtPiVq/FWGYllW6qMdxtJA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-rc.2.tgz#800fd49bbc176f7ee064375b726503c5e6c8387c"
-  integrity sha512-ImXzoQk8U3IiL75dJWnO/aIGfaExgiqDc6GJYgQ8PvB7ZUkdUOj/a+jd6asMvE52VZJkof5XShhdonTScPcdUA==
+"@angular/core@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0.tgz#bf7a582b818e9181d830219907470e2b865ba32f"
+  integrity sha512-mrkP1PTzqCmZGLYll+TDyawLXHzi+FcRPqSuRxCmDMthUUE93SLXT2yISDkx9aMPtFKgFr6KfrIkKuCz16BP/g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/elements@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-rc.2.tgz#84ca2aadff66bfcd3c8042492a0c6b87a6a749fa"
-  integrity sha512-7KVPDSGXo33WD+ZQHjmvSXyBa6az6MHIQo3I+wRKUB9pBZNqMa2Dcb7FQp7fq3tQTEpOW6fO52ozxAZ/ybozxA==
+"@angular/elements@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0.tgz#7d25f95ba6854adb7361f106701cb1280394867f"
+  integrity sha512-vDs/O/9RNpmXaGJjmtFZ6MNFr2rqfB2qgq8tDcYkY7bAF11ulfwI2OXsI2vFnf4/qBlstdwXTmI5zar+ZU6MGA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-rc.2.tgz#f4db4653470b74cd55508aa83da761309a1d341d"
-  integrity sha512-rjjGNVaxwOayuZCpsG8V13RK/h7S6v5ItzG6Ai1agO/em4/riNhEP3+BvxM4Rs1v4AfGOd+LhOeLt5qptj0JKA==
+"@angular/forms@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0.tgz#6d636c4f83004290e1a5732a05e87148aaf6ed64"
+  integrity sha512-T6XdG3mALWzvnrN3fA1hAmfwvraiF1SPMWNXgPk2riuMf8CFdoro+tQZ4eo1islHrTTw5QzmqN8JJALfhAG6bg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0-rc.2.tgz#5b8fd13b7cd9e7cc1c097f92749f05e72b1c7e47"
-  integrity sha512-PXsntGd053iiM9lJPo7jmjhd5dp6AxugEC4WDTXimZ3vK2Hzv53CnKuVTUGcTWjwazbKAEyG0jiUl4VXptwTAA==
+"@angular/language-service@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0.tgz#1ee4ce5003897cad53597da28f4c94fe30519bfb"
+  integrity sha512-vGk14oWroEo6ycO4cooznx57nn2sASmCQ/sdE8UVwySUKl940TsVzijgaGqapTepFof9sMqN77y2G15eRKQeAQ==
 
-"@angular/platform-browser-dynamic@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-rc.2.tgz#86e8e227f19aa9c6ef4439623ce6cf7f2b0cd3b1"
-  integrity sha512-c4QXgAikQx25AOnNiQUOe/yNJunR95rfTJ5yApcNU76eeCMG9KLFNGGQTg+PmcxZ6UMcw9zp2Tck9vjSb2BZYg==
+"@angular/platform-browser-dynamic@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0.tgz#c15f394579ff44f3752033de58edc1afa5065d59"
+  integrity sha512-dx7W7JoSFbsveexjZ/BPlsXbMDLWVLmRCo7IqLvibMrTbdpaaOCNJIXJk1X+f7JJrQ7SwlZaVkoLCMoDWw6fmA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-rc.2.tgz#b40fa05fd32422be499ab3986bc3031374f7c5bc"
-  integrity sha512-ErzIDckIqic9rmqMFk4scRX+lo7AWifOP+IOCot1KGPdQ7+CP/h/neJ9fiIzYTSDYUm5xk5i+2aW+2SWRJYQdA==
+"@angular/platform-browser@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0.tgz#fc7c55a0483e67e5606e499c129fda60ae8d4363"
+  integrity sha512-fTD+pTMbq+On9Uv3VXiei2lfuX7GX31dngm/Y4yWTFeW6eXy0+7kkfflzpLOb0hykCZvcXzarqCuEBBYNLrrOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-rc.2.tgz#3f583f4e4fd393218b9e14ab68b179279e9aa86d"
-  integrity sha512-5MVHNrazIw/WJ7ODah8kUY3AwXvw2HGscUUCW+sfkzJ7QqkWet7B1EExVEp708g/kooqyl92hjbFzTScXv4OCA==
+"@angular/platform-server@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0.tgz#87e80acba6b09955046dc0a9da7cd6b2e005061a"
+  integrity sha512-pA6m1okOfyy2qH5A6jUxrhx6z7eAG+ne7IM+j/6JUBDjp4KO9BC84aa/xfpZq5dsskl8E8II9c4hUKocMyeRjA==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-rc.2.tgz#e0e4636f56fc08760863486f45f203bb9b00543e"
-  integrity sha512-7NnRdEykm0FJf/SHjUWz3cgGDtW5KM2gKm8it8V8azr3vIiMRYyqhDqCKkhutjt7C+yKNotB5M7Da9uYf0n/xQ==
+"@angular/router@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0.tgz#26094fd473e17441b0ae8af4883ec1b4ea3ad569"
+  integrity sha512-DGUTb8qpndE5m716xh00GxuC8o7qamlqbUruGB+SQD6ynU7s5yLGxtKffxqb1BT63+YewpsVxc2Koruvb1qjDw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-rc.2.tgz#e73374fe4ccd8c15790f007832a5e60576ed85d9"
-  integrity sha512-uudl7+P9Xov9naoW7Ruv0rvvp+jYWe3P3OOpRul8X6tTYarKnorj3F44Y5GoNO5Xxjp0psPSD558rXrrIBt98w==
+"@angular/service-worker@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0.tgz#5cb55bc39b29e318f5d72c1223a966c088f18568"
+  integrity sha512-MrR6Xb0X0+qO+bbdGasg7+xEvH7rPhgLpDn9FF/RwMMzj4qQmeJw9uRSJe9xMR6n0gNS7+cH8RptivOanY1QjQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/upgrade@8.0.0-rc.2":
-  version "8.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-8.0.0-rc.2.tgz#b95187a355afc3814bcb7d23d1af428047745850"
-  integrity sha512-I89l3PlrCRDDJyETbDs3BkUuLcjcLsITp4zI0SnriyYPHqKxaaC2QjCpJ/CYdk8LAuiQBIv9M/tK3o6Ow1d9qQ==
+"@angular/upgrade@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-8.0.0.tgz#7a756815c553350ba4cd64a0275ac6fc14286898"
+  integrity sha512-HRL99P13Mql3/kyrX/XUHqA8fdXC6QAmEnbcatAyCq6BGjJ047z1EFv/A6LHXXN5GFAgziyQbEqw3CnhjUeRVw==
   dependencies:
     tslib "^1.9.0"
 
@@ -312,47 +313,47 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@ngtools/webpack@8.0.0-rc.3":
-  version "8.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.0-rc.3.tgz#9bbc52ecec8edf54e41f94935b9f4a05cb29d71c"
-  integrity sha512-XD2S0t1MhvXTJ3mksIgiSqFeUkXlWcN0hVQVjAxrUIthNI87asirYtcPryDDz+zmrhLM0f2HGJ8cU9bZgmyQ0Q==
+"@ngtools/webpack@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.0.tgz#1a842f14b80f5430358374d0150659cb029a0198"
+  integrity sha512-IbljboxtAde95VbxpmCLzVMA9SrPPCFsBsDu2bmCjRGRSjnMVbXNPFm3fel4AxjT+St650w8RLJ4h6Fb+AV/Aw==
   dependencies:
-    "@angular-devkit/core" "8.0.0-rc.3"
+    "@angular-devkit/core" "8.0.0"
     enhanced-resolve "4.1.0"
     rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
-"@nguniversal/common@8.0.0-rc.0":
-  version "8.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-8.0.0-rc.0.tgz#92ea2dbe02a72c0c20b9be9172f4c329f0492ed4"
-  integrity sha512-i9DnPuQC2bixU1p7wBl1Cb9DJGy+o4YVMrunRWUqqwVXx/7TjMQDVQV4J9Cy1uUCJ1mQ2TkmM41BRAiBJbCojQ==
+"@nguniversal/common@^8.0.0-rc.1":
+  version "8.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-8.0.0-rc.1.tgz#21072437251765864d74add678b3a3540c4611aa"
+  integrity sha512-J/oNhuWFroB1JAWrXgRHFCdbYQ/XTWJxyUOi7pUaWfdF+kudjKFEVc2TARBmPSGEizHxkTIkysVHT817/L3lXQ==
 
-"@nguniversal/express-engine@8.0.0-rc.0":
-  version "8.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-8.0.0-rc.0.tgz#ecf86f8cb433e28a29af3cf6a01cc6b6dc00e32c"
-  integrity sha512-iSDeu5TwNw7KjQQu5N+UUa4ie04gpa0LpBFPkci9ZRGgaiRbwV4Z/qNmHe2MWI7o4k6xaZddDKC5ixGZ7Lo1Cw==
+"@nguniversal/express-engine@^8.0.0-rc.1":
+  version "8.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-8.0.0-rc.1.tgz#95f05b6fdac036f0deda7813e8ee08fa4b4edfd2"
+  integrity sha512-WGJZTxkCMgDHK3UQHi6h7AL9Us7Vroz+pAS60lKJ0oNUCxoJ9S+i4jXfb6rtR5DtOTBqUy8O8fQ0U0HZOhhoWA==
 
-"@nguniversal/module-map-ngfactory-loader@^8.0.0-rc.0":
-  version "8.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@nguniversal/module-map-ngfactory-loader/-/module-map-ngfactory-loader-8.0.0-rc.0.tgz#888d9c3ec5498acc4c6357eac7bcdcd436007558"
-  integrity sha512-Z9WbOr3XcNeLNeg7P3VBKVJN2yEM9zYlr+Nvdxhw28k1xJa0gH42G35jb9mETgbWVqOq0njT5++fouhdzEwaOQ==
+"@nguniversal/module-map-ngfactory-loader@^8.0.0-rc.1":
+  version "8.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@nguniversal/module-map-ngfactory-loader/-/module-map-ngfactory-loader-8.0.0-rc.1.tgz#ca82a170fe72057b2379a55147580803c951319e"
+  integrity sha512-dPac8uahg4XHSvrXP0/XkU/LaFhAHJ8N9h93ttXfrEXNMukarOmbyKzAuX9DVjcE6+lll1UCZtsEweRvQBZPbw==
 
-"@schematics/angular@8.0.0-rc.3":
-  version "8.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0-rc.3.tgz#26f253e882173a78858e999409e64844b7030ddd"
-  integrity sha512-IuunKeNof7QL7aj3X56lS5KP28asmN18G9js2m/XTpyIKOX053kGppwWfBULmDnGMd4UR1+XU/xmIFQUq7vurQ==
+"@schematics/angular@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0.tgz#47954888fb8acbc3600235db7a46229c47fe5d9c"
+  integrity sha512-c/cFpe+u7Xh4xX3/kn9BSRY4YhdO0OsDbRK0pGLDJFFs5JGvwoURtNXn4/4dVlsj3PWyNhxK0Ljl3dyw3NQBHA==
   dependencies:
-    "@angular-devkit/core" "8.0.0-rc.3"
-    "@angular-devkit/schematics" "8.0.0-rc.3"
+    "@angular-devkit/core" "8.0.0"
+    "@angular-devkit/schematics" "8.0.0"
 
-"@schematics/update@0.800.0-rc.3":
-  version "0.800.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.0-rc.3.tgz#2cd33c21ed2ef82320f43ae3701945737f994e1a"
-  integrity sha512-H7beN0qLdqNX9WbgvBVwVN/WwXhmbBaZEDkclzMz8RivjBwX08ZA5HbDvwPU7oU5pYT2hpdaYpNuZFHxfz5EFg==
+"@schematics/update@0.800.0":
+  version "0.800.0"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.0.tgz#dddf09764f1917a1f42fea61af2520b196cdbfd0"
+  integrity sha512-StheH+k4GCaHqmtDsHLSFmxu8SCDJVhZTXpz2zFAVaVXDh/ABS2Dt7I7SmEMGkUHcPA+u83sbZVBIacw2QfybQ==
   dependencies:
-    "@angular-devkit/core" "8.0.0-rc.3"
-    "@angular-devkit/schematics" "8.0.0-rc.3"
+    "@angular-devkit/core" "8.0.0"
+    "@angular-devkit/schematics" "8.0.0"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.5.0"
@@ -942,7 +943,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@~2.0.3:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -2236,6 +2237,11 @@ debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2371,6 +2377,14 @@ dev-ip@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -5244,6 +5258,16 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
+normalize-package-data@^2.0.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
 normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -6145,6 +6169,29 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6192,6 +6239,16 @@ readable-stream@~2.0.6:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"

From 4da5e9a156868097d352f567c401528d2f945f47 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 26 May 2019 11:45:45 +0200
Subject: [PATCH 268/275] fix(ivy): type checking - apply attribute to property
 name mapping (#30675)

Some HTML attributes don't correspond to their DOM property name, in which
case the runtime will apply the appropriate transformation when assigning
a property using its attribute name. One example of this is the `for`
attribute, for which the DOM property is named `htmlFor`.

The type-checking machinery in ngtsc must also take this mapping into
account, as it generates type-check code in which unclaimed property bindings
are assigned to properties of (subtypes of) `HTMLElement`.

Fixes #30607
Fixes FW-1327

PR Close #30675
---
 .../src/ngtsc/typecheck/src/type_check_block.ts  | 16 +++++++++++++++-
 .../typecheck/test/type_check_block_spec.ts      |  5 +++++
 packages/core/src/render3/instructions/shared.ts |  6 ++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
index 7ee4cd8670..34ceffb1f0 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
@@ -287,6 +287,19 @@ class TcbDirectiveOp extends TcbOp {
   }
 }
 
+/**
+ * Mapping between attributes names that don't correspond to their element property names.
+ * Note: this mapping has to be kept in sync with the equally named mapping in the runtime.
+ */
+const ATTR_TO_PROP: {[name: string]: string} = {
+  'class': 'className',
+  'for': 'htmlFor',
+  'formaction': 'formAction',
+  'innerHtml': 'innerHTML',
+  'readonly': 'readOnly',
+  'tabindex': 'tabIndex',
+};
+
 /**
  * A `TcbOp` which generates code to check "unclaimed inputs" - bindings on an element which were
  * not attributed to any directive or component, and are instead processed against the HTML element
@@ -324,7 +337,8 @@ class TcbUnclaimedInputsOp extends TcbOp {
       if (binding.type === BindingType.Property) {
         if (binding.name !== 'style' && binding.name !== 'class') {
           // A direct binding to a property.
-          const prop = ts.createPropertyAccess(elId, binding.name);
+          const propertyName = ATTR_TO_PROP[binding.name] || binding.name;
+          const prop = ts.createPropertyAccess(elId, propertyName);
           const assign = ts.createBinary(prop, ts.SyntaxKind.EqualsToken, expr);
           this.scope.addStatement(ts.createStatement(assign));
         } else {
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
index 84887b8c23..e17e4f1a02 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
@@ -40,6 +40,11 @@ describe('type check blocks', () => {
     expect(tcb(TEMPLATE)).toContain('ctx.a[ctx.b];');
   });
 
+  it('should translate unclaimed bindings to their property equivalent', () => {
+    const TEMPLATE = `<label [for]="'test'"></label>`;
+    expect(tcb(TEMPLATE)).toContain('_t1.htmlFor = "test";');
+  });
+
   it('should generate a forward element reference correctly', () => {
     const TEMPLATE = `
       {{ i.value }}
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 948c3617d5..41ebfb15b2 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -765,8 +765,10 @@ export function generatePropertyAliases(tNode: TNode, direction: BindingDirectio
 }
 
 /**
-* Mapping between attributes names that don't correspond to their element property names.
-*/
+ * Mapping between attributes names that don't correspond to their element property names.
+ * Note: this mapping has to be kept in sync with the equally named mapping in the template
+ * type-checking machinery of ngtsc.
+ */
 const ATTR_TO_PROP: {[name: string]: string} = {
   'class': 'className',
   'for': 'htmlFor',

From 456f2e70af222f3970efce5e23e989d31f2b1ed1 Mon Sep 17 00:00:00 2001
From: JoostK <joost.koehoorn@gmail.com>
Date: Sun, 26 May 2019 12:14:29 +0200
Subject: [PATCH 269/275] fix(ivy): type checking - handle $implicit
 ng-template variables (#30675)

When an `ng-template` element has a variable declaration without a value,
it is assigned the value of the `$implicit` property in the embedded view's
context. The template compiler inserts a property access to `$implicit` for
template variables without a value, however the type-check code generation
logic did not. This resulted in incorrect type-checking code being generated.

Fixes FW-1326

PR Close #30675
---
 .../src/ngtsc/typecheck/src/type_check_block.ts        |  2 +-
 .../src/ngtsc/typecheck/test/type_check_block_spec.ts  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
index 34ceffb1f0..cb568f9911 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
@@ -122,7 +122,7 @@ class TcbVariableOp extends TcbOp {
     const id = this.tcb.allocateId();
     const initializer = ts.createPropertyAccess(
         /* expression */ ctx,
-        /* name */ this.variable.value);
+        /* name */ this.variable.value || '$implicit');
 
     // Declare the variable, and return its identifier.
     this.scope.addStatement(tsCreateVariable(id, initializer));
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
index e17e4f1a02..d215831881 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
@@ -45,6 +45,16 @@ describe('type check blocks', () => {
     expect(tcb(TEMPLATE)).toContain('_t1.htmlFor = "test";');
   });
 
+  it('should handle implicit vars on ng-template', () => {
+    const TEMPLATE = `<ng-template let-a></ng-template>`;
+    expect(tcb(TEMPLATE)).toContain('var _t2 = _t1.$implicit;');
+  });
+
+  it('should handle implicit vars when using microsyntax', () => {
+    const TEMPLATE = `<div *ngFor="let user of users"></div>`;
+    expect(tcb(TEMPLATE)).toContain('var _t2 = _t1.$implicit;');
+  });
+
   it('should generate a forward element reference correctly', () => {
     const TEMPLATE = `
       {{ i.value }}

From c7850fff3be566aecd3dc0002f2e636963a35933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Thu, 16 May 2019 14:30:44 -0700
Subject: [PATCH 270/275] refactor(ivy): rename debug.ts to lview_debug.ts
 (#30542)

PR Close #30542
---
 packages/core/src/render3/i18n.ts             | 46 ++++++++++---------
 .../{debug.ts => instructions/lview_debug.ts} | 24 +++++-----
 .../core/src/render3/instructions/shared.ts   |  3 +-
 packages/core/test/render3/debug_spec.ts      |  2 +-
 4 files changed, 38 insertions(+), 37 deletions(-)
 rename packages/core/src/render3/{debug.ts => instructions/lview_debug.ts} (95%)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 868d8ede3a..0b82ab5a1b 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -6,29 +6,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { getPluralCase } from '../i18n/localization';
+import { getTemplateContent, SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS } from '../sanitization/html_sanitizer';
+import { InertBodyHelper } from '../sanitization/inert_body';
+import { sanitizeSrcset, _sanitizeUrl } from '../sanitization/url_sanitizer';
+import { addAllToArray } from '../util/array_utils';
+import { assertDataInRange, assertDefined, assertEqual, assertGreaterThan } from '../util/assert';
 import '../util/ng_i18n_closure_mode';
-import {getPluralCase} from '../i18n/localization';
-import {SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS, getTemplateContent} from '../sanitization/html_sanitizer';
-import {InertBodyHelper} from '../sanitization/inert_body';
-import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer';
-import {addAllToArray} from '../util/array_utils';
-import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
-import {attachPatchData} from './context_discovery';
-import {attachI18nOpCodesDebug} from './debug';
-import {elementAttributeInternal, ɵɵload, ɵɵtextBinding} from './instructions/all';
-import {allocExpando, elementPropertyInternal, getOrCreateTNode, setInputsForProperty} from './instructions/shared';
-import {LContainer, NATIVE} from './interfaces/container';
-import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
-import {TElementNode, TIcuContainerNode, TNode, TNodeType} from './interfaces/node';
-import {RComment, RElement, RText} from './interfaces/renderer';
-import {SanitizerFn} from './interfaces/sanitization';
-import {StylingContext} from './interfaces/styling';
-import {BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, TView, T_HOST} from './interfaces/view';
-import {appendChild, createTextNode, nativeRemoveNode} from './node_manipulation';
-import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from './state';
-import {NO_CHANGE} from './tokens';
-import {renderStringify} from './util/misc_utils';
-import {getNativeByIndex, getNativeByTNode, getTNode, isLContainer} from './util/view_utils';
+import { attachPatchData } from './context_discovery';
+import { attachI18nOpCodesDebug } from './debug';
+import { elementAttributeInternal, ɵɵload, ɵɵtextBinding } from './instructions/all';
+import { allocExpando, elementPropertyInternal, getOrCreateTNode, setInputsForProperty } from './instructions/shared';
+import { LContainer, NATIVE } from './interfaces/container';
+import { COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu } from './interfaces/i18n';
+import { TElementNode, TIcuContainerNode, TNode, TNodeType } from './interfaces/node';
+import { RComment, RElement, RText } from './interfaces/renderer';
+import { SanitizerFn } from './interfaces/sanitization';
+import { StylingContext } from './interfaces/styling';
+import { BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, TView, T_HOST } from './interfaces/view';
+import { appendChild, createTextNode, nativeRemoveNode } from './node_manipulation';
+import { getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode } from './state';
+import { NO_CHANGE } from './tokens';
+import { renderStringify } from './util/misc_utils';
+import { getNativeByIndex, getNativeByTNode, getTNode, isLContainer } from './util/view_utils';
+
+
 
 
 const MARKER = `�`;
diff --git a/packages/core/src/render3/debug.ts b/packages/core/src/render3/instructions/lview_debug.ts
similarity index 95%
rename from packages/core/src/render3/debug.ts
rename to packages/core/src/render3/instructions/lview_debug.ts
index 0d186a5568..dcf9badded 100644
--- a/packages/core/src/render3/debug.ts
+++ b/packages/core/src/render3/instructions/lview_debug.ts
@@ -6,19 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDefined} from '../util/assert';
+import {assertDefined} from '../../util/assert';
 
-import {ACTIVE_INDEX, CONTAINER_HEADER_OFFSET, LContainer, NATIVE} from './interfaces/container';
-import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, TIcu} from './interfaces/i18n';
-import {TNode} from './interfaces/node';
-import {LQueries} from './interfaces/query';
-import {RComment, RElement} from './interfaces/renderer';
-import {StylingContext} from './interfaces/styling';
-import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTENT_QUERIES, CONTEXT, DECLARATION_VIEW, FLAGS, HEADER_OFFSET, HOST, INJECTOR, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, TVIEW, T_HOST} from './interfaces/view';
-import {runtimeIsNewStylingInUse} from './styling_next/state';
-import {DebugStyling as DebugNewStyling, NodeStylingDebug} from './styling_next/styling_debug';
-import {attachDebugObject} from './util/debug_utils';
-import {getTNode, isStylingContext, unwrapRNode} from './util/view_utils';
+import {ACTIVE_INDEX, CONTAINER_HEADER_OFFSET, LContainer, NATIVE} from '../interfaces/container';
+import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, TIcu} from '../interfaces/i18n';
+import {TNode} from '../interfaces/node';
+import {LQueries} from '../interfaces/query';
+import {RComment, RElement} from '../interfaces/renderer';
+import {StylingContext} from '../interfaces/styling';
+import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTENT_QUERIES, CONTEXT, DECLARATION_VIEW, FLAGS, HEADER_OFFSET, HOST, INJECTOR, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, TVIEW, T_HOST} from '../interfaces/view';
+import {runtimeIsNewStylingInUse} from '../styling_next/state';
+import {DebugStyling as DebugNewStyling, NodeStylingDebug} from '../styling_next/styling_debug';
+import {attachDebugObject} from '../util/debug_utils';
+import {getTNode, isStylingContext, unwrapRNode} from '../util/view_utils';
 
 /*
  * This file contains conditionally attached classes which provide human readable (debug) level
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 41ebfb15b2..2a869d7dc9 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -15,7 +15,6 @@ import {assertDataInRange, assertDefined, assertDomNode, assertEqual, assertLess
 import {normalizeDebugBindingName, normalizeDebugBindingValue} from '../../util/ng_reflect';
 import {assertLView, assertPreviousIsParent} from '../assert';
 import {attachPatchData, getComponentViewByInstance} from '../context_discovery';
-import {attachLContainerDebug, attachLViewDebug} from '../debug';
 import {diPublicInInjector, getNodeInjectable, getOrCreateNodeInjectorForNode} from '../di';
 import {throwMultipleComponentError} from '../errors';
 import {executeHooks, executePreOrderHooks, registerPreOrderHooks} from '../hooks';
@@ -38,6 +37,7 @@ import {attrsStylingIndexOf} from '../util/attrs_utils';
 import {INTERPOLATION_DELIMITER, stringifyForError} from '../util/misc_utils';
 import {getLViewParent, getRootContext} from '../util/view_traversal_utils';
 import {getComponentViewByIndex, getNativeByIndex, getNativeByTNode, getTNode, isComponent, isComponentDef, isContentQueryHost, isLContainer, isRootView, readPatchedLView, resetPreOrderHookFlags, unwrapRNode, viewAttachedToChangeDetector} from '../util/view_utils';
+import {attachLContainerDebug, attachLViewDebug} from './lview_debug';
 
 
 
@@ -605,7 +605,6 @@ export function createTView(
     schemas: schemas,
   };
 }
-
 function createViewBlueprint(bindingStartIndex: number, initialViewLength: number): LView {
   const blueprint = new Array(initialViewLength)
                         .fill(null, 0, bindingStartIndex)
diff --git a/packages/core/test/render3/debug_spec.ts b/packages/core/test/render3/debug_spec.ts
index 794dfb9d56..35937c0c61 100644
--- a/packages/core/test/render3/debug_spec.ts
+++ b/packages/core/test/render3/debug_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {getLContext} from '../../src/render3/context_discovery';
-import {LViewDebug, toDebug} from '../../src/render3/debug';
 import {RenderFlags, ɵɵdefineComponent, ɵɵelementEnd, ɵɵelementStart, ɵɵtext} from '../../src/render3/index';
+import {LViewDebug, toDebug} from '../../src/render3/instructions/lview_debug';
 
 import {ComponentFixture} from './render_util';
 

From 55a14e48662d7267cf755f8526710273febf4e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Fri, 17 May 2019 09:52:31 -0700
Subject: [PATCH 271/275] feat(ivy): in `ngDevMode` use named object literals
 and arrays for easier debugging/profiling (#30542)

PR Close #30542
---
 packages/core/src/render3/i18n.ts             |  44 +++---
 .../src/render3/instructions/lview_debug.ts   |  84 +++++++++-
 .../core/src/render3/instructions/shared.ts   | 146 +++++++++++-------
 packages/core/src/util/named_array_type.ts    |  42 +++++
 packages/core/src/util/ng_dev_mode.ts         |   6 +-
 .../core/test/acceptance/styling_next_spec.ts |   2 +-
 6 files changed, 244 insertions(+), 80 deletions(-)
 create mode 100644 packages/core/src/util/named_array_type.ts

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index 0b82ab5a1b..ae8008fafe 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -6,31 +6,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { getPluralCase } from '../i18n/localization';
-import { getTemplateContent, SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS } from '../sanitization/html_sanitizer';
-import { InertBodyHelper } from '../sanitization/inert_body';
-import { sanitizeSrcset, _sanitizeUrl } from '../sanitization/url_sanitizer';
-import { addAllToArray } from '../util/array_utils';
-import { assertDataInRange, assertDefined, assertEqual, assertGreaterThan } from '../util/assert';
 import '../util/ng_i18n_closure_mode';
-import { attachPatchData } from './context_discovery';
-import { attachI18nOpCodesDebug } from './debug';
-import { elementAttributeInternal, ɵɵload, ɵɵtextBinding } from './instructions/all';
-import { allocExpando, elementPropertyInternal, getOrCreateTNode, setInputsForProperty } from './instructions/shared';
-import { LContainer, NATIVE } from './interfaces/container';
-import { COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu } from './interfaces/i18n';
-import { TElementNode, TIcuContainerNode, TNode, TNodeType } from './interfaces/node';
-import { RComment, RElement, RText } from './interfaces/renderer';
-import { SanitizerFn } from './interfaces/sanitization';
-import { StylingContext } from './interfaces/styling';
-import { BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, TView, T_HOST } from './interfaces/view';
-import { appendChild, createTextNode, nativeRemoveNode } from './node_manipulation';
-import { getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode } from './state';
-import { NO_CHANGE } from './tokens';
-import { renderStringify } from './util/misc_utils';
-import { getNativeByIndex, getNativeByTNode, getTNode, isLContainer } from './util/view_utils';
 
+import {getPluralCase} from '../i18n/localization';
+import {SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS, getTemplateContent} from '../sanitization/html_sanitizer';
+import {InertBodyHelper} from '../sanitization/inert_body';
+import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer';
+import {addAllToArray} from '../util/array_utils';
+import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
 
+import {attachPatchData} from './context_discovery';
+import {elementAttributeInternal, ɵɵload, ɵɵtextBinding} from './instructions/all';
+import {attachI18nOpCodesDebug} from './instructions/lview_debug';
+import {allocExpando, elementPropertyInternal, getOrCreateTNode, setInputsForProperty} from './instructions/shared';
+import {LContainer, NATIVE} from './interfaces/container';
+import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
+import {TElementNode, TIcuContainerNode, TNode, TNodeType} from './interfaces/node';
+import {RComment, RElement, RText} from './interfaces/renderer';
+import {SanitizerFn} from './interfaces/sanitization';
+import {StylingContext} from './interfaces/styling';
+import {BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, TView, T_HOST} from './interfaces/view';
+import {appendChild, createTextNode, nativeRemoveNode} from './node_manipulation';
+import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from './state';
+import {NO_CHANGE} from './tokens';
+import {renderStringify} from './util/misc_utils';
+import {getNativeByIndex, getNativeByTNode, getTNode, isLContainer} from './util/view_utils';
 
 
 const MARKER = `�`;
diff --git a/packages/core/src/render3/instructions/lview_debug.ts b/packages/core/src/render3/instructions/lview_debug.ts
index dcf9badded..f82ca663a7 100644
--- a/packages/core/src/render3/instructions/lview_debug.ts
+++ b/packages/core/src/render3/instructions/lview_debug.ts
@@ -6,20 +6,24 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ComponentTemplate} from '..';
+import {SchemaMetadata} from '../../core';
 import {assertDefined} from '../../util/assert';
-
+import {createNamedArrayType} from '../../util/named_array_type';
 import {ACTIVE_INDEX, CONTAINER_HEADER_OFFSET, LContainer, NATIVE} from '../interfaces/container';
+import {DirectiveDefList, PipeDefList, ViewQueriesFunction} from '../interfaces/definition';
 import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, TIcu} from '../interfaces/i18n';
-import {TNode} from '../interfaces/node';
+import {TElementNode, TNode, TViewNode} from '../interfaces/node';
 import {LQueries} from '../interfaces/query';
 import {RComment, RElement} from '../interfaces/renderer';
 import {StylingContext} from '../interfaces/styling';
-import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTENT_QUERIES, CONTEXT, DECLARATION_VIEW, FLAGS, HEADER_OFFSET, HOST, INJECTOR, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, TVIEW, T_HOST} from '../interfaces/view';
+import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTENT_QUERIES, CONTEXT, DECLARATION_VIEW, ExpandoInstructions, FLAGS, HEADER_OFFSET, HOST, HookData, INJECTOR, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, TData, TVIEW, TView as ITView, T_HOST} from '../interfaces/view';
 import {runtimeIsNewStylingInUse} from '../styling_next/state';
 import {DebugStyling as DebugNewStyling, NodeStylingDebug} from '../styling_next/styling_debug';
 import {attachDebugObject} from '../util/debug_utils';
 import {getTNode, isStylingContext, unwrapRNode} from '../util/view_utils';
 
+
 /*
  * This file contains conditionally attached classes which provide human readable (debug) level
  * information for `LView`, `LContainer` and other internal data structures. These data structures
@@ -50,6 +54,80 @@ import {getTNode, isStylingContext, unwrapRNode} from '../util/view_utils';
  */
 
 
+export const LViewArray = ngDevMode && createNamedArrayType('LView');
+let LVIEW_EMPTY: unknown[];  // can't initialize here or it will not be tree shaken, because `LView`
+                             // constructor could have side-effects.
+/**
+ * This function clones a blueprint and creates LView.
+ *
+ * Simple slice will keep the same type, and we need it to be LView
+ */
+export function cloneToLView(list: any[]): LView {
+  if (LVIEW_EMPTY === undefined) LVIEW_EMPTY = new LViewArray !();
+  return LVIEW_EMPTY.concat(list) as any;
+}
+
+/**
+ * This class is a debug version of Object literal so that we can have constructor name show up in
+ * debug tools in ngDevMode.
+ */
+export const TViewConstructor = class TView implements ITView {
+  constructor(
+      public id: number,                                     //
+      public blueprint: LView,                               //
+      public template: ComponentTemplate<{}>|null,           //
+      public viewQuery: ViewQueriesFunction<{}>|null,        //
+      public node: TViewNode|TElementNode|null,              //
+      public data: TData,                                    //
+      public bindingStartIndex: number,                      //
+      public viewQueryStartIndex: number,                    //
+      public expandoStartIndex: number,                      //
+      public expandoInstructions: ExpandoInstructions|null,  //
+      public firstTemplatePass: boolean,                     //
+      public staticViewQueries: boolean,                     //
+      public staticContentQueries: boolean,                  //
+      public preOrderHooks: HookData|null,                   //
+      public preOrderCheckHooks: HookData|null,              //
+      public contentHooks: HookData|null,                    //
+      public contentCheckHooks: HookData|null,               //
+      public viewHooks: HookData|null,                       //
+      public viewCheckHooks: HookData|null,                  //
+      public destroyHooks: HookData|null,                    //
+      public cleanup: any[]|null,                            //
+      public contentQueries: number[]|null,                  //
+      public components: number[]|null,                      //
+      public directiveRegistry: DirectiveDefList|null,       //
+      public pipeRegistry: PipeDefList|null,                 //
+      public firstChild: TNode|null,                         //
+      public schemas: SchemaMetadata[]|null,                 //
+      ) {}
+};
+
+const TViewData = ngDevMode && createNamedArrayType('TViewData');
+let TVIEWDATA_EMPTY:
+    unknown[];  // can't initialize here or it will not be tree shaken, because `LView`
+                // constructor could have side-effects.
+/**
+ * This function clones a blueprint and creates TData.
+ *
+ * Simple slice will keep the same type, and we need it to be TData
+ */
+export function cloneToTViewData(list: any[]): TData {
+  if (TVIEWDATA_EMPTY === undefined) TVIEWDATA_EMPTY = new TViewData !();
+  return TVIEWDATA_EMPTY.concat(list) as any;
+}
+
+export const LViewBlueprint = ngDevMode && createNamedArrayType('LViewBlueprint');
+export const MatchesArray = ngDevMode && createNamedArrayType('MatchesArray');
+export const TViewComponents = ngDevMode && createNamedArrayType('TViewComponents');
+export const TNodeLocalNames = ngDevMode && createNamedArrayType('TNodeLocalNames');
+export const TNodeInitialInputs = ngDevMode && createNamedArrayType('TNodeInitialInputs');
+export const TNodeInitialData = ngDevMode && createNamedArrayType('TNodeInitialData');
+export const LCleanup = ngDevMode && createNamedArrayType('LCleanup');
+export const TCleanup = ngDevMode && createNamedArrayType('TCleanup');
+
+
+
 export function attachLViewDebug(lView: LView) {
   attachDebugObject(lView, new LViewDebug(lView));
 }
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 2a869d7dc9..6607f8d93b 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -12,6 +12,7 @@ import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SchemaMetadata} from '../../me
 import {validateAgainstEventProperties} from '../../sanitization/sanitization';
 import {Sanitizer} from '../../sanitization/security';
 import {assertDataInRange, assertDefined, assertDomNode, assertEqual, assertLessThan, assertNotEqual, assertNotSame} from '../../util/assert';
+import {createNamedArrayType} from '../../util/named_array_type';
 import {normalizeDebugBindingName, normalizeDebugBindingValue} from '../../util/ng_reflect';
 import {assertLView, assertPreviousIsParent} from '../assert';
 import {attachPatchData, getComponentViewByInstance} from '../context_discovery';
@@ -37,7 +38,8 @@ import {attrsStylingIndexOf} from '../util/attrs_utils';
 import {INTERPOLATION_DELIMITER, stringifyForError} from '../util/misc_utils';
 import {getLViewParent, getRootContext} from '../util/view_traversal_utils';
 import {getComponentViewByIndex, getNativeByIndex, getNativeByTNode, getTNode, isComponent, isComponentDef, isContentQueryHost, isLContainer, isRootView, readPatchedLView, resetPreOrderHookFlags, unwrapRNode, viewAttachedToChangeDetector} from '../util/view_utils';
-import {attachLContainerDebug, attachLViewDebug} from './lview_debug';
+
+import {LCleanup, LViewBlueprint, MatchesArray, TCleanup, TNodeInitialData, TNodeInitialInputs, TNodeLocalNames, TViewComponents, TViewConstructor, attachLContainerDebug, attachLViewDebug, cloneToLView, cloneToTViewData} from './lview_debug';
 
 
 
@@ -199,13 +201,12 @@ export function elementCreate(name: string, overriddenRenderer?: Renderer3): REl
   }
   return native;
 }
-
 export function createLView<T>(
     parentLView: LView | null, tView: TView, context: T | null, flags: LViewFlags,
     host: RElement | null, tHostNode: TViewNode | TElementNode | null,
     rendererFactory?: RendererFactory3 | null, renderer?: Renderer3 | null,
     sanitizer?: Sanitizer | null, injector?: Injector | null): LView {
-  const lView = tView.blueprint.slice() as LView;
+  const lView = ngDevMode ? cloneToLView(tView.blueprint) : tView.blueprint.slice() as LView;
   lView[HOST] = host;
   lView[FLAGS] = flags | LViewFlags.CreationMode | LViewFlags.Attached | LViewFlags.FirstLViewPass;
   resetPreOrderHookFlags(lView);
@@ -553,6 +554,7 @@ export function getOrCreateTView(def: ComponentDef<any>): TView {
                            def.viewQuery, def.schemas));
 }
 
+
 /**
  * Creates a TView instance
  *
@@ -575,38 +577,71 @@ export function createTView(
   // that has a host binding, we will update the blueprint with that def's hostVars count.
   const initialViewLength = bindingStartIndex + vars;
   const blueprint = createViewBlueprint(bindingStartIndex, initialViewLength);
-  return blueprint[TVIEW as any] = {
-    id: viewIndex,
-    blueprint: blueprint,
-    template: templateFn,
-    viewQuery: viewQuery,
-    node: null !,
-    data: blueprint.slice().fill(null, bindingStartIndex),
-    bindingStartIndex: bindingStartIndex,
-    viewQueryStartIndex: initialViewLength,
-    expandoStartIndex: initialViewLength,
-    expandoInstructions: null,
-    firstTemplatePass: true,
-    staticViewQueries: false,
-    staticContentQueries: false,
-    preOrderHooks: null,
-    preOrderCheckHooks: null,
-    contentHooks: null,
-    contentCheckHooks: null,
-    viewHooks: null,
-    viewCheckHooks: null,
-    destroyHooks: null,
-    cleanup: null,
-    contentQueries: null,
-    components: null,
-    directiveRegistry: typeof directives === 'function' ? directives() : directives,
-    pipeRegistry: typeof pipes === 'function' ? pipes() : pipes,
-    firstChild: null,
-    schemas: schemas,
-  };
+  return blueprint[TVIEW as any] = ngDevMode ?
+      new TViewConstructor(
+             viewIndex,   // id: number,
+             blueprint,   // blueprint: LView,
+             templateFn,  // template: ComponentTemplate<{}>|null,
+             viewQuery,   // viewQuery: ViewQueriesFunction<{}>|null,
+             null !,      // node: TViewNode|TElementNode|null,
+             cloneToTViewData(blueprint).fill(null, bindingStartIndex),  // data: TData,
+             bindingStartIndex,  // bindingStartIndex: number,
+             initialViewLength,  // viewQueryStartIndex: number,
+             initialViewLength,  // expandoStartIndex: number,
+             null,               // expandoInstructions: ExpandoInstructions|null,
+             true,               // firstTemplatePass: boolean,
+             false,              // staticViewQueries: boolean,
+             false,              // staticContentQueries: boolean,
+             null,               // preOrderHooks: HookData|null,
+             null,               // preOrderCheckHooks: HookData|null,
+             null,               // contentHooks: HookData|null,
+             null,               // contentCheckHooks: HookData|null,
+             null,               // viewHooks: HookData|null,
+             null,               // viewCheckHooks: HookData|null,
+             null,               // destroyHooks: HookData|null,
+             null,               // cleanup: any[]|null,
+             null,               // contentQueries: number[]|null,
+             null,               // components: number[]|null,
+             typeof directives === 'function' ?
+                 directives() :
+                 directives,  // directiveRegistry: DirectiveDefList|null,
+             typeof pipes === 'function' ? pipes() : pipes,  // pipeRegistry: PipeDefList|null,
+             null,                                           // firstChild: TNode|null,
+             schemas,                                        // schemas: SchemaMetadata[]|null,
+             ) :
+      {
+        id: viewIndex,
+        blueprint: blueprint,
+        template: templateFn,
+        viewQuery: viewQuery,
+        node: null !,
+        data: blueprint.slice().fill(null, bindingStartIndex),
+        bindingStartIndex: bindingStartIndex,
+        viewQueryStartIndex: initialViewLength,
+        expandoStartIndex: initialViewLength,
+        expandoInstructions: null,
+        firstTemplatePass: true,
+        staticViewQueries: false,
+        staticContentQueries: false,
+        preOrderHooks: null,
+        preOrderCheckHooks: null,
+        contentHooks: null,
+        contentCheckHooks: null,
+        viewHooks: null,
+        viewCheckHooks: null,
+        destroyHooks: null,
+        cleanup: null,
+        contentQueries: null,
+        components: null,
+        directiveRegistry: typeof directives === 'function' ? directives() : directives,
+        pipeRegistry: typeof pipes === 'function' ? pipes() : pipes,
+        firstChild: null,
+        schemas: schemas,
+      };
 }
+
 function createViewBlueprint(bindingStartIndex: number, initialViewLength: number): LView {
-  const blueprint = new Array(initialViewLength)
+  const blueprint = new (ngDevMode ? LViewBlueprint ! : Array)(initialViewLength)
                         .fill(null, 0, bindingStartIndex)
                         .fill(NO_CHANGE, bindingStartIndex) as LView;
   blueprint[BINDING_INDEX] = bindingStartIndex;
@@ -1132,7 +1167,6 @@ function postProcessBaseDirective<T>(
 }
 
 
-
 /**
 * Matches the current node against all available selectors.
 * If a component is matched (at most one), it is returned in first position in the array.
@@ -1146,7 +1180,7 @@ function findDirectiveMatches(tView: TView, viewData: LView, tNode: TNode): Dire
     for (let i = 0; i < registry.length; i++) {
       const def = registry[i] as ComponentDef<any>| DirectiveDef<any>;
       if (isNodeMatchingSelectorList(tNode, def.selectors !, /* isProjectionMode */ false)) {
-        matches || (matches = []);
+        matches || (matches = ngDevMode ? new MatchesArray !() : []);
         diPublicInInjector(
             getOrCreateNodeInjectorForNode(
                 getPreviousOrParentTNode() as TElementNode | TContainerNode | TElementContainerNode,
@@ -1173,7 +1207,8 @@ export function queueComponentIndexForCheck(previousOrParentTNode: TNode): void
   const tView = getLView()[TVIEW];
   ngDevMode &&
       assertEqual(tView.firstTemplatePass, true, 'Should only be called in first template pass.');
-  (tView.components || (tView.components = [])).push(previousOrParentTNode.index);
+  (tView.components || (tView.components = ngDevMode ? new TViewComponents !() : [
+   ])).push(previousOrParentTNode.index);
 }
 
 
@@ -1181,7 +1216,8 @@ export function queueComponentIndexForCheck(previousOrParentTNode: TNode): void
 function cacheMatchingLocalNames(
     tNode: TNode, localRefs: string[] | null, exportsMap: {[key: string]: number}): void {
   if (localRefs) {
-    const localNames: (string | number)[] = tNode.localNames = [];
+    const localNames: (string | number)[] = tNode.localNames =
+        ngDevMode ? new TNodeLocalNames !() : [];
 
     // Local names must be stored in tNode in the same order that localRefs are defined
     // in the template to ensure the data is loaded in the same slots as their refs
@@ -1320,7 +1356,8 @@ function setInputsFromAttrs<T>(
  */
 function generateInitialInputs(
     directiveIndex: number, inputs: {[key: string]: string}, tNode: TNode): InitialInputData {
-  const initialInputData: InitialInputData = tNode.initialInputs || (tNode.initialInputs = []);
+  const initialInputData: InitialInputData =
+      tNode.initialInputs || (tNode.initialInputs = ngDevMode ? new TNodeInitialInputs !() : []);
   // Ensure that we don't create sparse arrays
   for (let i = initialInputData.length; i <= directiveIndex; i++) {
     initialInputData.push(null);
@@ -1347,8 +1384,8 @@ function generateInitialInputs(
     const attrValue = attrs[i + 1];
 
     if (minifiedInputName !== undefined) {
-      const inputsToStore: InitialInputs =
-          initialInputData[directiveIndex] || (initialInputData[directiveIndex] = []);
+      const inputsToStore: InitialInputs = initialInputData[directiveIndex] ||
+          (initialInputData[directiveIndex] = ngDevMode ? new TNodeInitialData !() : []);
       inputsToStore.push(attrName as string, minifiedInputName, attrValue as string);
     }
 
@@ -1361,6 +1398,9 @@ function generateInitialInputs(
 //// ViewContainer & View
 //////////////////////////
 
+// Not sure why I need to do `any` here but TS complains later.
+const LContainerArray: any = ngDevMode && createNamedArrayType('LContainer');
+
 /**
  * Creates a LContainer, either from a container instruction, or for a ViewContainerRef.
  *
@@ -1376,16 +1416,17 @@ export function createLContainer(
     tNode: TNode, isForViewContainerRef?: boolean): LContainer {
   ngDevMode && assertDomNode(native);
   ngDevMode && assertLView(currentView);
-  const lContainer: LContainer = [
-    hostNative,  // host native
-    true,        // Boolean `true` in this position signifies that this is an `LContainer`
-    isForViewContainerRef ? -1 : 0,  // active index
-    currentView,                     // parent
-    null,                            // next
-    null,                            // queries
-    tNode,                           // t_host
-    native,                          // native
-  ];
+  // https://jsperf.com/array-literal-vs-new-array-really
+  const lContainer: LContainer = new (ngDevMode ? LContainerArray : Array)(
+      hostNative,  // host native
+      true,        // Boolean `true` in this position signifies that this is an `LContainer`
+      isForViewContainerRef ? -1 : 0,  // active index
+      currentView,                     // parent
+      null,                            // next
+      null,                            // queries
+      tNode,                           // t_host
+      native,                          // native
+      );
   ngDevMode && attachLContainerDebug(lContainer);
   return lContainer;
 }
@@ -1711,14 +1752,13 @@ export function initializeTNodeInputs(tNode: TNode): PropertyAliases|null {
   return tNode.inputs;
 }
 
-
 export function getCleanup(view: LView): any[] {
   // top level variables should not be exported for performance reasons (PERF_NOTES.md)
-  return view[CLEANUP] || (view[CLEANUP] = []);
+  return view[CLEANUP] || (view[CLEANUP] = ngDevMode ? new LCleanup !() : []);
 }
 
 function getTViewCleanup(view: LView): any[] {
-  return view[TVIEW].cleanup || (view[TVIEW].cleanup = []);
+  return view[TVIEW].cleanup || (view[TVIEW].cleanup = ngDevMode ? new TCleanup !() : []);
 }
 
 /**
diff --git a/packages/core/src/util/named_array_type.ts b/packages/core/src/util/named_array_type.ts
new file mode 100644
index 0000000000..f73a00ce35
--- /dev/null
+++ b/packages/core/src/util/named_array_type.ts
@@ -0,0 +1,42 @@
+
+/**
+ * @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 './ng_dev_mode';
+import {global} from './global';
+
+/**
+ * THIS FILE CONTAINS CODE WHICH SHOULD BE TREE SHAKEN AND NEVER CALLED FROM PRODUCTION CODE!!!
+ */
+
+
+/**
+ * Creates an `Array` construction with a given name. This is useful when
+ * looking for memory consumption to see what time of array it is.
+ *
+ *
+ * @param name Name to give to the constructor
+ * @returns A subclass of `Array` if possible. This can only be done in
+ *          environments which support `class` construct.
+ */
+export function createNamedArrayType(name: string): typeof Array {
+  // This should never be called in prod mode, so let's verify that is the case.
+  if (ngDevMode) {
+    try {
+      // We need to do it this way so that TypeScript does not down-level the below code.
+      const FunctionConstructor: any = createNamedArrayType.constructor;
+      return (new FunctionConstructor('Array', `return class ABC extends Array{}`))(Array);
+    } catch (e) {
+      // If it does not work just give up and fall back to regular Array.
+      return Array;
+    }
+  } else {
+    throw new Error(
+        'Looks like we are in \'prod mode\', but we are creating a named Array type, which is wrong! Check your code');
+  }
+}
\ No newline at end of file
diff --git a/packages/core/src/util/ng_dev_mode.ts b/packages/core/src/util/ng_dev_mode.ts
index d70d65c44a..f0424c44b3 100644
--- a/packages/core/src/util/ng_dev_mode.ts
+++ b/packages/core/src/util/ng_dev_mode.ts
@@ -11,6 +11,7 @@ import {global} from './global';
 declare global {
   const ngDevMode: null|NgDevModePerfCounters;
   interface NgDevModePerfCounters {
+    namedConstructors: boolean;
     firstTemplatePass: number;
     tNode: number;
     tView: number;
@@ -45,7 +46,9 @@ declare global {
 }
 
 export function ngDevModeResetPerfCounters(): NgDevModePerfCounters {
+  const locationString = typeof location !== 'undefined' ? location.toString() : '';
   const newCounters: NgDevModePerfCounters = {
+    namedConstructors: locationString.indexOf('ngDevMode=namedConstructors') != -1,
     firstTemplatePass: 0,
     tNode: 0,
     tView: 0,
@@ -79,7 +82,8 @@ export function ngDevModeResetPerfCounters(): NgDevModePerfCounters {
   };
 
   // Make sure to refer to ngDevMode as ['ngDevMode'] for closure.
-  global['ngDevMode'] = newCounters;
+  const allowNgDevModeTrue = locationString.indexOf('ngDevMode=false') === -1;
+  global['ngDevMode'] = allowNgDevModeTrue && newCounters;
   return newCounters;
 }
 
diff --git a/packages/core/test/acceptance/styling_next_spec.ts b/packages/core/test/acceptance/styling_next_spec.ts
index 1b22f5d273..4c5b50cd1b 100644
--- a/packages/core/test/acceptance/styling_next_spec.ts
+++ b/packages/core/test/acceptance/styling_next_spec.ts
@@ -9,7 +9,7 @@ import {CompilerStylingMode, compilerSetStylingMode} from '@angular/compiler/src
 import {Component, Directive, HostBinding, Input, ViewChild} from '@angular/core';
 import {SecurityContext} from '@angular/core/src/core';
 import {getLContext} from '@angular/core/src/render3/context_discovery';
-import {DebugNode, LViewDebug, toDebug} from '@angular/core/src/render3/debug';
+import {DebugNode, LViewDebug, toDebug} from '@angular/core/src/render3/instructions/lview_debug';
 import {SANITIZER} from '@angular/core/src/render3/interfaces/view';
 import {RuntimeStylingMode, runtimeSetStylingMode, setCurrentStyleSanitizer} from '@angular/core/src/render3/styling_next/state';
 import {loadLContextFromNode} from '@angular/core/src/render3/util/discovery_utils';

From 4ecff42e7f53e38d45ef29b2b388ea3fed724e17 Mon Sep 17 00:00:00 2001
From: Bowen Ni <bowen1897@gmail.com>
Date: Thu, 16 May 2019 12:11:11 -0700
Subject: [PATCH 272/275] refactor: Move away from index signature based
 "updateCache". (#30518)

We're deprecating the index signature overloads in favor of using a Map.

PR Close #30518
---
 packages/bazel/src/ngc-wrapped/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bazel/src/ngc-wrapped/index.ts b/packages/bazel/src/ngc-wrapped/index.ts
index f93c908f68..489d74b390 100644
--- a/packages/bazel/src/ngc-wrapped/index.ts
+++ b/packages/bazel/src/ngc-wrapped/index.ts
@@ -165,11 +165,11 @@ export function compile({allDepsCompiledWithBazel = true, compilerOpts, tsHost,
   if (inputs) {
     fileLoader = new CachedFileLoader(fileCache);
     // Resolve the inputs to absolute paths to match TypeScript internals
-    const resolvedInputs: {[path: string]: string} = {};
+    const resolvedInputs = new Map<string, string>();
     const inputKeys = Object.keys(inputs);
     for (let i = 0; i < inputKeys.length; i++) {
       const key = inputKeys[i];
-      resolvedInputs[resolveNormalizedPath(key)] = inputs[key];
+      resolvedInputs.set(resolveNormalizedPath(key), inputs[key]);
     }
     fileCache.updateCache(resolvedInputs);
   } else {

From b74df20c2a035bd0fefdf29fa7fd5ea1a8764eca Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Tue, 4 Jun 2019 16:19:53 +0300
Subject: [PATCH 273/275] docs(service-worker): mention that HTTPS is required,
 unless on `localhost` (#30847)

Fixes #30823

PR Close #30847
---
 .../guide/service-worker-getting-started.md    |  9 ++++++++-
 aio/content/guide/service-worker-intro.md      | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/aio/content/guide/service-worker-getting-started.md b/aio/content/guide/service-worker-getting-started.md
index 5d36fdf3cf..241bd5caea 100644
--- a/aio/content/guide/service-worker-getting-started.md
+++ b/aio/content/guide/service-worker-getting-started.md
@@ -59,6 +59,13 @@ With the server running, you can point your browser at http://localhost:8080/. Y
 
 **Tip:** When testing Angular service workers, it's a good idea to use an incognito or private window in your browser to ensure the service worker doesn't end up reading from a previous leftover state, which can cause unexpected behavior.
 
+<div class="alert is-helpful">
+
+**Note:**
+If you are not using HTTPS, the service worker will only be registered when accessing the app on `localhost`.
+
+</div>
+
 ### Simulating a network issue
 
 To simulate a network issue, disable network interaction for your application. In Chrome:
@@ -156,4 +163,4 @@ The service worker installed the updated version of your app *in the background*
 ## More on Angular service workers
 
 You may also be interested in the following:
-* [Communicating with service workers](guide/service-worker-communications).
\ No newline at end of file
+* [Communicating with service workers](guide/service-worker-communications).
diff --git a/aio/content/guide/service-worker-intro.md b/aio/content/guide/service-worker-intro.md
index 2eba216fb6..e9678ca1ff 100644
--- a/aio/content/guide/service-worker-intro.md
+++ b/aio/content/guide/service-worker-intro.md
@@ -6,16 +6,16 @@ At its simplest, a service worker is a script that runs in the web browser and m
 
 Service workers function as a network proxy. They intercept all outgoing HTTP requests made by the application and can choose how to respond to them. For example, they can query a local cache and deliver a cached response if one is available. Proxying isn't limited to requests made through programmatic APIs, such as `fetch`; it also includes resources referenced in HTML and even the initial request to `index.html`. Service worker-based caching is thus completely programmable and doesn't rely on server-specified caching headers.
 
-Unlike the other scripts that make up an application, such as the Angular app bundle, the service worker is preserved after the user closes the tab. The next time that browser loads the application, the service worker loads first, and can intercept every request for resources to load the application. If the service worker is designed to do so, it can *completely satisfy the loading of the application, without the need for the network*. 
+Unlike the other scripts that make up an application, such as the Angular app bundle, the service worker is preserved after the user closes the tab. The next time that browser loads the application, the service worker loads first, and can intercept every request for resources to load the application. If the service worker is designed to do so, it can *completely satisfy the loading of the application, without the need for the network*.
 
-Even across a fast reliable network, round-trip delays can introduce significant latency when loading the application. Using a service worker to reduce dependency on the network can significantly improve the user experience. 
+Even across a fast reliable network, round-trip delays can introduce significant latency when loading the application. Using a service worker to reduce dependency on the network can significantly improve the user experience.
 
 
 ## Service workers in Angular
 
 Angular applications, as single-page applications, are in a prime position to benefit from the advantages of service workers. Starting with version 5.0.0, Angular ships with a service worker implementation. Angular developers can take advantage of this service worker and benefit from the increased reliability and performance it provides, without needing to code against low-level APIs.
 
-Angular's service worker is designed to optimize the end user experience of using an application over a slow or unreliable network connection, while also minimizing the risks of serving outdated content. 
+Angular's service worker is designed to optimize the end user experience of using an application over a slow or unreliable network connection, while also minimizing the risks of serving outdated content.
 
 The Angular service worker's behavior follows that design goal:
 
@@ -33,14 +33,18 @@ Installing the Angular service worker is as simple as including an `NgModule`. I
 
 Your application must run in a web browser that supports service workers. Currently, service workers are supported in the latest versions of Chrome, Firefox, Edge, Safari, Opera, UC Browser (Android version) and Samsung Internet. Browsers like IE and Opera Mini do not provide the support. To learn more about other browsers that are service worker ready, see the [Can I Use](https://caniuse.com/#feat=serviceworkers) page and [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API).
 
+In addition, in order for service workers to be registered, the app must be accessed over HTTPS, not HTTP. Browsers will ignore service workers on pages that are served over an insecure connection. The reason is that service workers are quite powerful, so extra care needs to be taken to ensure the service worker script has not been tampered with.
+
+There is one exception to this rule: To make local development easier, browsers do _not_ require a secure connection when accessing an app on `localhost`.
+
 ## Related resources
 
-For more information about service workers in general, see [Service Workers: an Introduction](https://developers.google.com/web/fundamentals/primers/service-workers/). 
+For more information about service workers in general, see [Service Workers: an Introduction](https://developers.google.com/web/fundamentals/primers/service-workers/).
 
-For more information about browser support, see the [browser support](https://developers.google.com/web/fundamentals/primers/service-workers/#browser_support) section of [Service Workers: an Introduction](https://developers.google.com/web/fundamentals/primers/service-workers/), Jake Archibald's [Is Serviceworker ready?](https://jakearchibald.github.io/isserviceworkerready/), and 
-[Can I Use](http://caniuse.com/#feat=serviceworkers). 
+For more information about browser support, see the [browser support](https://developers.google.com/web/fundamentals/primers/service-workers/#browser_support) section of [Service Workers: an Introduction](https://developers.google.com/web/fundamentals/primers/service-workers/), Jake Archibald's [Is Serviceworker ready?](https://jakearchibald.github.io/isserviceworkerready/), and
+[Can I Use](http://caniuse.com/#feat=serviceworkers).
 
-The remainder of this Angular documentation specifically addresses the Angular implementation of service workers. 
+The remainder of this Angular documentation specifically addresses the Angular implementation of service workers.
 
 ## More on Angular service workers
 

From 0d4f8c7dd9d40ca81e8f648df7f90164e51b337c Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Tue, 4 Jun 2019 15:04:38 +0200
Subject: [PATCH 274/275] fix(ivy): allow empty cases for ICU expressions
 (#30846)

We used to ignore empty strings for optimization purposes, but it turns out that empty strings are also valid values for ICU cases and we shouldn't ignore those.

FW-1290 #resolve
PR Close #30846
---
 packages/core/src/render3/i18n.ts          | 9 +++------
 packages/core/test/acceptance/i18n_spec.ts | 7 +++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
index ae8008fafe..e3291dcfa8 100644
--- a/packages/core/src/render3/i18n.ts
+++ b/packages/core/src/render3/i18n.ts
@@ -123,7 +123,7 @@ function extractParts(pattern: string): (string | IcuExpression)[] {
         const block = pattern.substring(prevPos, pos);
         if (ICU_BLOCK_REGEXP.test(block)) {
           results.push(parseICUBlock(block));
-        } else if (block) {  // Don't push empty strings
+        } else {
           results.push(block);
         }
 
@@ -140,10 +140,7 @@ function extractParts(pattern: string): (string | IcuExpression)[] {
   }
 
   const substring = pattern.substring(prevPos);
-  if (substring != '') {
-    results.push(substring);
-  }
-
+  results.push(substring);
   return results;
 }
 
@@ -182,7 +179,7 @@ function parseICUBlock(pattern: string): IcuExpression {
     }
 
     const blocks = extractParts(parts[pos++]) as string[];
-    if (blocks.length) {
+    if (cases.length > values.length) {
       values.push(blocks);
     }
   }
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index a71d17304c..4e9bc759b5 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -618,6 +618,13 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
 
       expect(fixture.nativeElement.innerHTML).toContain('at least');
     });
+
+    it('with empty values', () => {
+      const fixture = initWithTemplate(AppComp, `{count, select, 10 {} 20 {twenty} other {other}}`);
+
+      const element = fixture.nativeElement;
+      expect(element).toHaveText('other');
+    });
   });
 
   describe('should support attributes', () => {

From ef4a15bc0ba9109526c31473e0b6912cdaebe8ca Mon Sep 17 00:00:00 2001
From: Lars Gyrup Brink Nielsen <larsbrinknielsen@gmail.com>
Date: Thu, 30 May 2019 14:01:19 +0200
Subject: [PATCH 275/275] docs: correct typos and formatting in the Getting
 Started guide (#30758)

PR Close #30758
---
 .../src/app/cart/cart.component.2.html               |  4 ++--
 .../src/app/shipping/shipping.component.html         |  4 ++--
 .../src/app/shipping/shipping.component.ts           |  4 +++-
 aio/content/start/data.md                            |  8 ++++----
 aio/content/start/deployment.md                      |  2 +-
 aio/content/start/index.md                           | 12 +++++++-----
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/aio/content/examples/getting-started/src/app/cart/cart.component.2.html b/aio/content/examples/getting-started/src/app/cart/cart.component.2.html
index 050618d664..829bc0e8fa 100644
--- a/aio/content/examples/getting-started/src/app/cart/cart.component.2.html
+++ b/aio/content/examples/getting-started/src/app/cart/cart.component.2.html
@@ -9,7 +9,7 @@
 <!-- #docregion prices -->
 
 <div class="cart-item" *ngFor="let item of items">
-  <span>{{ item.name }} </span>
+  <span>{{ item.name }}</span>
   <span>{{ item.price | currency }}</span>
 </div>
-<!-- #enddocregion prices -->
\ No newline at end of file
+<!-- #enddocregion prices -->
diff --git a/aio/content/examples/getting-started/src/app/shipping/shipping.component.html b/aio/content/examples/getting-started/src/app/shipping/shipping.component.html
index d4566bc318..72fc2d58e1 100644
--- a/aio/content/examples/getting-started/src/app/shipping/shipping.component.html
+++ b/aio/content/examples/getting-started/src/app/shipping/shipping.component.html
@@ -1,6 +1,6 @@
 <h3>Shipping Prices</h3>
 
 <div class="shipping-item" *ngFor="let shipping of shippingCosts | async">
-  <span>{{ shipping.type }} </span>
+  <span>{{ shipping.type }}</span>
   <span>{{ shipping.price | currency }}</span>
-</div>
\ No newline at end of file
+</div>
diff --git a/aio/content/examples/getting-started/src/app/shipping/shipping.component.ts b/aio/content/examples/getting-started/src/app/shipping/shipping.component.ts
index 4a86d5c664..6a04bcb55e 100644
--- a/aio/content/examples/getting-started/src/app/shipping/shipping.component.ts
+++ b/aio/content/examples/getting-started/src/app/shipping/shipping.component.ts
@@ -16,7 +16,9 @@ export class ShippingComponent {
 // #enddocregion props
 
 // #docregion inject-cart-service
-  constructor(private cartService: CartService) {
+  constructor(
+    private cartService: CartService
+  ) {
 // #enddocregion inject-cart-service
     this.shippingCosts = this.cartService.getShippingPrices();
 // #docregion inject-cart-service
diff --git a/aio/content/start/data.md b/aio/content/start/data.md
index a95b48c2cf..3afff3b116 100644
--- a/aio/content/start/data.md
+++ b/aio/content/start/data.md
@@ -6,7 +6,7 @@ Users can click on a product name from the list to see details in a new view, wi
 In this section, you'll create the shopping cart. You'll:
 * Update the product details page to include a "Buy" button, which adds the current product to a list of products managed by a cart service. 
 * Add a cart component, which displays the items you added to your cart.
-* Add a shipping component, which retrieves shipping prices for the items in the cart by using Angular's HttpClient to retrieve shipping data from a `.json` file.
+* Add a shipping component, which retrieves shipping prices for the items in the cart by using Angular's `HttpClient` to retrieve shipping data from a `.json` file.
 
 {@a services}
 ## Services
@@ -34,7 +34,7 @@ Later, in the [Forms](start/forms "Getting Started: Forms") part of this tutoria
 
 1. Generate a cart service.
 
-    1. Right click on the `app` folder, choose `Angular Generator`, and choose `**Service**`. Name the new service `cart`.
+    1. Right click on the `app` folder, choose `Angular Generator`, and choose `Service`. Name the new service `cart`.
 
         <code-example header="src/app/cart.service.ts" path="getting-started/src/app/cart.service.1.ts"></code-example>
 
@@ -238,7 +238,7 @@ In this section, you'll use the HTTP client to retrieve shipping prices from an
 
 ### Predefined shipping data
 
-For the purpose of this Getting Started, we have provided shipping data in `assets/shipping.json`. 
+For the purpose of this Getting Started guide, we have provided shipping data in `assets/shipping.json`. 
 You'll use this data to add shipping prices for items in the cart. 
 
 <code-example header="src/assets/shipping.json" path="getting-started/src/assets/shipping.json">
@@ -306,7 +306,7 @@ Here you'll define the `get()` method that will be used.
 
 <div class="alert is-helpful">
 
-Learn more: See the [HttpClient guide](guide/http "HttpClient guide") for more information about Angular's HttpClient. 
+Learn more: See the [HttpClient guide](guide/http "HttpClient guide") for more information about Angular's `HttpClient`.
 
 </div>
 
diff --git a/aio/content/start/deployment.md b/aio/content/start/deployment.md
index 2eed50a886..f909cd086e 100644
--- a/aio/content/start/deployment.md
+++ b/aio/content/start/deployment.md
@@ -52,7 +52,7 @@ This will produce the files that you need to deploy.
 
 #### Hosting the built project
 
-The files in the `dist/my-project-name` folder are static and can be hosted on any web server capable of serving files (node, Java, .NET) or any backend (Firebase, Google Cloud, App Engine, others).
+The files in the `dist/my-project-name` folder are static and can be hosted on any web server capable of serving files (Node, Java, .NET) or any backend (Firebase, Google Cloud, App Engine, others).
 
 ### Hosting an Angular app on Firebase
 
diff --git a/aio/content/start/index.md b/aio/content/start/index.md
index c648a05cdd..31e39be5c2 100644
--- a/aio/content/start/index.md
+++ b/aio/content/start/index.md
@@ -11,7 +11,7 @@ You don't need to install anything: you'll build the app using the [StackBlitz](
 <header>New to web development?</header>
 
 
-You'll find many resources to complement the Angular docs. Mozilla's MDN docs include both [HTML](https://developer.mozilla.org/en-US/docs/Learn/HTML "Learning HTML: Guides and tutorials") and [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript "JavaScript") introductions. [TypeScript's docs](https://www.typescriptlang.org/docs/home.html "TypeScript documentation") include a 5-minute tutorial. Various online course platforms, such as [Udemy](http://www.udemy.com "Udemy online courses") and [Codeacademy](https://www.codecademy.com/ "Codeacademy online courses"), also cover web development basics. 
+You'll find many resources to complement the Angular docs. Mozilla's MDN docs include both [HTML](https://developer.mozilla.org/en-US/docs/Learn/HTML "Learning HTML: Guides and tutorials") and [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript "JavaScript") introductions. [TypeScript's docs](https://www.typescriptlang.org/docs/home.html "TypeScript documentation") include a 5-minute tutorial. Various online course platforms, such as [Udemy](http://www.udemy.com "Udemy online courses") and [Codecademy](https://www.codecademy.com/ "Codeacademy online courses"), also cover web development basics. 
 
 
 </div> 
@@ -69,7 +69,9 @@ In this section, you'll learn about template syntax by enhancing the "Products"
       `*ngFor` causes the `<div>` to be repeated for each product in the list. 
 
       <div class="alert is-helpful">
-      `*ngFor` is a "structural directive". Structural directives shape or reshape the DOM's structure, typically by adding, removing, and manipulating the elements to which they are attached. Any directive with an * is a structural directive.
+
+      `*ngFor` is a "structural directive". Structural directives shape or reshape the DOM's structure, typically by adding, removing, and manipulating the elements to which they are attached. Any directive with an `*` is a structural directive.
+      
       </div>
 
     1. To display the names of the products, use the interpolation syntax {{ }}. Interpolation renders a property's value as text. Inside the `<div>`, add an `<h3>` heading to display the interpolation of the product's name property: 
@@ -131,9 +133,9 @@ The app now has a product list and sharing feature.
 In the process, you've learned to use five common features of Angular's template syntax: 
 * `*ngFor`
 * `*ngIf`
-* Interpolation {{ }}
-* Property binding [ ]
-* Event binding ( ) 
+* Interpolation `{{ }}`
+* Property binding `[ ]`
+* Event binding `( )`
 
 
 <div class="alert is-helpful">